200 files changed, 89576 insertions, 39495 deletions

diff --git a/Makefile.am b/Makefile.am
index 3b88fe0d9..f86a3a46f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,8 @@
 MY_SUBDIRS = tools extensions po data telepathy-yell libempathy libempathy-gtk src help tests
 NST_SUBDIRS = nautilus-sendto-plugin
+GOA_SUBDIRS = goa-mc-plugin
 
-DIST_SUBDIRS = $(MY_SUBDIRS) $(NST_SUBDIRS)
+DIST_SUBDIRS = $(MY_SUBDIRS) $(NST_SUBDIRS) $(GOA_SUBDIRS)
 
 SUBDIRS = $(MY_SUBDIRS)
 
@@ -9,6 +10,10 @@ if HAVE_NST
 SUBDIRS += $(NST_SUBDIRS)
 endif
 
+if HAVE_GOA
+SUBDIRS += $(GOA_SUBDIRS)
+endif
+
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 DISTCHECK_CONFIGURE_FLAGS =		\
diff --git a/NEWS b/NEWS
index ddb2cf89d..ef18f91ef 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,158 @@
+NEW in 3.2.0 (26/09/2011)
+============
+
+The "As good as Bigon's hangover" release.
+
+Here we are, the first 3.2 release. No big change since 3.1.92 as we were in
+hard code freeze so most of the credit goes to the awesome work of the GNOME
+translation team.
+
+Bugs fixed:
+ - Fixed #659118, empathy frequently crashes because of already unref'fed window (Danielle Madeley)
+ - Fixed #659298, log-window: improve icons in the search entry (Cosimo Cecchi)
+
+Translations:
+ - Updated an Translation (Daniel Martinez Cucalon)
+ - Updated as Translation (Nilamdyuti Goswami)
+ - Updated bg Translation (Alexander Shopov)
+ - Updated ca Translation (Gil Forcada)
+ - Updated cs Translation (Petr Kovar, Marek Černocký)
+ - Updated eu Translation (Inaki Larranaga Murgoitio)
+ - Updated ga Translation (Seán de Búrca)
+ - Updated he Translation (Yaron Shahrabani)
+ - Updated hu Translation (Gabor Kelemen)
+ - Updated id Translation (Andika Triwidada)
+ - Updated ko Translation (Changwoo Ryu)
+ - Updated lv Translation (Rudolfs Mazurs)
+ - Updated nl Translation (Hannie Dumoleyn)
+ - Updated sl Translation (Matej Urban�i�)
+ - Updated sr@latin Translation (Миро�лав �иколић)
+ - Updated sr Translation (Миро�лав �иколић)
+ - Updated th Translation (Theppitak Karoonboonyanan)
+ - Updated zh_HK Translation (Cheng-Chia Tseng)
+ - Updated zh_TW Translation (Cheng-Chia Tseng)
+
+Documentation translations:
+ - Updated hu Documentation translation (Gabor Kelemen)
+
+NEW in 3.1.92 (19/09/2011)
+=============
+
+Dependencies:
+ • folks ≥ 0.6.2
+ • champlain ≥ 0.12 (optional)
+ • clutter ≥ 1.7.14 (optional)
+ • the optional dependency on libgnome-control-center has been removed
+
+
+Bugs fixed:
+ - Fixed #580794, creates redundant call windows (Emilio Pozuelo Monfort)
+ - Fixed #632357, Contact list pane start with zero size (Xavier Claessens)
+ - Fixed #648315, Standardise drag-and-drop target types for contacts (Guillaume Desmottes)
+ - Fixed #652985, Avatar selector: weird behaviour if no camera is plugged in (Guillaume Desmottes)
+ - Fixed #655270, Closing application after a ctrl-F causes Gtk-CRITICAL and GLib-GObject-CRITICAL messages. (Guillaume Desmottes)
+ - Fixed #655356, Empathy cancel DTMF tones without minimal delay (Emilio Pozuelo Monfort)
+ - Fixed #655388, Remove libgnome-control-center dependency (Danielle Madeley)
+ - Fixed #657335, Unnecessary and unexplained tickybox for “Echo Cancellation� in Preferences (Will Thompson)
+ - Fixed #657746, Port to the new IndividualAggregator::individuals-changed-detailed signal (Philip Withnall)
+ - Fixed #657818, Prevent haze to be used for irc (Alban Browaeys)
+ - Fixed #658336, History window "Who" list should sort alphabetically (Jussi Kukkonen)
+ - Fixed #658340, empathy-chat crashes when I pick “Add Contact…� (Will Thompson)
+ - Fixed #658341, Support libchamplain 0.11/0.12 (Guillaume Desmottes)
+ - Fixed #658343, Mashing Enter in “New Conversation� dialogue does nothing (Will Thompson)
+ - Fixed #658573, Some contact in buddy list are shown as "empty" (Guillaume Desmottes)
+ - Fixed #658584, empathy-av crashed with SIGSEGV in gst_color_balance_list_channels() (Guillaume Desmottes)
+ - Fixed #658644, Invalid read when leaving a muc (Guillaume Desmottes)
+ - Fixed #658785, online accounts should not connect automatically (Guillaume Desmottes)
+ - Fixed #658821, Use a stable colour for the local user's messages (Guillaume Desmottes)
+ - Fixed #658857, individual-widget: use GtkGrid instead of GtkTable internally (Cosimo Cecchi)
+ - Fixed #658866, Translator comment for string "Provide" in code but not in po file (Guillaume Desmottes)
+ - Fixed #658895, GOA plugin should only save params of GOA accounts (Guillaume Desmottes)
+ - Fixed #658909, Crashes if account is changed before the callback tp_roomlist_create_channel_cb() happens (Guillaume Desmottes)
+ - Fixed #659003, Attack of the mutant tooltips (Cosimo Cecchi)
+ - Fixed #659053, Shouldn't save password until we actually connect (Guillaume Desmottes)
+ - Fixed #659141, Bad gettext syntax for duration string translation (Guillaume Desmottes)
+ - Fixed #659377, properly install schemas files under BSDs (Antoine Jacoutot)
+ - Fixed #659439, empathy-CRITICAL **: account_join_chatrooms: assertion `conn != NULL' failed (Guillaume Desmottes)
+ - Fixed #659476, Remove Folks deprecated API (Raul Gutierrez Segales)
+
+Translations:
+ - Updated ast Translation (Xandru Armesto)
+ - Updated be Translation (Ihar Hrachyshka)
+ - Updated bg Translation (Alexander Shopov, Krasimir Chonov)
+ - Updated cs Translation (Marek Černocký)
+ - Updated da Translation (Kenneth Nielsen)
+ - Updated de Translation (Mario Blättermann)
+ - Updated en_GB Translation (Bruce Cowan)
+ - Updated es Translation (Jorge González, Daniel Mustieles)
+ - Updated fi Translation (Timo Jyrinki)
+ - Updated fr Translation (Bruno Brouard)
+ - Updated gl Translation (Fran Dieguez)
+ - Updated he Translation (Yaron Shahrabani)
+ - Updated hi Translation (Rajesh Ranjan)
+ - Updated id Translation (Andika Triwidada)
+ - Updated it Translation (Milo Casagrande)
+ - Updated ja Translation (Jiro Matsuzawa)
+ - Updated lt Translation (Aurimas ÄŒernius)
+ - Updated lv Translation (Rudolfs Mazurs)
+ - Updated nb Translation (Kjartan Maraas)
+ - Updated nl Translation (Hannie Dumoleyn)
+ - Updated pa Translation (A S Alam)
+ - Updated pl Translation (Piotr DrÄ…g)
+ - Updated pt_BR Translation (Antonio Fernandes C. Neto)
+ - Updated pt Translation (Duarte Loreto)
+ - Updated ru Translation (Yuri Myasoedov)
+ - Updated sv Translation (Daniel Nylander)
+ - Updated ta Translation (Dr.T.Vasudevan)
+ - Updated tr Translation (Muhammet Kara)
+ - Updated zh_CN Translation (Yinghua Wang)
+ - Updated zh_HK Translation (Chao-Hsiung Liao)
+ - Updated zh_TW Translation (Chao-Hsiung Liao)
+
+Documentation translations:
+ - Updated de Documentation translation (Mario Blättermann)
+ - Updated gl Documentation translation (Fran Dieguez)
+
+NEW in 3.1.91 (06/09/2011)
+=============
+
+This release introduces a new optional mission-control plugins providing
+integration with GNOME's online accounts service. With this plugin
+installed, mission-control will automatically create a Telepathy account
+if there is a Google GOA account configured with the 'Chat' feature enabled.
+
+Dependencies:
+
+ • mission-control-plugins (optional)
+ • goa (optional)
+
+Bugs fixed:
+ - Fixed #652543, Add a MC GOA plugin (Danielle Madeley, Guillaume, Desmottes)
+ - Fixed #656871, Shouldn't allow to start video call with audio only contact (Emilio Pozuelo Monfort)
+ - Fixed #657087, build: fix typo in configure summary (Cosimo Cecchi)
+ - Fixed #657266, empathy crashed with SIGSEGV in folks_persona_store_get_can_alias_personas() (Guillaume Desmottes)
+ - Fixed #657842, Search field isn't at the right end of the History window toolbar (Guillaume Desmottes)
+ - Fixed #657843, Chat and Call icons don't match in History window (Emilio Pozuelo Monfort)
+ - Fixed #657914, EmpathyIndividualStore segfaults if contact cannot be obtained by individual (Cosimo Alfarano)
+ - Fixed #657954, log-window: add the "raised" style class to the account chooser (Cosimo Cecchi)
+ - Fixed #657956, primary-toolbar style class has been removed (Cosimo Cecchi)
+ - Fixed #658254, empathy-accounts.desktop should not get installed if no control center embedding (Guillaume Desmottes)
+
+Translations:
+ - Updated be Translation (Ihar Hrachyshka)
+ - Updated fa Translation (Arash Mousavi)
+ - Updated gl Translation (Fran Dieguez)
+ - Updated lt Translation (Aurimas ÄŒernius)
+ - Updated nb Translation (Kjartan Maraas)
+ - Updated nl Translation (Hannie Dumoleyn)
+ - Updated pt_BR Translation (Antonio Fernandes C. Neto)
+ - Updated ru Translation (Yuri Myasoedov)
+ - Updated sv Translation (Daniel Nylander)
+ - Updated ta Translation (Dr.T.Vasudevan)
+
+Documentation translations:
+ - Updated es Documentation translation (Jorge González)
+
 NEW in 3.1.90.1 (31/08/2011)
 ===============
 
diff --git a/configure.ac b/configure.ac
index 94ba3fe01..9ca9f61e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,9 +2,9 @@ dnl If not 1, append datestamp to the version number
 m4_define(empathy_released, 0)
 
 m4_define([empathy_major_version], [3])
-m4_define([empathy_minor_version], [1])
-m4_define([empathy_micro_version], [90])
-m4_define([empathy_nano_version], [1])
+m4_define([empathy_minor_version], [2])
+m4_define([empathy_micro_version], [0])
+m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'
 m4_define([empathy_base_version],
@@ -34,8 +34,8 @@ AC_COPYRIGHT([
 # Minimal version required
 
 # Hardp deps
-FOLKS_REQUIRED=0.6.0
-GLIB_REQUIRED=2.28.0
+FOLKS_REQUIRED=0.6.2
+GLIB_REQUIRED=2.30.0
 GNUTLS_REQUIRED=2.8.5
 GTK_REQUIRED=3.0.2
 GSTREAMER_REQUIRED=0.10.32
@@ -49,15 +49,13 @@ TELEPATHY_LOGGER=0.2.10
 WEBKIT_REQUIRED=1.3.13
 
 # Optional deps
+CLUTTER_REQUIRED=1.7.14
 CLUTTER_GTK_REQUIRED=0.90.3
 ENCHANT_REQUIRED=1.2.0
 GEOCLUE_REQUIRED=0.11
 ISO_CODES_REQUIRED=0.35
-LIBCHAMPLAIN_GTK_REQUIRED=0.7.1
-LIBCHAMPLAIN_REQUIRED=0.9
 NAUTILUS_SENDTO_REQUIRED=2.90.0
 NETWORK_MANAGER_REQUIRED=0.7.0
-GNOME_CONTROL_CENTER_REQUIRED=2.31.4
 
 # Use --enable-maintainer-mode to disable deprecated symbols,
 # disable single include and enable GSEAL. If this is not a released empathy,
@@ -218,7 +216,7 @@ if test "x$enable_call" != "xno" ; then
    [
       farsight2-0.10
       telepathy-farstream
-      clutter-1.0
+      clutter-1.0 >= $CLUTTER_REQUIRED
       clutter-gtk-1.0
       clutter-gst-1.0
    ], have_call="yes", have_call="no" )
@@ -441,8 +439,8 @@ if test "x$enable_map" != "xno"; then
    PKG_CHECK_MODULES(LIBCHAMPLAIN,
     [
        clutter-gtk-1.0
-       champlain-gtk-0.10
-       champlain-0.10
+       champlain-gtk-0.12
+       champlain-0.12
     ], have_libchamplain="yes", have_libchamplain="no")
 
    if test "x$have_libchamplain" = "xyes"; then
@@ -580,43 +578,33 @@ fi
 AM_CONDITIONAL(HAVE_NST, test "x$have_nst" = "xyes")
 
 # -----------------------------------------------------------
-# new, single-window control center
+# goa-mc-plugin
 # -----------------------------------------------------------
-AC_ARG_ENABLE(control_center_embedding,
-              AS_HELP_STRING([--enable-control-center-embedding=@<:@no/yes/auto@:>@],
-                             [Enable support for single-window control center]),
-                             , enable_control_center_embedding=auto)
+AC_ARG_ENABLE(goa,
+              AS_HELP_STRING([--enable-goa=@<:@no/yes/auto@:>@],
+                             [build GOA MC plugin]), ,
+                             enable_goa=auto)
 
-if test "x$enable_control_center_embedding" != "xno"; then
-
-   PKG_CHECK_MODULES(CONTROL_CENTER_EMBEDDING, [libgnome-control-center >= GNOME_CONTROL_CENTER_REQUIRED],
-        have_control_center_embedding="yes", have_control_center_embedding="no")
+if test "x$enable_goa" != "xno"; then
+   PKG_CHECK_MODULES(GOA,
+    [
+       mission-control-plugins
+       goa-1.0
+    ], have_goa="yes", have_goa="no")
 
-   if test "x$have_control_center_embedding" = "xyes"; then
-      AC_DEFINE(HAVE_CONTROL_CENTER_EMBEDDING, 1, [Define if you have the single-window control center])
+   AC_MSG_CHECKING([Mission Control plugins dir])
+   MISSION_CONTROL_PLUGINS_DIR=`pkg-config --variable=plugindir mission-control-plugins`
 
-      AC_MSG_CHECKING([gnome-control-center extension dir])
-      CONTROL_CENTER_EXTENSIONDIR=`$PKG_CONFIG --variable=extensiondir libgnome-control-center`
-      if test "x$CONTROL_CENTER_EXTENSIONDIR" = "x"; then
-          AC_MSG_ERROR([Could not determine extensiondir])
-      else
-          AC_MSG_RESULT([$CONTROL_CENTER_EXTENSIONDIR])
-      fi
-      AC_SUBST(CONTROL_CENTER_EXTENSIONDIR)
-   fi
+   AC_SUBST(MISSION_CONTROL_PLUGINS_DIR)
 else
-   have_control_center_embedding="no"
+   have_goa=no
 fi
 
-if test "x$enable_control_center_embedding" = "xyes" -a "x$have_control_center_embedding" != "xyes"; then
-   AC_MSG_ERROR([Could not find single-window control center dependencies:
-
-$CONTROL_CENTER_EMBEDDING_PKG_ERRORS])
+if test "x$enable_goa" = "xyes" -a "x$have_goa" != "xyes"; then
+   AC_MSG_ERROR([Could not find GOA dependencies.])
 fi
 
-AM_CONDITIONAL(HAVE_CONTROL_CENTER_EMBEDDING, test "x$have_control_center_embedding" = "xyes")
-AC_SUBST(CONTROL_CENTER_EMBEDDING_CFLAGS)
-AC_SUBST(CONTROL_CENTER_EMBEDDING_LIBS)
+AM_CONDITIONAL(HAVE_GOA, test "x$have_goa" = "xyes")
 
 # Optional dependency for avatar selection
 AC_ARG_WITH([cheese],
@@ -664,6 +652,7 @@ AC_CONFIG_FILES([
    libempathy-gtk/Makefile
    src/Makefile
    nautilus-sendto-plugin/Makefile
+   goa-mc-plugin/Makefile
    help/Makefile
    tests/Makefile
    tests/interactive/Makefile
@@ -687,7 +676,6 @@ Configure summary:
 	Location awareness (Geoclue):  ${have_geoclue}
 	Geocode support (Geocode)...:  ${have_geocode}
 	Meego widgets...............:  ${have_meego}
-	Control center embedding....:  ${have_control_center_embedding}
 	Cheese webcam support ......:  ${have_cheese}
 	Camera monitoring...........:  ${have_gudev}
 
@@ -697,6 +685,7 @@ Configure summary:
 
     Extras:
 	Nautilus-sendto plugin......:  ${have_nst}
+	GOA MC plugin...............:  ${have_goa}
 	Salut E-D-S support.........:  ${with_eds}
 	Exp. Call channel handler...:  ${have_call}
 	Exp. Call log support.......:  ${have_call_logs}
diff --git a/data/empathy-accounts.desktop.in.in b/data/empathy-accounts.desktop.in.in
index b2b5faf5c..0dc38c83a 100644
--- a/data/empathy-accounts.desktop.in.in
+++ b/data/empathy-accounts.desktop.in.in
@@ -7,8 +7,7 @@ Icon=empathy
 StartupNotify=true
 Terminal=false
 Type=Application
-Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;
-X-GNOME-Settings-Panel=empathy-accounts
+Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-PersonalSettings;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=empathy
 X-GNOME-Bugzilla-Component=General
diff --git a/data/empathy.convert b/data/empathy.convert
index 71353248a..b6a1d2d3a 100644
--- a/data/empathy.convert
+++ b/data/empathy.convert
@@ -4,7 +4,6 @@
 use-conn = /apps/empathy/use_conn
 autoconnect = /apps/empathy/autoconnect
 autoaway = /apps/empathy/autoaway
-butterfly-logs-migrated = /apps/empathy/butterfly_logs_migrated
 file-transfer-default-folder = /apps/empathy/file_transfer_default_folder
 
   
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index c7c7265af..56ad3312f 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -188,7 +188,8 @@ private_icons = \
 EXTRA_DIST = \
 	$(public_icons)		\
 	$(private_icons)	\
-	empathy.svg \
+	empathy.svg		\
+	local-xmpp.svg		\
 	$(NULL)
 
 ###############################################################################
diff --git a/data/icons/hicolor_apps_16x16_im-local-xmpp.png b/data/icons/hicolor_apps_16x16_im-local-xmpp.png
index 956e090c7..dff0c8244 100644
--- a/data/icons/hicolor_apps_16x16_im-local-xmpp.png
+++ b/data/icons/hicolor_apps_16x16_im-local-xmpp.png
diff --git a/data/icons/hicolor_apps_22x22_im-local-xmpp.png b/data/icons/hicolor_apps_22x22_im-local-xmpp.png
index 4f363c744..2558cd346 100644
--- a/data/icons/hicolor_apps_22x22_im-local-xmpp.png
+++ b/data/icons/hicolor_apps_22x22_im-local-xmpp.png
diff --git a/data/icons/hicolor_apps_24x24_im-local-xmpp.png b/data/icons/hicolor_apps_24x24_im-local-xmpp.png
index 6117bd95f..f4332f4e1 100644
--- a/data/icons/hicolor_apps_24x24_im-local-xmpp.png
+++ b/data/icons/hicolor_apps_24x24_im-local-xmpp.png
diff --git a/data/icons/hicolor_apps_32x32_im-local-xmpp.png b/data/icons/hicolor_apps_32x32_im-local-xmpp.png
index dcc4d2373..975734a98 100644
--- a/data/icons/hicolor_apps_32x32_im-local-xmpp.png
+++ b/data/icons/hicolor_apps_32x32_im-local-xmpp.png
diff --git a/data/icons/hicolor_apps_48x48_im-local-xmpp.png b/data/icons/hicolor_apps_48x48_im-local-xmpp.png
index 9e8141abe..2c681e363 100644
--- a/data/icons/hicolor_apps_48x48_im-local-xmpp.png
+++ b/data/icons/hicolor_apps_48x48_im-local-xmpp.png
diff --git a/data/icons/hicolor_apps_scalable_im-local-xmpp.svg b/data/icons/hicolor_apps_scalable_im-local-xmpp.svg
index eb63de9c5..2c1613512 100644
--- a/data/icons/hicolor_apps_scalable_im-local-xmpp.svg
+++ b/data/icons/hicolor_apps_scalable_im-local-xmpp.svg
@@ -1,1723 +1,13059 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<svg:svg
-   xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/"
-   xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#"
-   xmlns:xapMM="http://ns.adobe.com/xap/1.0/mm/"
-   xmlns:xapGImg="http://ns.adobe.com/xap/1.0/g/img/"
-   xmlns:xap="http://ns.adobe.com/xap/1.0/"
-   xmlns:x="adobe:ns:meta/"
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   id="Calque_1"
-   width="48"
-   height="48"
-   viewBox="0 0 37.982 43.529"
-   overflow="visible"
-   enable-background="new 0 0 37.982 43.529"
-   xml:space="preserve"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   sodipodi:docname="hicolor_apps_scalable_im-local-xmpp.svg"
-   sodipodi:docbase="/home/zdra/programmation/empathy/data/icons"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/zdra/utilities-avahi1.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"><svg:defs
-   id="defs266" /><sodipodi:namedview
-   inkscape:window-height="725"
-   inkscape:window-width="1280"
-   inkscape:pageshadow="2"
-   inkscape:pageopacity="0.0"
-   borderopacity="1.0"
-   bordercolor="#666666"
-   pagecolor="#ffffff"
-   id="base"
-   inkscape:zoom="5.6568542"
-   inkscape:cx="23.353073"
-   inkscape:cy="29.563951"
-   inkscape:window-x="0"
-   inkscape:window-y="25"
-   inkscape:current-layer="g34"
-   width="48px"
-   height="48px" />
-<svg:metadata
-   id="metadata3"><xpacket />
-<x:xmpmeta
-   x:xmptk="3.1.1-111">
-   
-<svg:metadata
-   id="metadata268"><rdf:RDF>
-      <rdf:Description
-   rdf:about="">
-         <dc:format>image/svg+xml</dc:format>
-      </rdf:Description>
-      <rdf:Description
-   rdf:about="">
-         <xap:CreatorTool>Adobe Illustrator CS2</xap:CreatorTool>
-         <xap:CreateDate>2005-11-18T17:59:54+01:00</xap:CreateDate>
-         <xap:ModifyDate>2005-11-18T17:59:54+01:00</xap:ModifyDate>
-         <xap:MetadataDate>2005-11-18T17:59:54+01:00</xap:MetadataDate>
-         <xap:Thumbnails>
-            <rdf:Alt>
-               <rdf:li
-   rdf:parseType="Resource">
-                  <xapGImg:width>224</xapGImg:width>
-                  <xapGImg:height>256</xapGImg:height>
-                  <xapGImg:format>JPEG</xapGImg:format>
-                  <xapGImg:image>/9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA
-AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK
-DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f
-Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgBAADgAwER
-AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA
-AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB
-UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE
-1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ
-qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy
-obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp
-0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo
-+DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9U4q7FXYq7FVK7u7Wztp
-Lq7mS3toVLzTysERFHUszUAGAkDcpAt4d56/5ybsrSSSy8o2q3si1U6lchlhr/xXEOLv82K/IjNf
-m14G0XMx6QneTx7W/wA2fzF1mRmvNeukRj/c2zm2jp2HGHgD9NcwJ6nJLmXKjhgOiQDX9dEnqDUr
-oSUpz9aStBvSvLK+OXe2cI7mT+Xfzm/MfQpVaDWJryFftW18TcxkDt+8JdR/qMMuhqskerVLBCXR
-6Nc/85WXx0+NbXy/Euo8f30ss7NCGHdY1VWofd9vfMo9omthu0DRi+bDdW/5yG/M+/ZvSv4dPjbr
-HaQRgD5NKJXH/BZRLW5D1ptjpYBi99+Ynny+JN15h1Bwf2Bcyqnf9hWC9/DKTnmeZLaMUR0CTz6p
-qc9fXu5peQ4tzkdqjwNTlZkSyoIXAlUiuJ4STDI8ZbrwYrX7sQVpMrTzZ5qsyDaazfW5FADFczJ0
-2H2WGTGSQ5EsTCJ6Mh0386vzQ0+no6/PKo6rciO4r9Myu345bHVZB1azp4HozTRP+cpPNVuyrrGl
-2l/EOrwl7aT7/wB6n/CjL4doSHMW1S0cehZNrP8AzlNoo0cPo2lTvq77GK74rBGf5i0bFpB7fD9G
-XS7QFbDdrjoze52eP+YPzd/MTXZGN3rdxDCx2trRvq0QH8tIuJYf6xOYM9TklzLlRwQj0Y6Nf10S
-eoNRuhIRQuJpK0HavLKuOXe2cI7mR6F+cH5kaLIrW2uXM8Y6wXjfWkI8KTcyo/1SMthqckerXLBA
-9HtHkP8A5yV0bU5I7HzTAulXb0UX0RLWjE/zBqvF9JYeJGZ+HXg7S2cTJpCN47vaYpYpYklidZIp
-FDRyKQysrCoII2IIzYOGuxV2KuxV2KuxV2KuxVD6lqNlpthcahfTLb2dqjSzzOaKqKKk4JSAFlIB
-JoPkX81/zd1XztftbW7PaeXYW/0ayrQyFTtLPTqx7L0X51J0mp1JyH+i7TDgEB5sKsNJuLv4x8EP
-+/D3+Q75rsucQ97m48Jl7kyfT9Nsouco5U7vuSfYdMxhlnM0G844QG6U3V6stViiWOP2A5H6cy4Y
-65m3HnkvkFK3tri4f04I2kfwUVycpiIslrAtO7PybqEoBndYAe322/Db8cxJ62I5C2wYim9v5L01
-KGVpJT3qeI/Df8cx5ayZ5bMxjCPi8t6RGNrVD/rfF+uuUnPM9Sy4AiBpNgv2beMfJRkDOR6lNONh
-bf76T/gRgs96VCTTrU9YUP8AsRg45DqikJLo+nt1to/+BA/Vk46iY6lHCEDP5d01h8KFD4qx/jXL
-46uYYmAS6fyz19Gbf+Vx/Ef0zIjrO8MDjS260y9tqmSM8B+2u4/DMmGaMuRYGJCGRuLBqA07EVGW
-EWgGk4sbiyuKRvGiSdlIFD8sxMsJR3vZyscoy2pEy6LZyjZfTbxX+mVR1Eh5szgiUnvtMubQ1cco
-z0kHT6fDMvHmE/e42TEYvR/ye/ObUPKV5DpOrStceWZWoytVntSx/vIup4V3ZPpG/XZabVGBo/S4
-OfAJbjm+r7e4gubeO4t5FmgmUSRSoQysjCqspHUEZuQbdYQqYVdirsVdirsVdir5x/5yX/MCS4v4
-/JthKRbWoWfVSp+3MwDRRH2RaMfcjuuarX5rPAPi7DSYtuIvG9F0o3sxeQf6PGfi/wAo/wAv9c0u
-pz8Aoc3Z4MXEd+TIb24gsrb1GFFX4UQbVPYDNfjgZmnNnIRDEru7mupjJIf9VR0A8Bm2x4xEUHXT
-mZGynGk+WTKgub8+lABy9OtCR4sT9kZiZtXvww3KYw6lWufOeg6Yv1fT4frBX/fdEjr/AK5BJ+dM
-ycHYubL6sh4ftLj5NfCO0d0ub8ytS5fBaQBewPMn7wRmwHYGLrKX2ON/KU+4Iuy/M8g0vbEFe7wv
-Qj/Yt/zVlOXsDb0S+f6/2M4dp/zh8mV6Z5i0/VIy9k6uR9uM1Dr812zQarTZcBqYr7vm7PDlhkHp
-KMM8vgB9GYnG38Cm003t92HiXhUXnm9vuyQKOFQe5k7qPxyXCCiku1DW7GxTldNwr9lRux+S5laf
-R5MpqAtozZY4xcixu789AsRa2vw9nlbf/gV/rm8w9g7euXy/H6HWz7S/mhDL53vq/FbxFe4HIfxO
-XHsLH0lL7Gsdoz7gu/S2jX5pIhsLg9H+1ET70pT7spn2dmxfSeMfIt8NbCXP0lTmglgcK/fdWU1B
-HYqR1GY4kC5Kd6NqnqkW85/e/sOf2vY++YOowVuOTmYct7FOmhSVDHIoZGFGU98wxIg2HKMQRuxT
-V9MaxuKCphfeNj+IPyza4M3GPN12bFwHye+f84z/AJgS3EM/k7UJSz26m40lmNT6df3sP+xJ5L7c
-uwzd6DNfoPwdVq8X8Qe9ZsnCdirsVdirsVUL68hsrG4vZzSC2ieaU+CRqWb8BgJoWkCy+DdY1S71
-fVrzU7o8rq+mknl7/FIxYgewrQZzc5WSS7qMaFBl9hZraWUcPQqtXPix3Y5ocuTjkS7jHDhjTE9Y
-1A3l2Sp/cx/DEPbufpzbafFwR83XZsnFLyTXy3oy0F9cgU6wq3QAftn+GYur1B+iP48lhHqUq1PU
-dU8z6vHo2kKzxSPwijXb1COrueyild+2+b7Q6LHpMfiZPq6+XkHVajPLNLgjy+96/wCR/wAiNDs4
-Y59aUajemhZWr6KnwVP2vm33DNTqu2smQ1A8Eft+fT4ORj0kID1eqX2PTrXydodvEI4bCCNB0VY1
-A+6ma05SdySfi2eJXJKPMH5V+TtXhdbvS4RI1f38SiOUHx5pQ5kYdblxn0yP6PkxkIT5gPBPzA/L
-DWvI9yuraZO8+lhwFuRtLCWNAsoGxB6cuh6EePRaTXY9VE48gF93Q+5wsmGWI8cDsnHlXXYtb0/1
-CAl3DRbmMdKnow9mzlu09AdNkrnA8j+j4O70epGWN/xDmmzxZrhJyqQ8kWWAopIvMmrxaTZ+oQGn
-kJWCM9z3J9hmz7O0Z1E6/hHMuJq9QMUb69EB5B/LXWfO922o30zwaWHpJc0q8pB3SEHYAdK9B750
-uq1uPSR8OA9Xd3e902LDLMeKR2e/eXfyq8naPEi2umRNKtK3EyiWUnx5vUj6M5zNrsuT6pH7h8g5
-sYwhyATu48n6JPEY5bCB0PVWjUg/RTMbxSNwT82XiPNvO/5DaBfQST6Mg02+FSoSvosfBo+gH+rT
-6c2Ol7Zy4j6jxx+35/rap6aGTl6T9jwuWLUNE1CXRdZjaIRtRlO5jJ6SIe6n26jN9mxQ1EPFxfV9
-/kfxs4uLLLFLhlyVJEkgmKk0dDUMPvBBzUg2HZsv0e9F7aK5/vU+GUe47/Tmo1GPglXR2eGfFG1+
-sWQutPlSlXQc4/mu/wCPTBp8nDMJzQ4olI/JevyeXvNmlayjFRZXMcktO8RPGVf9lGWGb7FPhkC6
-jJHiiQ+6wQQCDUHcEZ0TpXYq7FXYq7FWM/mdI8f5d+ZGQ0b9HXK19miZT+BynUf3cvc2YfrHvfFG
-nqGv7ZW6NKgPyLDObymoH3F3eMeoe9lnmK6+raa4U0eY+mvyP2vwzVaSHFP3Ox1M+GPvYtplmby9
-jg/YJq5/yRuc2mbJwRJdbEWWQeb702OgtHF8LXBEC07KQS3/AAoplHY2DxM9n+Hf49GGuycOOh12
-Zn+QnlSKDSn12ZAbm+YxwMRusMbUNP8AWcb/ACGT9odYTMYxyj9/9jToMXDDi6n7mY/mL5+u9BMO
-i6JxGrzxiae5ZQ4toSSqkKQVaRyp4g7ACpHTMfsnQjKDkyfQPtLXqMpuhzePaw2p3PO6vr+6uZ6b
-yzTSO3yFTsPYbZujq4Y/TGIA9zCOlMuav5L/ADa82eVr6Nb65m1XRCQs9ncOZHROnKB3JZSo/Zrx
-P4inJhxagVQjPoR+lZQlj8w+h9Rh0vXNEDgLdabqMAZaj4ZIZlqDvvupzm/Elin3SiftDl4yJDyL
-5c0+1n8p/mJLpEjExesbUk7co5aGFj96nOs7QiNVouMcwOL4jn+kOHpScOfh86+fJ6XJFnCCT0lI
-WWPLIliXnF/azeZvPkGkRsQhmW1DDfiqmsr09viP0Z3PZ0Rp9JxnmRxfq/Q87qicufh+H631Fo1p
-pWiaKKBbTTdPgLMf2Y4olqzH5AVOclLLLLPvlI/aXPyVEUOQeAedvzf80+aNQli0q5m0nQlJW3t4
-HMcsi9Oc8iGpLfyA8R036npcelxaaPqAnk+z4OvAlkPcEHobanBwubS/ura4AoJoZ5Ef3FQ248Qd
-sl+dhP0yiD8GZ0pHJ7L+XH5gXuszSaFrzK+qRxmWzvFAT6zGtA4ZAAokSoPw7Eb0FDmo7U0UccfE
-x/R1Hd+xlhyEGixb8/fKUN1oo1yFKXensokYdWgdqEH/AFWIb23yXs9rTHL4Z+mf3tmtx8WPi6x+
-549aE3WipMd5bRvRc9yh3Q/RWmbTWw8PPXSYv49f1o0k+LH7kx8tXZh1ARE/BOOJ/wBYbr/TNdrI
-XC+52OmnUq72Yhc1DsnnUoCyOB0BIH350I5OlPN94+WZZZvLekyygiWSzt2kDGpDNEpNSffOkx/S
-Pc6SfMplk2LsVdirsVS/zFpY1fy/qelGgF/az21T29aNkr/w2RnHiiR3somiC+D3Se0umSRTHcW7
-lXRhQq6GhBHsRnNSj0LuweoTbzLfpdfVDGaoY/Up4FjSh+XHMPR4jHivvcnU5OKqRHlK3HKecjfZ
-FP4n+GV6+XINeIKH5iBvqtj/AC83r86CmbH2d+qfw/S4PafKL3P8qvRHkjRjF9n6utf9avxdf8qu
-c726SM8/e5OD+6j7mBecubfmDrpmpz9S340r/d/VIeHX6a+9c6Hs6V6GBHn/ALouBX702kWtj/Rh
-TpyHL5b5r7PG7TEAxa/CemczMJNteoAp9F/lO8v/ACq7RBNXnwmC8uvD6xJw69uFKe2aLtnJ/hUg
-PL/chx9KPS8U/NoL/wArST0f70/VOVOvPan4Uzreyf8AEd+VScXU/wB/t5PQpkABJ2A755+Hpix3
-y7qp1bSEvGpzZ5FIGwornj/wtM2vaOlGnzGA5UPu/W4ulzeJDi97GvywC/8AK1x6n2xJeca9eXF6
-/hXOs13+ICv5sf0Okwf4wffL9L278z2uv+VZa6tpy9X0F5cK19L1U9Xp29PlX2zkux5j83AS7/0G
-vtcvWA8BfOGmBOAzodUTxFOlAplmhj9y1enLb7hmsmfWHLnTJPKJZfPmgGP+8+sS9OvD6rLz/wCF
-zN1cq0eS+4feHWTH7wU9D/M8wt5L1wy/Z+pzU/1uB4f8NTOc7FkTqIEfzh97mZf7uXuL5x8nwmaz
-1GI/ZcIF/wBajf2Z2PbcqljPv/Q4fZw2l8P0oeGVoZklX7UbBh8wa5iyjYpzImjbPNQvY7Wwkua/
-s/u/dj9nNHixmUxF2+TIIxthmj6Xc6tq9nplsK3F9PHbxd/ilYKCfvzfxjZADppSoW+9bW3jtraK
-2iFIoUWNAf5UFB+AzpAKdISqYVdirsVdirsVfMX/ADkP+Wdxpesy+bNNhLaVqL8tQCAn0blju7U6
-LKd6/wA1fEZqNbgo8Q5F2Oly2OE83i+YDlsu8qoBp1f5pGP6h/DNTrT6/g34+S3zvZNdaNVBV7dv
-Wp34gUb8DXMnsXOMeajylt+po12Lix7dN2X/AJEebEm0aTQpHAubBmkgU9Whkapp/quTX5jIe1Gj
-kJeJHlL7/wCxq7PyCUeE8x9zJvPvk671mWLWdJCtqkMfoz2zEILiIEsoDEhVdCx4k7GtCemaDsPt
-waYnFmvwpHn/ADT+o/2MtTpyTxR5vLtWa8hDW15aXFtNTeKaJ0b5io3+Y2zrRixZfVjnGQ8iGmOo
-MdiKb8q/lp5l8yXkbXdvLpukAhprudTG7p4Qo4BYt/NTiPwOv1va2DSRNEZMvSIN7/0iOVd3P72X
-ry7cg94ubyw0XSAoZbbTdOgCrX7McUS0A8dlGcdozm1Gb+dKR+0ucIRhHuAfOmiy3PnD8ypNWkU+
-isxu2r+xFCQIUP3Kuena+Q0mi4OtcPxPP9JdVpYnNqOLpd/Lk9I8y3ItdFv560McEhXt8XEhfxzi
-tDj49RCPfIO/1M+HHI+TCfyznrpN3bHrFMH+iRQP+NDm/wDaXHWWMu+NfI/tdb2TL0EdxSTVbi48
-r+fYdXhUlPWW6AH7SsaSpX3+IfTm37NkNTo+A8wOH9X6HC1cTiz8Xx/W+j7HULDWtIBBW507UISr
-D9mSKVaMp+YNDnm3aAzYMtj0yiftDtjGM43zBeF+a/yw8x+XL6R9Pt5dS0ZiWguIVMkiL14zIgqC
-v8wHE+3Qddo+2cGsiOKUcebqDsD5xJ7+7n97ruGeI98VPRXvJeNvbWlxcT02hihkdvpCg069TmXL
-Bjx+vJOMR3kgJOpMtgHqvkHybe6VcPreshU1F0MVpaAh/QjahcswqpkelPh2A2qanOT7c7bjnAw4
-P7scz/OP6h58z02bcGA3xS5pD+evm1LXQBokbj63qRBdB1WCNuRY/wCsyhR475ufZTRznPxZfTD7
-/wAfoY6/IIw4RzLzvyjZtb6UJHFHuGMn+x6L+qubHtjOJ5qHKO3x6p0OPhx33pLcrxuZV/ldh9xy
-yBsBtKte6lc3ixJIaRwqFRB02FKn3OQx4YwsjqznlMqvo9x/5xx/LK5a7XzpqsJS3jVl0aJxu7sC
-rT0/lUVVPE79hm30On34z8HXarN/CH0Tm0cB2KuxV2KuxV2KqV1a213bS2t1Ek9tMpSaGRQ6OrCh
-VlNQQcBF7FINPjX85PLGl+WvP+oaZpUTQWAWKaCJiWC+rGGYKW34hq0zRarGITIHJ22CZlGyoeWG
-H6NUeDsM0Gt+tzcfJNrkA8K7gggg5iwbQwe/sNU8s6tHrOkO0ccb84pF39MnYo47qa036jbOt0Ws
-x6vH4WX6vv8AMebpNTp5YZ8cOX3PWPJ3506DqMMcGruumX4oGLk+g58Vc/Z+Tfec5ftT2WmCZY/V
-H7f2/BzMOvhMVL0n7HoNv5i02aMSQ3kEkbdHSRGB+kHOVydkZomjE/IuWDE9Uq1z8wvK2kxM17qc
-Kuv+6I2EkpPhwTk2Zuj9ntRlO0TXyHzLXPPjhzLxTzr+Yes+drtNH0i3kj053HC3G8sxG4aUjYKv
-WnQdSfDv+zOyMOgh4kyOIdeg9zq8+plnPBAbM18meWIPLmlGIkSX1xR7uYdKjoi/5K1zmu1u0jqc
-ljaA5D9Pxd1otKMMa/iPNLvzIvxFoDW4Px3cixgd+Knmx/4UD6cyPZ3Bx6ni6QF/PZp7UycOKv5z
-Efy/uxb6rLbsaLcx/D7unxD/AIXlm+9osHFhEv5p+w/tp13ZeSshHeGSeadDi1ix9IkJcREtbyHs
-e4Ps2c92Zrjpsl84nmPx3O11emGWNdeiQeSfzC1fyXdNpmowvNpvOr29fjiJO7xE7EHrTofbOj7R
-7Lw6+HHAji7+/wB7psGpngPDIbfjk9t0H8xPK2rRI1nqUPNqfuJWEUoJ7cHofuzgNb7O58R+k18w
-7WGfHPkU5m8w6dFGZJbyGONd2dpFAHzJOa6PZOYmhE/IthMR1YF5u/Ory9psLxaXINUv9wgjJ9BT
-4tJ0Yf6lfozpuzPZTLIiWX0R+35frcTNroQHp9ReMoNU8zaw+p6rI0vquDLIdgabBEA6AdNs7HUZ
-8ekxeHj5jl5eZcHBhlmlxS5M1VQqhVFFAoAOwGcoTe5dyAwy8Nbuc+Mjf8SObjH9I9zjnm+hPyr/
-AOcetHksNO8xeZJ/r/1uGK7t9LQFYVWVBIonJ+JyA26igr/MM2+n0QoSlu6/NqjZAe9IiRoqIoRE
-AVVUUAA2AAGbJwm8VdirsVdirsVdirsVfLX/ADk/p5g8/Wl2B8F5p8ZLeLxySIR/wPHNPr41O/J2
-WkPp+LBvKktbWWPuj8voYD+mc9ro+oF2GMp7PvGp8D+vMGPNvDk4spVgGUihB3BBxNg2GdWkmoeQ
-tKu2Mlq7Wch6hRzj/wCBJFPoObbT9vZcYqY4x8j83X5ezYS3j6UrP5ZamWPC7gK9i3MH7gDmxHtJ
-i6xl9n63F/kmfeEdYflWSwa+vwF7pAu5H+u3T/gcxs/tOK/dw+f6h+tsx9kfzpfJnOiaJpGjQmOw
-gEbMKSSn4pG/1mO/0dM5rWa7NqDcz8OjtcGnhiFRCYTXcccbSSMEjQFnY7AAbknMSGMyIA3JbpSA
-Fl5R5l1t9Z1EyiotoqpbIf5e7H3bPRuy9ANNi4f4jvL8eTy+s1JyzvoOSWwtLbzJPCxSWMhkYdiM
-z8kBOJjLcFxoyMTY5h6BpurRajZrOu0g2lj/AJW7/R4ZwWs0UtPkMTy6HvD02n1Ayxsc+qE1bTLD
-UI+F1EHI+y42Zfkwyel1WTCbga+5c2CGQVIMUu/JQViba5+Hssg3/wCCH9M3+Ht3+fH5fj9LrJ9m
-fzT80EfKV4D8U0dPbkf4Zkfy1DpEtf8AJs+8I208s2cRDTMZ2HY/Cv3D+uYeftbJLaPp+9ycXZ8I
-7y3Tu1jUSIqgBV6AbAAZqckjRJc6qCYswVSx6AVP0ZjAIYQeUkhoKs52A3JJObsBxn3vo1j9Q0ex
-sf8Alkt4oP8AkWgXxPhnSxFAB0kjZtGZJDsVdirsVdirsVdirsVeG/8AOVGhtNoeja0i1+pTyW0x
-H8twoZSfYNDT6c13aENgXM0ctyHgnlm49O9aI9JV2+a7/qrnPayFxvudpjO7LPtxle5G2arkXIBU
-YnycgzCMikykhkio5cqITaISbIGLJUE2Q4Vtg/nXzL68h0u1f90h/wBKcftMP2Pkvf3zr+wezOAe
-NMbn6fd3/H7ve6PtHV2fDjy6sZiIzpXUqkhWm2KV+marJp12JV3ib4Zk8V/qO2YWu0Yz46/iHIt+
-m1BxSvp1Zj9YjmjWWNgyOKqw7g5xksZiTE7EPRxkJCxyQ0r5OIUoVzU5aELcKEVZJuz+GwyrIeiC
-t1ef0dPlNd3HBfm236sOnjcwwmdlH8sdDOuef9C07jyje7SWdf8AiqD97J/wiHN5p4cUwHEzSqJL
-7ezoHTuxV2KuxV2KuxV2KuxV2Ksc/MTywPM/kvVdGABnuIS1rXtPERJFv2q6gH2yrPj44ENmKfDI
-F8RxvLa3KsVKSwv8SMKEFTuCDnOTjYILuQWcW1wksSSoaq4BH05o5xo0XJBWyjhJUfZbcYY7hmCq
-RyZEhkiElysxZK6zZAxW0n81eYDpun8YmpdXFUhP8o/af6M2fZOg8fL6vojuf1OHrtT4cNvqLz2N
-ZWQyUJXuxzuaebVklpilcZdsVU+LyV4CtO2Kpn5c1YxS/UZT8DkmKvZu4+nNJ2vouIeLHmObsuz9
-RR4DyPJP5HznwHcKOTQ4AkgDqemKplFGI4wv3/PMaRssUh8x3fOZLZTtH8T/AOsen3DM/SQocTVk
-L2D/AJxb8rNLqGqeZ5k/dWyfUbMkbGSSjykHxVAo/wBlm97Px7mTrtZPYRfRmbVwHYq7FXYq7FXY
-q7FXYq7FXYq+Tf8AnIPyMfL3nFtUtY+Ol62WuEIHwpcV/fp9JPMfP2zS63Dwzsci7PTZOKNdQwry
-5qFK2jnxaL+I/jmk1eL+IOdjl0ZCwEicT9B98wOTcChgzKxVtiMsq2YKskuQMU2qrNkDFNsA85Xb
-y67IjH4YERFHzUOf+JZ2XYuIR04P84k/o/Q892jMnKR3I6azUWqxpsvAAH6OubVwUhYvGxVxRh1G
-KteocVTXTLduNWG7GtPbFUu1Y/V9TcxGjIVcU7NQH9eCURIEHkUgkGwy9JPURX6cgDT5jOIIo09R
-E2LbwJRdpB/uxh/qj+OVZJdEFfe3aWtu0z9tlXxY9BkccDI0xJpitrbXup6jFa28bT3t5KscMa7s
-8kjUVR8yc3MIcgHHJ6l9ueQvKdv5T8p6focJDvbR1uZgKepO55SP8uR29qZ0OHHwRAdNknxStkGW
-sHYq7FXYq7FXYq7FXYq7FXYqxz8wfJVj5x8sXWjXVEkcepZ3B/3VcIDwf5b0b2JyrNiE40WzFkMJ
-W+K9V0vU9D1e406/ia21CykMcsZ6qy9we4PUHuN85+cKJiXbxkCLDINK1JbuGvSZP7xf4j2zUZ8P
-AfJyIytGSIJB1o46HKQabAUNzZG4tscsq2VrxNg4VtjfmrRpbiT69bLzcKBNGOpA6MPHN72TrowH
-hz2HQur1+lMjxx+KXWGuoluttdqf3Y4pINzQdmHtnSOnUL+/s5ARGC57EilPvxVC2t1FG9XWo8R1
-xVM/09bQxn0UZ5KbctlHz74qhdP0661K6M0tfSLcpZDtX2XMDW62OKND63K02lOQ/wBFlwAAoOmc
-o9Aibe1Jo7ig7L45XOfcglFO6IhdyFVRUk9ABlQFoYrquoteT/DtCm0a/wATm0wYeAebRKVvdP8A
-nG/8s3Df411WKgo0ejRONzX4XuKH6VT6T4ZutDg/jPwdfqsv8IfQebNwXYq7FXYq7FXYq7FXYq7F
-XYq7FUNqWp6fpdjNf6jcR2llbrzmuJWCoo9yclGJkaHNBNPkX87PzG8t+cvMMNxo1iY0tEML6m9V
-kuVr8NY6fCq78eXxb9umW6vsOU8fEP7wdP0e9On14jKj9LAbe4lglWWJuLL0PjnI5Md3GQd5GXUM
-o07VYbxKfYnH2o/4jNXmwGHub4ytGOiuKMK+B75SDTNDSQSruvxD8csEgU2gdRnljtXKEq4oK9xv
-l+KIMt2MzskE5juVIuI1d+0oFHH0jr9ObLFknj+k15dGiAxmV5IiY+X2hB/o62puzg+OzD8BmYO0
-MncHb4uyeys24nPGe4kfq/S4abag7u7bbACn4kYf5RydwZz7C7LgLOaR9xH6IlXt7a0gBIjEkh6N
-J8QA9l6ffmPk1WWfWh5Oo1GLTCX7qGw6yNk/oTnR2uZ5nSvJQtd9gN81uoAiLTjKexWqJu3xN+GY
-Mpktlqks0UMZklYIi9ScjGJJoIJYzqmrPdt6cdUtwdh3b3ObPBgENzzaZStLTMI2U0DEEHiehp45
-0PZPZR1EuKW2Mfb5D9LrdbrBjFD6vufWH5R/nh5e80W9tot7HFo+uRosUNovwW0wUUUW1fsmg/uz
-v4Vzd6nQHFvHeP3Osx5xLnzerZgtzsVdirsVdirsVdirsVdirsVY/wCd/PXl/wAm6O2p6zNxU1W2
-tkoZp3A+xGpIr7noO+XYcEskqiwnMRFl8h/mP+anmTz1f871zbaXExNnpcbH0ox0DOdvUen7RHyA
-GdDp9LHENufe4OTIZJJoflm91Rw1DFbd5D3+WZJ2aDJld95GtGslWyPp3MY2Zvsv7Hw+eaHtTsmO
-o9cPTk+/3/rc7Ra+WLaW8fuYbcW13ZXJinRoZ4zWh2I8CD/HOKzYZQkYzFF6PHkjMXE2E0sfMLKA
-l2OQ7Sr1+kZr8uk6xbxPvTqC5gnTnC4dfbt8xmFKBjzbAbdcW8U8TRyCoYUr3HyxhMxNhJDEryzm
-tJjHKP8AVbsw8Rm2x5BMWHHIpD5Yh2KrkRnYKoLMdgBuScBNJZRpFh9TtiZNpZN5PYDoPozV58vG
-duTdGNLb3XbSAFYj60ngv2R8z/TJY9NKXPYIMwx+8vrm7flM1QPsoNlHyGZ+PFGA2aibTnQvKs92
-VuLxTFa9VQ7O4/gPfOh7N7GllqeT0w+0/s8/k6rWdoiHphvL7ky1vyha3Kc7NRDOo2UfZNM7XHGM
-IiIFAPPGZJs7sIuLa6srj05VaKZDUHoajoQcspmDb6B/Jz/nIQloPL3nOetaR2etyH6FS6J/5Of8
-F/Nmn1nZ/wDFD5fqcvFn6F9EKysoZSCpFQRuCDmnct2KuxV2KuxV2KuxV2KsX/MP8w9D8j6G2o6i
-3qXElVsbFSBJPIB0Hgo/abt86A36fTyyyoMJzERZfGnnHzlrvm/W5dW1iYyTSGkMK1EUMdfhjiXs
-o+89TvnSYcMccai6+czI2Uw8s+T3uON3fqVh6pEep+eWE00mXczyKKKGIKoCRoPkAMr5sUFdamTV
-LfYd5P6ZZGHewMkqvLOG+j4XIMlPssT8S/I5Rq9Di1EamPj1Dbg1M8RuJY7feWLyGr237+PwGzj6
-O/0ZyGt9n82PfH64/b8uvw+Tv9N2tCe0/SfsSn9/bykfFFKuxG6sD+vNBOFbSDtYyBFhGwa9qEez
-MJR/ljf7xTMeWlgfJsEyiW8wQzR+nc2odT1+Kv6xlQ0pBuJTxoKVtIY1RJo/8kFWH475eBkHOix2
-Uq2APSVx4VVf4NkvX5LsrxaoLcH6rbpET1dqu/3nISwcX1G08VckPcX13cf30rMP5eg+4bZOGOMe
-QYkkorTdA1TUCDBCREf93P8ACn3nr9GbLSdm5s/0R27zsPx7nEz63Fi+o793VmWjeULCxKzT/wCk
-3I3BYfAp/wAlf4nOs0HYWLD6p+uf2D4fr+x0Gq7Unk2j6Y/asvLudL6Vo3ICsQBXbbbpm/oOtBRt
-pfxXA4n4Jf5ex+WVSjTMFD6xotpqUBSVaSD7Eg6g4g0kPPNT0u6064MM67fsP2YZJsBt7H+SH56T
-6NLbeWPM03PRmIisb9z8VqSaKkjHrD7/ALH+r01et0PF6o/V97lYc1bHk+oFZWUMpBUioI3BBzRu
-a7FXYq7FXYq7FUj85+cNH8o+X7jWtVekMI4xQr9uaUj4IkH8zfh1O2W4cMskuEMZzERZfFXnXznr
-XnDX59Z1WSssnwwQKT6cMQ+zHGD0A/E7nfOmw4Y448IddOZkbKaeU/KlSl9fLt1iiP6zlhNNEpWz
-Vnihj5MQqL/nQZCrQlN1eyXBoPhiHRfH3OWxjTWSpKuSQqquKqqpgVFzWFjfQqLqBJtqVYAkfI9R
-mNn0mLKKnESbcWeeP6SQk115F0mUkwPJbnsAeaj6G3/HNNm9nMEvpMo/aP1/a7HH2xlH1ASS6X8v
-7kf3N4j/AOuhX9RbNfP2ZmPpmD7xX63Lj23HrE/NCS+R9VQ09aA/7J6/8Qyr/Q1qP50Pmf8AiWz+
-WcXdL7P1tL5Mvv254l8ePI/rAyUfZnN1lH7f1BjLtrH0iUdY+SbRn43N05PYIoX8TyzMx+zER9cy
-fcK/W48+2pfwxA9/4Cf2XlrRbMho7ZXcftyfGf8Ahth9GbXT9kafFyjZ7zv+xwMuvzT5y28tk0zZ
-OG07BEZz0UEn6MKsVkJZix6k1P05NKkag1GxHQ4VTOx1LmRFOaP0V/H2PvlUodzIFfqem21/btDO
-ta/Zbup8RkAaZPOdV0u4065MMoqOqP2YZNsBt7n/AM4+/nK1vLb+TfMM1beQiPRr2Q7ox2W3difs
-npH4H4elKanX6O/XH4/rczBl6F9IZpXLdirsVdiqyeeGCGSed1ihiUvLI5CqqqKszE7AAYQLV8Zf
-nJ+Ztx538yM0DsuhWBaLTIDUchWjTsD+1JT6FoPHOk0emGKP9I83X5cnEfJJ/KHl363KL25X9wh/
-dqf2iO+ZZNONI9Ges8cMRZqKij/OmV82KT3N3JcyVOyD7K+GXRjTAlaowsVVRiqsoxVVUYFRlsfh
-K+HTAVVsVaJoMVQ7rU1PXFVJlwqpEUO2Ko22m9RN/tr1/rgVWxVB6pLwtio+1JsPl3whUiYZJKi2
-KqTYVTLT9R50gmPx9Ec9/Y5VOPVmCu1fS4NRtWhkFGG8b9wciCyec3lpPZ3LwSjjIh/zIyTYDb6v
-/IL81T5r0c6Jq03LzBpkY/eOatc24+ES+JdNlfx2Pc05/X6Xw5cQ+k/Y5+DJxCjzetZr292KuxV4
-X/zk1+YjafpcXk/T5eN3qKiXU2U7pbV+GOo7ysN/8keDZtezdPZ4z05ONqMlCnznomlyalfJCB+7
-G8reAzduDI09QtoYreBIowFjjFB26ZWTbWlV9em4k4qf3S/ZHifHLoxpgSpLkkKy4EKqYqrLgVVT
-FVeJuJrgVFYqtZh0xVSY4qothVSbFWoJfTmU9jsfkcVTPAqSahcetMaH4F2X+uSCoFsKVJsVUWwq
-pN1xSnGnX/rp6ch/ep3/AJh45VKNMgUu8z6OL22M8S/6RCKj/KXuMESyBpjHlnzFqflvXrPWtNf0
-7yykDqD9lh0ZHH8rrVTkcuMTiYnq3RlRsPuXyl5n07zP5dstc09q215Hy4E1aNxs8be6MCDnLZcR
-hIxPR2UZcQtN8rZIXVtUs9K0u71O9f07Syhe4nfqQkalmoO5oNslCJkQBzKCaFvg/wA1+Yr3zJ5j
-1DXL01uL6ZpOPUIvRIx7IgCj5Z1WLGIRER0dZKVm2X+U9LFlp6yOKTzfE3iB2GTkejSTZRuq3nBB
-Ah+J93Pt4fThhHqwJSxTljFVU4qrKcUKqnAqsrYqqq2BVRXxVEQzD7J+g4FWGTc4qtZ8KqbNiqkz
-YqpM2FUVe3tIhEh+JgOZ8PbAAqVOcklSY4qpMcVUmOFVFsUrEleKRZENGU1GJFqyCC4SeBZV6N1H
-ge4ygiizYV5o0wWl560YpDPU7dA3cZJnEvWP+cYfPj2GuT+UryT/AEPVKzWHI7JcxrVlFf8AfqL9
-6jxzV9p4LjxjmHM086NPp3NG5jxr/nJ/zW2meTLfQ4H43GtzUlod/q9vR3+9yg+Vc2XZmLinxfzX
-H1EqFd75m0Cx+uapDGR8Cnm/yGb9wJHZ6SXSKMsdkQV+gZW1sfkmaaVpG6sa/wBBl4FMFynChVU4
-FVVbFVVWwIVFbFVRXxVUD4FXB8VdzxVoviq0viqmz4VU2bFVJmwqpM2KVJjiqkxwqh7ib0l5kVUH
-4vYHvkZGkgWsLAioNQehyQVTY4VRek3fpz+ix+CXp7N2+/ITDIIvWbFb2wkip8YHKM/5QysFkGD6
-ff3mmajb39o5iu7OVJoHHVZI2DKfoIxlEEEFtB6vvHyp5gtfMXlvTtbtqCK/gSbiDXgxFHSvijgq
-flnKZcZhIxPR2cZWLfLn/OS+unUfzJksVasWkW0NsF7c5B67n5/vQD8s3vZsKxX3uHqJXJi3ke1p
-HPckbsQin2GZ0uTiS5p5rE/C3WMHeQ7/ACG+GA3YFKFbLWKqrYoXtKsaF3NFHU4CaSAutZmkjEjC
-nI1UeA7ZGJsWpCIV8khUD4oXh8Crw+Kt+pirfqYq0ZMVWl8VWl8VU2fCqmzYpU2bFVJmwqps2KqE
-oDqynoRQ/TgIsJCV21yYZDDIfhrQHwOUY58Jotso3ujGOZLUplypBBoRuDilklvOJ4ElH7Q3+ff8
-coIosmFeYrP6tqclBRJfjX6ev44WyL6N/wCcV/MrXnlbUdAlasmlTiaAH/fN1U8R8pEcn/WzR9qY
-6mJd7naaW1Pn78wdROpeevMF6TVZtQuTGT/IJWCDfwUDNvp48OOI8nFmbkWQeWYvS0iDxern6csk
-0Hmp6zLyugnZFH3nfLMY2YFBq2TQqq2BUvurk3Eywxn4K0HufHMacuI0G2IoWm8ZCqFHQCg+jMim
-lUD4qvD4qvD4quEmKt+pihvnirXqYq0XxSsL4qsL4qsZ8VWM2FVNmxVSZsUqbNhVKNSTjPyHRxX6
-RtmLmjRboHZfZ3XNfTY/Ev2T4jLMU72YzirMcuYJxoU1YZIj+waj5H/ayvIGQQHnG3BhguAN1JQn
-2O4yIZR5su/5xn1k2P5lx2Rakeq2s9vx7cowJ1P3QkfTmB2lC8V9xcvTmpPK7iZp55Jm2aVmdgPF
-jXM8Cmh6FpI46dbr4IMEubSlWoyVvpT7gfcAMtjyYlRVskhQvrrgnpqfifr7DKcs6FM4RtS0xeU/
-Lsgr9J2yrCLLKZ2ThXzKaV4fFV4fFVwfArYfFW+eKu54q7nirRfFVpfFVpfCqwviqxnxVTZsUqbN
-hVTZsVQWoryh5d0NfoyrMLDOB3SxXZGDA7jpmKDRbimcUgkQOO/Ue+Z0ZWLaCKTPRH43ZXsykfdQ
-4J8lCJ8yxh9Il/yCrfccqDIc0B+Vd81j+ZHlqdTxrqFvEzVpRZnETVPhxc5Tqo3il7nIxmpBjVxC
-0FxLCxq0TshPuppl4NsGfaW/LT7dh/IPwwS5tKUaieN9KPcH7wDlseTEqBlVFLE7AVOEmlASqSZp
-JC7dTmFI2bbwKTLTBxhL93P4DMjCNmqZ3RwfLmC8PgVcJMVXCTFC7nirueKt88Va54q0XxVoyYqs
-L4pWl8VWF8KrC+KrC+KqbNilSko6sp6EUxIsKEmYEEg9RscwKchE2MvF/TPRunzy7DKjTCYTvSa/
-X4/9lX/gTl8+TWE01wA6TdA/yfxyoMgxfyg7R+bNEkVS7Jf2rBB1YiZTQfPIZvoPuLdHmEZ+YumN
-pfnzzBYkUEV/cemP+K3kLx/8IwyOnlxY4nyTkFSKbeW5hLpMQ7x1Q/Rl0mg80PrcZW6V+zr+I2yc
-DsxKR381AIh33b+GV55dGcB1QYOY7YncHwRKvgBXM6IoOOeaqHwoXh8VXB8VbD4q3zxVvn74Fdz9
-8Vdz98Va54VaL4qtL4qtL4qtL4qsL4pWF8VWE4VdiqWXicZ28G3+/MPKKk3ROyiCQQR1HTK2TJdA
-Pq3KyDshJ+fTMsyuNtNUUf5hkCaRPX9oBR9JyMUhJPy+tnuvPnl23TYyanaCvWg9dCT26DKtQaxy
-9xb4D1B6B/zk75dOnef49VRKQazbJIW7GaD91IP+AEZ+nMPszJeOu5t1EalbA/KF4FeW1Y/a+JPm
-M2J5OJJPNWt/VtCw+1F8Q+XfGBosSwiaT1JGfxO3yyiUrNtoFBu3XlMi++/0b4wFkLI7JuGzOaFw
-fAq4Piq4PirYfFW+eKHc8Vb54q1zxV3PFWi+KVpfFVpfFVpfFVpJwq7FXYq7FUFqC/Yf5g5j5xyL
-ZBB5jtjJvKYpDMT1Ygr8h1/HLIS6MJBrzfchbaO3B3c8iPYdMtHJEeae/wDOPejNqf5paY5XlFp6
-TXs3sI0KIf8AkbImYXaE+HEfPZycAuT3v/nILyY3mTyDPcWyF9R0Zje24HVo1FJ0/wCRfxe5UZqt
-Bm4MlHlLZys8Li+QrO5e2uY506oQfozow68i2cTXscmm+vGdpQAPmeuVZdgwiN2H31sYZagfu23X
-29soibbS6wWsxP8AKMvwjdrnyTHMtqdirsVdU4q3yOBW+eKu54q7nirueKtc8VdyOFWqnFXYq7FX
-Yq7FXYq7FUPerW3J/lIP8MqzD0s4c0FbwNNKEX/ZHwGYZNNrJ9IT05Sw+GKNDzPgP8xjislE+THd
-bvjeX7uPsL8Kj2GZZREPon/nFbym1roupeZ50o+oOLSzJG/owGsjD2aQ8f8AYZo+1MtyEO5ztNHa
-3u5AIIIqDsQc1TkvjP8AO78uX8m+bZDaxFdD1MtcaawHwpU1kg/55k7f5JGdJotR4kN/qHN1+bHw
-nyYZYam8SC3kP7ktUex6ZfmFhqA3TOSOOWMq26t/nUZiskNb2MsAkenKOoAcfxzN05u2nIq5ktbs
-VdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVXfU5rmGQIvwgEs56Cm+V5T6SyjzXWdmEpFE
-OTt1PcnNfuS38m9Z1GO0tvqVu1ZG3lceOZmOHCGvmUJ5P8ral5p8x2Wh6etZ7uQK0lKrHGN5JW/y
-UXf8OuQzZRjiZFthHiNPufQdFsdD0Wy0iwThaWMKQQjuQgpybxZjuT45y2SZlIyPMuyiKFI/IJY7
-598kaV5z8uXGi6gOHP47W5ABeCZR8Ei/qI7ioy7BnOOXEGE4CQp8VebvKWs+VtbuNG1iAxXEJqjf
-sSxk/DJG3dW/sO4zpcWWOSNjk6+UTE0UDY6o1uRFPvF+y/hlU4UoZjorRS2bMpDqzkeI6DJ4uTVP
-m3caNbSEmMmJvbcfdmQJlhSBk0W7X7BVx7Gh/HJiYRSg2nXy9YW+jf8AVh4gtLDZ3Y/3RJ/wJ/pj
-xBDvqd3/AL4k/wCBb+mGwrvqd3/viT/gW/pjYV31O7/3xJ/wLf0xsK76nd/74k/4Fv6Y2Fd9Tu/9
-8Sf8C39MbCu+p3f++JP+Bb+mNhXfU7v/AHxJ/wAC39MbCu+p3f8AviT/AIFv6Y2Fd9Tu/wDfEn/A
-t/TGwrvqd3/viT/gW/pjYV31O7/3xJ/wLf0xsKuXT71ukLfSKfrwcQTSIj0W8b7XFB7mv6q4OMLS
-Ng0W3Qgykynw6D7sgZlNIudY1tnSqxJxK16AA7ZAi0jZjV/rVvbI0Fj8TnZ5z1+jwxhjEWW5Sazs
-7/U7+G0tIXur26cRwwxgs7uxoAAMMpACyzA6B9gfkv8AlPB5G0dri9Cy+Yr9R9dmWjCJK1EEbeA6
-se59gM53WarxZUPpDn4sXCPN6PmE3OxV2KsX/MD8uvLvnfSfqOqxlLiIE2V/GB60DGm6k9VNPiU7
-H50Iv0+oliNhhPGJDd8lfmF+U/mvyVcuNRtzcaWzUg1SEFoHBPwh/wDfb/5LfRXrnQYNVDKNufc4
-M8ZixTT766sCTbyFQTUqdxmRGNNUhaf2vnAUAuYd/wCZD/A4aDDhTOHzJpEg/vuB8HBGCkUUSmp6
-c/2bmL/ggP140qp9btD/ALuj/wCCH9caVv63a/7+j/4If1xpXfW7X/f0f/BD+uNK763a/wC/o/8A
-gh/XGld9btf9/R/8EP640rvrdr/v6P8A4If1xpXfW7X/AH9H/wAEP640rvrdr/v6P/gh/XGld9bt
-f9/R/wDBD+uNK763a/7+j/4If1xpXfW7X/f0f/BD+uNK763a/wC/o/8Agh/XGlWPqFgn2riMf7Mf
-1xpULN5h0iL/AHeHI7ICcaWktuvOCAEW0JJ7M/8AQYaCeEpHe6tfXh/fSHj2UbDDbIRTfyb+X3mv
-zhei20SyaVFNJrx6pbxf68pFP9iKsewyjNqIYxci2QgZcn1V+V35NeX/ACNbi5NL/X5FpPqLqBwq
-N0gU/YXxPVu+2w0Oq1ksu3KPc52PEI+96FmG2uxV2KuxV2KrJoIZ4XhnjWWGQFZI3AZWU7EEHYjC
-DSvKfN//ADjZ5E1t3uNL9TQbxySfqwD25J7+gxHH5IyjM/D2jkjsfUGiWnieWzybXf8AnGL8w7Bm
-bTWtdXi34iKUQy091m4KPoc5sIdp4zzsNEtPIcmFaj+V35i6eSLry5qACmheOB5kG9PtxB1/HMmO
-qxnlINZxyHRIp9G1eBuM9jcRNStHidTT6RlomD1Y0UJkkOxV2KuxV2KuxV2KuxV2KuxV2KuxVWt7
-K8uCBbwSTEniPTRm3PbYHfASBzWk7078uvPuo0+peXtQlU9JPq0qp/wbKF/HKpajHHnIMhjkejNt
-C/5xo/MnUSrX0dtpER+0bmYSPT2SD1d/YkZjT7SxDlu2x08i9V8pf84x+S9KZJ9cnl1y5U19Nv3F
-tX/jGhLt9L0PhmBl7SnL6fS3R04HPd65Y2Fjp9rHaWFvFaWsQpHBAixxqPZVAAzXSkSbLeBSvgS7
-FXYq/wD/2Q==</xapGImg:image>
-               </rdf:li>
-            </rdf:Alt>
-         </xap:Thumbnails>
-      </rdf:Description>
-      <rdf:Description
-   rdf:about="">
-         <xapMM:DocumentID>uuid:0A41642B59EE11DA9346CE657E5F1B06</xapMM:DocumentID>
-         <xapMM:InstanceID>uuid:0A41642C59EE11DA9346CE657E5F1B06</xapMM:InstanceID>
-         <xapMM:DerivedFrom
-   rdf:parseType="Resource">
-            <stRef:instanceID>uuid:c939d50e-5853-11da-9437-000a95dac8e4</stRef:instanceID>
-            <stRef:documentID>uuid:FDEFD071588811DA91E5E11227A4C4DF</stRef:documentID>
-         </xapMM:DerivedFrom>
-      </rdf:Description>
-   <cc:Work
-   rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-     rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>AVAHI</dc:title><dc:creator><cc:Agent><dc:title>Inkscape</dc:title></cc:Agent></dc:creator><dc:publisher><cc:Agent><dc:title>izo@aucuneid.net</dc:title></cc:Agent></dc:publisher><dc:subject><rdf:Bag><rdf:li>avahi tango freedesktop</rdf:li></rdf:Bag></dc:subject><cc:license
-     rdf:resource="http://creativecommons.org/licenses/by-nc-sa/2.0/" /></cc:Work><cc:License
-   rdf:about="http://creativecommons.org/licenses/by-nc-sa/2.0/"><cc:permits
-     rdf:resource="http://web.resource.org/cc/Reproduction" /><cc:permits
-     rdf:resource="http://web.resource.org/cc/Distribution" /><cc:requires
-     rdf:resource="http://web.resource.org/cc/Notice" /><cc:requires
-     rdf:resource="http://web.resource.org/cc/Attribution" /><cc:prohibits
-     rdf:resource="http://web.resource.org/cc/CommercialUse" /><cc:permits
-     rdf:resource="http://web.resource.org/cc/DerivativeWorks" /><cc:requires
-     rdf:resource="http://web.resource.org/cc/ShareAlike" /></cc:License></rdf:RDF></svg:metadata></x:xmpmeta>
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                           
-<xpacket />
-	</svg:metadata>
-<svg:switch
-   id="switch5">
-	<svg:foreignObject
-   requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"
-   x="0"
-   y="0"
-   width="1"
-   height="1"
-   id="foreignObject7">
-		<i:pgfRef
-   xlink:href="#adobe_illustrator_pgf">
-		</i:pgfRef>
-	</svg:foreignObject>
-	<svg:g
-   i:extraneous="self"
-   id="g9">
-		<svg:g
-   id="g11">
-			
-				<svg:radialGradient
-   id="path2329_1_"
-   cx="38.7061"
-   cy="-110.314"
-   r="18.9916"
-   gradientTransform="matrix(1,0,0,-0.6819,-21.9902,-50.4182)"
-   gradientUnits="userSpaceOnUse">
-				<svg:stop
-   offset="0"
-   style="stop-color:#729FCF"
-   id="stop14" />
-				<svg:stop
-   offset="1"
-   style="stop-color:#3465A4"
-   id="stop16" />
-			</svg:radialGradient>
-			
-				<svg:path
-   id="path2329"
-   nodetypes="cczcczc"
-   d="M 12.021,42.829 L 26.871,42.829 C 31.079,42.829 35.244,41.287 36.769,36.89 C 38.221,32.715 37.018,24.763 27.612,18.328 L 10.042,18.328 C 0.638,24.268 -0.537,32.391 1.628,37.137 C 3.833,41.972 7.566,42.829 12.021,42.829 z "
-   style="fill:url(#path2329_1_);stroke:#204a87;stroke-width:1.39999998;stroke-linecap:round;stroke-linejoin:round" />
-			<svg:path
-   id="path3812"
-   nodetypes="cccc"
-   d="M 19.12,22.039 C 19.12,22.039 16.108,24.363 16.368,27.164 C 13.511,24.643 13.429,19.812 13.429,19.812 L 19.12,22.039 z "
-   style="fill:#729fcf" />
-			
-				<svg:path
-   id="path3838"
-   nodetypes="cczcczc"
-   enable-background="new    "
-   d="M 12.168,41.339 L 26.61,41.339 C 30.307,41.339 33.965,39.984 35.308,36.121 C 36.579,32.455 35.174,25.469 26.913,19.816 L 10.779,19.816 C 2.519,25.033 1.137,32.17 3.038,36.339 C 4.977,40.587 8.256,41.339 12.168,41.339 z "
-   style="opacity:0.21520003;fill:none;stroke:#ffffff;stroke-width:1.39999998;stroke-linecap:round;stroke-linejoin:round" />
-			<svg:path
-   id="path3810"
-   nodetypes="cccc"
-   d="M 20.491,22.039 C 20.491,22.039 23.5,24.363 23.24,27.164 C 26.097,24.643 26.179,19.812 26.179,19.812 L 20.491,22.039 z "
-   style="fill:#729fcf" />
-			
-				<svg:linearGradient
-   id="path4368_1_"
-   gradientUnits="userSpaceOnUse"
-   x1="84.215797"
-   y1="80.128899"
-   x2="86.967102"
-   y2="79.569199"
-   gradientTransform="matrix(0.9834,0.1816,0.1816,-0.9834,-93.3736,97.3126)">
-				<svg:stop
-   offset="0"
-   style="stop-color:#000000"
-   id="stop23" />
-				<svg:stop
-   offset="1"
-   style="stop-color:#000000"
-   id="stop25" />
-			</svg:linearGradient>
-			<svg:path
-   id="path4368"
-   nodetypes="cccc"
-   enable-background="new    "
-   d="M 5.982,41.38 C 4.236,40.617 3.454,38.779 3.454,38.779 C 4.632,33.082 8.662,28.914 8.662,28.914 C 8.662,28.914 5.471,37.891 5.982,41.38 z "
-   style="opacity:0.22780002;fill:url(#path4368_1_)" />
-			
-				<svg:linearGradient
-   id="path4370_1_"
-   gradientUnits="userSpaceOnUse"
-   x1="-698.33789"
-   y1="-77.105003"
-   x2="-700.1275"
-   y2="-76.193901"
-   gradientTransform="matrix(-0.9777,0.2101,-0.2101,-0.9777,-667.8553,105.2513)">
-				<svg:stop
-   offset="0"
-   style="stop-color:#000000"
-   id="stop29" />
-				<svg:stop
-   offset="1"
-   style="stop-color:#000000"
-   id="stop31" />
-			</svg:linearGradient>
-			<svg:path
-   id="path4370"
-   nodetypes="cccc"
-   enable-background="new    "
-   d="M 32.451,40.18 C 34.174,39.367 34.974,37.377 34.974,37.377 C 33.632,31.717 29.41,27.795 29.41,27.795 C 29.41,27.795 32.861,36.675 32.451,40.18 z "
-   style="opacity:0.22780002;fill:url(#path4370_1_)" />
-		</svg:g>
-		
-			<namedview
-   showgrid="false"
-   pagecolor="#ffffff"
-   window-x="472"
-   bordercolor="#666666"
-   cy="24.622653"
-   zoom="9.8994949"
-   pageshadow="2"
-   cx="25.799661"
-   grid-bbox="true"
-   window-height="695"
-   document-units="px"
-   window-width="770"
-   showpageshadow="false"
-   borderopacity="0.17254902"
-   pageopacity="0.0"
-   window-y="167"
-   current-layer="layer1">
-			</namedview>
-		<svg:g
-   id="g34">
-			
-				<svg:linearGradient
-   id="XMLID_1_"
-   gradientUnits="userSpaceOnUse"
-   x1="-147.7383"
-   y1="-97.484398"
-   x2="-137.5947"
-   y2="-97.484398"
-   gradientTransform="matrix(-0.7135,-0.7006,-0.7006,0.7135,-141.2909,-25.0322)">
-				<svg:stop
-   offset="0"
-   style="stop-color:#C17D11"
-   id="stop37" />
-				<svg:stop
-   offset="0.2735"
-   style="stop-color:#BD7A10"
-   id="stop39" />
-				<svg:stop
-   offset="0.5694"
-   style="stop-color:#B0700C"
-   id="stop41" />
-				<svg:stop
-   offset="0.8747"
-   style="stop-color:#9A6105"
-   id="stop43" />
-				<svg:stop
-   offset="1"
-   style="stop-color:#8F5902"
-   id="stop45" />
-			</svg:linearGradient>
-			<svg:path
-   d="M 25.182,1.811 C 23.599,3.424 23.934,6.324 25.93,8.286 C 27.929,10.25 30.832,10.531 32.418,8.918 C 34.003,7.305 33.668,4.406 31.669,2.443 C 29.672,0.48 26.768,0.197 25.182,1.811 z "
-   id="path47"
-   style="fill:url(#XMLID_1_);stroke:#6f4709;stroke-width:1.39999998" />
-			
-				<svg:linearGradient
-   id="XMLID_2_"
-   gradientUnits="userSpaceOnUse"
-   x1="-49.540501"
-   y1="-1.0635"
-   x2="-39.397499"
-   y2="-1.0635"
-   gradientTransform="matrix(0.7135,-0.7006,0.7006,0.7135,41.6581,-25.0322)">
-				<svg:stop
-   offset="0"
-   style="stop-color:#C17D11"
-   id="stop50" />
-				<svg:stop
-   offset="0.2735"
-   style="stop-color:#BD7A10"
-   id="stop52" />
-				<svg:stop
-   offset="0.5694"
-   style="stop-color:#B0700C"
-   id="stop54" />
-				<svg:stop
-   offset="0.8747"
-   style="stop-color:#9A6105"
-   id="stop56" />
-				<svg:stop
-   offset="1"
-   style="stop-color:#8F5902"
-   id="stop58" />
-			</svg:linearGradient>
-			<svg:path
-   d="M 12.801,1.811 C 14.384,3.424 14.049,6.324 12.053,8.286 C 10.054,10.25 7.151,10.531 5.565,8.918 C 3.98,7.305 4.315,4.406 6.314,2.443 C 8.311,0.48 11.215,0.197 12.801,1.811 z "
-   id="path60"
-   style="fill:url(#XMLID_2_);stroke:#6f4709;stroke-width:1.39999998" />
-			
-				<svg:radialGradient
-   id="path2327_1_"
-   cx="159.8369"
-   cy="-47.0518"
-   r="12.3745"
-   gradientTransform="matrix(0.788,0,0,-0.788,-109.7853,-28.1509)"
-   gradientUnits="userSpaceOnUse">
-				<svg:stop
-   offset="0"
-   style="stop-color:#E9B15E"
-   id="stop63" />
-				<svg:stop
-   offset="1"
-   style="stop-color:#966416"
-   id="stop65" />
-			</svg:radialGradient>
-			
-				<svg:path
-   id="path2327"
-   type="arc"
-   ry="8.6620579"
-   cx="31.112698"
-   rx="8.6620579"
-   cy="19.008621"
-   d="M 30.77,9.777 C 30.773,16.473 25.348,21.907 18.649,21.909 C 11.951,21.912 6.52,16.486 6.516,9.788 C 6.516,9.785 6.516,9.78 6.516,9.777 C 6.513,3.078 11.938,0.704 18.637,0.7 C 25.334,0.696 30.767,3.067 30.77,9.763 C 30.77,9.769 30.77,9.771 30.77,9.777 z "
-   style="fill:url(#path2327_1_);stroke:#6f4709;stroke-width:1.39999998;stroke-linecap:round;stroke-linejoin:round" />
-			
-				<svg:path
-   id="path3834"
-   type="arc"
-   ry="8.6620579"
-   cx="31.112698"
-   rx="8.6620579"
-   cy="19.008621"
-   enable-background="new    "
-   d="M 29.279,9.777 C 29.282,15.65 24.521,20.415 18.648,20.418 C 12.774,20.422 8.01,15.661 8.006,9.788 C 8.006,9.782 8.006,9.78 8.006,9.777 C 8.003,3.901 12.764,2.356 18.637,2.353 C 24.511,2.35 29.277,3.889 29.28,9.766 C 29.279,9.769 29.279,9.771 29.279,9.777 z "
-   style="opacity:0.12660002;fill:none;stroke:#ffffff;stroke-width:1.59619999;stroke-linecap:round;stroke-linejoin:round" />
-			<svg:radialGradient
-   id="XMLID_3_"
-   cx="19.202101"
-   cy="17.4814"
-   r="1.9231"
-   gradientUnits="userSpaceOnUse">
-				<svg:stop
-   offset="0"
-   style="stop-color:#EF2929"
-   id="stop70" />
-				<svg:stop
-   offset="0.4553"
-   style="stop-color:#DD1414"
-   id="stop72" />
-				<svg:stop
-   offset="1"
-   style="stop-color:#CC0000"
-   id="stop74" />
-			</svg:radialGradient>
-			<svg:path
-   d="M 21.547,16.603 C 21.547,17.848 20.496,18.86 19.202,18.86 C 17.908,18.86 16.857,17.848 16.857,16.603 C 16.857,15.354 17.908,16.84 19.202,16.84 C 20.496,16.84 21.547,15.354 21.547,16.603 z "
-   id="path76"
-   style="fill:url(#XMLID_3_);stroke:#cc0000;stroke-width:0.16240001;stroke-linecap:round;stroke-linejoin:round" />
-			<svg:g
-   id="g78">
-				<svg:g
-   id="g80">
-					<svg:radialGradient
-   id="XMLID_4_"
-   cx="19.250999"
-   cy="12.7207"
-   r="4.7763"
-   gradientUnits="userSpaceOnUse">
-						<svg:stop
-   offset="0"
-   style="stop-color:#555753"
-   id="stop83" />
-						<svg:stop
-   offset="0.4309"
-   style="stop-color:#424645"
-   id="stop85" />
-						<svg:stop
-   offset="1"
-   style="stop-color:#2E3436"
-   id="stop87" />
-					</svg:radialGradient>
-					<svg:path
-   d="M 16.056,14.185 C 16.81,13.081 17.732,11.991 18.281,11.139 C 18.868,10.297 19.079,7.218 19.253,7.225 C 19.425,7.218 19.637,10.297 20.224,11.139 C 20.771,11.991 21.693,13.08 22.449,14.185 C 23.2,15.292 23.44,16.268 22.843,17.004 C 22.281,17.733 20.881,18.221 19.254,18.217 C 17.625,18.221 16.225,17.733 15.664,17.004 C 15.062,16.268 15.305,15.292 16.056,14.185 z "
-   id="path89"
-   style="fill:url(#XMLID_4_)" />
-				</svg:g>
-				<svg:g
-   id="g91">
-					
-						<svg:linearGradient
-   id="XMLID_5_"
-   gradientUnits="userSpaceOnUse"
-   x1="35.154301"
-   y1="-75.928703"
-   x2="36.964802"
-   y2="-75.928703"
-   gradientTransform="matrix(-0.8133,-0.5818,-0.5818,0.8133,6.2482,98.8567)">
-						<svg:stop
-   offset="0"
-   style="stop-color:#EEEEEC"
-   id="stop94" />
-						<svg:stop
-   offset="0.173"
-   style="stop-color:#D2D3D2"
-   id="stop96" />
-						<svg:stop
-   offset="0.5467"
-   style="stop-color:#8B8E8F"
-   id="stop98" />
-						<svg:stop
-   offset="1"
-   style="stop-color:#2E3436"
-   id="stop100" />
-					</svg:linearGradient>
-					<svg:path
-   d="M 20.774,15.892 C 20.295,16.532 19.112,16.501 19.778,16.959 C 20.444,17.417 21.37,17.27 21.847,16.63 C 22.321,15.988 22.166,15.096 21.502,14.638 C 20.835,14.18 21.25,15.249 20.774,15.892 z "
-   id="path102"
-   style="opacity:0.3;fill:url(#XMLID_5_)" />
-					
-						<svg:linearGradient
-   id="XMLID_6_"
-   gradientUnits="userSpaceOnUse"
-   x1="29.1709"
-   y1="-80.1465"
-   x2="30.9785"
-   y2="-80.1465"
-   gradientTransform="matrix(0.8133,-0.5818,0.5818,0.8133,39.576,98.8567)">
-						<svg:stop
-   offset="0"
-   style="stop-color:#EEEEEC"
-   id="stop105" />
-						<svg:stop
-   offset="0.173"
-   style="stop-color:#D2D3D2"
-   id="stop107" />
-						<svg:stop
-   offset="0.5467"
-   style="stop-color:#8B8E8F"
-   id="stop109" />
-						<svg:stop
-   offset="1"
-   style="stop-color:#2E3436"
-   id="stop111" />
-					</svg:linearGradient>
-					<svg:path
-   d="M 17.728,15.944 C 18.205,16.586 19.39,16.552 18.724,17.012 C 18.059,17.468 17.133,17.321 16.658,16.681 C 16.183,16.041 16.336,15.148 17,14.689 C 17.665,14.232 17.252,15.304 17.728,15.944 z "
-   id="path113"
-   style="opacity:0.3;fill:url(#XMLID_6_)" />
-				</svg:g>
-			</svg:g>
-			<svg:ellipse
-   cx="13.243"
-   cy="7.4829998"
-   rx="3.6570001"
-   ry="3.5209999"
-   id="ellipse115"
-   sodipodi:cx="13.243"
-   sodipodi:cy="7.4829998"
-   sodipodi:rx="3.6570001"
-   sodipodi:ry="3.5209999"
-   style="fill:#ffffff;stroke:#2e3436;stroke-width:1.39999998" />
-			
-				<svg:radialGradient
-   id="XMLID_7_"
-   cx="9.3857002"
-   cy="22.077101"
-   r="3.7695"
-   gradientTransform="matrix(0.9241,0,0,0.8901,4.5696,-12.1687)"
-   gradientUnits="userSpaceOnUse">
-				<svg:stop
-   offset="0"
-   style="stop-color:#FCE94F"
-   id="stop118" />
-				<svg:stop
-   offset="0.3535"
-   style="stop-color:#FBE651"
-   id="stop120" />
-				<svg:stop
-   offset="0.6"
-   style="stop-color:#F7DD57"
-   id="stop122" />
-				<svg:stop
-   offset="0.8134"
-   style="stop-color:#F1CE61"
-   id="stop124" />
-				<svg:stop
-   offset="1"
-   style="stop-color:#E9B96E"
-   id="stop126" />
-			</svg:radialGradient>
-			<svg:ellipse
-   cx="13.243"
-   cy="7.4829998"
-   rx="3.483"
-   ry="3.355"
-   id="ellipse128"
-   sodipodi:cx="13.243"
-   sodipodi:cy="7.4829998"
-   sodipodi:rx="3.483"
-   sodipodi:ry="3.355"
-   style="fill:url(#XMLID_7_)" />
-			
-				<svg:radialGradient
-   id="XMLID_8_"
-   cx="9.5366001"
-   cy="20.9419"
-   r="3.1631"
-   gradientTransform="matrix(0.9241,0,0,0.8901,4.5696,-12.1687)"
-   gradientUnits="userSpaceOnUse">
-				<svg:stop
-   offset="0"
-   style="stop-color:#EEEEEC"
-   id="stop131" />
-				<svg:stop
-   offset="0.2125"
-   style="stop-color:#EBEBE9"
-   id="stop133" />
-				<svg:stop
-   offset="0.3608"
-   style="stop-color:#E2E2E1"
-   id="stop135" />
-				<svg:stop
-   offset="0.4895"
-   style="stop-color:#D3D3D2"
-   id="stop137" />
-				<svg:stop
-   offset="0.6072"
-   style="stop-color:#BDBEBD"
-   id="stop139" />
-				<svg:stop
-   offset="0.7172"
-   style="stop-color:#A0A3A2"
-   id="stop141" />
-				<svg:stop
-   offset="0.8216"
-   style="stop-color:#7E8181"
-   id="stop143" />
-				<svg:stop
-   offset="0.9197"
-   style="stop-color:#555A5B"
-   id="stop145" />
-				<svg:stop
-   offset="1"
-   style="stop-color:#2E3436"
-   id="stop147" />
-			</svg:radialGradient>
-			<svg:path
-   d="M 9.898,7.684 C 9.898,5.83 11.459,4.33 13.382,4.33 C 15.305,4.33 16.865,5.831 16.865,7.684 C 16.865,9.537 15.304,8.055 13.382,8.055 C 11.459,8.055 9.898,9.536 9.898,7.684 z "
-   id="path149"
-   style="opacity:0.1566265;fill:url(#XMLID_8_)" />
-			
-				<svg:radialGradient
-   id="XMLID_9_"
-   cx="9.3857002"
-   cy="22.077101"
-   r="2.1484001"
-   gradientTransform="matrix(0.9241,0,0,0.8901,4.5696,-12.1687)"
-   gradientUnits="userSpaceOnUse">
-				<svg:stop
-   offset="0"
-   style="stop-color:#8F5902"
-   id="stop152" />
-				<svg:stop
-   offset="0.273"
-   style="stop-color:#8C5804"
-   id="stop154" />
-				<svg:stop
-   offset="0.4635"
-   style="stop-color:#835408"
-   id="stop156" />
-				<svg:stop
-   offset="0.6288"
-   style="stop-color:#744F11"
-   id="stop158" />
-				<svg:stop
-   offset="0.7799"
-   style="stop-color:#5E461C"
-   id="stop160" />
-				<svg:stop
-   offset="0.9198"
-   style="stop-color:#423C2B"
-   id="stop162" />
-				<svg:stop
-   offset="1"
-   style="stop-color:#2E3436"
-   id="stop164" />
-			</svg:radialGradient>
-			<svg:ellipse
-   cx="13.243"
-   cy="7.4829998"
-   rx="1.985"
-   ry="1.911"
-   id="ellipse166"
-   sodipodi:cx="13.243"
-   sodipodi:cy="7.4829998"
-   sodipodi:rx="1.985"
-   sodipodi:ry="1.911"
-   style="fill:url(#XMLID_9_);stroke:#2e3436;stroke-width:0.1367" />
-			<svg:linearGradient
-   id="XMLID_10_"
-   gradientUnits="userSpaceOnUse"
-   x1="11.3965"
-   y1="7.4829001"
-   x2="13.6787"
-   y2="7.4829001">
-				<svg:stop
-   offset="0"
-   style="stop-color:#EEEEEC"
-   id="stop169" />
-				<svg:stop
-   offset="0.2125"
-   style="stop-color:#EBEBE9"
-   id="stop171" />
-				<svg:stop
-   offset="0.3608"
-   style="stop-color:#E2E2E1"
-   id="stop173" />
-				<svg:stop
-   offset="0.4895"
-   style="stop-color:#D3D3D2"
-   id="stop175" />
-				<svg:stop
-   offset="0.6072"
-   style="stop-color:#BDBEBD"
-   id="stop177" />
-				<svg:stop
-   offset="0.7172"
-   style="stop-color:#A0A3A2"
-   id="stop179" />
-				<svg:stop
-   offset="0.8216"
-   style="stop-color:#7E8181"
-   id="stop181" />
-				<svg:stop
-   offset="0.9197"
-   style="stop-color:#555A5B"
-   id="stop183" />
-				<svg:stop
-   offset="1"
-   style="stop-color:#2E3436"
-   id="stop185" />
-			</svg:linearGradient>
-			<svg:path
-   d="M 13.06,7.483 C 13.06,8.478 14.301,9.285 13.268,9.285 C 12.235,9.285 11.397,8.478 11.397,7.483 C 11.397,6.487 12.235,5.68 13.268,5.68 C 14.301,5.68 13.06,6.487 13.06,7.483 z "
-   id="path187"
-   style="opacity:0.15;fill:url(#XMLID_10_)" />
-			<svg:ellipse
-   cx="24.877001"
-   cy="7.4829998"
-   rx="3.658"
-   ry="3.5209999"
-   id="ellipse189"
-   sodipodi:cx="24.877001"
-   sodipodi:cy="7.4829998"
-   sodipodi:rx="3.658"
-   sodipodi:ry="3.5209999"
-   style="fill:#ffffff;stroke:#2e3436;stroke-width:1.39999998" />
-			
-				<svg:radialGradient
-   id="XMLID_11_"
-   cx="-179.37601"
-   cy="22.077101"
-   r="3.77"
-   gradientTransform="matrix(-0.9241,0,0,0.8901,-140.8831,-12.1687)"
-   gradientUnits="userSpaceOnUse">
-				<svg:stop
-   offset="0"
-   style="stop-color:#FCE94F"
-   id="stop192" />
-				<svg:stop
-   offset="0.3535"
-   style="stop-color:#FBE651"
-   id="stop194" />
-				<svg:stop
-   offset="0.6"
-   style="stop-color:#F7DD57"
-   id="stop196" />
-				<svg:stop
-   offset="0.8134"
-   style="stop-color:#F1CE61"
-   id="stop198" />
-				<svg:stop
-   offset="1"
-   style="stop-color:#E9B96E"
-   id="stop200" />
-			</svg:radialGradient>
-			<svg:ellipse
-   cx="24.878"
-   cy="7.4829998"
-   rx="3.484"
-   ry="3.355"
-   id="ellipse202"
-   sodipodi:cx="24.878"
-   sodipodi:cy="7.4829998"
-   sodipodi:rx="3.484"
-   sodipodi:ry="3.355"
-   style="fill:url(#XMLID_11_)" />
-			
-				<svg:radialGradient
-   id="XMLID_12_"
-   cx="-179.22459"
-   cy="20.9419"
-   r="3.1616001"
-   gradientTransform="matrix(-0.9241,0,0,0.8901,-140.8831,-12.1687)"
-   gradientUnits="userSpaceOnUse">
-				<svg:stop
-   offset="0"
-   style="stop-color:#EEEEEC"
-   id="stop205" />
-				<svg:stop
-   offset="0.2125"
-   style="stop-color:#EBEBE9"
-   id="stop207" />
-				<svg:stop
-   offset="0.3608"
-   style="stop-color:#E2E2E1"
-   id="stop209" />
-				<svg:stop
-   offset="0.4895"
-   style="stop-color:#D3D3D2"
-   id="stop211" />
-				<svg:stop
-   offset="0.6072"
-   style="stop-color:#BDBEBD"
-   id="stop213" />
-				<svg:stop
-   offset="0.7172"
-   style="stop-color:#A0A3A2"
-   id="stop215" />
-				<svg:stop
-   offset="0.8216"
-   style="stop-color:#7E8181"
-   id="stop217" />
-				<svg:stop
-   offset="0.9197"
-   style="stop-color:#555A5B"
-   id="stop219" />
-				<svg:stop
-   offset="1"
-   style="stop-color:#2E3436"
-   id="stop221" />
-			</svg:radialGradient>
-			<svg:path
-   d="M 28.22,7.684 C 28.22,5.83 26.662,4.33 24.741,4.33 C 22.816,4.33 21.258,5.831 21.258,7.684 C 21.258,9.537 22.817,8.055 24.741,8.055 C 26.662,8.055 28.22,9.536 28.22,7.684 z "
-   id="path223"
-   style="opacity:0.15;fill:url(#XMLID_12_)" />
-			
-				<svg:radialGradient
-   id="XMLID_13_"
-   cx="-179.375"
-   cy="22.077101"
-   r="2.1484001"
-   gradientTransform="matrix(-0.9241,0,0,0.8901,-140.8831,-12.1687)"
-   gradientUnits="userSpaceOnUse">
-				<svg:stop
-   offset="0"
-   style="stop-color:#8F5902"
-   id="stop226" />
-				<svg:stop
-   offset="0.273"
-   style="stop-color:#8C5804"
-   id="stop228" />
-				<svg:stop
-   offset="0.4635"
-   style="stop-color:#835408"
-   id="stop230" />
-				<svg:stop
-   offset="0.6288"
-   style="stop-color:#744F11"
-   id="stop232" />
-				<svg:stop
-   offset="0.7799"
-   style="stop-color:#5E461C"
-   id="stop234" />
-				<svg:stop
-   offset="0.9198"
-   style="stop-color:#423C2B"
-   id="stop236" />
-				<svg:stop
-   offset="1"
-   style="stop-color:#2E3436"
-   id="stop238" />
-			</svg:radialGradient>
-			<svg:path
-   d="M 22.892,7.483 C 22.892,8.538 23.781,9.394 24.88,9.394 C 25.975,9.394 26.862,8.538 26.862,7.483 C 26.862,6.427 25.974,5.569 24.88,5.569 C 23.78,5.569 22.892,6.428 22.892,7.483 z "
-   id="path240"
-   style="fill:url(#XMLID_13_);stroke:#2e3436;stroke-width:0.1367" />
-			
-				<svg:linearGradient
-   id="XMLID_14_"
-   gradientUnits="userSpaceOnUse"
-   x1="-183.62109"
-   y1="7.4829001"
-   x2="-181.33791"
-   y2="7.4829001"
-   gradientTransform="matrix(-1,0,0,1,-156.8955,0)">
-				<svg:stop
-   offset="0"
-   style="stop-color:#EEEEEC"
-   id="stop243" />
-				<svg:stop
-   offset="0.2125"
-   style="stop-color:#EBEBE9"
-   id="stop245" />
-				<svg:stop
-   offset="0.3608"
-   style="stop-color:#E2E2E1"
-   id="stop247" />
-				<svg:stop
-   offset="0.4895"
-   style="stop-color:#D3D3D2"
-   id="stop249" />
-				<svg:stop
-   offset="0.6072"
-   style="stop-color:#BDBEBD"
-   id="stop251" />
-				<svg:stop
-   offset="0.7172"
-   style="stop-color:#A0A3A2"
-   id="stop253" />
-				<svg:stop
-   offset="0.8216"
-   style="stop-color:#7E8181"
-   id="stop255" />
-				<svg:stop
-   offset="0.9197"
-   style="stop-color:#555A5B"
-   id="stop257" />
-				<svg:stop
-   offset="1"
-   style="stop-color:#2E3436"
-   id="stop259" />
-			</svg:linearGradient>
-			<svg:path
-   d="M 25.062,7.483 C 25.062,8.478 23.821,9.285 24.853,9.285 C 25.886,9.285 26.726,8.478 26.726,7.483 C 26.726,6.487 25.886,5.68 24.853,5.68 C 23.82,5.681 25.062,6.487 25.062,7.483 z "
-   id="path261"
-   style="opacity:0.15;fill:url(#XMLID_14_)" />
-			<svg:path
-   d="M 22.559,18.449 C 22.559,19.856 21.078,20.996 19.251,20.996 C 17.424,20.996 15.944,19.856 15.944,18.449 C 15.944,17.044 17.424,18.874 19.251,18.874 C 21.078,18.874 22.559,17.044 22.559,18.449 z "
-   id="path263"
-   style="fill:#6f4709" />
-		</svg:g>
-	</svg:g>
-</svg:switch>
-<i:pgf>
-	
-	eJzs/eda68ySAAp/N6B7sAGDwUnBkWxZssnR5OggwOCEw7v3Oz/O9Zy5jrmxUx0ktWQlhz17Zr5F
-P4tlrFbHyl3VFQlfXCeKzV5dS0hJPsRFIqWBVhv1Bpsh/G3osN0eD0cD9FX0aj0kiEkeKhUP82+0
-4q02GLZ63U38KCnAwzJ6OyoIkpAQBD6fyPC5bEJM82IiI/FSosALwrrfc2im2hq1NWio9lftq5UQ
-krXWuj486E+pjeChkE8JQorPwIdNHg1M7o27zVb3U+79czMk5fmQmMuH0kIhJIkiPD5oXWlDe51k
-VsrmUMWklMmmoXY+mRUKArwiJPP5TA7eU3qNcUfrji4GvYY2HJZ67d5guBkq/V3rhk5rn/CkFnrQ
-2u3eP0Jyu9b44WCFMm/lVluDxejURqE8WrbioSC+yeNWu3k27tQ1WCWRz6CvpTfc4s0QmoJW0Wf0
-de7tsAPfXGujEQwX+kMzvKrIJdiRXgdXg+9wiT5daf3/+s8BVH8JoeVDjVa1Tr8N60QmWigkMyGJ
-59Fv8zOtCSPFtRKFZKHAi1JIyCQzfLoQyvM5/E0ok88m04WMQF4wF0T7q6X9YzN01utqZNbFwei6
-9R8wjzSsfJ58dzVua4ObbmsEk8iirwpkxqe9ptaGbTTeLLdreKK4COZvUqFaG3xqI9jCXns8wkCX
-5+kjWNGT2t8a2hWBdHDe17rV3i0eXUIAGMmKWWhM4AUxlM2KIfgLNZ8N5STch4ALrw8GvY5e1ltF
-YHABy3s+aH22upsSQEpCzOfJPlUGraa5TTkxlCe/8NiTeeZfQf9HBgnzHY20Lh00gEfplNluPnl6
-Dd2q3Wap10HLPUQgrkH/AIjt3id5ZnzGT+D1cZ9MAf/9BjtzMWh1UZvcGX6Sf7toj+FRZdAb9w+7
-Hz0uSpC9Oqg1oFrovP6tNUaApLfwX2/QGmKUs/8NGNlf92zvuoFmNwjJg/HwK1Tt9drQBuw5QENI
-+yc86WqUzCA00ULN1sfHeKhBJcvf/4M6uqiNvgDFtW5zONmD8iwK2c9BrYn+DzW10AdqfEh6huqW
-58NAnaGGz7uk16Bz00Kd3qj1YUyuNhi1hqPW7zjY/P67uwSsD9CdvV1jUf8XdFiqtdst2Pf+V6sR
-oM+GWX2yX+tD/76BwAxgW/FD1Aj6E/4/qLV7AdDq7069124NO/CG8dkckfmVf1OKhpDBHIgjNKnd
-v7R2r99HjRufQ9oohDHmA7NSH8KD9vWj1W0CMbget0bMwvU6/d4QtWNOQIXeu0h6CZmvBcCRdq1b
-G4Tw95MzudCA1o5hzZt/d2sdvIPNNb3Dk9ZfCMeghtFN5g1IOEukEwlOEEJyl6HhFaAZLSD/IA3d
-dKFVrRn6pF8hZu/0JbAeMSQ3uSdum+NLcxTFVuA7tkEVirWCavmuTP9W4VNZ/0vgyV/Ai/EnDn3A
-RaC/yY+Ii4RLGkpWyEDJQsnR3zkhD6Ug5LldNNFM4JKbKFkoeaYU+SKHfkGRaWEnrdIJkB8Jxpk2
-xojGVYAiC0WhJKhQykIZpiJxoiimxYwIooiYh1IQZVGBooLgK0qSlJFyUlbKSwWpKJUkRSqn+bSY
-Tqcz6Wy6kC6m5bSCJ1rKTF3SlmL7nmMeSY5FpEWgBa+DXIaiQlHgXwkX9FOUixz8Ksh5OQclCyUD
-BUYvS1Bgzmgxi+WiCkWBIhfRT6GYg5IpSkWxKBTKMFEeplouzVHkycIxfxQnSsFS8kbJMSVLS4YU
-rpymRcJFpEXAhQB9GQr5UaCUcEELh1agoBbwnqIPAUveseSYklWzHPoFJUNLmhYJFxEXDJsYXcu4
-oOGhnxIU2FTYmwKUPJSckuWUrJJR0lAkBLOKAMQArbIKtUuw98VSAUq+lCtlMVxJGFx4DCIlDBZk
-ounytMUVjTE94Mh/uIhMkYySpkX/yeKSwyWPSwEXAD4EqBz8QrgBs8VLB7uMiAOiOAhxQV0E6R+3
-gX5y2TyUQrYIRc6WsrBKWRUmmg5F3uQBEGA+yadzfAZJ/bxQACIDH3I5MQPaFdIOCvm8KGXQB0GC
-b+GDxBfyfBrody6XzIh5pERAU6AJvC2iKXmIRlRIC0IeV4B24OtkFt4UaTP627TlZBoIMGhJoASC
-esSzo5mrGRiJrBg8UGdyQfke78j4eCvn8/oReQlDURaIfwHT+RJmWISqE3quc5s8pudFDki6jAmg
-ghCH4G0eMLIIyFwC7FHVMuFsmARIBHoR/GDKQWgJoS2E3pi0SCdZCldWmEL6AJgqAEqWAVUlQOkC
-9KZCLyK0noUWi+i98hQ/nO3PXe+1EpgiMkWiJY1LBrPQLGWneQ5z0QJd2iJZqzImgYT8FTEly1Ei
-lcZECZMjTIgIGUIkqIhJUA7hFUN/BER/OEqACAkq4T6AqebFHOBpBlitBAxXEHmgxCq8UMIcGaQF
-LD9k8A4jzi1gMUTF0g1mTTDoPBUJMhxMDU1SxNPn/5v6MKkHwiSCxXwSJAOkWuLvEHIh7BJgxfNp
-84MYSiPbTSbLkI152sD0QhBy2XQOvVJANZBhI8nThpBdA8okdZjmpflogbMQDFIwb9KCCZlGsRTC
-F/X/VcLLYVfwb1zQVoq4SOgfB/+lsWyGpDP0DyabzuN/eSytIXkNlRLALPqnAjVQDW5G2JVEWRU0
-wDHcifAmnSshnoTALu/0U7CV4kSRaSnhov8POMXlFVpU+FfGYgT8BsAsA7mjvxHhK4jwD3YO/0vD
-7zQudICFbCGH/+U59AuK/lPERQa5AP7hKZRVhzLHD+dfZYENEkJZniwCP1GclBhdkUlTeQUzF45q
-MZTH4KIzGYXqDjxuRcLgh9SHHBSiPsgglYMCgdkND+2LUpoDmQcJKTmsScgY1FUMwAhssf4g2IpF
-5TOYkkoLlgUZAR+L+CDfF7CMD1I+5yjmI2bJCvogIRqifh4L+1mQuBCiYJEfsQngjCqInCUOmkag
-UwBgQrCVwVAnEqjEU8gpDqVkK7JRirQUaMnTQn5AiOPgF0E7wOCchAtaZqTMEf0QCf2IWSFGBCIu
-mi8W+gpYAERtoJ8MogOw+iIHkiLaYB5rCSqWJkuwQEjIJIKw4PczCVS8rjJbClWxOZvuTdV1c1+N
-UjRKgRZd62W14SyHeBMthAjqHB8A0iriShlYAwkJgIjqZzCtR3CaRuwlo7MXKY2OEoALoL+dBMr5
-msGsCgugqFZGQj8m+4H6GRCQ0aOc3g00BIIreoRFeWgqW0gi5GVl7oW1OB+TEx2ZnGgReKmoKlMJ
-FREOEcgGIRl5sYjJhWqQCklKY1qRozYHWacWlO0JHOZ2hMXlbKytRJmaztJ0/UvXuFhNS9exihzD
-zvD3hL+VsKqF0KSMFS2RqlhEvTKVK6JgqQgXAUoFjKESDAzhLaAwxmT4ncc4XgS8R1RAAY24jMFb
-yIv4H0wXZpJBeAtEIE/5poy5YokyRJCrOcz9RDxYQBsBaJqE6VsGcD8PxK8IpBARRRXkdx7IqIhN
-K2mgDjlgsQUgeDKSS0E6VUFC50FslbAAm0HadA76KQJhLWFZV8XSvQAycBqr61mQjPOGXqFrFkSn
-wNPHmgSR/FWGcfnJ8qw8b5Xj04Ycn6FyvCHAc9T8pTBmLxHzsoyhHulsi4W7NIa7AoY7ZDOwsaic
-bvggaoCpBOgqQInaIIj4nzFEf95mdrAYHThsdVAxx5INO1QWsybClghLUig7IsyIsCLKiHQ2hLlQ
-gSNMiIDB5Nt+77twMSxzlTgsmRUB/vIAiVmAyTTAJoJSHjRGFfM0wr8KmFtlMYOSMGPiMUPSmRFh
-RDmO8CCCYCrLcwDZgEoBUqYxioqArjyWSBWMyjIgdQHLr1mM8Gks5gpYBCaicYkD8lAEQpHHZsos
-tJIGEiLClvLY5qXCFpdgq4tYP7JrSHYdCbQkjqhJNmuJTkGlNGICiBnQb1ijQtYwPcCsxRxhAhbT
-xBytYEZi8KIMMWBgXiSgL9F3uqkF6TMZpOTwqIGMF0+brZ25mIYjzxAtepGQWWxxazA3dSFCcZ7T
-P0yUgkspOhTZLBz9oNikYJVYdWgpm4W1eYgCU+gPh4mdXtJGyWL4z2BpXTf556nhn5QiLTKV5ElR
-OHIqQAqWt8pUfSB9kJ80Llkq6+cwF0eliAvh5VTR5Yhma9NkSQumEosK4fCm+lqifJ5yep3Xcwyz
-N1VWg81jps7aT1nLKbGaEsZewIwd2DpHObuKObvO2ylnx0J6HrN0lqmrlLELlKnjwetsnbNxdqLz
-qtQGhxk7VmRNFZZorkX8T8ZaKzJ/q9haxxcFDgOSiFcXLU8GaD4aUB7zAPQjYxUHmaxUbNzjsdCA
-xAZdaMhSfQRR/QJnyA8KLWUsqAuEh6uLLe4NOuiznkUl0gPnrp+46jPiRBFM1ZijH/SjNL1IFjqi
-HwOadCVrFJ1yZE3KoZ/FFfBXhBaQsznCg0qYG+lmXV3rLtFzO/S5TAgC4l4cPsYjdEA0KICAkVI0
-iECaqukZetJH1PUcRvi8ge74N0exXmEQnmjyPF4L3kD3NOa1GYzw+jEh4sMFjPAFHeU5w7SlG7N0
-AxZBehbZiUBvInvRQHQFoTn8AwmBo0aqNGObyuN/RYzoJSq9K1R2Nw9KJExQMlgeyZnHJByWVXRB
-XjEQnqB8mhaE9HmM9HkqycusNE/RHkv0nCHOZ7A4T9A+T01hMhXrKepjbVfAxNe0YiE6pJurAPE5
-dI5l4L5K0R4QP5jWPuWPe4OTyOJXBBaNnIodtZxRTEc0G0fPUouViW1Wrp61MOccw5DzBhumxyhF
-in863pnYJ2OcMzFQxRhYxliIGbFhDdNZMU8YsGDgYRqLnBIWPXUmnLVgIsuE7QwYoyKHZVmFsF+M
-kYKBk6hIFrxMYzU6Y5jddFZcwAVjJmfwY8URL3mDIdvxkyjcBYqfiCFj/OQYUzIS5SWMpxmMpzlG
-5y7qFmR64E/0bPNIU6SMOc0RXR3zZl3tzhv8Gf0mirdqqN6ChUkTnCWsGukqBc6BXysG6gp4DyTK
-sU1V3GTZBG9l3VidVzkDhREYpfHqYgQOovNO/fOnwT8NLqxBq4Dkdn6asZyhUuuL6YRUov5VrAVG
-ojJQntpgWAuMQGlhhrH9lUSVw9RMxDQrh6UHmTobEQEhi0mOjIUAgYr3eczpVRiaiAX4PBCEUlaF
-YQL6c5hXFwHJyzAM0GgBfUvo8IiYdxb849agMnUhfjglTv8wUWSXUnQojH8O5+Kmk7O76Bglw5Q0
-U+hZJGc47JhOO9Rxh3HeKTNz039KtMjUnYeUAmf49RDfnhw9Xkc2tgw9ZE/Tk1GROvvgA3d8pFBm
-Tt0VevKOTXHIGFc0/IDy9BQmi01zGca9THckM8+a9FMmw4WMowdMeWq8m3Qh08+WrKdLpkmOGOWM
-EyaO2uaIdY7Y54iFDtv4DBsdsdLpdjrdUodtdYypLo/0S2KtM+x1jMWuZLHY2W12ug==
-	
-	
-	1c6w2VGTHTk3okdGpunOarizmu10o112wmCHzXWmsY6Y6oihTv1vxcuZMdMdL2fETM7Vgc4dM91w
-08BLKSBuln1wE2MnRz3uTOxkcTM4dqo6dnIEPcnR7fTYaXHxxNjJWY5/8xMuniZ2CjYnT/b01zz/
-zXLMEfCs+Elt6RhDixwWIHVrum5PZy3qioGfVpu63apO5N4CZ6Iog59zYChnoig2qBsYSvDSHepn
-KtOzN68Cm8k5YpkDH/T1WaUIx7ninhX7rLzR4I42FAQk5OxY6IiHnphI/c4oKnIBsdGbW6o6t0T8
-0sTIgoGReQtGZhh3bF+OyXngpA0rGZ45iZUG1+ToeZbBNempFjnXYk+2ZsBL/ZzLPOlyOuuynnZN
-YCbHMk+KmbPwzpyOm5yFfTJHXdbzKeOoP6v7ssFkJAE7CJBTJD4Jk4KH6KAH/Y8/EIeGyeOhxTRH
-vHrRWZKE3RJ0DwnihECc/XTnBeMDPo5ydjOet6W5Tq0kp1MryeLogC0a8xVLeARni5dwqGIYUKyF
-JVBls3DUFsoW3XJGbC76/+RYRMIwLFEjDHEtzxpHJblsnjOMqMQZoqifnNCi6tYZw57KUwuNgHlb
-mtpoiJUGNDaOGlcL1DWqhBFQyakIIamNRmAsq1nDrirToxTVepBCvP8KxC+MWE+BbKADkyymLOh4
-RMVHIhIsbg4qyfjMg+iJhdLcRWYLZ/2T0vKgzSiT9dkGnXu2/120jIpal+knKJzlUYF9ZJSC8bRg
-/J+n/xcMT0vyf56zfwEbolNo8hf5rP9PKLdOv0khfgr0E0c/ZoyH5qt5Yyz6xMl+C4al/L/VNfP/
-XxpE/rJEpkBiMolIQvSGOGCgxyXg7UiUIgISknyQZIMEFxBNOCyLIK8kJGqkQazgsURfAHxM08As
-GXA1i4VyHjBAhl3OURtrWpq7WH446580TicboOi2cf24mhYOH2UVGedr2YhsU4xTbFU/y8YWdHvc
-EBsrlOVsZ9tFWmR6vm09+OIt8UE6+c5T3MIiGUcN6Sq2nhESrZNn3XheMI68SkQqpt6ZAnUfIPMm
-FDnPYXtbEdvcDFM5KvSoi3XfFukn/A1xKS/PXSwiPecYm6Y4lJKtyExhvNc5xrVd/9G9d7O00CAu
-ui4SFSxFqvYJ1LOVIIvK0YMIhfEQLhraoC53Zi2uwIwjsMUJmMqhpg+wxQOYkUd1idSUSVmp1CaX
-coxgajXsmDqju10nU1hssTeYn6rkJgvH/JF1LJM/aVuR2MJZ0Fe0nGKa/stmPKFJAhSj6EQCkwwO
-6wak6KRFJzbkfFonQxnqKpfGm0QKOf8nB6s8iSDhqA+dStXEEt5FGe9kkR4TkuP8nOFah3aWWAQs
-MVcLKJzl8MGvpF2Lsbhs4LVd6LUGWbMB1gWmmA7p2GmGs4Rbl2yx5YbHii3WwhppYYmz4Bj3ENNz
-zPQMMz0/DOcvw9lLNFw7dLcOQG3OOEfWz5DN02OVCccQ6EGxfkScXYjbvIPGNndLWIP8n6rbzq5L
-pp10ybTVaf6PB+QfD8g/HpB/PCD/eED+8YD84wH5xwPyjwfkHw/IPx6Q/2ud7f40+D+wwT8ekP9y
-T6s/HpB/PCD/eED+8YD84wH5xwPyjwfkHw/IPx6Qfzwg/yUekP+z/Az/L55aZZxOrTL2ezuyjNpD
-FB/VUHwEegEPuS9OP6aU9SNK4wIoCdtTQQviqAHVvC0O3xdHb5/WraSyfpMhvfJJpOpRzjj3kKkh
-VOCoBdR0gjGNnmXDOVH3e8kbFzYRO4luJTEtJFnOMG0WDaMI6+linmbonmqGQdN+kkFMXpzlJCMb
-4CRDxITE8SwDXQeln2co+EZsFd/ryp5n4JMBnqqu5AIlyTDhk2uU8nQndTWWqLICY97L6HcAkmtI
-zUsAFeZmL4HeJ07u9jLv99KvvVTJ/V7G4Re+u5KjW1xkNlm/pJLd5iKmLMatXYYdLc3c2oV3nDO2
-nN6LbFjOJMPGrW9/nnF6UkwbtwEGGBA4m41bBwV3G7dp3zadFovG/9hLtMRABm+3dPPUyGBe2UgO
-ZnPGKSs5MSnpB6YU9wR61bt+XyM2t3JWPwF8qql7CaQNL4EsNZ/qRxpF/U42vGM8tpRSvOTopaM6
-asq2nRPo5aLEgpFnkFS3hOrXW9PjSQ5vYBqjLXtCWWTut2YvXzOvYDOtn0SqpI7FnMX6SbcUm0nc
-rJ/s3upW0JK5qxzeWP1aUvH/pg3UbikzrWQZ5n42ZCErcNR9hrmhjSEw7P1sLIMgzEG3ixWJXYyY
-xTiLXYxYxQihcLOLIZKPDrglfM5FLWMAJMizMZPLITN4idrGJCfrmK7w6hfi56kgnKFCrvO90AXL
-xXDG1XCc76X05rX0ipGxwHpJnOWaOM73pjfmrrjJm97Mu9502wnneNObymhl7je92SwmWOgTufmk
-PqvNBBEczmY1Ee12k8kd06/w0y/x06/x0y/yM6/ym9gzjmoJ+p6xd/pZUglYdq3ovmuc5bpZdtcm
-b+hz3jfLHX15mTNu6FvIHX3ZLGfTpSf9Q4PtnbF7nEWfLjhp1Pa9csYv/dpF+26Zly9SHNN1uUkc
-Y1M/uO+X5TJGfcf0/bLjmf+dio475nCromXP3C2UFvsHc6+iZc888c0P44gNxGHX/o9Hm2WkpJRD
-mSvm1gLNlubStbJOulbW4iFoKBOGsIgFReILpftB5bHmIGOtQcUag35hbBbrCAVDOVA5475YCd8Y
-i+6LLRj3xeq3xQrkvlgSecFKdbo8V6Dct4T5r35vrn5rLhHXTG8yJKQR8ayYK3H0VlyiYBGRWhe4
-sBBN9SkkOtPkSgJNTyCS+5/xb5RBQ6K5H9jfuYnfSEjJ498FLKzg5EpIYikaN1KTv/Rbq/XfKvpN
-kwEFYIZenHCClnJ+jHCCklpvhjVokMPNro7XutqZRpFz4RmOUyR3t5sJL2QL8bWSXysBtgo65oES
-LAJn3tVO7WL2m9p1Ygzk2EqbMvqdpUb6F55SDHQRtp6pRk8Jk8wzVITB/rlawZQojxLLILKRMe/l
-5gs4w4RJwyT9WRbnoXGgjfM1MxcNyjnRoBxj74HR4ati8QcYFOIM+OpYTgDMQIXZF1I1RKuG9Ko0
-oapTqo7Ab5D1DlJ72tbnXMG80wrmLVTc4qsqGxYe1aDWgmHdYS08unWngDGohHEJm3c4m32HMUmV
-DX1VV1GJkqoHURJbRBFbIoo04FQ3QyDuIiAOw2HRR8Rnt7h9PVOH0QexMVvCvATqWC1RqUh3EhIZ
-d6E0IewcHhC2mJHIIR5rdWnKW7C/g6HXZWngcYlGrun8BCn6snHFuoi1eaK/l9CCEE5C1iewNuJE
-hlmFhKoknHnxtH6fvGtMlaUfltybPel9FfVgHM645Jpepy3R4CKehhGxF2cXaGwQe3m2aEQAqUwP
-Rh8cjfjJ2mW+rC4GGf+jBASIMkpGYi9dGDKut5aoVDSZ/WdR7f0vtrU7ZEF2Srzp+UKBPEH5rUd/
-t7Uhlzru9v7RxX+ENrno00VtEGr+139+1Majl/VQ6gxoUSjOpa5bnX5b06vxoXOONxJco3Jfgy+u
-ApDVe5CZzD/+hj+O4MM3fPWPUDp0Gnp64UNN+Pb+isPtNrkUzjUa2uJCKUX7gP/xNGDe5iR8V+Ki
-1tZGIw0P+qIeYJi2XOR4nvf/wdlTlF80oC2cOoNkoULgmNHBEX2PBABYm+hZb/yX1obF645r3YZm
-vkvSySHQwfk5UANpXUpI6zk7RBToRDJP4W+cWhRxixeysRj6nKeBh5PWcGQHgon1xpVmAT6BJ49I
-zl3UzP+Pfg0N2b50aZyOV0/drtRGNUDBlP43wCb6q9VAKXZrg7/x30IoJfd67VAUuhJCFwNtqA3+
-0kJV7Z+jkNpsjWr1Vrs1+nsd4BylGUsdQjukrtEsTkgeOql1P8ew9aGLXh+lzY07dCZlQ6krrQa9
-9WvNptEmGUCnNvwhXxljGvZ7I1utWrs1JF+BIEdG0+y3kuSrNP2m0WsPyDdbaLCh4njUC13VhiNt
-0PoPzdYinkxTn8xPt9f46Y1HIGL09GkAP9DHDYscOtWGX0ZrOF9xyMxYT94QjYUqhEaDWnfYrw20
-buNvaLXVDA2NQQhMvdpgVO/VBs0QjL5Hh49OF/KudYA81ttjLWDVz4GmdQPWHWh0d4DdAuK71hSY
-AfhWNRoFQoETpNMlC3V6f2vdroZI6vVogPLTO0JYuY1yl3e1AQHTUQjRX8/NbEEXtZEGg9S6TWiX
-VJZ4y3aej0d92G/vDWU6KIT6tT4MYtjqjNs1s4rv/JkNYLGOD30YE+vr+Nf7Sxv0EXIPJyfIvgCQ
-2m51tdBwNOj9aLQyYpgGorK1B3iOib+0xghGVK+1EXH0HlGj3erj1Npt7Z+wg58w3YBDGgEJcSYD
-qeJgUCMfAT+vtfZBbQR7fdJr1NpoT4f4OX3XuS7MThscKmxN9nG1BluOerVN7qd4COQbuoC3hyWY
-Faz30NhBHRstte6+Wo2vi0Hvo9XWjjUbIbTUVDt1rWmv6dz1hVJGvQP0sORVMAHTUvt6XAdwL/cA
-Gq4QwBmNp+5PT856Tc2RssN6/LPT7sLjBGzNoFUfj3QAYRb1X93EAtpnajW+Wu3mQLNRWf0p+jX6
-u08hOrraHb79VRsMtxi6wlb9q2bQLvz90KVe1yAzdCRDy1//S1en2+tqARamDewQ0W3/ldFrLggw
-Z51XvYVJvRBgbgAcwFkIF/GfH1t7Qds/50oInisRaP4tRCiDAL7vrv5vQvTNvwKjOqr6b4ZoNL3G
-eDjqdf69lOxfB4ebwxoSMJDCAigWFBz/5XgBY/kfNJT/C1g6/PjH/2Bu/G9Gg2G71fjfTovFXB5d
-VGPo+W5z/TvI7i5Oyp1xNlIe2Z6yeb/Z/DMQrP67Z2OoIm7TqPdGwGROtI/R+aD12eoGmdXkO//e
-SaYl5Dhe8NuxL631+RWEuhs1/82QmEsWkE3WZ1r/aDVHX0FmRSv+D2D+mOpd98aDhib3xt3mv537
-A4/6dw8B1P5aE4ShecdRmHMcy7olLQhIMZXJNwCrjd6gqTUJLLHoEkqd9UaWxxYbqyCGioch/ZQn
-VOs2qdHVZpWzWPLISyfI9FQckJewFdv+kmlzJW+c20xtQa2T6sW1l0nSalhHlUvIlFaiprQr1pQ2
-WfecGtGuWbse71qtatjacqYJktYhhs3ULTH6yRajn2XRSfVpV5285b/sc50dTMKL3lzKpFmpQXMw
-TAJQgrzcXPeu9THuNtyr9IfJttDABjr3Sv/sJ3v9Rs+nwlDzqdAcu1dodJK6Rbg3+tIGE+tvG/Tw
-q9bUBgy4OM0MwBQZa7va0IQ+x9astQzAss3AYkWWeJd5DgZ2LMy41Py013Sp1+h1AXFHppVZ8KxH
-DOTeNQE/A+1Fo/P3j52ETkAY0ditvN3WHtAcrdUdeewCgVVKZPSdiAIluum2GkCAXQ==
-	
-	
-	e691uz2PdYHOO/A6be8meZ0M3Wl1IE61EeDXc/T67vzieT30l+jdFV4TbO/WSafthNzr3V67rWEM
-t9DMiaEOR+1kU4MG2yNMpXUs8FkF9Bqtb3KpIO/0m2hl2t3Ag+o3AzdOYMJ4wxFB+wML6Dj1jurQ
-3kmlTCGdLBQc0RiqMrJePi2AHOlWkRV1gTe61Gp1gFIn2yDxB6s56lGsyuRFj1GSygNzBHmx4DFW
-Up1oH4HWH71kbqojBW3YVsu9ErtSHk31Pj6Gmm+1L1u1SWxFtfAxsnud714dYGLY+uzWvEknqogR
-o06lbd+KDIJ71qsN661Rp+ZBQ1FVUsdO5H02D71o2bzJNWoPGJLmVkNnBv3eyGPmqKZxAFtv1xo/
-unHDsfagmewNkMjks/Ko4gfwmK/e4D8oRrjU6veGLUtbDpCDe/1MeoIqrUNN2IKz3IBqDRu1tqa3
-5VvvL+85Dhv9duNvd/JF6jS6Qy+QhzqjVts4s3efH+xTu9b3Xwdaz2Ps/c/Oj7/4iGsNkatPMLKD
-qhOCzvDJAO8AyI9aIwPxkmLGkRSiqsALkBZgpVzOA4e5+U6uMeh54DCu0gfi2+p+eAi/uBryFwDB
-ywcvSKfISaJeGww99tGcAVBMhgMFqDxipuRXd+BD2621WRaUda3eqQ1+htZRB6hsjDpAXWbUAWqz
-o3bC0Y/uKNlsexNUUqc/+Oh1vagpqjYc13Vsd5KFkb6l/aW1PfWWegvpgp5VutonwNpfHmOGSg27
-24drPWB9XUOyvfqv/3QyCXigMagUFgMJ9bBD/ppFvVbIdFIJZnfAJouAZgdcN5jVgVhC/IwOllrO
-NgdcxcvkwDpSdXumo1Oo1cV+Roj1aYFMAM7KFxZHgDyBuPTpIcGjasOfVh/Ye/fHW2IZAGgOhhrq
-eOBdE+k0tZHjjh/16odAMEMWpySrocZuiPK3gExieav70x6OQLP8EZK19ggkGYFCV+nvWjf0O641
-B61155Uz3+V9hC2zpkhEP1I17cii2GZhT9peEjjbMBm+NFVtMVBtybo03jPk2Rn6LZyQRKKlaVxK
-uzfdAPFbp9e+s/sYaL9j5EAabMTAcvumnde7tqQLxYGWjrduS/Ss1xoEhSqJhapkzpFLsUvZ1LrD
-Cddjt6anmTJvm3JS8BmLaB2L337xDvsVBFXTU21BOshUBdvC+KGoYENRbzBj1zvIkIVg6ydNuX6S
-dUX84FAMjqQGaLHEP5l1tNWx050CdMUpsXUKasTbJho9qo2BcQdEVzHpbQOzAJl5UOm3mAEnKiRb
-Q9POKiRzfiBgX/Ig8CgGG4mFWngvBW+HFn+iaN0j7/UTJ4AxGGUJNFHRsuR+lEJiKYVfZZGt7KQB
-WKZoepMEoG3TL4YUjAoJU1IhcRq6LFnWOnoKAmt3VAuKmkJg+Yy39BNwBsJUVDeYhCZNB4l2mcQT
-DBiSqAvdh92fEAqXcpS3C/bzx36tqyufeRT7zWgzILeHzvtIDB+Gro24nSh2zgd1LTcaaKH+AClu
-TfTro9VthYrNXl0LXShlZMTpkZftWhzbrqm9peSWLu4Xr0uHh/mMoiH1Ej1M752vPsW273bWtmr3
-8SNp9Twh7w8qna/Nz274qByOR9dKrVpyuJK9OVCzy5v7N5Xd0/Te5snz2un+YNzIlVXxNB8R0ull
-nh8q38pnnF/Z33pNbuxvx/vD/eGxmOIi+1sn4YFe6Wgkfx5cnuxvp7XrUmtnt6Ekk2ufE12dNB+g
-v5xSjmzmHisj5ftFTj8m4sVO72RYPLwefcV2s8vjspJeuZO/22t3XET54I/qjo2t5AofudvLp+di
-tZS8de+Urbf5sr/9U37Z3xwmOzElHhmXo5XmBxfBi1V+fzsfKx8vdzm5vd++3/yQv0alr9yjYFmO
-91WlIZz87m/vrd2RdmDIw9Lr52sPPq3+KofNw7CcyH+vFK8Ty10yhvtac8xFCt/RWENtZC6jpa/0
-29Z2MSKtxuSz+Htsv7R2Uy5p443d26Plr61Go/aDPrVi6sfJF+lZ4FO13KC18r7Zej1qyu3I3lpi
-EHseF0+uV3/R+Nf3t46+JC6S3bp92S92G2ud2M7pVirXed5p5XKp4YdUHDQOhdjPpmC02FCOhrew
-bLk1LXcn8c3NVilVg/0VTneiibgmt3MXHTKDh5PIfulwe/lOjRcyQ9iXw6fs8m6u1HuNbd82nzbF
-+vILbna3G4EJ7WY3ltGWPGXvspddtE678s96NkFB87Z5wgsvy6dKqra9Wg7HHgeolyx68IpbwVW4
-CF9fOkzjz7Hd8jb9tH2nHpPqpbj6ThoTH8RDAN17Pra7q8ZFZe9zh7Zzt7O91fw+e8U7aQwY2juX
-M7QXqCQfGQN4MQcgRHeuUCUtjb/LhGXlDS+1og330tnH7HejWFW+Y8pH6vhXrdXWVuRs/eaycBG5
-vymel+QL5eO69bv/+7L5yUXk9EP1jSzmY7b5qL4JsVs5fV88Lyvfd2+l1nc2tfXRiXyWSx8bAizg
-7nsud9Xsmf3lr387x8Xzk43jsrLePCZroy80gX3Y/VE/eRnbu639kgntZvO1/a3qaKlYPRqNJ6dm
-W1lmHfSNuB+E9aauAXPOSyMuoj42I5/i+/aewpef9yUMAtvv22UFoGMjHpN7hVf7XllXlt1YfSMI
-5Ox9Dcd4lWAu7DodnVSKb0cChpjtWH/rvRz9OE4W+e3qo7i+8rpNBmJdjuz4qqCVo6v99dJX9upH
-jZ0kyyakAgI89BCFuVabCEL3Aak6qzC15fXS55c6zG01bq6KuUfxzr4HFwftW0vbSxU1Ea8XnLak
-8KMdl7hIsXrajAGF2S0o8snDj9NocU2mXuUh9wFIo4q8WEmfTkLO6KK8ftHeKiuZRzG2W3lPcBFz
-XjCrxkdZVTI5OZs4v8UEJykc3MZxp0rqvb8hf4+aHbndve0Vq1/3K9DE8YbRQF+N987E8moi91S8
-+vhag9fOVoFdRVuAL6SJ2lm8vD5KNTEJZ2gkvP1biVReCmSxqiefX/nq6tpp5TmqJC316j+IjF5m
-f/n7Jxjh+4rJUwD3jedKs/30tD9Yvh+ZNBtvCdDSbo3Zl+rRuKA2fn5X6WJdbRCS6foUaHK73Ptw
-fD64PDgrVsWrJCzw3UbhYlV+KL3/KPvk6eh4tFN+aydHxevxSkutV9UoTPLuRTk+DF8bT1M6JI9O
-yidQ6RizFomlgketjdjeXew1d/Wx1sCQLCoHnV3xrbO2Tz6VjzOXucx4VBXfNySZPujwsvgeThSF
-eLRUEN8e+7tcxHyRfKs0N4q57EbkRlTD2RJ5+i4VSrgds4oQ/+zQFsvVrSumA3VjWxHV7YMy7gq/
-Br2Yz9HImBedmsX9oafkAR4IblF5WtkXVUlW6Z+oFWPoXERoPGUVsSynLsgvMm59FMzq4D/LL8Vr
-duL6kMzRkCq4UzIkGDpascnBC/XPp232ncvhHq5HGkM7JDQSnT2hsb9SFJLb7TP64GqNDg5PCI8a
-fYJe8LhxV7Xj+DkdFBqKwzbOsPuoK+jFWATS31szvEfmag4eUWxSz1hPpmf0LoEXpt7dZcUcOuyL
-uaJmsxgOyGKhB3j+zE5btnbiXbT4zJCgZ31fDIA1p8m8GBCUaH94KfE+63OeE8aMITODc9gBtPsB
-98BYGFLFBi8EqNBC471iuiJYaZv1ghcLjxXBGPrWbJbAKoYdPCgd5il0G2tHBo+GbMNKGwzZ8cUR
-nU0swfQJ10tuvJ/QgaL+yBvGxppNGUiBIBnoEwUB1DbCaROzKBCjDvBTswPbxmPyYC6lOcwFYKV9
-tdGiGqtIn8I6QC8MkXagNeaKWYkG/m4C+AwEILvG9OK6lyZ4GdXtK487MJfNDSAtkJzcKRYQB62m
-f5OtIogd8R5oScNodvcmfVYspNp5hl+PTg7P9wej6LPaGC/nkR6wyh9VhBwVNgpv9/LlM7+iHB5m
-f7kIaIlX5fLbevgLSRIbymdifY/IyVRuJzJhxypxWOp9Nk5cVNjECpZVQbZE0qpVxIgxerMgv2nF
-q+56qdQc7D6X1fzVgTmh3NbjSbmYhl42zwSlBYrw7Y6lF355/3YtWgFpPHbWax4sX+1s2Z7L7Xat
-mL17etlUjnbCKzbNmMq3z/EDi/LMLEsMtLzqL54pFzHnyspwcv1T0TbUK4uebm2icXUhp+/ELV06
-zm6AEp6MbdU3v3JIsC/vDwZfN+nN07s9pIuBKpHPtAbZ+VUJ1NRWbGccLSttQeaPMpvwq8KDBKsr
-NPXeQnQjAz7x1Ih9YQtg7P3t/IcoFe+56DKSZbuV/lI9vdns/LyTPTDF0wnFjmnMXXlGkOyiPi9Q
-eeYirurz1MpzAhTlTN1BP3sESK7z2xuKNhjEee1iZwvv1uQ6HTwrx3J2DQBkvY7Bnhf3Kms62DPL
-5qjRgS6m63TMUJDylWGxm+7GBYXzm8gPRYB77Vyp/EQ00Dsut7E4z39s3vVsw4RekJa4dTjsfZRa
-w1ZW+UjJrdLXU2kdxnj6PtnshDpHq3wufaFOj5XU/cEePLiMS6tnd5eGltRb5XM/4/oFf3Jc7wPh
-SohOmEWQgd/bekcaX4n/KJQO6e6PHyLF8758IKfHMi/Eb4aGvv+ShH15gt0vFraOE8YjA9yRiaK6
-ocE2/aQZrXvCBFHN7W8dPywB7H+FDcjaRDas8+J1pfld3lZ3BkD592/CBWJLiK+knnaiY1GTD6qr
-H+SBYRnIt5ODA8xG8Hpnht0rOWjPxNZn73vGnnWAzMrQynPSmFoOsPL1ZWO5rHbH72Kk0Mmbbedz
-jZMj+fJi/0Jcf+icMXtweXZ9i0GOPrj7lggIiInNXulQad8DbFwmitXSzY1ae/+MwVzU2/sDHfAr
-o8pj6r1Xjh5XWmjjj/gj9beExiOZ1BnY5M6jfHDdpjYQMVtcVepp7doJXgqJ3Y99alUw8JdtzIq/
-rtjLcEA37EW3kpFpHCSUo8HGu79FhhmI3XQin7x96SYWpj3glXI7+/lkIppp8Nw8EhNRW7Ms9iae
-roz1TAONuBqqsY3sh8mgEv03+XX/dmU00vnLznH1V0mVpRQxvEClKixMMmWxk55qhcY4tYTXiTD6
-1NJ2wip2ZMpKPBvbFPLhs/L6w8UI8yu6L/C8mWKIPj98uCteVWPP6nu2P0KfvtnGCMUmppNPwq9X
-n9YOAZ4+BiznpvUAxtTG5foOsnXW4J36Ji9tXa8q5dXUGf5ObufX1pnuheN6s6wq6xKA6X5VORpe
-xrc+Duqf+5t3qbtiVfncKOZePtcZQYXaYHez29H9QaIwBnGjfYcqXaj16tqGw+BTIJacQDvPp9dK
-5WH/Qzk+rgpyYlPrG8JNlsgR1dWV6/Lb8uorbGIxAzBm7RY6PRoryatmYn/z7PuHYW9or7JL5W6J
-mtfpdyeJ3+stFQDtcqyUDpYjzIPe9oWA95mj3xr8Fe8g7Or6Z+nz87NelEbhC1h5YA==
-	
-	
-	BJNTY+ulC9td1yrAkXGlTOXx3aFSQW6nwikkcdwiU1wGGagyMF11SU5nNn91yKEUZhKG0KFPrAGS
-EkKbbbWeeuw7QAcIkwC42zE+e1E831SP97fkPiMdUogoxdf3t15uLqCpRG9yBwpRkJOPhhev+9vZ
-8NNWJS9VDSGYbmO+JdfU98RnG5jMcVJ9rV1fFK8+JqAIwVAYg1w+M9i6w6dd2b3sfaV0VroV2BMr
-OrLPyA8ARmEJaHJ6DwA296B8fFyKDusp7W8nwn2lcv5zi+hrwQoqz+yZBVTfOzQGD4PayUomnBj2
-chuAAL7c7v3sb+/2FSBhW3n1sVF/ZMYqZpeXAIe0z/3ciL8Dabz4dZouh9d/nhwr5b+27kvCTWcY
-2zl6NMWzp8JPUa0Wc4WrT2BGle/i8Z18amsAQGX5CW37KVDLzvluxnWulplSMc/azjvoHWKez2S2
-gUVebP7o23SQ2L89vm8BBfl8hn3Z3pM6yEJdYpvY/e0Aon2G93/3Gpql07VxMV/vfxpUlaBrbnAa
-zVci6obELP7OsRThD58q2zpWmscZ+NjqjG+/7a5e7wy24w/b8cLX83JfOT76+DnYeU6LdngRL6Ot
-4sXT7nPxelwdU0Ete8mrjcauILe/mz9GL3c7+eJ1ez9VPC985kunySdgTNG39CTAPsYRasYxLUXN
-pu3oI45Ha/vbOz9VgP29fHZlKRVBJ4m/tSvEVd+RaqNhE7g6Wj0M682+F4rnNwfl4lVv562YOdyq
-4wNBqwJIlmD7QHmTt9dXIg0QDPnV7MpyXSqXii9AYcqlva0sg4u6GJRlRCzUBBDKE9i/HP9Z+B6s
-3Tv1gqp0yanZTrl7Yz171alJMXe9eqR8FFWQJD7ediYXa/mnmDl4OSxerDTOlZfWw/JkL6fR4nX6
-rWJrQO9lN7s6Kl4vl46K3YON3/J2uTEMgqkBwR6fWdCzD3JS07jbu90U30+2leOXqlSO9i4Flv4U
-ih10uLBCRRF6rnsD0sXlONGNVw2dbWcDUGGYUA4P71fQiVVKbiva9utS8XIjdYvOZ5aRkCRk+okb
-xXyHUWdOD9Z5ud3uvxOjhik20mWRkHZ6s6ocdlp1JMaBPMaKtLTFLH5ULrZrmtEpDzB2MlLi579N
-XSP6GRuL+k1UBb2XVbWxlH0BzAgPsLUDSRcWUp/7Pbg6wSepWx+d1VXQSr+zxeOH664bZz9VPgpq
-Eqhz0omdEkkBaXzPW3dq7HwtJrdzrwkvmWL3tFz6OF6BnstJz57v9rfb5XUT2HWpz1LpiR73g/I8
-Cc6VEQLTNoVF9fCModMYkVbHfQ1rZfwRaNIW2wWu1Inme3I7qbbl7++LfeWweTlSjqLRMsLpw/3b
-6mEN7RWGsQ0LefCTemDFbHJPf7DcBBBJxwHk3hrlUqMjsGT2aDzCZNaRyDabjerm2Wt9XH5/FTuw
-vHsSBnYkjUf2HovX9f4HMdGIO9rNBME9qF6VzpThI+IQ8tbxivKslIurR/vbB6WkpfLzMvBmOQ+U
-L6HgOWM41zULnTKmgbp99ItX3dTqzrOy2TOXjZzbX27ftgBL0rViMv/zOfnacyq7WT9fLeYrwxHx
-87iq1rpcZLvS7sJu/TSbzKCkjeh6dnx5dQ/rfRNHdku1yO8edRig0qnqkCpkF6uxnf3EVx66ilcq
-j/nqM3CI4p3ymVmF3S/2vs43TKXDIFI6fTJIEyFmdCNUvAeY3Za+nrZ/y8WL/f7m6XDcsyoa2eyv
-ULgCCtMo1X6UjVaqkduWVE19/DhUDZMernQNUsp1ubzPj2rFfCK5hBSkin7AfPGYq74fpMrKuIiO
-rL8vgbWswZ50i6dIVl+Xf7a2E1yEkjhbi5/7bcQIm6ajjKXZyyU5s15Oqc1NBfSX869ty9Pqcnl/
-Tasaa3cDKwb06T27+7v+w9gt8SrLa9snavxFDsPborklZLG24+PnFry2caTU77UrwLDdg8rDW//d
-Kv89m1YF68obm0PEPJgkEKnyMjpW3lM+1vZWYSV+ZXZIl9FROXpY287eXDRTGF7KESH6icAnrhyF
-P3igyRPV+0L29vejSNh75CS36db2uLz6+NlVPnovMWzFcDRIIxyCXggWleRqZZzsvxaPH9fz5u5j
-HqA2xkuv+fMDqVqQ4kdb5bf47aalPwMXq2oPqGHiwQZoxNaH23kH3b68Bgyul3duop+tFHu/w5QD
-31eBkMQ/Qa8cbmwe1W5PzdljcmtaFS5BwD4tr1Ui5QMQK5UayGt5ECeqdytJ5Si2nGF7bo9W1EY9
-3kRW6z36XWdpFW38m/LBP25bzC4vOaRZvCbGSIF4AzbSXAUGnagVe0WtbA6PtCNFi1tIGZJz3cOq
-oLx8vohETqSNgdx20QTsa23DdC3cR4V9Wa2c9E33r2R4tXCbzR61PrPVxMOjqIYTcuqr26ytFD7v
-BjDag6jc1mSh1Ao/ramxjcavwq8kutiKnAmXNgRQOTqgDz7c1CvIDBkRpP9n1/CMtDoeKviOoQCx
-RtGnw3Z7jEM5e4NQf65LHnyCX9EgL5Ty2xWJHf3b+3YIvTYIKaMWCX2/6LVbXoEyyD8UvVIdtDqn
-KB5Sd2H2qnza6/aU3j+65KLKQ3T5QLHe84o09L0V2zHmRO/vHF8JUB70OsXB6B+9wc+VGd7p5BWt
-v+dwq7SjY65eX0ZhrLJPMGjgK8GdL3XR+6oMan+ba2i/H2i65Tgxr59wvHJGf9G8OhvfnE0XMJP1
-XMJ2b1BttTXT3df7BTQva32/2szN48etbtNz5Z1euhzXzP0VRadrBCyzcYdc7x2zvWzfslmCYvWm
-aQgrPCchrFPTB3Jtf6nXbeKrEg6bWnfU+mjpsQBeq4mQufEFwKSZczP3weV6pcCpAqYaP4wRxk0v
-jfcldQ5oZI57OgRicd4LBMow1zutftvS/uFfGWg2Q1Hd7iywE+A762Uqrq1fkOt80CtVzygi4wWA
-9UP2lgIfOsgQFQ9WQzfrsNsAjmjjNwH3nuFWZ56BHPoL1UGt39cCEAoyj1b3JzA1d84g4cNiEB0q
-eoVn6AO/GWp426rMXR6ON4kFz1ThFK43idmOJNaX1sneF1BYVpnhyMw9enaSESBZjBewuVAJFua8
-XseTKuFYGjuoOl/V5kUi3W70c8ZVclVasTHo1Wujk9rf2iAAbOmvMdImSkIEoFOq9UkqopYW7Bo0
-Fz4RgOIRIKwyaXtmIbBV5u4Ob6CbWhqwsWXzJW9RwMo4JiSBKYZpkT9ILNR//b8jeMiqBqHmmtal
-N8BoONiquTbuhj5ajS/g0iFWodC6Zs4eM3gqdINuABpq/xFqkJaNXmA0w9+xFvqrN4YHg//6z79A
-9viPUFMDIaSJhQD0uYuSgNXGobZmdNqEPbX03BtbG2tqf0FDrU6/NwCMnXgVhc8CJQYsIqiMeoQR
-ogmgOyfiIN6jrGO/47VDZBdvfXbjqIt6CypY+oF2Gr1ut9Yaovn1azCnGrRmsAXotluDlppjfQDJ
-wKylMWj1fakLgQhEa2sjrfo17tRhMG1vFMUdXI9qoIwOAoCpcZ9FUIpqoAzoqvAlEQxLhgpp7fH6
-toLEepQ0iLma1HwIbzdak7l96GvVyVux0TufH1b6AN8pVcX4zqiIgRSnKurXGtpEDzgTECH6k52g
-ZGTH2sCeCQqe3Ot3p4nWwRIlZsRehmW8U9UAmY07R6xP/jk6717U9Duh0majOFNddSLMFo28CwBm
-dLQ1aQkwMwxa08yhjSTp51C/+jMObzD7jWNoY2w3o/yk987fd/nm6vU+/nO3cLDybT6Q5LyUzz5m
-O4/bifdyD8e1Ma8dvGmlwWC31q20b7/r8vvpZbEY7wovW3vCbV5Zbo5VLqKUDp5fhI1irpsJl9Yv
-00NpBbkV1VN8KnYqprcvN7ekvepIVj4KlR/kw1JTPviHXeOpGNu5yn6F1/rV33D86/sgHGskI+H4
-W/MpHBfL1+HowRDmgr54SEonhXBsd6cfob18jaTd/vp2H4Z81KFDrl3J9NP70R6eSzI1zPzCp+v+
-RBWY3zBf7lbFaOFhhYvAOgl4GufmyAbPw8889Jwfx3Yr4dX0UBye6s3mK9Ld1vIH/Flpw7sPij7x
-k+FgsDV8HLxsXZzzqfR1FI8Vdwq9kG4rwnP6/usk7tjpy6d84NppVvxOhd06rQ9eU7E76MXaLe30
-TF5fvum3T5w6HS6/ZmW3Tg92L3PdW1unqBfcbXr9PrbVOD916nQwft+MbkS2w+9OnfJlfm/bpdPs
-8kp+66OAIdlhrumHZ75clS8dZ7pU7m9GzlunV46dVpZ7J7ZOKb7gbteOTtKnbgt8M3huiEeo0/WJ
-5a0s3UmRzGgNXkv3JvZ0cwV2n3Z7sbZm29V0NVdp404Bm+qqtdOXwctt/cql0823zE3zM2V2ykWY
-bl8T1TPXTnOpj+s15063w+uD4WZs6NzpRe4VeqHwOzHX4drug+DSaeZrfU3WKs6dptdfYttbHWam
-OETb3NVaZvk3Oz516pQvH1/KLp1mlyOZfGbPpdOHN4Dkcq9adZzrUmVlZ/VE+7px7LRymb91W96D
-1UQ4+UU6VZ9/ygBj7AIvrQ/X9uN4gTcmOj1462R+N/o8dJrr2zs9OTx7oZ0+JKK2mXKRXCaZfDS7
-tcz1UeZPOpc5504Pl8b5k4dG3rHT87Z2YHYK+2Lt9jj524+7dPoU469PfsfOnR5Lryfl8l7YqVPY
-l+ph69B1rten2eq7W6cKf8u/Fpw7PUksV5tvG1u4Uy5in+vt687QtdPbqPbWd+v0lL9L7MlOnXIR
-6FaN3e3nByXHBX6MV19dO/1eqp7ILp0+Z/mX2nsMd4pgzDbXs5vWz2bkLO7Y6evr/Ztrpz1tL/rp
-1CkXQd2e8u/qieK8wOUbYel+dHno1OlgcJZYpp3WpXUb0sQKG6qEO+UiQm1pVLFSpc3BWCrxqNP4
-RKfnO9HfV/V+HzrdGdg6jW32HuK005/Chtkp0GTUbeTjaYmwclF+EA6tBOKKV8+eKqjTxCRPPUus
-dKWtC+i0NLIvr6p+J3GnaF+iatxGCteaMUqVpJXN0rGVFGqxnfzZE+o0NdlpNrK083BwAJ0ehc1O
-oRcsTony+ReZ697mZdK2wN+9HfWHdLp3c3JiXV7Y2O+vHuapIEJdlNin4qgTFje7dSpdTD4fr4al
-Zqfv/DS9Dkizm9Hcng4AGE5b5lMrtUw/XPDq9rlKnk/IAo87/Mm+JOKnkwT+cY8/udpLOz3FkPxY
-5E+ax1m3t0v8afgu7/ZU5c8bh1duT9/469LPiK7Y5POnOH99uxx2e5rkq/unUbenGf4m/Js0n9r4
-S5gfjMM5+nySUh3wtzfhHfLUjmbppyP+9jOx5/QUr9jTCX+3Uii6vX3G32XVktvTC/5xOffi9vSb
-f7l/3NBXbOL5c45/+f6Iuz0t8K83W5Lb033+LftWMJ/aYOxtICQ3jjMub9eiQuFdPA==
-	
-	
-	dXlaXxbk1dey64rVr4Xjy6Ujl7cbPeHsR2y5PG2uCw/fx6vOTzOv3erW9ujRbcXE4UV4bf3oDD8V
-13ajB9anxXDyYH+XPLVTPnHUDm+nj77Np7BipcTGFauBRZvVmNwbnhGyR/SzdPwKUSUZ4E6TnVRP
-qlzuCZH91GitVK7u5R6Ux/JDVXlUt5Mc+pYvl+Rko1SSU8cxVn97j7TReCTSH9PzsrSGVUFM5ZCe
-82RSvtRpvrvGp3buxwgznoA4fmybu3+6nGrt1NcBi5bUYf5y88JCcAdL4trORYKwEaTnMFSe7TTz
-hfScnq1TtC+42/TDPe7WsdOlcjPl2inWc1w6BdEW9JwaK4+xc00/vHt0WkkUmE6bq6vLZqdY+jc6
-lXCnWEuiC4yk/y2900rbssBLUbbT9PWK2Snog0LStVMs/TPymGSbK5L+n507TT88uXYKy9sRbZ1y
-EXaBQfp37RRJ/023TjX3TvNnl/cWecw6VyxTuHSaP0AyxZtbp5e2PeUiqdbyZpwOAH+ikL45sfvO
-9bYC1CNS30mgFtPrF6QeoRbiSdZqFbIgbnkMmvbaU8mwkNSuZCzDEeKir62J8ftC/EaIG7+eWGUd
-Vhstap/FpvdYFzVwZYzhEkHyxWoPDa9k2sdMCxF/lIlE8C+0oXesEEw7ODdGoyDdr4yr2GxPXGS3
-ULm5gC9WI/RX7Z6RmKnNTEdcqPykCOrLsMJM1xgyCjmN0F/x0x5ZG10X08mxOQOAwZJlAdmVl1Nf
-mhJBvwAg9/hD7yHhKoS/uAwqrsbJL7qegpM58BIt+dh7ybmIufJ0hlivdpzfRdh/fvjXlW3/LBof
-3kGQk0+ddpDdv7fxhj54otM4za9nbLGk22H8d9BlfluxAPDJWRbLo7H4PMCuz4WAe+WhvxjI4j+E
-pQdz3RHuz77yRn8+mMMFWCx+jsXqWy1X78mejfhAz/G+pQMD7qYkPUjmh2lUmCYYYz9DetZXMVw6
-r91DfOQ9Gspf8C+6dthw6rB26vNt2I1sO2MlUWwcsBK+FY5P5pxaYtk2NWNfLEuNok1XyWmCwyrD
-dC86/rNaJbMy52IF91eV14Y/d/PuVd/kEAQrJWdIrxyv2mR1yzYpqQAQiJcF4Yv7wry5c2leG92k
-KOQYkEz0E2dIrtSHczRmZflCfwLr6uIv0V/mxrsyMiIduu4kPuUZr4Gsdxo3qFLUhQrWyuLLWD42
-puuynegXHToxQ18afN8yQysVtDQWl6N0SOy4Yq7j4j9KySd6/jI5zfNLJynMa0vSvxNb8pMf4Fnh
-0zdnWhuU9MCs7odubIlIjOgqIw+Z0dzfip2q2tmS1+6yuhhUb1aE2srawQKkp59C2IReywkvs1g7
-9agvyDUrovxYOHIekjEa9MvEF/dBLbvySnPrvPePyvywoj8rnoLFcuD9cxDo6IoF2EHbYvFa7e0m
-KDCwZ6/OjX1rtzNCFmu1po1ZGcpsjZGmPtZ+7xe2Yla5bs4V+9iMPi5sxRBNm7kxatfS7TCj3V9T
-ccUgzEVE+f7VlQxNIx1/HriqglxkQpVwZtAH6ITlIKBiY5cUdKyU73+WFoKVB+gM5NgTxiYU5XXX
-1ZFWto5PAinKsDbUDjMxnuBqn6McBWvzlvSjyYxM4TYXP6JgGYizvo+GElxrcR2IQQVM/WWGNRGD
-DoTZl8mheKO9XTPc/HVmUKPdIcJKV37npJPjY0mrk5H+RgIPyTRnw2i+D4EK1FRPC4mtAxejhvgy
-7PoYNTgb+XBDkO9DP7HDa0islgSDGi0vhAAc2giAm74fhAB8HwYlAJyPJUl8GcXWpqHYjkPC/AUg
-wUdWsEMtleXtULsXVUbChvxdts0P+1xND1RfgRGS4r6pldt3cLfy/Dv3YuGlgrlMieIei+WK4A68
-cnKxrCienETxzhFGcVcljZvswMW6JK1sLi1NZUsw187klZ0jDz1vGqViTyBmAn8Lib9JFqYmrAWd
-mivl7xxJe7fVUz992Mu8Ia0UfnmbXulh4HCTno6gl9tegAlxEafdYmDHJltPb/fZE47GyB+Gpegz
-LkzGz9Znt4G4WGyOPO01TqSAsTRwEbswvbd5MbIJ09LeTSSAMdFdlDbxpX9sFaZnWbu9GyHiNBro
-ZVpGeGyXhJ0hgmWDrvjSP7YywtmmtrOOp2aciU9BlcyB2JmfG5xzEQ9I37wMWznfbBOKpAPZ+jwJ
-wPEEt5tcFi7QwtgYnePCeMmyOt9Hq2NldS6rE0iWXYOel9fMo1gCySX4NhrA3O2vwt5fO51OOGl8
-njbvykVnem5nWOAdGpvN3urUFBeZG/kQ0giBaLInrKJdW4/OA/Hm7q9vzIs5uJWYUyv6+f4U7cSn
-H439LAm3k5jO9u/C93BTyUDSRbCTivX1SXnzvmqeMOjymJ1oBLbHQWP+7IYLqHehkXkc+jif8Rmz
-n9yX5qoY6CSKET+9KBooLpl1AslnZi/w7WYAQS4ARbsxKZrbvgShaLe9oBTN3wKPGpuXohl6JTS2
-AIo2/JEWgPvoIH4GSjQBY5PeD7NQNNQKQ0Es52LTtpMMOhr3s1fcTspVrU999WI7OhQ5ywKs1Rpt
-WczrUIg5Okw5SinU0YuiCtJ4NiZs4+jbIBvhfwBbggeHjkSIkcb9JbP7W++DXFci63S+D41NLdW7
-jwv5PrievQYlMw/9ALo054fOaNdMt6YZiQLd/blFe9KKmzJntfb4tzObQm2xkKB2groeeaMhacpA
-woD+Y57csLZUidl5YW3phNFpLFbrabnhXVDvIy+ND+lYi7FmYUiGxhYl3z//OvFCBxusN6AJSz42
-l2BcrLZ0ugAuBq3YT6xmbWcBHkS4HX4hsxJs+v7M3BBtWMLTnjw9N9yMxm3cEH3nLgawfrABuCEM
-5GkUyHXKdMOA2TufJKKRuSuklqU0EdLt9A1UBeRpvxBbNWrMFbetlD8Idr8NAkm6FnhxX7HsYpRL
-2MnbxBReai6E+d7TdE0gwvDqDDSogBAxgVzUbmljTKJ8/5CwMaYJz4kp2JLN5+r+wYsxBfFcO7eM
-6yvsbh11Ry9nUCklHXWjWbxtUWOBWIvD2Y01Upg2tigglh+WVoPYkx3PBiZ20tf5lj0Td0H2+tDL
-+ZaFCNchmXZLPCh3w3BgX1WTn/Gp8tuGs2ZB94BcxnL+VWnf1t7w7Svlwsr+a7m6e6E6xdB5R9DZ
-pb5ZY+jYOKDJCDrz9ob5Yui8I+jwafUCYui8I+hcogWnjqGLeUbQGdGCc8bQuXRKI+hMajlfDJ13
-BJ0ZLThfDJ17pyiCzjVacMoYOu8IOuvuzx5D5x1BZ8TxzRlD5x1BRywk88fQeUfQMefIUV9F8klx
-cnbx0tloHJCDD/zF6q+3s0vgIRnGATdNHKSdQOGBVhOTm8spIye7WfKfFKv8679O7pbei7XwYtbJ
-amJy8lMKuk42Rj/pZ2ZRuPSbW5zD8CzuOoHhyakpxF+8gTPw/Dzi5gwZxjJD10H5xhQ4D2ky8tF+
-mOO76K5D8rdceayTldYECpmb8FMKBrCv6lSuIC7RterzuavCPZUriIqNxgEsvQHMxq+qt0bLBbFX
-wdSel/3VMHe7OvaERMFuwZxBfILd3OzFwS29KNgt8IGLzcTExL2qAZxBfA8cYFkcXEFMzSKQIsI2
-Zo1m8NRpiMxvacwWz1AXezYhwmYsdoLzgDS5Lo699yBwiGlt6W2Jc/TEChBkakW+sncAIzoXm0K3
-R1ZIcXrDmWXFrIZDJOvGrWaSCloYNYA4EeDEqlnx4GyWODDfKLD8aIFxfK9jb440TRyfn+y1wRqt
-LEOy+MCv7WiuQTABRGlLaJqXD/z5lUOIpntslJ8P/DRxfO7m86D7Z8bx3SbmbsxoKmlryoHvB2/M
-/cTc1pQRNeDRmE+8zXQrJixuxeze/nOtmDTfilkNv+SKSIur0+eBn6xuERsB910E7AP/oF0d2X2j
-5dyinwI04UdwMG4LASIfPw/mVvYMSWm054vduuzsEkW1t+rdAOffxO7Q6kXgsdNuK4I4sl/8rO8O
-2U5GnPiLIdS4hrj5oqvvYtj9+WdYDv/Q2A0uiOcBmlB6GmuAXYq06JV7UWVgkyPFl+HnaAo10xWS
-gXlOZbaYITyOjeVh1FX3iKhg5p0A8tj34WIwHq3Sqr88FmydnMw7NiDlIoHWaTrzjqvlyi02zt3S
-4DGkCYsMo/EFhksypGksMt4RdlNZZDyG5B/36rFOVovMzshukUEhSX5e0MEsMp2jABYZPy81aWUz
-ujK3RYbYxo8W5sjXOVqABxFMLR2d3vBgOxPvHM1vkUF7brPIMCcjU4Wh+RyC2ywyjvH7R4uwyKDo
-PJ2Jenp0+4eao9UJEJzjwZGtwnJqUljuH3vHoZoYTS2KbsLy8fz3hu1tXkb8PFWCKhrS3k3OPXSU
-i0xj1Dme8d4wCyTD5NYXET424bpg5y/B4uqmvTds8lwMx9UtIAYywjiczOo9eBwwhGTZzW5pC65z
-N4L6Yq9hb6M2WEQj1+wnqfCdDzAEY3T31wu5r883Ho6bxqdu5ng4h7NXaGzR8XAze6hOFQ/n4aG6
-wHi4+SNSg8TDBY4WnCsejqFjTETcouPhGJ+r6oyhGg5oaI+HY7WkqUM1AsfDcY4RcfZ9mTcezoBk
-IwYARcRNHQ/nc+rLxovNzVUQe3OcMxsvFtgnEhrzCae1LSC+C9r5RgvUmPuJzhQRX9eBTqy8Y5Vu
-AntC+rcT6FoL7xNe3I5VfZ51Vs5C/HSRXDcz3kXqqFmUvO8ADhBOYENCbLXe3bCjofpc8l7AYM4X
-sA0YCRmvzhkjq3xCMaidP5Br8tpvIMxxu1bGHmM1nb7ouKcOjg3TS+MoZHARtwHjduZDQ70VioTz
-3N2B2wmkS3vfdYPbCS7auwr2hMLcTlwx43fblJd3A8zPZsOi8WJBVWpPhRrFIF05hi9MR8fuFhmR
-ere4iNS7xUSkPv8uJCJVWEosJCIV2llARCpqZRERqaidRUSkovi1YNdAO0evWTfM1K+dTkX9PZbs
-aPg2mHDuQ98ZSOh2q3kwNAwaCmflYq7ROnOGwlmtoyh+7V8RCud5D/zCQuECnSTOHQrH6pWTjiSL
-CoVjepnqmvrpQuG4IDeWzBYKxwiGWHt1FQ3rQw/9bIob4QlHfrBfKDxfXN2P/SbEidO3gF5VqLFf
-7+Mfxnys28ZdDMiosVEAdS2QDPNgv2R4xsMFEsI2eYDjcJuW1+28iJinPFieC3NwvU0LBmW763u6
-uDrKHNiYdxnf7eHQH5sxPHq1kkMZw6/DIC+dhBP5xFt443hLCMeVq7tw/Pb1GiUNr4Y3qsUs+nSB
-6pXCieO3DNKS7n9ylB3t9H7YIetnLdZgt6hHsNtFimfXWI86o7k4h2srPTYBqjXYLVpfufpxiTtb
-f/ZKF/easPJ9W7CbnD136TS7bAmLsge7vXpG2FXCGae50lzIlcGD0ak9Fssjc9t2+A==
-	
-	
-	xRpjZQsBu9y/Yjq1BbtttW/OXDrNfG3s32303SLs0g8PXsFun7xrp3z55cA9wi7yk7qtu0fY1Tw6
-rfCbrp0Ohp9Hy7ZO2Qi78PNy9sZtgeNeMz1cte0pQtcE7h5/0nc/fzZuetek9c6XtSD1ls53wlZP
-SJeag/HbDxtFjuY8IYjqiAvvxqM2dup9l5q/y61Ngr1Y7djd5K32VGIdnTGOpu9qdrJZTQLksdr3
-vqo5yJBIprzBYkLFXO/JMX2uFpVJzsm65JopzyeTXMCtW1uazufKIy+ab8YRm1/fnEnk2HWyNMXq
-lQGSyAWen/VCZId74G2O+R7zs7uHuw6JWEe9BuXrTBlgSJha+uWPC75OJ+lnpyEZmSWd3V1niKZz
-GiETkbqgaDqXFVtwNJ2TNOqei3PWaDqnqU3cqjF3NJ1TLJ3reeXM0XRTRT7OHE3HbJNhbZ7Hau0c
-TeekfDCQvKBoOl8v6IVE07lx5MVG0wWxWs8fTecUS4fnstBoOg/fngVG002CT7PiGSc+UzSdE/8w
-7lVYWDSdE2l1PBWdK5rOMiQaS8dYRxcUTecUS0eiORYZTee0f1ZL7yKi6Zxi6dyy/s0eTTfzCe9U
-0XQB4isXEE3nFEs3/4r55M6ZbsUCR9M5r9iio+mcjlEI5V9kNJ1TA1xk0dF0TrhtWkcXFU3nFEvn
-cROFWxM+0XRODVgpzCKi6Zxi6ew5H+ePpnOKpbPg/kKi6ZzCb1xuoXFdjukUQNsNh9YJzR5NZxuS
-rgBOF5FqVQA3hxPBO1HFUcSwetwFDKRzS1PpGmPkKF0c+uWqtC2/e7Yzmq3OUbqYK1+dU4KyoHkT
-/PPVecWsMedih35ZKwOv05edffvcqOM+Nf88tMyQPPwtA6SqCzok4t3hnYQ26Dq5I7PjLWce6+Sb
-fdZxSJMUBgaVnYFkWm8XkVYKPylTH9Jj32wa0aT/URAzmGuau6m8oWZOc+cQ/zKZ6G4qf0TL1Gia
-u3lsF8HT3JGoAZ9Ed3MYY0iau7n9kwOlueMCRRjOm+YOZWXyTXQX8DJb9zR3dkgO5IU4dZq7Ke6F
-A76wPCMwMPzleGFxFv1jW2SRW6xogID2zcsFxPIcB/LF8At6DOOn8/laoz0P4tHM+QfSze2C3z+e
-5JWzLYx/VFqwRBhodXIzYi+xwdoiiqKTijLKTTc7o7NISlrtzTHV2bSBXWm7bXhmbygs8y/KGwpH
-/8/rp44iH+dGPuR47x3EbkjjAdqZNqbWKfoJ2pk7tytpZRL/ZsmTOH2iSY88iYsJrKWaBbI1RCcC
-a781n7Ok4GFf3xofLL7SX8JDjW24EjPXTBOunnvX3UBLyaqRMWu+V7sP9e3kkS76bupABtfop/15
-71VAAVmLy2B4s8gMhjczXhBgw/3b3tyJqnHaNadAhmlzDKF2pg9kmMwBgdtZRDxnzH579qzteKTW
-sviqcv5oCAjioX/PcMILstckGsJ388YT0UysrjnupgzschHnGR+SoGg4Q4Y717zVNMfdnKyTZrib
-P/IxSIa7QJny5o4n0jPlzY2GnhnupsyUN2OGO4csM5Ycd1M1xriAGtETOMPdZL7XhThaYCcVcxtm
-p2Mg3PmEpJtijt+9o6ixQLGwnmKObueHxtJzqy6w2ppj7MXUkY/TBtYatj57O/MH1t7ZVGv3PIn+
-7QS/pMqdWt553gs3XRATunnS7lwzX3y7g2tNCftd3HgzsIBo+DbwjK+cIoyJRoRNG8SEV8w1Iqzu
-br6bSm3HK/YVwF0wgDMWGtdPIKwMkITrfvogJle98m0Q6B467yCmzWgS81k3vj9djCsMyTOIiblv
-PGCMa33ixBV/5ykYcsFjXOX75tgNSnzy0TnmfZvPz846ScbXet4YV2jM82oqiwzjF+NaH06f7tF9
-xWY1T07u5FvSFjUwQ4zrgyfLs0U9BxpUQIhwZg66Bd7E393MadexP7oHJ8PBQByt0CC9o8IDiu2r
-ol/74VgjeYTC+ko4ti8pnRRWGB151TY8+skSmjYYCpEBi5/WPGxL4mbBJc3d0ioXcQ3DG4zfkwkW
-Nqxp7rbFT/eMc7bcerAvliixR6/Yv2/BtVO+/HF27dopF1kVjt4abrF/Ta88bPI106k1NG24/KUx
-8XAIKy0LvPu70jHmaouHW3cPwoPl3XHPOAe7Xy7wbrF/2eWVq4746haE9+IVDzdMW+RkW+xfJf5+
-69rpmhbNfbkF4SVdO+Ui0O3JmutcB8Ob3bBrp+H9l0TVsqdaQe8ef6LbwEXWS4/NToCa66/jTte3
-Xnb591W9P7fVo6cJlpqZLwp3lE2iuJ3nok3o1C0y0c4E6yyPBzZyxJ6/mKzO1U5slVYdToOeFCe3
-ydmymF2slV1MTI4Wkg1Xmf9Jmc61yn1IIO5a71GcNdqq7H0bT/DMLEoA1ypXc65N43tSpnOtcl0n
-q5A7V1TahqtyNW1Umk++g0l4cmoK2/pQY1P4aXnOzzG/i7v3oFeI21ReWjAk1yjOLV939KBDKiWf
-FoMvW+6OrUaE3aR3rJVcrU+Sq1d1Khuze84UdQHX0T7E7bmfZo9GUp9vvXXpCBdUAVYXcsrzkJjV
-pcYS7OZs15rKPoaiAGc6srZ63aAowHktyygG0H5h54TvaLCFmfLKRnc7jOrqpxXQPta3SH0H78Lk
-2U5d/PUz4wahMLXy4nTkurTkPSQu8Kk3sgnOetmVw13QsFgel+EHMNnZbCo/+T6iMNa0MnYD48yu
-3hVTbnO85Wy6tGy+chvOyBYsFNDnnoOpYqzq09xz4J4pbsk2pCmlccuQrOZOr0BAypE9QgGt9H62
-UE4sKTUrvllvAodyDpzCdGyaxRSN+UV3sU1hjuzRmG8WnUDjQvuCGvOH+aCTDBDLE7wxv5PLqVbM
-N5/ONCvmEZA2ES7sKh26xwBaTqxm0oiCxAAa95DMFAUYNAbQRxr3iQI0F8Y7BnAae/LsGfUMSJ4p
-CtAyBo8YwMksZm5rMk9GPSNWdKYoQIYReMYATkTZuC7HPBn1MOWfOQrQYUKOYUPuOnKQKEAHyeTG
-aVZIHrMFHvwLkvKZGdn+lUn5vKxwi0vK52qFW2hSPi4w0fCJJfQUTyZPEv8VSfms+ZL+VUn5Atyl
-toCkfD4+8AtKyofzVyqjOZLyWYekOWIvocn7ZDx+ocEeef28tdwAd0MFyuvnH8m1iLx+JJJrcXdD
-Oef1m9Lbdsa8ft5Z/Wa6G8ohr5/3hJxtsNPn9XPcpoXcDcXm9fN2M/H1HA6Y18/bV4qhlnPl9fMU
-2I8XkV8M5fXzsykFVfC98/p5+zNZfK3l2fP6WadmT+Q2g93SMa+fN3w6ZWeYJa+fU9TdAjxUbXn9
-vBHXK75yIck/jJjEhYUfuWb1889fGSyvnzfWBY9Kmyc9gC3XwMx5/ZzGZXK7OaI5am+BEnMFyMcX
-OBbYO6vfgvLx+QR/Bs7H55PXz7sVGjMyd14/65Ds0XnO1HL6vH4G5jhm9bPfQTRrXj/v8BRiH5s/
-rx/DuxyWUt+XefP6eWf10yOG5s3rZ4ZKOYnuM0Sl+czZSY5wli2nz+vnndVvAbiP8/oFOa2eP6+f
-dytmPr754x7cs/pNn49vluTc9miOybx+s8c9mDczO9/RPX3cg3dWP3f9Zbq8fvNHpQXJ6+ctzhsR
-Q3Pm9bOOy64tziCNO+b1m14anyWvn0srt725tVc2r593KwHy8c2ChrZWMIz5WMCCBpO4Z/Wb6UYd
-h7x+Mc+sfpMnI57BFq55/aaOSltU+mImq59bZP20ef28ZSbfW5sC5vULlI8vQBxukDx6btasafPx
-zWbBnMjHN/edVg5Z/USrxjd7Xj+HU6UAd6dPm9fP266lW+DnzevnFPPkwMXmzOtnm6RNbXe452qm
-vH7eaju3oLx+3qeZzIrNldfPspMTWf289EoXwuWY129W78Hp8vp5C4ZES5o/r5+XYFgfIp/eReT1
-2/XM6oc1iwXk9fM+scHS+ALy+nkemKHo2oXk9dv1zOpnPUuaPa+fm6XT7eaW2fL6uQ8JueW7Zvud
-PumrNnHOiL+z+SlZh0w4g88lpvzHzWbKbtqF7+zIbPVRxM26Od7bwhYt8NS32bBgcy5Kpj5o3Zf3
-WJddBBwmYIRA1Za6JbqeemP0tTetNBjsXrX2U6Pto6KQv7sW13aXFFwFRVOhWJ7qRW0QjjzHVsPI
-FBReez34Cid3vouxrd3fQmx76+ohVm399HhV/U7x6ndiky8fXyp8udc64SuXhQR/cnj2xp90Pj75
-87b2xV+fSgW+eti65W+GXx/8LT9CWHn7ujPm7xK3Uf4xfrPOv9SXzvnX1/sP/u1KGvHv0v0a/34a
-vRwMBmpqMHzubQ3GQvd2MH7LR4druVUkEFyNUGTnWqLVPDg/OCt87N++PH6GN1Yj9xcr+a02SH2R
-i+vK0erXT2RpqZA6iy63G5HDdGH1vP59r2xv6KGA4XG8nz57x1tCwt6K5Wo1wq9oTfjuoudIQei+
-nAC1hFEMhyig9CSckB/STApImkdwU3ZZrM00LMf4l3/ffl0fDM4SMdeZol7S6/exbWltny/LxzJf
-/mgc8ZXzs85w+TVbR7GrYdrf7q8a28mfPfGp8lsYxSRe8upt7g2n+eNT51rchk0m+uhxryygRTum
-vZWZmsl9jJVAu7EaXm+1d8OJ7uVzONZIXIZjj9H98IqSP0cBuEfo1xYXCSeKmfVwIrV2Fk7k428k
-nyb8eYueK+GN32WYde03T6GbJNIUY4iCrggbJWGr1KqlBDS/t/2tk/AAb1NZFU/z8Om6L8Q/P3cx
-hbn9xQo+n/pZSuK3pZVCZ8Tz0WQK/4nIY5R++tY24I2DddLfx9pvDP0Zo39uRhPozwT98yRNGkCa
-xc3mSG38/Bb4VOaQL3Z6J8Pi8d3dC9CDUYEOdDe3bj5gZ7C7E2Me1FZKO/qDUsJ8gPjL482e/ugw
-ZT4CKeyzqD84F4wHr7B1kTafquxsmN+xPVdKceYB6pmL6I8Ok7De8Q1gas8xaGd5XXwZfo/hwZWA
-/5T2bsLw58W+2fYbFhbhu3IcVdkAaVuTMV1BJDEPVPUkD4TpfIBg7OI8hazMccyC4c8b3OwG2ZzU
-xZOUOr3+keDtKiz/8vYyehqDDpIdPvVwYi7Mu97LO2x89jGhpGrbq5uf3bUbLlLeVtPfJvmkxLVy
-f8mqsLoeq/Phk4JOPCdadGqPWEd9WtQpLG5x/Sh/WchXyvtrWlU5bNI0lTCre0GH36oYU+KRcTl6
-cHgorrfflrkIBa+HWtqYeo0Fr/p5Ai1RHBY114U/b1IU7Ov3vFA/OVyHT08CkX5T9Vdxt3Aowl7V
-axL+ZFgVKA8ssUwPoIglAAZWTksAnjEBANyH//YQsh+F47/9c1LJkQDYM+mmVtEko1SzAGJNJ3Su
-bWBcBLZ7vYHXAeF+edxGd5mjPJ8ZHjch7d2ptfLb+tMxQvskQucoSbmpDX+Qs/PBBg==
-	
-	
-	xW5hKSUqiacYYPROXN8XhPsgOMB3pSQSVO516yj8WqcSc6accjaTAGXQQQVZO3STB+BsOopnxTej
-0U0djzfxNKKC+rq5bWDl7j7GLCRdXP3Cn+WkSQVgpvUfub3ULQvxfolXjrZ7/CQ9ACWcbCIQBQEk
-g12Y1VmMUn5WXsPyCpJlzU3e3embjp8YsDN2a50d13TZAwsWsZ1rtYmk8UhXGQx2GtbMsEgs2T4m
-qhSuLpaq9bQpiuHvUKLfU72B94i9gXH94hfYYH5M8yOHVx/FI4Zj4+/COw8dXXQY3liuQkDwm364
-wE3QBjK9Mgv76WsSG49pIPaEPBORmR4BxkEMfUoa36WM7wD44tewYaPogOAxcJ9HY7FWjTl/bUS2
-w+/M/QQIxLmIkc35GUhTugKPhKSNQdMJpddfGTFgWxle6xIAvgqhsOyQ15jknKX7MlwqN1Mx53sO
-lB9yIGEkgTZuPHiyXiixwUzoaSDV9QltCjYJNv3rPG7b3Raj3V+y5+P3fSlmJmCGxeqZg0MIkKS3
-N+AmjFsg0IUMhSU69cb5KaIXSxPXQ8ROky7jxp1iwTDztR7de3rB2wDy2MRG7P9/7V17QxNJEv8E
-+Q7jKisIGaa7p1+6qxJAYEUEBAUfYAgROHltCOd6f9xnv6rqnp6e8Eqie+zeua6S1PRUv+rxq+oH
-5982Ee7qVcfgPTHwkgyg+2g1sNi4jgVdGzlgG3punnz/e08rBm3DducyBjgvfbOgS46GGcriXuvH
-c/tXzAa0oSL9768YsR4xXN6OxJVubrmSYzs0ni5b8eUA+P+yXCl3cufKFlInHea/VnU7P4WqjqKq
-5l9stirh4fsgWZvv4yZ9mO+9d3T5qPL11XFPrF35enin0prXlcLLmyeVvQqPl3cqN+Us71eYLX8+
-L6JgdMvdJ+PoZFSPocza3aeGrEDp2Uq4hFm4e0fvyceDm9yUDhc0NrbJdda9v5bvz/DrZIEk5u+H
-T6MEHBAQPKgCAsIHE/TV7R8j/JCGFyfHZ19vzGN73osnr08bhdPOR6OIoOrjI+CPjr508/SgNuI8
-+/0ni4+LR1WXf771tHiwGMUdcfVzD8fIWcU1zz0tQ44tzPWVdc89K7H1Fp2ABdripMdZcy8zBFPj
-HqbPrXNC7TEQXZ4eJ2DvgejyQj1kejHJ5Nzo8mLq0P/9XzdAVZZXM7TeDP7Zxa8bjq14snbsYjY+
-di8d84B2c4FmcjyOZDZfpr4W0TDCPGpvjX2a3lfPXjYOzV0TARSaWoS2jlnvinKxCAwcVyeJ42X8
-KqcG+ue4npUc1fqvD6en1n9+9HF6Xz8/nVqbOn7jQoXGuwdbJL0Q8Y21Ng6K6HZNBPH6GM/vzuJE
-FBG4AGlnNXXBwOz7mTH3qfnTaxcglBAZAkq8uQVh3iaI0i8LrrXo6krgT5DHR91T5j6JUiHxyyde
-LDY+jxdqtnXmIu2Dn5Z/DpH2WYhfZOpS1z5UlPkY7TWChj7Frw/HC1AKiha0Cd54nTldw+Q7bgRP
-CUCzua30rVO9RvhtJtWU7XxG6dmwiPpz8eD5KGkym8iOPxZj/PyBp02P7ATahKetM9T35ynYsWBt
-2MTer5MF1F7MMrnzHFe5nrOoyFzjdwWisvcSoTZUsHlCkzPmrikq8zAn/35c09ryxOTwz+Tq+WG7
-87JzsHdwnEzUHtUmpxYYWz/ePXnWabfX2n90Z05a50ft427yMJmcejW9sGDkTLt1sttOJiq/ljJK
-rVZSgU4O36qjt7/UPz470W9EtnsxUdg8njt8/Y+dxscXK1NTE8fsw6Mn7LWZubt7PlsbmZmef/+B
-FP2SVC/pxyPQ4W5j5pOd+zx/d/XX5synbPNxpD0Esu+frv2OybN5vI1tBCPBd3cm+LNXd0bnz6Av
-SNh0LsuFINWEKqZ7yuxrz2ojRQ2P1cirkWf23uru9Iff7s6PW3m6PDUv9leeflo7fTT7pvECgtKn
-n9bXlj6v3H1zf2petV6OW2Xfzrx91t6gvk5/WPh4QNmkqmqMsvHPGm/h2twqBObFcZkRKVUWvNth
-SkvddycKH7TZ8SatO4qitd316gRKUnxio5iGGfXGVGrSXLyXeOGUIlP6CvrxrkNBabElFKPQELRm
-sbze3w/5sudj8QPbbYYH4/GDxfFWeFCvONqJLd0Ojybjd06n98KDHl144NQgoq2PBmVbmogf7OUQ
-LoZHKZlasA9PM2eP5uvPEJgvMaeg809W8etKzHtnbxxHdsXrcOuefuitNoTxLlPeqv/KSF9WJikQ
-Yq0nCzhsK55ta2Wd2IooDTW/3RnxfqmeY1JwrR4nbJ48fRRkf7VxmO49mFpufVoEfXm+cOdVKZw0
-tcE8XTBehWlo8LH5Z79cxvEyfn6z5k0cVxZ/LfVTdpfvtec+vDV7U6/O7x3Mvt1dRnu7xkr5jbHG
-5paojYRcVR51feaJDsLyxiVK+czKNEaUbyYLsX8DvHc+4H7dN6xwJW8om3SCn4T7VNlKVUlRlwnq
-wgAErRzUAMycNx+BCyQT0Bg77Cw/neyq+cYsX5u5wgAEWzOob6QFwsu943f0je6Xk13qHb+jbyy1
-8oJ3/I6+sXpo9sbEJAn2hY2XF3RtKXI892a3JC0QumTQyoVkED+rx8mglnl+IZvUHT0LDJYvZpMe
-zKX5/NRRmfY6eXAx7VV/EaW9Ru2mqKS91N07I417Mz15s0L2ISByKVEKS0BYHtXFz4/eMfARMxMo
-Am5VlmgoLKmjfTjbFhQGFXq83a2sO969XwbBPYmUIiVxXSrl/kCplIuJlPHjMC/Xh9CbE8f9JK7w
-Iv84geA79L73AtbxK1NXlebpTj8ZA3cqHhpHqSJgUaaunr550IS5Gn/mrnlFexHG5LD3l2hebPdW
-nNE6XF+iaSiTBVGHJr9xIsbiZB5mJ0HGqvnJG7OTY1cN6jVt6EkUjk1cnyO9uQ31yxjQvPTNYrD0
-YMmgvPJpLLuCReUq2vmPE32K4UQ0LLWRazmGxoNu6NWxpeI+2r2sWo5d3cIoGX2dxEzwsion566q
-uefTlXKTD6ImHYtHy0WTjriffVqAAMP99MxBtXCvq7NPj+feuIWTyKFEmYyX7WPvWDc+1/n2/O4E
-Ll3VHW7DZSGHxlO/MLT+E7me+8W6DXzCjXTkhx3oDn7YgW63BiOf1t3XD2dth8bFvV9++ejWmD5t
-Pd2LfGXc0B7XGj2oxp7Rg3W2Gx70+NlPUS0x3K/fW9gPANota7O5xZ8C0l+KkT74hQDelurxg9OH
-KLhLk2F7q1zKHFieV4s43UtuhY7tbI0E3ivjrsjOKUPlW6kHm3SP3388ijvCVlIPudU0clnJyGSC
-hWnNvySCZ9t6+44V2Z9n42Fl2GEPPqYehoFZS10t2dg9k/HDVyOzE3YMQrPs9b0KKhg9chuDVj0o
-vXBkMezRWZvsl+Nl/GqXccwijmzy7tkv4+uPOurxer40pT/sjnqE/vbVnWLR9x0v17tL8eJj57uf
-qeMUv7yZiIH4/K+o8W9Sj8HfLjAn+DOtlz4lOnO4zv2n83dbhK347Fhzu9gCtah7Eq/FUUMIdt2G
-CdCIKdLAB4VYvDr1RUDRigA3Hy0D3BCT3nerOu1/tGmLxZhbhMUdF9QX3HPhsSAo2tM7H7w+TROa
-WZ6gdNXkwUY3dbj1YOLhOFkLce/R7G+XHRQRT14vPXcy5I6A+mMfo7vrHsv3bNCggLtnbwZF3Y+n
-624RtrofI+Bb0Az9en764+cpiF57MrEoLC9obMG4GDclGAAbB4IdjJ369+Pao9oI5nu2Z49341xP
-bWQEKK/a3fNTLCC3G+29g+PF5td2p8YS9yeDP/ivtgnjJuFSwheJ1MWd2uh08/D383bCxpJFMObb
-k1Od7sxBq3twctzsfE0eImnjxeL6wkzyMPGFt6Hwo2QU2pNtQ3F4NoYppm1o43YtS6bg78aX2jk0
-YAY+voS/q7UstZxJZZMs1VIZJeADyxnTCj5kgglNFC5zLMJtxiw+kdzmjCcbyBP7wOHvxlfg/Bt8
-/UfC0jz5kuTJi+TdhyzZxYpXa8LyVEnNE65tmkmlkqNanulUZsqUtMUa1J5qlke0nMnUaGsTbqBq
-a5Ci0zyTAih5aq1iyTS8Z1IjdQ40mzKdWSqlZA6lrIY+iCTPTMqBs8hEKiXwmYZWZanSWpe0xZow
-LOVa5PSeYoYnAirOsGLknVvJgMJTroSmFmiJnOBDrqymdlsYRCgD1cEglj25OAbTtcZOLUvcn8Y+
-DOHo+vFx86i9m+x1mrsHmDhUY0kd6lecGY2zICT0CqUnZUZK62UJiijDbFLnDIYk4wkTCjpnrJJJ
-Y68Go2MtU07seGpllkNzdCokl9TRzDCWNI5qOzWeNBo3ytxps7vPBbeXyxwWXMIcJ711CZcrHwK3
-P44Oj+Fxvdntdg52zrvtM890qtNpXijV2j843O20j10ZnkwuwJCFp/hP9+tp2z0dbbX+hf+PJZOv
-gPfxXrXgP5uH50XJs5Pdg1P4+7DgcHbFSzhZXtGSS9+a+PZesWt7dXNnXr2e217bPzibPWyjeeqn
-JxdeQbr27cCHr/abp+210IjKPCaTSyfd1XbrpLMLgux6cJOMTq62m4cvmtCuP7BPo9NTC3NeA9Y+
-nXSO3KPQvqndk5329tSCRbl71f162N4uWxAZPjS1G7s9WsaH1jL3L+hThkqiktGxZOMNfAGTCqYJ
-bCm+K9BMMrSgGWg8GscszXOdSTSiCjhz/GDQzMpkowmv/wZlwG4mX8AgWTLFoJM2NbnSYCaFVanO
-weqgnkoOCouam2VglMEQp5oznbyGUjnYbu20mecCzBZQMuyFyHiaaaBsXsJ/sfapL20Hs8j/btre
-+qHq31/VvV7NOAThtcqBGkIEoDxMskJjenEBAQGT5dq5c3CZHgjwXLOShkAA0EmO7rug5SxPVYb+
-Cjw0mA9B0MDmBARkqlWuCAgAL4YSjs5aZNoBCMZQM1QKjxPCHTIzTjGUFYQEoHngIAMJgYBImUTu
-8J5BR4nQQBM0AN6aSeAAZZRGuAItoFYiFJCAG4SgdnJrDEEBY7kq+3JxFKZrZ33qoTB/Nz384XX/
-RFUkMP8t3ieC8LEryjPwfYBUY1eUZ+BkBHwMrigH4Gy0jj1RnoG/EnleeiKkGKYqnugi+wE8UfZ3
-04AfnujPE/8Z53S4NmCHg9cRRoEVtt6noPgfUZBmtDfMEO8mSMhshuYbbH0GErpJ5psecrTaGQR5
-Aqw92XEOVttqEPJNYs8yijcFgFmKCXsrfI2487KQThPYBMHnqJUJhLy5JdipoT4Ksa0BLwOht8GY
-zf2oe2qd5Tm8APgvgTgZvB0oskJMCsElvI0FILjMAF5DC8GDAsyWqVDMuS8JBoBaCEgwTzaOalop
-/ALGoC4yg2Ei+M7eN+saRjc14NUSAZjdlW+0hqmy0WeVODUMLBgFyyKHUYH6Pjng3Q==
-	
-	
-	j5XIhfrb+ckfVuK/H5oOoWt/UqyahVj1sgD1JptxXYCKaD1nIs0M+lsEsRlABHDngKjBmSKi5ilg
-dklYWTHmUmsAkQ16aijFlUX8DMOjDCJxgBcIWtHrk/3cJP7QIgLCnFH+rbfC6+whZhUZdQgGXcKb
-PEMQI8C+AJLA+cA0HcYWQK+XP4nMAHlgHRB05ACm4SF4Asx6YU5PQGQC7VcaxgiabQAT1RmHSeXa
-AxMhXUcgBkCLKAGYp7mEiYaQxKQ5mKuLb9YlBuEq59AKMFvwgtBkEoeos9FnnZjAFNBVeBOMZAZw
-b1CTqH8Apx8m8UaTOIy23ZZNvN5uXGcU12vWfzqHzzfpz/YfYnp7p3nWhg+z25drEcx84+Tk0A35
-dKfd7LZ3G18Xjk5POt12pw9N60/y/qrK+ql5eAafJ9ePD3CD841Ku3/yZa9zsHv9G1WNDa98p6Ec
-tqt3P9F//Xf2tLkHGnZ40hmgt9E7t9zdXPP+u3pw/PmsBebm4ZeD492TL/U/BujyJe/ectdR5Qfo
-+yDS/FeQY0X/9d/BHfQSnUElufLWLXcZoJriXEkxhES3vg4jy62vt95pmxqIveHPEJ3+18nJ0TDd
-du/d9mwP0WG0u2f7TbA/w3Q7fvu2Oy9Tba1SbBhRH8pst27fYHc754MY7KLlCCvqOzsnQ3U7evmW
-ew9h+vCeer99sLff/QZ3XTC45UE4vWESLx2DXb95q35+fNA9G2YQejnc8ihoDPaHFYUvB7vd/W+Q
-BP/+LQ/BgBFJ6ATGGd/mBXo53PJAZCkE7TK32QD+0IG2k9Nm66A7CO7pee/Wez6MFuDUDd7zy1+/
-5QFgSg9vBobqffnuLXf9EHfcDgV+zjsdNOTEYCgcVGXwF8gqlslOTKH986D9pY/E4sSf2aLvleek
-PGGZymPJ1KlfFMYNznmxi1nhzgfKCKZ5sQsid7QsxbVjQZsmHCVsbS62MNHWpTzDjUQmTwSHklpy
-vyMC2AEN0/aK2QQpUmcCKDKVivZIKPiA2x+YSFWWqaRVw1w+bTEUjEHbFG5TgloU7haCD0JK6VZQ
-ZK6BwlOLj1q0GKNwvUfAB2k47YoSGRXSaW4yfI271QHBbJrnIqfXcGcIrnhz5vZO4yYoaKogCvDG
-ZvZ2r3XVgg0DrSo2ftWzVONyBv7EvhU/PZlZaaD7mbCJyXAxTUqGudi6hnHTUL/GhXdobR0GJMet
-5/BBWZvltINbcMWpa/CX1qvrUnOdWmw5DC70Pc8ve1exXEIFMBx1KaCrGQcpaLSGq7bRd7W0MmaM
-hTHMUc4M1nntnuobU/EDD+73T8WDF9VagfRGStpoTLUA766edJtYNtJFdm3OPhad69Lzwgq3phYp
-m7ASE/yyVDbc46qMlKWy0SZ7Y2WsbLTNH6cnKJswOtVGs1LZcPsGzxiPlQ33IChGkuCUDQlWMl4q
-G75mZcZjZcPtfjbXolQ23F1oJFOlsl3sXl/K1iMOVWmoC5FnqVEgdRVVI5HPjBN5LhKSWmu81HJF
-uzSsyAqJN6RoUlsQeA1UqaCxLBfq4pt1+K5SGFnQMg3mg0NHQOKHqLHRZ424GQcwjfQaln+rhg0+
-ov8b+pU5P3nx/A4dwQGXJUgTWAZzc+RpFuYLnAQ4GEbewhra5Wdh0kikbcoN7vUhinIHbDgojt/l
-Z7VQpHlMIndgQDuCHIW7+jKrNalQRGM4Iz0U0tgKBdo57d7LrXPHJtPu0I3UOSfVo80d1E7cxeso
-wKlFrh0kT3sa7YTAHgvhOKGEVseFwxi0esYKgqyeUiDDycXxbPVx7Ad324NQMrB3GrEKg0HPNW3n
-NJwbJ6NgpfzBCvwIloq7rQXg/PDMEkAfnHfc8o97OrBo8RkPFZhMFOZu8KM/+u+1k6DZGWgjgXtz
-gD0EZVW32EmwkQrco7aDdBWN0AAd7dx+XCcYaoOyZpBuUkK7/27+BTLZw83mYN3s3H43ATdlEJlw
-NtBsDia0xRLc//3Wnv58xm0fxrvZ912PbC45kwT2AgF8eSgplVYxQ1E9HthVFbRDJIziIHKn6B7x
-AaMIIANnTkChQDtEUdoQ2gFQzxjzNIjKMBRQuZKOE8+Vp3BVRTsRjWVCJj0UeYHi0Y4pkgHagTFq
-QUaRjsVz2iJCO0gRnOMZKewNnhV0NIknNLDHgjlOeICkMiy4rb1VHSnCOhUCQp3esWz1f6op/wEo
-fgCKH4DiLzebPwDF/zWg8J6bkgV40BAPDqIvRi+RaTpwhbvYOR2ecNCiN3uOpwY4eCZytuAYDKYB
-wAVxI1wKPdBwQ7xB3wMKKbi7qiPjmDnHQ4KCPLKnYFYPk0O5jUvpFIJ/VnKKKL4+fC/QlPOIESeZ
-Zrm0cX2e0qpFrfK0qOWe08X+9RXrZ1fmbFhqOR5iJshWfIlal7skfhm+n8Of6o0CKlWW49lLnWpM
-cB65EcgpB4NZElwqgBEQivAN7hVDvAEUy3ARAYAins1u0eUBlGvGpKmkLDdeJ4DbvzFBqpRxLTNG
-ewJzsAEvVqCsrSuEBK4xV1vwQYqRlLYJteFwu7RJ0SQcXBh/VjYbT58izAh9w9cEjI0DXNIKQ+sx
-lGDFKaH7XLBIrhH+wCNjGK2rAG9CLnjCVQpBMiiZVCRdSsmoa0Qw1osgl9ZEhZTvSMEHKe4QeFkZ
-5rExm1k2CSkgknnZ7Ivz1s9lMeZKQcopxcidIBVfXJ/o/hvMqkqUI3+gZJ2qAriuwtIaGgCOm+s9
-Z1BtmiSHeKEDqFRHNN9WcKcDAJ7d0GmvXgJPaWKRnLkJsFwZP910CQ3JNObfcUoyvB4IKZSGR0pO
-MBe1S3qtxOtsnFIaq52UuGObeA7ZKymBZLploKgrx3OcbmyVszjGKPeSW4670LMrE/Syshhm8Og/
-/JQ418VPT2ZW4tU/uE6hBF0CpOnoZh3bg7lzPEcpYPZhhjKOclQHAeHaaBLj3JCEGLA+RtBimFJa
-4+lpGBsNn8Aq5Ze8qzPjNacOao8HLkHDcDFsmGobfVdL2pmR6IN0ZezmI5w3LoYNPLh/QrJeIozi
-WvWVrL/+AIvsdy0MrXPucuZkJo6IZvLMCT631imVc4OoZsKFfkJlzhjhuWdnsJTFFSmcV9QAi4ca
-rVNFqXJ3uQwEjk5beZY7y6/80jBqWe7Nk9XcaxkusdN5OFpbA6ViVhXVQSxsiKacOdSFFVVuSe1C
-3/rRsx5JqApCXTADUawCXa9oGUXuTJC0M1RxFNi8EFhspcWhRPef+SgYdAxkHSwMqgDIunCL9hfe
-rMMP7VYiUcVwLdIKdxxw4DobfdZJ9wKBjyX1ynIwdd+mXoOP6f+EcpXnwMpPPSmkpt9MEi7JUwXg
-lbhvBHeQ4BOu6fwwomHcU+Lv30i5v2vj0j0lqA9S0EI0QjkuPDzzNPB3hM4kbeAneGRMZinPYzQi
-sILSoitsDKl7WQrvReA6YhQIvja3OO5pyh20jxjBlHN0rmV1nuJAjG9UKBXaHTj19g7Xah0s9VcA
-VPodaICZJMFJgLzS7W3RUvc0hCi+IeTwy1IabAqt3QVGgRJ1PNA4wH/rdNFzYk6jovo8xY2za1Qo
-FNodGPX2rq8wILZvAP28sMAoZyzBTSdoww1edcQ1LewDjDUi95hO4D4GRF3UZGt93UJEoG44s3Bj
-U/70w5835Yv703RURlliV5wkSn7iQPGMMy+CnqbAxpHKYJrWy6B01ziCKWa0w8RTnAzanOdxKbzc
-ktuYU6D4+pwMehovVCZwwkAGAWhZn6e0alGrQqnQ8sCpt3/9CGE+qBByDEqdCOJKgszDCNGmnBzv
-wvyfl8C8300X392NZHQhU+5sKpgv5Sc82NRAAwORY6gHk0O7M8gpWNzMVBo5T3ECpk3O41LgFWwu
-Y06BEhnVQIO5J6cQGIFToEugyuo8pVWLGhVKhYYXjHp71484i0HFGWy7AZcVEi6MC365Tf2mTUe3
-JdF9r8GJ/m1qlA9wYiggxlCiKoaBhgtU2t1OaWkDHONunx6WoQ2WgeLE0GjG4lJg+YTgMadAicQw
-0HCXEUYuJSfc6IcXNpX1eYqXQ9eqqJRveeDU278rIxZ+5SDylBte2E2IHDJKP5atNq52iD8MAm+i
-VsrWtbayLEiXMfXFsnElS+w89DKvcPV2+7+HiCkVI2m3dBCfiOaALKXwMFgKWBfXNCHCUjEipose
-BdmeUApvh2Y2YhQIYTIjmsexESOPdaPqAiKOGhVKhXYHTr29KxAx7gi31la7XZA8jKVN28LIEupW
-2uEBMbZDWowQy1IoBZmIOQVK1O9A8zg24uSxblRfAMRRq0KpouGBUU/nBsTD9YsWk0mJt7cZZSv2
-u06g2OgIFKui2bn6XqC4z/bcNiwZDhjjZAUZ9cA4onk4S5e2UmK7gLw4yEJHSNmrhOQsLoQAQaiY
-UaAEnBrReKE4gZNHvGV1ARZHbQqFTGk5PKPe3g0IiweQRcTGqCwBHeMVs67d8nuh47+JKP4lEDLZ
-M25E1cgGmse1eZEbLaBvZPQCQMZDPXRTWlQK1xVtzKcgRCa2IDlQG3HxuDeqK6DjskGhUGhzwae3
-YwOC4wGE+lKE7JotdPKdEPLtSvV/ASXjgClreFUUA81jW5p5qUv4i0VyYysgmc6X0b3wZSlMbXER
-MwqUijB6moe2EScPf6P6AkguGxUV8u0OjHp71w9GrhdjyBQzeNcd7v7zhpQW0ytwNWp+iZbrEKUB
-isGF20phQ4shyDAGt33ybVzNFzuaacsuw8xDyf2lQ3Art6tdHbxULfawZyx77p5GE8bc0hQejQJD
-fhTTYPBxOyMCA81odQohvVXxGranuHWnjG6RLUvhchMt53pOEcXX59a5ZLEIbXJaZAmcBEw/03F9
-nuLgim+Vp0Ut95wu9g8FpVxzWGy4XxY0e7xLvyqoXq+NjCw399prnebBYbtT2ztr/rOdNI+PcSGk
-jWfMYa7aZ92TTjsp7huAV4riIyOzL5/V/gOEepm2
-	
-</i:pgf>
-</svg:svg>
\ No newline at end of file
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="256"
+   height="256"
+   id="svg10532">
+  <defs
+     id="defs10534">
+    <radialGradient
+       cx="197.0293"
+       cy="1131.0117"
+       r="11.6563"
+       id="SVGID_1_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9999,0.017,-0.017,0.9999,26.0318,-927.0317)">
+      <stop
+         id="stop32"
+         style="stop-color:#d5e2ee;stop-opacity:1"
+         offset="0.77579999" />
+      <stop
+         id="stop34"
+         style="stop-color:#d1dfed;stop-opacity:1"
+         offset="0.82630002" />
+      <stop
+         id="stop36"
+         style="stop-color:#c7d6e8;stop-opacity:1"
+         offset="0.8714" />
+      <stop
+         id="stop38"
+         style="stop-color:#b4c6e1;stop-opacity:1"
+         offset="0.91439998" />
+      <stop
+         id="stop40"
+         style="stop-color:#9bb0d8;stop-opacity:1"
+         offset="0.9562" />
+      <stop
+         id="stop42"
+         style="stop-color:#7a95cb;stop-opacity:1"
+         offset="0.99680001" />
+      <stop
+         id="stop44"
+         style="stop-color:#7792ca;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="345.58691"
+       cy="625.37598"
+       r="13.1022"
+       id="SVGID_2_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9472,0.3208,-0.3208,0.9472,76.6095,-496.3437)">
+      <stop
+         id="stop51"
+         style="stop-color:#0b1929;stop-opacity:0"
+         offset="0.41209999" />
+      <stop
+         id="stop53"
+         style="stop-color:#0a1827;stop-opacity:0.53789997"
+         offset="0.58490002" />
+      <stop
+         id="stop55"
+         style="stop-color:#091420;stop-opacity:0.7317"
+         offset="0.64719999" />
+      <stop
+         id="stop57"
+         style="stop-color:#060d15;stop-opacity:0.86940002"
+         offset="0.69139999" />
+      <stop
+         id="stop59"
+         style="stop-color:#010204;stop-opacity:0.98030001"
+         offset="0.727" />
+      <stop
+         id="stop61"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0.73329997" />
+      <stop
+         id="stop63"
+         style="stop-color:#03080d;stop-opacity:0.61080003"
+         offset="0.78759998" />
+      <stop
+         id="stop65"
+         style="stop-color:#0b1929;stop-opacity:0"
+         offset="0.87269998" />
+    </radialGradient>
+    <radialGradient
+       cx="198.2637"
+       cy="1123.8535"
+       r="18.053499"
+       id="SVGID_3_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9999,0.017,-0.017,0.9999,26.0318,-927.0317)">
+      <stop
+         id="stop70"
+         style="stop-color:#b4cb80;stop-opacity:0"
+         offset="0.33329999" />
+      <stop
+         id="stop72"
+         style="stop-color:#60bd71;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="197.0293"
+       cy="1130.8838"
+       r="11.6563"
+       id="SVGID_4_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9999,0.017,-0.017,0.9999,26.0318,-927.0317)">
+      <stop
+         id="stop77"
+         style="stop-color:#3fb1cb;stop-opacity:0"
+         offset="0.33329999" />
+      <stop
+         id="stop79"
+         style="stop-color:#456c90;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="419.1524"
+       cy="645.20508"
+       r="4.5430002"
+       id="SVGID_5_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0012,0.6747,-0.5589,0.8292,140.3358,-604.4919)">
+      <stop
+         id="stop90"
+         style="stop-color:#46c3d6;stop-opacity:0.74000001"
+         offset="0.2667" />
+      <stop
+         id="stop92"
+         style="stop-color:#48c3d3;stop-opacity:0.57990003"
+         offset="0.4253" />
+      <stop
+         id="stop94"
+         style="stop-color:#4dc4c9;stop-opacity:0.45969999"
+         offset="0.54439998" />
+      <stop
+         id="stop96"
+         style="stop-color:#57c5b9;stop-opacity:0.35249999"
+         offset="0.65069997" />
+      <stop
+         id="stop98"
+         style="stop-color:#65c6a2;stop-opacity:0.2529"
+         offset="0.74940002" />
+      <stop
+         id="stop100"
+         style="stop-color:#76c785;stop-opacity:0.1584"
+         offset="0.84299999" />
+      <stop
+         id="stop102"
+         style="stop-color:#8bc961;stop-opacity:0.0692"
+         offset="0.9314" />
+      <stop
+         id="stop104"
+         style="stop-color:#9fcb40;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="57.870098"
+       cy="-1265.1826"
+       r="4.1327"
+       id="SVGID_6_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.7523,0.8673,-0.5959,-0.5169,-515.0956,-502.9347)">
+      <stop
+         id="stop111"
+         style="stop-color:#1d3c6e;stop-opacity:0.36000001"
+         offset="0.44240001" />
+      <stop
+         id="stop113"
+         style="stop-color:#1e3c6e;stop-opacity:0.36379999"
+         offset="0.44400001" />
+      <stop
+         id="stop115"
+         style="stop-color:#3c4f6c;stop-opacity:0.53109998"
+         offset="0.51209998" />
+      <stop
+         id="stop117"
+         style="stop-color:#525d6a;stop-opacity:0.6954"
+         offset="0.579" />
+      <stop
+         id="stop119"
+         style="stop-color:#5f6569;stop-opacity:0.85390002"
+         offset="0.64349997" />
+      <stop
+         id="stop121"
+         style="stop-color:#636869;stop-opacity:1"
+         offset="0.70300001" />
+      <stop
+         id="stop123"
+         style="stop-color:#5c8b8a;stop-opacity:0.57340002"
+         offset="0.79869998" />
+      <stop
+         id="stop125"
+         style="stop-color:#51c1bc;stop-opacity:0"
+         offset="0.92729998" />
+    </radialGradient>
+    <radialGradient
+       cx="461.69919"
+       cy="-365.7695"
+       r="7.9542999"
+       id="SVGID_7_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.4207,0.9072,-0.9072,-0.4207,60.0593,-368.1773)">
+      <stop
+         id="stop130"
+         style="stop-color:#040506;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop132"
+         style="stop-color:#050709;stop-opacity:1"
+         offset="0.3195" />
+      <stop
+         id="stop134"
+         style="stop-color:#070c13;stop-opacity:1"
+         offset="0.55989999" />
+      <stop
+         id="stop136"
+         style="stop-color:#0a1523;stop-opacity:1"
+         offset="0.77380002" />
+      <stop
+         id="stop138"
+         style="stop-color:#0b1929;stop-opacity:1"
+         offset="0.83639997" />
+      <stop
+         id="stop140"
+         style="stop-color:#23474c;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="186.43359"
+       cy="-936.53271"
+       r="1.1188999"
+       id="SVGID_8_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.6237,0.7816,-0.7816,-0.6237,-403.3182,-515.8688)">
+      <stop
+         id="stop147"
+         style="stop-color:#040506;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop149"
+         style="stop-color:#050709;stop-opacity:1"
+         offset="0.3195" />
+      <stop
+         id="stop151"
+         style="stop-color:#070c13;stop-opacity:1"
+         offset="0.55989999" />
+      <stop
+         id="stop153"
+         style="stop-color:#0a1523;stop-opacity:1"
+         offset="0.77380002" />
+      <stop
+         id="stop155"
+         style="stop-color:#0b1929;stop-opacity:1"
+         offset="0.83639997" />
+      <stop
+         id="stop157"
+         style="stop-color:#23474c;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="-829.55078"
+       cy="1166.4326"
+       r="10.9668"
+       id="SVGID_9_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6235,-0.7818,0.7818,0.6235,-197.1253,-1173.7216)">
+      <stop
+         id="stop162"
+         style="stop-color:#040506;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop164"
+         style="stop-color:#0b1929;stop-opacity:0.51999998"
+         offset="0.5273" />
+      <stop
+         id="stop166"
+         style="stop-color:#132935;stop-opacity:0.30559999"
+         offset="0.72219998" />
+      <stop
+         id="stop168"
+         style="stop-color:#23474c;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="196.87309"
+       cy="1226.0996"
+       r="6.2147999"
+       id="SVGID_10_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9999,0.017,-0.0157,0.9206,26.0913,-930.5986)">
+      <stop
+         id="stop173"
+         style="stop-color:#eef8fb;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop175"
+         style="stop-color:#ecf7fa;stop-opacity:0.491"
+         offset="0.509" />
+      <stop
+         id="stop177"
+         style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+         offset="0.69239998" />
+      <stop
+         id="stop179"
+         style="stop-color:#daf0f4;stop-opacity:0.177"
+         offset="0.82300001" />
+      <stop
+         id="stop181"
+         style="stop-color:#c9e9ef;stop-opacity:0.0721"
+         offset="0.92790002" />
+      <stop
+         id="stop183"
+         style="stop-color:#b8e2e9;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="196.3741"
+       cy="1224.7578"
+       r="4.5488"
+       id="SVGID_11_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9999,0.017,-0.0157,0.9206,26.0913,-930.5986)">
+      <stop
+         id="stop188"
+         style="stop-color:#eef8fb;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop190"
+         style="stop-color:#ecf7fa;stop-opacity:0.491"
+         offset="0.509" />
+      <stop
+         id="stop192"
+         style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+         offset="0.69239998" />
+      <stop
+         id="stop194"
+         style="stop-color:#daf0f4;stop-opacity:0.177"
+         offset="0.82300001" />
+      <stop
+         id="stop196"
+         style="stop-color:#c9e9ef;stop-opacity:0.0721"
+         offset="0.92790002" />
+      <stop
+         id="stop198"
+         style="stop-color:#b8e2e9;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="196.1597"
+       cy="1123.4746"
+       r="3.0989001"
+       id="SVGID_12_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9999,0.017,-0.017,0.9999,26.0318,-927.0317)">
+      <stop
+         id="stop203"
+         style="stop-color:#eef8fb;stop-opacity:1"
+         offset="0.2667" />
+      <stop
+         id="stop205"
+         style="stop-color:#edf7f8;stop-opacity:0.80159998"
+         offset="0.4122" />
+      <stop
+         id="stop207"
+         style="stop-color:#e9f5ee;stop-opacity:0.65249997"
+         offset="0.52149999" />
+      <stop
+         id="stop209"
+         style="stop-color:#e2f1de;stop-opacity:0.51959997"
+         offset="0.61900002" />
+      <stop
+         id="stop211"
+         style="stop-color:#d8ecc7;stop-opacity:0.396"
+         offset="0.70959997" />
+      <stop
+         id="stop213"
+         style="stop-color:#cce4aa;stop-opacity:0.2789"
+         offset="0.79540002" />
+      <stop
+         id="stop215"
+         style="stop-color:#bcdc86;stop-opacity:0.16670001"
+         offset="0.87769997" />
+      <stop
+         id="stop217"
+         style="stop-color:#abd25b;stop-opacity:0.0604"
+         offset="0.95569998" />
+      <stop
+         id="stop219"
+         style="stop-color:#9fcb40;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="-899.35449"
+       cy="1250.8535"
+       r="4.0022998"
+       id="SVGID_13_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6377,-0.9894,0.791,0.5098,-216.9556,-1323.5928)">
+      <stop
+         id="stop226"
+         style="stop-color:#c9daf0;stop-opacity:0"
+         offset="0.50910002" />
+      <stop
+         id="stop228"
+         style="stop-color:#ccddf1;stop-opacity:0.3477"
+         offset="0.54280001" />
+      <stop
+         id="stop230"
+         style="stop-color:#d6e4f4;stop-opacity:0.63069999"
+         offset="0.57020003" />
+      <stop
+         id="stop232"
+         style="stop-color:#e7f1fa;stop-opacity:0.8901"
+         offset="0.59539998" />
+      <stop
+         id="stop234"
+         style="stop-color:#f1f9fd;stop-opacity:1"
+         offset="0.60610002" />
+      <stop
+         id="stop236"
+         style="stop-color:#d6eff2;stop-opacity:0.91769999"
+         offset="0.63849998" />
+      <stop
+         id="stop238"
+         style="stop-color:#ade1e2;stop-opacity:0.77700001"
+         offset="0.69389999" />
+      <stop
+         id="stop240"
+         style="stop-color:#8cd6d4;stop-opacity:0.63209999"
+         offset="0.75099999" />
+      <stop
+         id="stop242"
+         style="stop-color:#72cdc9;stop-opacity:0.4844"
+         offset="0.80919999" />
+      <stop
+         id="stop244"
+         style="stop-color:#60c6c2;stop-opacity:0.33270001"
+         offset="0.8689" />
+      <stop
+         id="stop246"
+         style="stop-color:#55c2bd;stop-opacity:0.17460001"
+         offset="0.93120003" />
+      <stop
+         id="stop248"
+         style="stop-color:#51c1bc;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="185.2437"
+       cy="1201.0166"
+       r="5.1918001"
+       id="SVGID_14_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9576,0.004,-0.004,0.952,26.6511,-939.7222)">
+      <stop
+         id="stop253"
+         style="stop-color:#eef8fb;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop255"
+         style="stop-color:#ecf7fa;stop-opacity:0.491"
+         offset="0.509" />
+      <stop
+         id="stop257"
+         style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+         offset="0.69239998" />
+      <stop
+         id="stop259"
+         style="stop-color:#daf0f4;stop-opacity:0.177"
+         offset="0.82300001" />
+      <stop
+         id="stop261"
+         style="stop-color:#c9e9ef;stop-opacity:0.0721"
+         offset="0.92790002" />
+      <stop
+         id="stop263"
+         style="stop-color:#b8e2e9;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="326.14459"
+       cy="1002.1309"
+       r="12.7158"
+       id="SVGID_15_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9687,0.2482,-0.2482,0.9687,47.035,-816.7146)">
+      <stop
+         id="stop272"
+         style="stop-color:#d5e2ee;stop-opacity:1"
+         offset="0.77579999" />
+      <stop
+         id="stop274"
+         style="stop-color:#d1dfed;stop-opacity:1"
+         offset="0.82630002" />
+      <stop
+         id="stop276"
+         style="stop-color:#c7d6e8;stop-opacity:1"
+         offset="0.8714" />
+      <stop
+         id="stop278"
+         style="stop-color:#b4c6e1;stop-opacity:1"
+         offset="0.91439998" />
+      <stop
+         id="stop280"
+         style="stop-color:#9bb0d8;stop-opacity:1"
+         offset="0.9562" />
+      <stop
+         id="stop282"
+         style="stop-color:#7a95cb;stop-opacity:1"
+         offset="0.99680001" />
+      <stop
+         id="stop284"
+         style="stop-color:#7792ca;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="429.17191"
+       cy="463.30179"
+       r="14.2883"
+       id="SVGID_16_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.8471,0.5315,-0.5315,0.8471,-3.4861,-386.0533)">
+      <stop
+         id="stop291"
+         style="stop-color:#0b1929;stop-opacity:0"
+         offset="0.41209999" />
+      <stop
+         id="stop293"
+         style="stop-color:#0a1827;stop-opacity:0.53789997"
+         offset="0.58490002" />
+      <stop
+         id="stop295"
+         style="stop-color:#091420;stop-opacity:0.7317"
+         offset="0.64719999" />
+      <stop
+         id="stop297"
+         style="stop-color:#060d15;stop-opacity:0.86940002"
+         offset="0.69139999" />
+      <stop
+         id="stop299"
+         style="stop-color:#010204;stop-opacity:0.98030001"
+         offset="0.727" />
+      <stop
+         id="stop301"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0.73329997" />
+      <stop
+         id="stop303"
+         style="stop-color:#03080d;stop-opacity:0.61080003"
+         offset="0.78759998" />
+      <stop
+         id="stop305"
+         style="stop-color:#0b1929;stop-opacity:0"
+         offset="0.87269998" />
+    </radialGradient>
+    <radialGradient
+       cx="327.48251"
+       cy="994.31049"
+       r="19.693399"
+       id="SVGID_17_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9687,0.2482,-0.2482,0.9687,47.035,-816.7146)">
+      <stop
+         id="stop310"
+         style="stop-color:#b4cb80;stop-opacity:0"
+         offset="0.33329999" />
+      <stop
+         id="stop312"
+         style="stop-color:#60bd71;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="326.14359"
+       cy="1001.9922"
+       r="12.7153"
+       id="SVGID_18_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9687,0.2482,-0.2482,0.9687,47.035,-816.7146)">
+      <stop
+         id="stop317"
+         style="stop-color:#3fb1cb;stop-opacity:0"
+         offset="0.33329999" />
+      <stop
+         id="stop319"
+         style="stop-color:#456c90;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="91.042999"
+       cy="1160.416"
+       r="13.8324"
+       id="SVGID_19_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop328"
+         style="stop-color:#040506;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop330"
+         style="stop-color:#0b1929;stop-opacity:0.51999998"
+         offset="0.5273" />
+      <stop
+         id="stop332"
+         style="stop-color:#132935;stop-opacity:0.30559999"
+         offset="0.72219998" />
+      <stop
+         id="stop334"
+         style="stop-color:#23474c;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="437.9317"
+       cy="677"
+       r="3.9558001"
+       id="SVGID_20_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.996,0.6823,-0.5652,0.8249,55.119,-615.6229)">
+      <stop
+         id="stop339"
+         style="stop-color:#b4decf;stop-opacity:1"
+         offset="0.2667" />
+      <stop
+         id="stop341"
+         style="stop-color:#b4decc;stop-opacity:0.77960002"
+         offset="0.42829999" />
+      <stop
+         id="stop343"
+         style="stop-color:#b2dcc2;stop-opacity:0.61409998"
+         offset="0.54970002" />
+      <stop
+         id="stop345"
+         style="stop-color:#b0dab2;stop-opacity:0.4664"
+         offset="0.65799999" />
+      <stop
+         id="stop347"
+         style="stop-color:#acd79b;stop-opacity:0.32929999"
+         offset="0.75849998" />
+      <stop
+         id="stop349"
+         style="stop-color:#a8d37e;stop-opacity:0.19930001"
+         offset="0.8538" />
+      <stop
+         id="stop351"
+         style="stop-color:#a3ce5a;stop-opacity:0.0764"
+         offset="0.94389999" />
+      <stop
+         id="stop353"
+         style="stop-color:#9fcb40;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="-46.215801"
+       cy="1475.1348"
+       r="6.3042998"
+       id="SVGID_21_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1476,-0.0333,0.0226,0.7797,133.7359,-925.1971)">
+      <stop
+         id="stop360"
+         style="stop-color:#1d3c6e;stop-opacity:0.36000001"
+         offset="0.54549998" />
+      <stop
+         id="stop362"
+         style="stop-color:#30486d;stop-opacity:0.433"
+         offset="0.56900001" />
+      <stop
+         id="stop364"
+         style="stop-color:#46566b;stop-opacity:0.54839998"
+         offset="0.60610002" />
+      <stop
+         id="stop366"
+         style="stop-color:#56606a;stop-opacity:0.67330003"
+         offset="0.64630002" />
+      <stop
+         id="stop368"
+         style="stop-color:#606669;stop-opacity:0.81339997"
+         offset="0.69139999" />
+      <stop
+         id="stop370"
+         style="stop-color:#636869;stop-opacity:1"
+         offset="0.75150001" />
+      <stop
+         id="stop372"
+         style="stop-color:#51c1bc;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="-29.955999"
+       cy="1610.1816"
+       r="8.6611996"
+       id="SVGID_22_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9925,-0.1225,0.1225,0.9925,-52.6962,-1360.2935)">
+      <stop
+         id="stop379"
+         style="stop-color:#040506;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop381"
+         style="stop-color:#050709;stop-opacity:1"
+         offset="0.3195" />
+      <stop
+         id="stop383"
+         style="stop-color:#070c13;stop-opacity:1"
+         offset="0.55989999" />
+      <stop
+         id="stop385"
+         style="stop-color:#0a1523;stop-opacity:1"
+         offset="0.77380002" />
+      <stop
+         id="stop387"
+         style="stop-color:#0b1929;stop-opacity:1"
+         offset="0.83639997" />
+      <stop
+         id="stop389"
+         style="stop-color:#23474c;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="1378.8408"
+       cy="1000.8789"
+       r="1.6339999"
+       id="SVGID_23_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9798,0.1996,-0.1234,0.6054,-1115.8159,-634.5699)">
+      <stop
+         id="stop396"
+         style="stop-color:#040506;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop398"
+         style="stop-color:#050709;stop-opacity:1"
+         offset="0.3195" />
+      <stop
+         id="stop400"
+         style="stop-color:#070c13;stop-opacity:1"
+         offset="0.55989999" />
+      <stop
+         id="stop402"
+         style="stop-color:#0a1523;stop-opacity:1"
+         offset="0.77380002" />
+      <stop
+         id="stop404"
+         style="stop-color:#0b1929;stop-opacity:1"
+         offset="0.83639997" />
+      <stop
+         id="stop406"
+         style="stop-color:#23474c;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="-3.7392001"
+       cy="1224.8076"
+       r="5.1849999"
+       id="SVGID_24_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2206,0.0051,-0.004,0.952,125.5627,-939.3163)">
+      <stop
+         id="stop411"
+         style="stop-color:#eef8fb;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop413"
+         style="stop-color:#ecf7fa;stop-opacity:0.491"
+         offset="0.509" />
+      <stop
+         id="stop415"
+         style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+         offset="0.69239998" />
+      <stop
+         id="stop417"
+         style="stop-color:#daf0f4;stop-opacity:0.177"
+         offset="0.82300001" />
+      <stop
+         id="stop419"
+         style="stop-color:#c9e9ef;stop-opacity:0.0721"
+         offset="0.92790002" />
+      <stop
+         id="stop421"
+         style="stop-color:#b8e2e9;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="489.56839"
+       cy="655.89062"
+       r="2.9888999"
+       id="SVGID_25_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.8906,0.6566,-0.5919,0.8029,69.4326,-623.5166)">
+      <stop
+         id="stop426"
+         style="stop-color:#eef8fb;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop428"
+         style="stop-color:#ecf7fa;stop-opacity:0.491"
+         offset="0.509" />
+      <stop
+         id="stop430"
+         style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+         offset="0.69239998" />
+      <stop
+         id="stop432"
+         style="stop-color:#daf0f4;stop-opacity:0.177"
+         offset="0.82300001" />
+      <stop
+         id="stop434"
+         style="stop-color:#c9e9ef;stop-opacity:0.0721"
+         offset="0.92790002" />
+      <stop
+         id="stop436"
+         style="stop-color:#b8e2e9;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="127.0777"
+       cy="1299.1113"
+       r="5.5640998"
+       id="SVGID_26_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1309,0.1977,-0.1343,0.7684,146.6669,-796.4049)">
+      <stop
+         id="stop443"
+         style="stop-color:#c9daf0;stop-opacity:0.17"
+         offset="0" />
+      <stop
+         id="stop445"
+         style="stop-color:#ccddf1;stop-opacity:0.45860001"
+         offset="0.21070001" />
+      <stop
+         id="stop447"
+         style="stop-color:#d6e4f4;stop-opacity:0.69340003"
+         offset="0.3822" />
+      <stop
+         id="stop449"
+         style="stop-color:#e7f1fa;stop-opacity:0.90880001"
+         offset="0.5395" />
+      <stop
+         id="stop451"
+         style="stop-color:#f1f9fd;stop-opacity:1"
+         offset="0.60610002" />
+      <stop
+         id="stop453"
+         style="stop-color:#ceedef;stop-opacity:0.90020001"
+         offset="0.64539999" />
+      <stop
+         id="stop455"
+         style="stop-color:#a8dfdf;stop-opacity:0.7701"
+         offset="0.69660002" />
+      <stop
+         id="stop457"
+         style="stop-color:#89d4d3;stop-opacity:0.63459998"
+         offset="0.75" />
+      <stop
+         id="stop459"
+         style="stop-color:#70ccc9;stop-opacity:0.49430001"
+         offset="0.8053" />
+      <stop
+         id="stop461"
+         style="stop-color:#5fc6c2;stop-opacity:0.34720001"
+         offset="0.86320001" />
+      <stop
+         id="stop463"
+         style="stop-color:#54c2bd;stop-opacity:0.1891"
+         offset="0.92549998" />
+      <stop
+         id="stop465"
+         style="stop-color:#51c1bc;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="262.31549"
+       cy="893.60059"
+       r="12.7148"
+       id="SVGID_27_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9687,0.2482,-0.2482,0.9687,47.035,-816.7146)">
+      <stop
+         id="stop474"
+         style="stop-color:#d5e2ee;stop-opacity:1"
+         offset="0.77579999" />
+      <stop
+         id="stop476"
+         style="stop-color:#d1dfed;stop-opacity:1"
+         offset="0.82630002" />
+      <stop
+         id="stop478"
+         style="stop-color:#c7d6e8;stop-opacity:1"
+         offset="0.8714" />
+      <stop
+         id="stop480"
+         style="stop-color:#b4c6e1;stop-opacity:1"
+         offset="0.91439998" />
+      <stop
+         id="stop482"
+         style="stop-color:#9bb0d8;stop-opacity:1"
+         offset="0.9562" />
+      <stop
+         id="stop484"
+         style="stop-color:#7a95cb;stop-opacity:1"
+         offset="0.99680001" />
+      <stop
+         id="stop486"
+         style="stop-color:#7792ca;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="335.31741"
+       cy="379.37601"
+       r="14.2871"
+       id="SVGID_28_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.8471,0.5315,-0.5315,0.8471,-3.4861,-386.0533)">
+      <stop
+         id="stop493"
+         style="stop-color:#0b1929;stop-opacity:0"
+         offset="0.41209999" />
+      <stop
+         id="stop495"
+         style="stop-color:#0a1827;stop-opacity:0.53789997"
+         offset="0.58490002" />
+      <stop
+         id="stop497"
+         style="stop-color:#091420;stop-opacity:0.7317"
+         offset="0.64719999" />
+      <stop
+         id="stop499"
+         style="stop-color:#060d15;stop-opacity:0.86940002"
+         offset="0.69139999" />
+      <stop
+         id="stop501"
+         style="stop-color:#010204;stop-opacity:0.98030001"
+         offset="0.727" />
+      <stop
+         id="stop503"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0.73329997" />
+      <stop
+         id="stop505"
+         style="stop-color:#03080d;stop-opacity:0.61080003"
+         offset="0.78759998" />
+      <stop
+         id="stop507"
+         style="stop-color:#0b1929;stop-opacity:0"
+         offset="0.87269998" />
+    </radialGradient>
+    <radialGradient
+       cx="263.65039"
+       cy="885.78522"
+       r="19.692101"
+       id="SVGID_29_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9687,0.2482,-0.2482,0.9687,47.035,-816.7146)">
+      <stop
+         id="stop512"
+         style="stop-color:#b4cb80;stop-opacity:0"
+         offset="0.33329999" />
+      <stop
+         id="stop514"
+         style="stop-color:#60bd71;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="262.31641"
+       cy="893.46289"
+       r="12.7158"
+       id="SVGID_30_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9687,0.2482,-0.2482,0.9687,47.035,-816.7146)">
+      <stop
+         id="stop519"
+         style="stop-color:#3fb1cb;stop-opacity:0"
+         offset="0.33329999" />
+      <stop
+         id="stop521"
+         style="stop-color:#456c90;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="58.565899"
+       cy="1049.8984"
+       r="11.0627"
+       id="SVGID_31_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop530"
+         style="stop-color:#040506;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop532"
+         style="stop-color:#0b1929;stop-opacity:0.51999998"
+         offset="0.5273" />
+      <stop
+         id="stop534"
+         style="stop-color:#132935;stop-opacity:0.30559999"
+         offset="0.72219998" />
+      <stop
+         id="stop536"
+         style="stop-color:#23474c;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="58.370098"
+       cy="1049.9414"
+       r="4.8829002"
+       id="SVGID_32_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop541"
+         style="stop-color:#040506;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop543"
+         style="stop-color:#0b1929;stop-opacity:0.51999998"
+         offset="0.5273" />
+      <stop
+         id="stop545"
+         style="stop-color:#132935;stop-opacity:0.30559999"
+         offset="0.72219998" />
+      <stop
+         id="stop547"
+         style="stop-color:#23474c;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="357.45511"
+       cy="596.91602"
+       r="3.9574001"
+       id="SVGID_33_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.996,0.6823,-0.5652,0.8249,55.119,-615.6229)">
+      <stop
+         id="stop552"
+         style="stop-color:#26b481;stop-opacity:0.60000002"
+         offset="0.2667" />
+      <stop
+         id="stop554"
+         style="stop-color:#29b57f;stop-opacity:0.45879999"
+         offset="0.43920001" />
+      <stop
+         id="stop556"
+         style="stop-color:#33b67a;stop-opacity:0.35280001"
+         offset="0.56879997" />
+      <stop
+         id="stop558"
+         style="stop-color:#43b972;stop-opacity:0.25830001"
+         offset="0.68430001" />
+      <stop
+         id="stop560"
+         style="stop-color:#5abe65;stop-opacity:0.17039999"
+         offset="0.79170001" />
+      <stop
+         id="stop562"
+         style="stop-color:#77c355;stop-opacity:0.0872"
+         offset="0.89340001" />
+      <stop
+         id="stop564"
+         style="stop-color:#9bca42;stop-opacity:0.0085"
+         offset="0.9896" />
+      <stop
+         id="stop566"
+         style="stop-color:#9fcb40;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="-73.388199"
+       cy="1333.8066"
+       r="6.3053999"
+       id="SVGID_34_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1476,-0.0333,0.0226,0.7797,133.3413,-938.8114)">
+      <stop
+         id="stop573"
+         style="stop-color:#1d3c6e;stop-opacity:0.36000001"
+         offset="0.54549998" />
+      <stop
+         id="stop575"
+         style="stop-color:#30486d;stop-opacity:0.433"
+         offset="0.56900001" />
+      <stop
+         id="stop577"
+         style="stop-color:#46566b;stop-opacity:0.54839998"
+         offset="0.60610002" />
+      <stop
+         id="stop579"
+         style="stop-color:#56606a;stop-opacity:0.67330003"
+         offset="0.64630002" />
+      <stop
+         id="stop581"
+         style="stop-color:#606669;stop-opacity:0.81339997"
+         offset="0.69139999" />
+      <stop
+         id="stop583"
+         style="stop-color:#636869;stop-opacity:1"
+         offset="0.75150001" />
+      <stop
+         id="stop585"
+         style="stop-color:#51c1bc;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="-605.86432"
+       cy="1553.4648"
+       r="8.6555004"
+       id="SVGID_35_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.8182,-0.5749,0.5749,0.8182,-314.1375,-1499.7417)">
+      <stop
+         id="stop592"
+         style="stop-color:#040506;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop594"
+         style="stop-color:#050709;stop-opacity:1"
+         offset="0.3195" />
+      <stop
+         id="stop596"
+         style="stop-color:#070c13;stop-opacity:1"
+         offset="0.55989999" />
+      <stop
+         id="stop598"
+         style="stop-color:#0a1523;stop-opacity:1"
+         offset="0.77380002" />
+      <stop
+         id="stop600"
+         style="stop-color:#0b1929;stop-opacity:1"
+         offset="0.83639997" />
+      <stop
+         id="stop602"
+         style="stop-color:#23474c;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="-1129.0967"
+       cy="-2510.5957"
+       r="1.6341"
+       id="SVGID_36_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.6927,0.7212,-0.4456,-0.428,-1831.28,-153.949)">
+      <stop
+         id="stop609"
+         style="stop-color:#040506;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop611"
+         style="stop-color:#050709;stop-opacity:1"
+         offset="0.3195" />
+      <stop
+         id="stop613"
+         style="stop-color:#070c13;stop-opacity:1"
+         offset="0.55989999" />
+      <stop
+         id="stop615"
+         style="stop-color:#0a1523;stop-opacity:1"
+         offset="0.77380002" />
+      <stop
+         id="stop617"
+         style="stop-color:#0b1929;stop-opacity:1"
+         offset="0.83639997" />
+      <stop
+         id="stop619"
+         style="stop-color:#23474c;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="260.07819"
+       cy="966.93848"
+       r="6.7708998"
+       id="SVGID_37_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9687,0.2482,-0.2286,0.8919,47.918,-820.168)">
+      <stop
+         id="stop624"
+         style="stop-color:#eef8fb;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop626"
+         style="stop-color:#ecf7fa;stop-opacity:0.491"
+         offset="0.509" />
+      <stop
+         id="stop628"
+         style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+         offset="0.69239998" />
+      <stop
+         id="stop630"
+         style="stop-color:#daf0f4;stop-opacity:0.177"
+         offset="0.82300001" />
+      <stop
+         id="stop632"
+         style="stop-color:#c9e9ef;stop-opacity:0.0721"
+         offset="0.92790002" />
+      <stop
+         id="stop634"
+         style="stop-color:#b8e2e9;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="260.19629"
+       cy="1098.9199"
+       r="6.0444999"
+       id="SVGID_38_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9687,0.2482,-0.1964,0.7666,43.0603,-801.2024)">
+      <stop
+         id="stop639"
+         style="stop-color:#eef8fb;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop641"
+         style="stop-color:#ecf7fa;stop-opacity:0.491"
+         offset="0.509" />
+      <stop
+         id="stop643"
+         style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+         offset="0.69239998" />
+      <stop
+         id="stop645"
+         style="stop-color:#daf0f4;stop-opacity:0.177"
+         offset="0.82300001" />
+      <stop
+         id="stop647"
+         style="stop-color:#c9e9ef;stop-opacity:0.0721"
+         offset="0.92790002" />
+      <stop
+         id="stop649"
+         style="stop-color:#b8e2e9;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="55.575199"
+       cy="1037.6338"
+       r="2.9777999"
+       id="SVGID_39_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop654"
+         style="stop-color:#eef8fb;stop-opacity:1"
+         offset="0.2667" />
+      <stop
+         id="stop656"
+         style="stop-color:#edf7f8;stop-opacity:0.80159998"
+         offset="0.4122" />
+      <stop
+         id="stop658"
+         style="stop-color:#e9f5ee;stop-opacity:0.65249997"
+         offset="0.52149999" />
+      <stop
+         id="stop660"
+         style="stop-color:#e2f1de;stop-opacity:0.51959997"
+         offset="0.61900002" />
+      <stop
+         id="stop662"
+         style="stop-color:#d8ecc7;stop-opacity:0.396"
+         offset="0.70959997" />
+      <stop
+         id="stop664"
+         style="stop-color:#cce4aa;stop-opacity:0.2789"
+         offset="0.79540002" />
+      <stop
+         id="stop666"
+         style="stop-color:#bcdc86;stop-opacity:0.16670001"
+         offset="0.87769997" />
+      <stop
+         id="stop668"
+         style="stop-color:#abd25b;stop-opacity:0.0604"
+         offset="0.95569998" />
+      <stop
+         id="stop670"
+         style="stop-color:#9fcb40;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="-661.57318"
+       cy="1094.1963"
+       r="4.9277"
+       id="SVGID_40_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9395,-0.6599,0.6365,0.9061,6.9776,-1311.354)">
+      <stop
+         id="stop681"
+         style="stop-color:#c9daf0;stop-opacity:0.17"
+         offset="0" />
+      <stop
+         id="stop683"
+         style="stop-color:#ccddf1;stop-opacity:0.45860001"
+         offset="0.21070001" />
+      <stop
+         id="stop685"
+         style="stop-color:#d6e4f4;stop-opacity:0.69340003"
+         offset="0.3822" />
+      <stop
+         id="stop687"
+         style="stop-color:#e7f1fa;stop-opacity:0.90880001"
+         offset="0.5395" />
+      <stop
+         id="stop689"
+         style="stop-color:#f1f9fd;stop-opacity:1"
+         offset="0.60610002" />
+      <stop
+         id="stop691"
+         style="stop-color:#ceedef;stop-opacity:0.90020001"
+         offset="0.64539999" />
+      <stop
+         id="stop693"
+         style="stop-color:#a8dfdf;stop-opacity:0.7701"
+         offset="0.69660002" />
+      <stop
+         id="stop695"
+         style="stop-color:#89d4d3;stop-opacity:0.63459998"
+         offset="0.75" />
+      <stop
+         id="stop697"
+         style="stop-color:#70ccc9;stop-opacity:0.49430001"
+         offset="0.8053" />
+      <stop
+         id="stop699"
+         style="stop-color:#5fc6c2;stop-opacity:0.34720001"
+         offset="0.86320001" />
+      <stop
+         id="stop701"
+         style="stop-color:#54c2bd;stop-opacity:0.1891"
+         offset="0.92549998" />
+      <stop
+         id="stop703"
+         style="stop-color:#51c1bc;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <linearGradient
+       x1="142.21539"
+       y1="1125.166"
+       x2="176.2896"
+       y2="1125.166"
+       id="SVGID_41_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop710"
+         style="stop-color:#517287;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop712"
+         style="stop-color:#5c7b8f;stop-opacity:1"
+         offset="0.0118" />
+      <stop
+         id="stop714"
+         style="stop-color:#809bab;stop-opacity:1"
+         offset="0.057" />
+      <stop
+         id="stop716"
+         style="stop-color:#9fb7c3;stop-opacity:1"
+         offset="0.1063" />
+      <stop
+         id="stop718"
+         style="stop-color:#b8cdd6;stop-opacity:1"
+         offset="0.15970001" />
+      <stop
+         id="stop720"
+         style="stop-color:#ccdee5;stop-opacity:1"
+         offset="0.219" />
+      <stop
+         id="stop722"
+         style="stop-color:#daeaef;stop-opacity:1"
+         offset="0.2872" />
+      <stop
+         id="stop724"
+         style="stop-color:#e2f1f5;stop-opacity:1"
+         offset="0.37239999" />
+      <stop
+         id="stop726"
+         style="stop-color:#e4f3f7;stop-opacity:1"
+         offset="0.5273" />
+    </linearGradient>
+    <radialGradient
+       cx="176.3282"
+       cy="1137.2598"
+       r="11.5198"
+       id="SVGID_42_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop733"
+         style="stop-color:#46c3d6;stop-opacity:0.74000001"
+         offset="0" />
+      <stop
+         id="stop735"
+         style="stop-color:#48c3d3;stop-opacity:0.57990003"
+         offset="0.1036" />
+      <stop
+         id="stop737"
+         style="stop-color:#4dc4c9;stop-opacity:0.45969999"
+         offset="0.1813" />
+      <stop
+         id="stop739"
+         style="stop-color:#57c5b9;stop-opacity:0.35249999"
+         offset="0.2507" />
+      <stop
+         id="stop741"
+         style="stop-color:#65c6a2;stop-opacity:0.2529"
+         offset="0.3152" />
+      <stop
+         id="stop743"
+         style="stop-color:#76c785;stop-opacity:0.1584"
+         offset="0.37630001" />
+      <stop
+         id="stop745"
+         style="stop-color:#8bc961;stop-opacity:0.0692"
+         offset="0.43399999" />
+      <stop
+         id="stop747"
+         style="stop-color:#9fcb40;stop-opacity:0"
+         offset="0.4788" />
+    </radialGradient>
+    <radialGradient
+       cx="91.282303"
+       cy="1160.7344"
+       r="17.0993"
+       id="SVGID_43_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop758"
+         style="stop-color:#46c3d6;stop-opacity:0.74000001"
+         offset="0" />
+      <stop
+         id="stop760"
+         style="stop-color:#48c3d3;stop-opacity:0.57990003"
+         offset="0.1036" />
+      <stop
+         id="stop762"
+         style="stop-color:#4dc4c9;stop-opacity:0.45969999"
+         offset="0.1813" />
+      <stop
+         id="stop764"
+         style="stop-color:#57c5b9;stop-opacity:0.35249999"
+         offset="0.2507" />
+      <stop
+         id="stop766"
+         style="stop-color:#65c6a2;stop-opacity:0.2529"
+         offset="0.3152" />
+      <stop
+         id="stop768"
+         style="stop-color:#76c785;stop-opacity:0.1584"
+         offset="0.37630001" />
+      <stop
+         id="stop770"
+         style="stop-color:#8bc961;stop-opacity:0.0692"
+         offset="0.43399999" />
+      <stop
+         id="stop772"
+         style="stop-color:#9fcb40;stop-opacity:0"
+         offset="0.4788" />
+    </radialGradient>
+    <linearGradient
+       x1="99.228104"
+       y1="1131.8906"
+       x2="96.127197"
+       y2="1143.5513"
+       id="SVGID_44_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop777"
+         style="stop-color:#517287;stop-opacity:1"
+         offset="0.18790001" />
+      <stop
+         id="stop779"
+         style="stop-color:#7895a5;stop-opacity:0.847"
+         offset="0.23980001" />
+      <stop
+         id="stop781"
+         style="stop-color:#9fb6c2;stop-opacity:0.66949999"
+         offset="0.30000001" />
+      <stop
+         id="stop783"
+         style="stop-color:#bdd1d9;stop-opacity:0.4932"
+         offset="0.3599" />
+      <stop
+         id="stop785"
+         style="stop-color:#d3e4ea;stop-opacity:0.32089999"
+         offset="0.41839999" />
+      <stop
+         id="stop787"
+         style="stop-color:#e0eff4;stop-opacity:0.1543"
+         offset="0.47490001" />
+      <stop
+         id="stop789"
+         style="stop-color:#e4f3f7;stop-opacity:0"
+         offset="0.5273" />
+    </linearGradient>
+    <linearGradient
+       x1="84.858902"
+       y1="1074.5898"
+       x2="55.6236"
+       y2="1044.1366"
+       id="SVGID_45_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop796"
+         style="stop-color:#517287;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop798"
+         style="stop-color:#698799;stop-opacity:1"
+         offset="0.0517" />
+      <stop
+         id="stop800"
+         style="stop-color:#95adba;stop-opacity:1"
+         offset="0.1601" />
+      <stop
+         id="stop802"
+         style="stop-color:#b7ccd5;stop-opacity:1"
+         offset="0.26480001" />
+      <stop
+         id="stop804"
+         style="stop-color:#d0e1e8;stop-opacity:1"
+         offset="0.36340001" />
+      <stop
+         id="stop806"
+         style="stop-color:#dfeef3;stop-opacity:1"
+         offset="0.4535" />
+      <stop
+         id="stop808"
+         style="stop-color:#e4f3f7;stop-opacity:1"
+         offset="0.5273" />
+      <stop
+         id="stop810"
+         style="stop-color:#e0eff4;stop-opacity:1"
+         offset="0.60890001" />
+      <stop
+         id="stop812"
+         style="stop-color:#d4e4ea;stop-opacity:1"
+         offset="0.6925" />
+      <stop
+         id="stop814"
+         style="stop-color:#bfd1da;stop-opacity:1"
+         offset="0.77710003" />
+      <stop
+         id="stop816"
+         style="stop-color:#a2b7c4;stop-opacity:1"
+         offset="0.8624" />
+      <stop
+         id="stop818"
+         style="stop-color:#7e96a7;stop-opacity:1"
+         offset="0.94739997" />
+      <stop
+         id="stop820"
+         style="stop-color:#637e92;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="57.035198"
+       cy="1049.2236"
+       r="11.4001"
+       id="SVGID_46_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop827"
+         style="stop-color:#46c3d6;stop-opacity:0.74000001"
+         offset="0" />
+      <stop
+         id="stop829"
+         style="stop-color:#48c3d3;stop-opacity:0.57990003"
+         offset="0.1036" />
+      <stop
+         id="stop831"
+         style="stop-color:#4dc4c9;stop-opacity:0.45969999"
+         offset="0.1813" />
+      <stop
+         id="stop833"
+         style="stop-color:#57c5b9;stop-opacity:0.35249999"
+         offset="0.2507" />
+      <stop
+         id="stop835"
+         style="stop-color:#65c6a2;stop-opacity:0.2529"
+         offset="0.3152" />
+      <stop
+         id="stop837"
+         style="stop-color:#76c785;stop-opacity:0.1584"
+         offset="0.37630001" />
+      <stop
+         id="stop839"
+         style="stop-color:#8bc961;stop-opacity:0.0692"
+         offset="0.43399999" />
+      <stop
+         id="stop841"
+         style="stop-color:#9fcb40;stop-opacity:0"
+         offset="0.4788" />
+    </radialGradient>
+    <radialGradient
+       cx="107.7227"
+       cy="1101.1846"
+       r="47.014"
+       id="SVGID_47_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop847"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop849"
+         style="stop-color:#010203;stop-opacity:1"
+         offset="0.3003" />
+      <stop
+         id="stop851"
+         style="stop-color:#03080d;stop-opacity:1"
+         offset="0.5262" />
+      <stop
+         id="stop853"
+         style="stop-color:#08111d;stop-opacity:1"
+         offset="0.72719997" />
+      <stop
+         id="stop855"
+         style="stop-color:#0b1929;stop-opacity:1"
+         offset="0.83639997" />
+      <stop
+         id="stop857"
+         style="stop-color:#23474c;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="253.53709"
+       cy="619.94043"
+       r="42.171398"
+       id="SVGID_48_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9525,0.3046,-0.3046,0.9525,81.9305,-503.3005)">
+      <stop
+         id="stop862"
+         style="stop-color:#0b1929;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop864"
+         style="stop-color:#0d1b2c;stop-opacity:0.2447"
+         offset="0.20469999" />
+      <stop
+         id="stop866"
+         style="stop-color:#132234;stop-opacity:0.40290001"
+         offset="0.33700001" />
+      <stop
+         id="stop868"
+         style="stop-color:#1d2d43;stop-opacity:0.53649998"
+         offset="0.44870001" />
+      <stop
+         id="stop870"
+         style="stop-color:#2b3d58;stop-opacity:0.6566"
+         offset="0.54909998" />
+      <stop
+         id="stop872"
+         style="stop-color:#3d5173;stop-opacity:0.76740003"
+         offset="0.64179999" />
+      <stop
+         id="stop874"
+         style="stop-color:#536a95;stop-opacity:0.87150002"
+         offset="0.72890002" />
+      <stop
+         id="stop876"
+         style="stop-color:#6d87bc;stop-opacity:0.96859998"
+         offset="0.81010002" />
+      <stop
+         id="stop878"
+         style="stop-color:#7792ca;stop-opacity:1"
+         offset="0.83639997" />
+    </radialGradient>
+    <radialGradient
+       cx="102.2515"
+       cy="1105.4219"
+       r="33.175598"
+       id="SVGID_49_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop883"
+         style="stop-color:#0b1929;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop885"
+         style="stop-color:#0d1b2c;stop-opacity:0.2447"
+         offset="0.20469999" />
+      <stop
+         id="stop887"
+         style="stop-color:#132234;stop-opacity:0.40290001"
+         offset="0.33700001" />
+      <stop
+         id="stop889"
+         style="stop-color:#1d2d43;stop-opacity:0.53649998"
+         offset="0.44870001" />
+      <stop
+         id="stop891"
+         style="stop-color:#2b3d58;stop-opacity:0.6566"
+         offset="0.54909998" />
+      <stop
+         id="stop893"
+         style="stop-color:#3d5173;stop-opacity:0.76740003"
+         offset="0.64179999" />
+      <stop
+         id="stop895"
+         style="stop-color:#536a95;stop-opacity:0.87150002"
+         offset="0.72890002" />
+      <stop
+         id="stop897"
+         style="stop-color:#6d87bc;stop-opacity:0.96859998"
+         offset="0.81010002" />
+      <stop
+         id="stop899"
+         style="stop-color:#7792ca;stop-opacity:1"
+         offset="0.83639997" />
+    </radialGradient>
+    <radialGradient
+       cx="125.5313"
+       cy="1069.5029"
+       r="52.926998"
+       id="SVGID_50_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop904"
+         style="stop-color:#f5f9ed;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop906"
+         style="stop-color:#f3f8eb;stop-opacity:0.52960002"
+         offset="0.3506" />
+      <stop
+         id="stop908"
+         style="stop-color:#ecf5e5;stop-opacity:0.36019999"
+         offset="0.477" />
+      <stop
+         id="stop910"
+         style="stop-color:#e1f0da;stop-opacity:0.2395"
+         offset="0.56690001" />
+      <stop
+         id="stop912"
+         style="stop-color:#d0e8cb;stop-opacity:0.1418"
+         offset="0.6397" />
+      <stop
+         id="stop914"
+         style="stop-color:#badeb7;stop-opacity:0.0591"
+         offset="0.70139998" />
+      <stop
+         id="stop916"
+         style="stop-color:#a5d4a4;stop-opacity:0"
+         offset="0.74550003" />
+      <stop
+         id="stop918"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="123.9854"
+       cy="1169.793"
+       r="22.649401"
+       id="SVGID_51_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9207,24,-936.5648)">
+      <stop
+         id="stop923"
+         style="stop-color:#f5f9ed;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop925"
+         style="stop-color:#f3f8eb;stop-opacity:0.52960002"
+         offset="0.3506" />
+      <stop
+         id="stop927"
+         style="stop-color:#ecf5e5;stop-opacity:0.36019999"
+         offset="0.477" />
+      <stop
+         id="stop929"
+         style="stop-color:#e1f0da;stop-opacity:0.2395"
+         offset="0.56690001" />
+      <stop
+         id="stop931"
+         style="stop-color:#d0e8cb;stop-opacity:0.1418"
+         offset="0.6397" />
+      <stop
+         id="stop933"
+         style="stop-color:#badeb7;stop-opacity:0.0591"
+         offset="0.70139998" />
+      <stop
+         id="stop935"
+         style="stop-color:#a5d4a4;stop-opacity:0"
+         offset="0.74550003" />
+      <stop
+         id="stop937"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="125.9678"
+       cy="1163.1113"
+       r="2.9981"
+       id="SVGID_52_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9207,24,-936.5648)">
+      <stop
+         id="stop942"
+         style="stop-color:#dcecef;stop-opacity:1"
+         offset="0.44850001" />
+      <stop
+         id="stop944"
+         style="stop-color:#d3e9ed;stop-opacity:0.63789999"
+         offset="0.64819998" />
+      <stop
+         id="stop946"
+         style="stop-color:#bae3e9;stop-opacity:0.0435"
+         offset="0.97600001" />
+      <stop
+         id="stop948"
+         style="stop-color:#b8e2e9;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="-300.06741"
+       cy="1151.0977"
+       r="7.9678001"
+       id="tublightreflection_1_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1755,-0.3579,0.3156,1.0363,129.1247,-1121.3802)">
+      <stop
+         id="stop953"
+         style="stop-color:#c9daf0;stop-opacity:0.88999999"
+         offset="0.39390001" />
+      <stop
+         id="stop955"
+         style="stop-color:#c6daee;stop-opacity:0.5772"
+         offset="0.44929999" />
+      <stop
+         id="stop957"
+         style="stop-color:#bcdae8;stop-opacity:0.32269999"
+         offset="0.49439999" />
+      <stop
+         id="stop959"
+         style="stop-color:#abd9dd;stop-opacity:0.0893"
+         offset="0.53570002" />
+      <stop
+         id="stop961"
+         style="stop-color:#a2d9d8;stop-opacity:0"
+         offset="0.55150002" />
+      <stop
+         id="stop963"
+         style="stop-color:#a5dada;stop-opacity:0.1564"
+         offset="0.60589999" />
+      <stop
+         id="stop965"
+         style="stop-color:#b0dfde;stop-opacity:0.287"
+         offset="0.65130001" />
+      <stop
+         id="stop967"
+         style="stop-color:#c1e6e6;stop-opacity:0.4082"
+         offset="0.69340003" />
+      <stop
+         id="stop969"
+         style="stop-color:#d9eff2;stop-opacity:0.523"
+         offset="0.73339999" />
+      <stop
+         id="stop971"
+         style="stop-color:#f1f9fd;stop-opacity:0.61000001"
+         offset="0.76359999" />
+      <stop
+         id="stop973"
+         style="stop-color:#ceedef;stop-opacity:0.54909998"
+         offset="0.78719997" />
+      <stop
+         id="stop975"
+         style="stop-color:#a8dfdf;stop-opacity:0.4698"
+         offset="0.81800002" />
+      <stop
+         id="stop977"
+         style="stop-color:#89d4d3;stop-opacity:0.38710001"
+         offset="0.85000002" />
+      <stop
+         id="stop979"
+         style="stop-color:#70ccc9;stop-opacity:0.30149999"
+         offset="0.88319999" />
+      <stop
+         id="stop981"
+         style="stop-color:#5fc6c2;stop-opacity:0.21179999"
+         offset="0.91790003" />
+      <stop
+         id="stop983"
+         style="stop-color:#54c2bd;stop-opacity:0.1153"
+         offset="0.95529997" />
+      <stop
+         id="stop985"
+         style="stop-color:#51c1bc;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="334.8067"
+       cy="-527.68262"
+       r="6.8185"
+       id="tublightreflection_2_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.0457,1.2279,-1.0825,-0.0403,-452.0393,-273.2723)">
+      <stop
+         id="stop989"
+         style="stop-color:#c9daf0;stop-opacity:0.88999999"
+         offset="0.39390001" />
+      <stop
+         id="stop991"
+         style="stop-color:#c6daee;stop-opacity:0.5772"
+         offset="0.44929999" />
+      <stop
+         id="stop993"
+         style="stop-color:#bcdae8;stop-opacity:0.32269999"
+         offset="0.49439999" />
+      <stop
+         id="stop995"
+         style="stop-color:#abd9dd;stop-opacity:0.0893"
+         offset="0.53570002" />
+      <stop
+         id="stop997"
+         style="stop-color:#a2d9d8;stop-opacity:0"
+         offset="0.55150002" />
+      <stop
+         id="stop999"
+         style="stop-color:#a5dada;stop-opacity:0.1564"
+         offset="0.60589999" />
+      <stop
+         id="stop1001"
+         style="stop-color:#b0dfde;stop-opacity:0.287"
+         offset="0.65130001" />
+      <stop
+         id="stop1003"
+         style="stop-color:#c1e6e6;stop-opacity:0.4082"
+         offset="0.69340003" />
+      <stop
+         id="stop1005"
+         style="stop-color:#d9eff2;stop-opacity:0.523"
+         offset="0.73339999" />
+      <stop
+         id="stop1007"
+         style="stop-color:#f1f9fd;stop-opacity:0.61000001"
+         offset="0.76359999" />
+      <stop
+         id="stop1009"
+         style="stop-color:#ceedef;stop-opacity:0.54909998"
+         offset="0.78719997" />
+      <stop
+         id="stop1011"
+         style="stop-color:#a8dfdf;stop-opacity:0.4698"
+         offset="0.81800002" />
+      <stop
+         id="stop1013"
+         style="stop-color:#89d4d3;stop-opacity:0.38710001"
+         offset="0.85000002" />
+      <stop
+         id="stop1015"
+         style="stop-color:#70ccc9;stop-opacity:0.30149999"
+         offset="0.88319999" />
+      <stop
+         id="stop1017"
+         style="stop-color:#5fc6c2;stop-opacity:0.21179999"
+         offset="0.91790003" />
+      <stop
+         id="stop1019"
+         style="stop-color:#54c2bd;stop-opacity:0.1153"
+         offset="0.95529997" />
+      <stop
+         id="stop1021"
+         style="stop-color:#51c1bc;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="-575.8125"
+       cy="-1028.6616"
+       r="6.9545002"
+       id="tublightreflection_3_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.1372,0.4656,-0.4104,-1.0025,-946.634,-614.2469)">
+      <stop
+         id="stop1025"
+         style="stop-color:#c9daf0;stop-opacity:0.88999999"
+         offset="0.39390001" />
+      <stop
+         id="stop1027"
+         style="stop-color:#c6daee;stop-opacity:0.5772"
+         offset="0.44929999" />
+      <stop
+         id="stop1029"
+         style="stop-color:#bcdae8;stop-opacity:0.32269999"
+         offset="0.49439999" />
+      <stop
+         id="stop1031"
+         style="stop-color:#abd9dd;stop-opacity:0.0893"
+         offset="0.53570002" />
+      <stop
+         id="stop1033"
+         style="stop-color:#a2d9d8;stop-opacity:0"
+         offset="0.55150002" />
+      <stop
+         id="stop1035"
+         style="stop-color:#a5dada;stop-opacity:0.1564"
+         offset="0.60589999" />
+      <stop
+         id="stop1037"
+         style="stop-color:#b0dfde;stop-opacity:0.287"
+         offset="0.65130001" />
+      <stop
+         id="stop1039"
+         style="stop-color:#c1e6e6;stop-opacity:0.4082"
+         offset="0.69340003" />
+      <stop
+         id="stop1041"
+         style="stop-color:#d9eff2;stop-opacity:0.523"
+         offset="0.73339999" />
+      <stop
+         id="stop1043"
+         style="stop-color:#f1f9fd;stop-opacity:0.61000001"
+         offset="0.76359999" />
+      <stop
+         id="stop1045"
+         style="stop-color:#ceedef;stop-opacity:0.54909998"
+         offset="0.78719997" />
+      <stop
+         id="stop1047"
+         style="stop-color:#a8dfdf;stop-opacity:0.4698"
+         offset="0.81800002" />
+      <stop
+         id="stop1049"
+         style="stop-color:#89d4d3;stop-opacity:0.38710001"
+         offset="0.85000002" />
+      <stop
+         id="stop1051"
+         style="stop-color:#70ccc9;stop-opacity:0.30149999"
+         offset="0.88319999" />
+      <stop
+         id="stop1053"
+         style="stop-color:#5fc6c2;stop-opacity:0.21179999"
+         offset="0.91790003" />
+      <stop
+         id="stop1055"
+         style="stop-color:#54c2bd;stop-opacity:0.1153"
+         offset="0.95529997" />
+      <stop
+         id="stop1057"
+         style="stop-color:#51c1bc;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="-1493.042"
+       cy="13.3194"
+       r="6.5349998"
+       id="tublightreflection_4_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.6244,-0.9876,0.9156,-0.5789,-787.8409,-1316.5985)">
+      <stop
+         id="stop1061"
+         style="stop-color:#c9daf0;stop-opacity:0.88999999"
+         offset="0.39390001" />
+      <stop
+         id="stop1063"
+         style="stop-color:#c6daee;stop-opacity:0.5772"
+         offset="0.44929999" />
+      <stop
+         id="stop1065"
+         style="stop-color:#bcdae8;stop-opacity:0.32269999"
+         offset="0.49439999" />
+      <stop
+         id="stop1067"
+         style="stop-color:#abd9dd;stop-opacity:0.0893"
+         offset="0.53570002" />
+      <stop
+         id="stop1069"
+         style="stop-color:#a2d9d8;stop-opacity:0"
+         offset="0.55150002" />
+      <stop
+         id="stop1071"
+         style="stop-color:#a5dada;stop-opacity:0.1564"
+         offset="0.60589999" />
+      <stop
+         id="stop1073"
+         style="stop-color:#b0dfde;stop-opacity:0.287"
+         offset="0.65130001" />
+      <stop
+         id="stop1075"
+         style="stop-color:#c1e6e6;stop-opacity:0.4082"
+         offset="0.69340003" />
+      <stop
+         id="stop1077"
+         style="stop-color:#d9eff2;stop-opacity:0.523"
+         offset="0.73339999" />
+      <stop
+         id="stop1079"
+         style="stop-color:#f1f9fd;stop-opacity:0.61000001"
+         offset="0.76359999" />
+      <stop
+         id="stop1081"
+         style="stop-color:#ceedef;stop-opacity:0.54909998"
+         offset="0.78719997" />
+      <stop
+         id="stop1083"
+         style="stop-color:#a8dfdf;stop-opacity:0.4698"
+         offset="0.81800002" />
+      <stop
+         id="stop1085"
+         style="stop-color:#89d4d3;stop-opacity:0.38710001"
+         offset="0.85000002" />
+      <stop
+         id="stop1087"
+         style="stop-color:#70ccc9;stop-opacity:0.30149999"
+         offset="0.88319999" />
+      <stop
+         id="stop1089"
+         style="stop-color:#5fc6c2;stop-opacity:0.21179999"
+         offset="0.91790003" />
+      <stop
+         id="stop1091"
+         style="stop-color:#54c2bd;stop-opacity:0.1153"
+         offset="0.95529997" />
+      <stop
+         id="stop1093"
+         style="stop-color:#51c1bc;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="-1302.3652"
+       cy="-518.05469"
+       r="7.7940001"
+       id="tublightreflection_5_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0609,-0.7135,0.4489,-0.6946,-991.0353,-1157.8248)">
+      <stop
+         id="stop1097"
+         style="stop-color:#c9daf0;stop-opacity:0.88999999"
+         offset="0.39390001" />
+      <stop
+         id="stop1099"
+         style="stop-color:#c6daee;stop-opacity:0.5772"
+         offset="0.44929999" />
+      <stop
+         id="stop1101"
+         style="stop-color:#bcdae8;stop-opacity:0.32269999"
+         offset="0.49439999" />
+      <stop
+         id="stop1103"
+         style="stop-color:#abd9dd;stop-opacity:0.0893"
+         offset="0.53570002" />
+      <stop
+         id="stop1105"
+         style="stop-color:#a2d9d8;stop-opacity:0"
+         offset="0.55150002" />
+      <stop
+         id="stop1107"
+         style="stop-color:#a5dada;stop-opacity:0.1564"
+         offset="0.60589999" />
+      <stop
+         id="stop1109"
+         style="stop-color:#b0dfde;stop-opacity:0.287"
+         offset="0.65130001" />
+      <stop
+         id="stop1111"
+         style="stop-color:#c1e6e6;stop-opacity:0.4082"
+         offset="0.69340003" />
+      <stop
+         id="stop1113"
+         style="stop-color:#d9eff2;stop-opacity:0.523"
+         offset="0.73339999" />
+      <stop
+         id="stop1115"
+         style="stop-color:#f1f9fd;stop-opacity:0.61000001"
+         offset="0.76359999" />
+      <stop
+         id="stop1117"
+         style="stop-color:#ceedef;stop-opacity:0.54909998"
+         offset="0.78719997" />
+      <stop
+         id="stop1119"
+         style="stop-color:#a8dfdf;stop-opacity:0.4698"
+         offset="0.81800002" />
+      <stop
+         id="stop1121"
+         style="stop-color:#89d4d3;stop-opacity:0.38710001"
+         offset="0.85000002" />
+      <stop
+         id="stop1123"
+         style="stop-color:#70ccc9;stop-opacity:0.30149999"
+         offset="0.88319999" />
+      <stop
+         id="stop1125"
+         style="stop-color:#5fc6c2;stop-opacity:0.21179999"
+         offset="0.91790003" />
+      <stop
+         id="stop1127"
+         style="stop-color:#54c2bd;stop-opacity:0.1153"
+         offset="0.95529997" />
+      <stop
+         id="stop1129"
+         style="stop-color:#51c1bc;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="-1306.2578"
+       cy="-399.98871"
+       r="6.0194001"
+       id="tublightreflection_6_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0163,-0.7763,0.6764,-0.8708,-900.0159,-1232.0898)">
+      <stop
+         id="stop1133"
+         style="stop-color:#c9daf0;stop-opacity:0.88999999"
+         offset="0.39390001" />
+      <stop
+         id="stop1135"
+         style="stop-color:#c6daee;stop-opacity:0.5772"
+         offset="0.44929999" />
+      <stop
+         id="stop1137"
+         style="stop-color:#bcdae8;stop-opacity:0.32269999"
+         offset="0.49439999" />
+      <stop
+         id="stop1139"
+         style="stop-color:#abd9dd;stop-opacity:0.0893"
+         offset="0.53570002" />
+      <stop
+         id="stop1141"
+         style="stop-color:#a2d9d8;stop-opacity:0"
+         offset="0.55150002" />
+      <stop
+         id="stop1143"
+         style="stop-color:#a5dada;stop-opacity:0.1564"
+         offset="0.60589999" />
+      <stop
+         id="stop1145"
+         style="stop-color:#b0dfde;stop-opacity:0.287"
+         offset="0.65130001" />
+      <stop
+         id="stop1147"
+         style="stop-color:#c1e6e6;stop-opacity:0.4082"
+         offset="0.69340003" />
+      <stop
+         id="stop1149"
+         style="stop-color:#d9eff2;stop-opacity:0.523"
+         offset="0.73339999" />
+      <stop
+         id="stop1151"
+         style="stop-color:#f1f9fd;stop-opacity:0.61000001"
+         offset="0.76359999" />
+      <stop
+         id="stop1153"
+         style="stop-color:#ceedef;stop-opacity:0.54909998"
+         offset="0.78719997" />
+      <stop
+         id="stop1155"
+         style="stop-color:#a8dfdf;stop-opacity:0.4698"
+         offset="0.81800002" />
+      <stop
+         id="stop1157"
+         style="stop-color:#89d4d3;stop-opacity:0.38710001"
+         offset="0.85000002" />
+      <stop
+         id="stop1159"
+         style="stop-color:#70ccc9;stop-opacity:0.30149999"
+         offset="0.88319999" />
+      <stop
+         id="stop1161"
+         style="stop-color:#5fc6c2;stop-opacity:0.21179999"
+         offset="0.91790003" />
+      <stop
+         id="stop1163"
+         style="stop-color:#54c2bd;stop-opacity:0.1153"
+         offset="0.95529997" />
+      <stop
+         id="stop1165"
+         style="stop-color:#51c1bc;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="-1340.5571"
+       cy="656.08008"
+       r="6.5285001"
+       id="tublightreflection_7_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.0701,-1.2144,1.0815,0.0624,-444.2149,-1502.1295)">
+      <stop
+         id="stop1169"
+         style="stop-color:#c9daf0;stop-opacity:0.88999999"
+         offset="0.39390001" />
+      <stop
+         id="stop1171"
+         style="stop-color:#c6daee;stop-opacity:0.5772"
+         offset="0.44929999" />
+      <stop
+         id="stop1173"
+         style="stop-color:#bcdae8;stop-opacity:0.32269999"
+         offset="0.49439999" />
+      <stop
+         id="stop1175"
+         style="stop-color:#abd9dd;stop-opacity:0.0893"
+         offset="0.53570002" />
+      <stop
+         id="stop1177"
+         style="stop-color:#a2d9d8;stop-opacity:0"
+         offset="0.55150002" />
+      <stop
+         id="stop1179"
+         style="stop-color:#a5dada;stop-opacity:0.1564"
+         offset="0.60589999" />
+      <stop
+         id="stop1181"
+         style="stop-color:#b0dfde;stop-opacity:0.287"
+         offset="0.65130001" />
+      <stop
+         id="stop1183"
+         style="stop-color:#c1e6e6;stop-opacity:0.4082"
+         offset="0.69340003" />
+      <stop
+         id="stop1185"
+         style="stop-color:#d9eff2;stop-opacity:0.523"
+         offset="0.73339999" />
+      <stop
+         id="stop1187"
+         style="stop-color:#f1f9fd;stop-opacity:0.61000001"
+         offset="0.76359999" />
+      <stop
+         id="stop1189"
+         style="stop-color:#ceedef;stop-opacity:0.54909998"
+         offset="0.78719997" />
+      <stop
+         id="stop1191"
+         style="stop-color:#a8dfdf;stop-opacity:0.4698"
+         offset="0.81800002" />
+      <stop
+         id="stop1193"
+         style="stop-color:#89d4d3;stop-opacity:0.38710001"
+         offset="0.85000002" />
+      <stop
+         id="stop1195"
+         style="stop-color:#70ccc9;stop-opacity:0.30149999"
+         offset="0.88319999" />
+      <stop
+         id="stop1197"
+         style="stop-color:#5fc6c2;stop-opacity:0.21179999"
+         offset="0.91790003" />
+      <stop
+         id="stop1199"
+         style="stop-color:#54c2bd;stop-opacity:0.1153"
+         offset="0.95529997" />
+      <stop
+         id="stop1201"
+         style="stop-color:#51c1bc;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="341.46881"
+       cy="147.9659"
+       r="6.0193"
+       id="tublightreflection_8_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.8294,1.1696,-0.8836,0.6266,-46.2313,-305.4576)">
+      <stop
+         id="stop1205"
+         style="stop-color:#c9daf0;stop-opacity:0.88999999"
+         offset="0.39390001" />
+      <stop
+         id="stop1207"
+         style="stop-color:#c6daee;stop-opacity:0.5772"
+         offset="0.44929999" />
+      <stop
+         id="stop1209"
+         style="stop-color:#bcdae8;stop-opacity:0.32269999"
+         offset="0.49439999" />
+      <stop
+         id="stop1211"
+         style="stop-color:#abd9dd;stop-opacity:0.0893"
+         offset="0.53570002" />
+      <stop
+         id="stop1213"
+         style="stop-color:#a2d9d8;stop-opacity:0"
+         offset="0.55150002" />
+      <stop
+         id="stop1215"
+         style="stop-color:#a5dada;stop-opacity:0.1564"
+         offset="0.60589999" />
+      <stop
+         id="stop1217"
+         style="stop-color:#b0dfde;stop-opacity:0.287"
+         offset="0.65130001" />
+      <stop
+         id="stop1219"
+         style="stop-color:#c1e6e6;stop-opacity:0.4082"
+         offset="0.69340003" />
+      <stop
+         id="stop1221"
+         style="stop-color:#d9eff2;stop-opacity:0.523"
+         offset="0.73339999" />
+      <stop
+         id="stop1223"
+         style="stop-color:#f1f9fd;stop-opacity:0.61000001"
+         offset="0.76359999" />
+      <stop
+         id="stop1225"
+         style="stop-color:#ceedef;stop-opacity:0.54909998"
+         offset="0.78719997" />
+      <stop
+         id="stop1227"
+         style="stop-color:#a8dfdf;stop-opacity:0.4698"
+         offset="0.81800002" />
+      <stop
+         id="stop1229"
+         style="stop-color:#89d4d3;stop-opacity:0.38710001"
+         offset="0.85000002" />
+      <stop
+         id="stop1231"
+         style="stop-color:#70ccc9;stop-opacity:0.30149999"
+         offset="0.88319999" />
+      <stop
+         id="stop1233"
+         style="stop-color:#5fc6c2;stop-opacity:0.21179999"
+         offset="0.91790003" />
+      <stop
+         id="stop1235"
+         style="stop-color:#54c2bd;stop-opacity:0.1153"
+         offset="0.95529997" />
+      <stop
+         id="stop1237"
+         style="stop-color:#51c1bc;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <linearGradient
+       x1="130.314"
+       y1="1067.9688"
+       x2="184.4834"
+       y2="1067.9688"
+       id="SVGID_53_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop1243"
+         style="stop-color:#517287;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop1245"
+         style="stop-color:#6e8b9d;stop-opacity:1"
+         offset="0.0227" />
+      <stop
+         id="stop1247"
+         style="stop-color:#8da7b5;stop-opacity:1"
+         offset="0.0532" />
+      <stop
+         id="stop1249"
+         style="stop-color:#a9bfca;stop-opacity:1"
+         offset="0.0878" />
+      <stop
+         id="stop1251"
+         style="stop-color:#bfd2db;stop-opacity:1"
+         offset="0.1268" />
+      <stop
+         id="stop1253"
+         style="stop-color:#d0e1e7;stop-opacity:1"
+         offset="0.1724" />
+      <stop
+         id="stop1255"
+         style="stop-color:#dbebf0;stop-opacity:1"
+         offset="0.2288" />
+      <stop
+         id="stop1257"
+         style="stop-color:#e2f1f6;stop-opacity:1"
+         offset="0.30779999" />
+      <stop
+         id="stop1259"
+         style="stop-color:#e4f3f7;stop-opacity:1"
+         offset="0.5273" />
+    </linearGradient>
+    <radialGradient
+       cx="177.8506"
+       cy="1057.0029"
+       r="20.2362"
+       id="SVGID_54_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop1266"
+         style="stop-color:#46c3d6;stop-opacity:0.74000001"
+         offset="0" />
+      <stop
+         id="stop1268"
+         style="stop-color:#48c3d3;stop-opacity:0.57990003"
+         offset="0.1036" />
+      <stop
+         id="stop1270"
+         style="stop-color:#4dc4c9;stop-opacity:0.45969999"
+         offset="0.1813" />
+      <stop
+         id="stop1272"
+         style="stop-color:#57c5b9;stop-opacity:0.35249999"
+         offset="0.2507" />
+      <stop
+         id="stop1274"
+         style="stop-color:#65c6a2;stop-opacity:0.2529"
+         offset="0.3152" />
+      <stop
+         id="stop1276"
+         style="stop-color:#76c785;stop-opacity:0.1584"
+         offset="0.37630001" />
+      <stop
+         id="stop1278"
+         style="stop-color:#8bc961;stop-opacity:0.0692"
+         offset="0.43399999" />
+      <stop
+         id="stop1280"
+         style="stop-color:#9fcb40;stop-opacity:0"
+         offset="0.4788" />
+    </radialGradient>
+    <linearGradient
+       x1="164.02789"
+       y1="1079.2363"
+       x2="205.2583"
+       y2="1120.4667"
+       id="SVGID_55_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop1287"
+         style="stop-color:#517287;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop1289"
+         style="stop-color:#6e8b9d;stop-opacity:1"
+         offset="0.0227" />
+      <stop
+         id="stop1291"
+         style="stop-color:#8da7b5;stop-opacity:1"
+         offset="0.0532" />
+      <stop
+         id="stop1293"
+         style="stop-color:#a9bfca;stop-opacity:1"
+         offset="0.0878" />
+      <stop
+         id="stop1295"
+         style="stop-color:#bfd2db;stop-opacity:1"
+         offset="0.1268" />
+      <stop
+         id="stop1297"
+         style="stop-color:#d0e1e7;stop-opacity:1"
+         offset="0.1724" />
+      <stop
+         id="stop1299"
+         style="stop-color:#dbebf0;stop-opacity:1"
+         offset="0.2288" />
+      <stop
+         id="stop1301"
+         style="stop-color:#e2f1f6;stop-opacity:1"
+         offset="0.30779999" />
+      <stop
+         id="stop1303"
+         style="stop-color:#e4f3f7;stop-opacity:1"
+         offset="0.5273" />
+    </linearGradient>
+    <radialGradient
+       cx="215.1465"
+       cy="1101.0889"
+       r="18.8706"
+       id="SVGID_56_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop1310"
+         style="stop-color:#46c3d6;stop-opacity:0.74000001"
+         offset="0" />
+      <stop
+         id="stop1312"
+         style="stop-color:#48c3d3;stop-opacity:0.57990003"
+         offset="0.1036" />
+      <stop
+         id="stop1314"
+         style="stop-color:#4dc4c9;stop-opacity:0.45969999"
+         offset="0.1813" />
+      <stop
+         id="stop1316"
+         style="stop-color:#57c5b9;stop-opacity:0.35249999"
+         offset="0.2507" />
+      <stop
+         id="stop1318"
+         style="stop-color:#65c6a2;stop-opacity:0.2529"
+         offset="0.3152" />
+      <stop
+         id="stop1320"
+         style="stop-color:#76c785;stop-opacity:0.1584"
+         offset="0.37630001" />
+      <stop
+         id="stop1322"
+         style="stop-color:#8bc961;stop-opacity:0.0692"
+         offset="0.43399999" />
+      <stop
+         id="stop1324"
+         style="stop-color:#9fcb40;stop-opacity:0"
+         offset="0.4788" />
+    </radialGradient>
+    <linearGradient
+       x1="116.8828"
+       y1="1108.6611"
+       x2="131.2825"
+       y2="1172.244"
+       id="SVGID_57_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop1331"
+         style="stop-color:#202d36;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop1333"
+         style="stop-color:#517287;stop-opacity:1"
+         offset="0.0732" />
+      <stop
+         id="stop1335"
+         style="stop-color:#7895a5;stop-opacity:1"
+         offset="0.1426" />
+      <stop
+         id="stop1337"
+         style="stop-color:#9fb6c2;stop-opacity:1"
+         offset="0.22319999" />
+      <stop
+         id="stop1339"
+         style="stop-color:#bdd1d9;stop-opacity:1"
+         offset="0.30329999" />
+      <stop
+         id="stop1341"
+         style="stop-color:#d3e4ea;stop-opacity:1"
+         offset="0.38159999" />
+      <stop
+         id="stop1343"
+         style="stop-color:#e0eff4;stop-opacity:1"
+         offset="0.45719999" />
+      <stop
+         id="stop1345"
+         style="stop-color:#e4f3f7;stop-opacity:1"
+         offset="0.5273" />
+    </linearGradient>
+    <radialGradient
+       cx="-2251.0732"
+       cy="1565.3145"
+       r="24.297501"
+       id="SVGID_58_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.2616,-0.9652,0.6428,-0.1743,-1441.7035,-1668.0449)">
+      <stop
+         id="stop1352"
+         style="stop-color:#46c3d6;stop-opacity:0.74000001"
+         offset="0" />
+      <stop
+         id="stop1354"
+         style="stop-color:#48c3d3;stop-opacity:0.57990003"
+         offset="0.14040001" />
+      <stop
+         id="stop1356"
+         style="stop-color:#4dc4c9;stop-opacity:0.45969999"
+         offset="0.2458" />
+      <stop
+         id="stop1358"
+         style="stop-color:#57c5b9;stop-opacity:0.35249999"
+         offset="0.33989999" />
+      <stop
+         id="stop1360"
+         style="stop-color:#65c6a2;stop-opacity:0.2529"
+         offset="0.42730001" />
+      <stop
+         id="stop1362"
+         style="stop-color:#76c785;stop-opacity:0.1584"
+         offset="0.51010001" />
+      <stop
+         id="stop1364"
+         style="stop-color:#8bc961;stop-opacity:0.0692"
+         offset="0.58829999" />
+      <stop
+         id="stop1366"
+         style="stop-color:#9fcb40;stop-opacity:0"
+         offset="0.64899999" />
+    </radialGradient>
+    <radialGradient
+       cx="47.6558"
+       cy="1150.9707"
+       r="24.728399"
+       id="SVGID_59_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop1373"
+         style="stop-color:#46c3d6;stop-opacity:0.74000001"
+         offset="0" />
+      <stop
+         id="stop1375"
+         style="stop-color:#48c3d3;stop-opacity:0.57990003"
+         offset="0.1036" />
+      <stop
+         id="stop1377"
+         style="stop-color:#4dc4c9;stop-opacity:0.45969999"
+         offset="0.1813" />
+      <stop
+         id="stop1379"
+         style="stop-color:#57c5b9;stop-opacity:0.35249999"
+         offset="0.2507" />
+      <stop
+         id="stop1381"
+         style="stop-color:#65c6a2;stop-opacity:0.2529"
+         offset="0.3152" />
+      <stop
+         id="stop1383"
+         style="stop-color:#76c785;stop-opacity:0.1584"
+         offset="0.37630001" />
+      <stop
+         id="stop1385"
+         style="stop-color:#8bc961;stop-opacity:0.0692"
+         offset="0.43399999" />
+      <stop
+         id="stop1387"
+         style="stop-color:#9fcb40;stop-opacity:0"
+         offset="0.4788" />
+    </radialGradient>
+    <linearGradient
+       x1="65.777397"
+       y1="1106.8008"
+       x2="37.484001"
+       y2="1070.5869"
+       id="SVGID_60_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop1394"
+         style="stop-color:#517287;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop1396"
+         style="stop-color:#5c7b8f;stop-opacity:1"
+         offset="0.0118" />
+      <stop
+         id="stop1398"
+         style="stop-color:#809bab;stop-opacity:1"
+         offset="0.057" />
+      <stop
+         id="stop1400"
+         style="stop-color:#9fb7c3;stop-opacity:1"
+         offset="0.1063" />
+      <stop
+         id="stop1402"
+         style="stop-color:#b8cdd6;stop-opacity:1"
+         offset="0.15970001" />
+      <stop
+         id="stop1404"
+         style="stop-color:#ccdee5;stop-opacity:1"
+         offset="0.219" />
+      <stop
+         id="stop1406"
+         style="stop-color:#daeaef;stop-opacity:1"
+         offset="0.2872" />
+      <stop
+         id="stop1408"
+         style="stop-color:#e2f1f5;stop-opacity:1"
+         offset="0.37239999" />
+      <stop
+         id="stop1410"
+         style="stop-color:#e4f3f7;stop-opacity:1"
+         offset="0.5273" />
+    </linearGradient>
+    <radialGradient
+       cx="33.9258"
+       cy="1086.5967"
+       r="23.272499"
+       id="SVGID_61_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop1417"
+         style="stop-color:#46c3d6;stop-opacity:0.74000001"
+         offset="0" />
+      <stop
+         id="stop1419"
+         style="stop-color:#48c3d3;stop-opacity:0.57990003"
+         offset="0.1036" />
+      <stop
+         id="stop1421"
+         style="stop-color:#4dc4c9;stop-opacity:0.45969999"
+         offset="0.1813" />
+      <stop
+         id="stop1423"
+         style="stop-color:#57c5b9;stop-opacity:0.35249999"
+         offset="0.2507" />
+      <stop
+         id="stop1425"
+         style="stop-color:#65c6a2;stop-opacity:0.2529"
+         offset="0.3152" />
+      <stop
+         id="stop1427"
+         style="stop-color:#76c785;stop-opacity:0.1584"
+         offset="0.37630001" />
+      <stop
+         id="stop1429"
+         style="stop-color:#8bc961;stop-opacity:0.0692"
+         offset="0.43399999" />
+      <stop
+         id="stop1431"
+         style="stop-color:#9fcb40;stop-opacity:0"
+         offset="0.4788" />
+    </radialGradient>
+    <radialGradient
+       cx="42.487801"
+       cy="1133.252"
+       r="18.6436"
+       id="SVGID_62_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9545,0,0,0.9545,-0.1888,-930.3677)">
+      <stop
+         id="stop1440"
+         style="stop-color:#d5e2ee;stop-opacity:1"
+         offset="0.77579999" />
+      <stop
+         id="stop1442"
+         style="stop-color:#d1dfed;stop-opacity:1"
+         offset="0.82630002" />
+      <stop
+         id="stop1444"
+         style="stop-color:#c7d6e8;stop-opacity:1"
+         offset="0.8714" />
+      <stop
+         id="stop1446"
+         style="stop-color:#b4c6e1;stop-opacity:1"
+         offset="0.91439998" />
+      <stop
+         id="stop1448"
+         style="stop-color:#9bb0d8;stop-opacity:1"
+         offset="0.9562" />
+      <stop
+         id="stop1450"
+         style="stop-color:#7a95cb;stop-opacity:1"
+         offset="0.99680001" />
+      <stop
+         id="stop1452"
+         style="stop-color:#7792ca;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="198.6104"
+       cy="674.43457"
+       r="20.9529"
+       id="SVGID_63_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9092,0.2908,-0.2908,0.9092,55.1576,-520.1451)">
+      <stop
+         id="stop1459"
+         style="stop-color:#0b1929;stop-opacity:0"
+         offset="0.41209999" />
+      <stop
+         id="stop1461"
+         style="stop-color:#0a1827;stop-opacity:0.53789997"
+         offset="0.58490002" />
+      <stop
+         id="stop1463"
+         style="stop-color:#091420;stop-opacity:0.7317"
+         offset="0.64719999" />
+      <stop
+         id="stop1465"
+         style="stop-color:#060d15;stop-opacity:0.86940002"
+         offset="0.69139999" />
+      <stop
+         id="stop1467"
+         style="stop-color:#010204;stop-opacity:0.98030001"
+         offset="0.727" />
+      <stop
+         id="stop1469"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0.73329997" />
+      <stop
+         id="stop1471"
+         style="stop-color:#03080d;stop-opacity:0.61080003"
+         offset="0.78759998" />
+      <stop
+         id="stop1473"
+         style="stop-color:#0b1929;stop-opacity:0"
+         offset="0.87269998" />
+    </radialGradient>
+    <radialGradient
+       cx="44.429699"
+       cy="1121.793"
+       r="28.879"
+       id="SVGID_64_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9545,0,0,0.9545,-0.1888,-930.3677)">
+      <stop
+         id="stop1478"
+         style="stop-color:#b4cb80;stop-opacity:0"
+         offset="0.33329999" />
+      <stop
+         id="stop1480"
+         style="stop-color:#60bd71;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="42.491199"
+       cy="1133.0498"
+       r="18.6443"
+       id="SVGID_65_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9545,0,0,0.9545,-0.1888,-930.3677)">
+      <stop
+         id="stop1485"
+         style="stop-color:#9fcb40;stop-opacity:0"
+         offset="0.33329999" />
+      <stop
+         id="stop1487"
+         style="stop-color:#458691;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="42.109402"
+       cy="1224.0742"
+       r="9.9401999"
+       id="SVGID_66_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9545,0,0,0.8789,-0.1888,-933.7701)">
+      <stop
+         id="stop1498"
+         style="stop-color:#eef8fb;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop1500"
+         style="stop-color:#ecf7fa;stop-opacity:0.491"
+         offset="0.509" />
+      <stop
+         id="stop1502"
+         style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+         offset="0.69239998" />
+      <stop
+         id="stop1504"
+         style="stop-color:#daf0f4;stop-opacity:0.177"
+         offset="0.82300001" />
+      <stop
+         id="stop1506"
+         style="stop-color:#c9e9ef;stop-opacity:0.0721"
+         offset="0.92790002" />
+      <stop
+         id="stop1508"
+         style="stop-color:#b8e2e9;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="42.110901"
+       cy="1223.4004"
+       r="7.2747002"
+       id="SVGID_67_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9545,0,0,0.8789,-0.1888,-933.7701)">
+      <stop
+         id="stop1513"
+         style="stop-color:#eef8fb;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop1515"
+         style="stop-color:#ecf7fa;stop-opacity:0.491"
+         offset="0.509" />
+      <stop
+         id="stop1517"
+         style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+         offset="0.69239998" />
+      <stop
+         id="stop1519"
+         style="stop-color:#daf0f4;stop-opacity:0.177"
+         offset="0.82300001" />
+      <stop
+         id="stop1521"
+         style="stop-color:#c9e9ef;stop-opacity:0.0721"
+         offset="0.92790002" />
+      <stop
+         id="stop1523"
+         style="stop-color:#b8e2e9;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="43.5"
+       cy="1121.7168"
+       r="4.9622002"
+       id="SVGID_68_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9545,0,0,0.9545,-0.1888,-930.3677)">
+      <stop
+         id="stop1528"
+         style="stop-color:#eef8fb;stop-opacity:1"
+         offset="0.2667" />
+      <stop
+         id="stop1530"
+         style="stop-color:#edf7f8;stop-opacity:0.80159998"
+         offset="0.4122" />
+      <stop
+         id="stop1532"
+         style="stop-color:#e9f5ee;stop-opacity:0.65249997"
+         offset="0.52149999" />
+      <stop
+         id="stop1534"
+         style="stop-color:#e2f1de;stop-opacity:0.51959997"
+         offset="0.61900002" />
+      <stop
+         id="stop1536"
+         style="stop-color:#d8ecc7;stop-opacity:0.396"
+         offset="0.70959997" />
+      <stop
+         id="stop1538"
+         style="stop-color:#cce4aa;stop-opacity:0.2789"
+         offset="0.79540002" />
+      <stop
+         id="stop1540"
+         style="stop-color:#bcdc86;stop-opacity:0.16670001"
+         offset="0.87769997" />
+      <stop
+         id="stop1542"
+         style="stop-color:#abd25b;stop-opacity:0.0604"
+         offset="0.95569998" />
+      <stop
+         id="stop1544"
+         style="stop-color:#9fcb40;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="251.91409"
+       cy="898.89258"
+       r="6.8579001"
+       id="SVGID_69_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0826,0.3949,-0.3271,0.8967,54.9292,-746.3787)">
+      <stop
+         id="stop1551"
+         style="stop-color:#46c3d6;stop-opacity:0.74000001"
+         offset="0.2667" />
+      <stop
+         id="stop1553"
+         style="stop-color:#48c3d3;stop-opacity:0.57990003"
+         offset="0.4253" />
+      <stop
+         id="stop1555"
+         style="stop-color:#4dc4c9;stop-opacity:0.45969999"
+         offset="0.54439998" />
+      <stop
+         id="stop1557"
+         style="stop-color:#57c5b9;stop-opacity:0.35249999"
+         offset="0.65069997" />
+      <stop
+         id="stop1559"
+         style="stop-color:#65c6a2;stop-opacity:0.2529"
+         offset="0.74940002" />
+      <stop
+         id="stop1561"
+         style="stop-color:#76c785;stop-opacity:0.1584"
+         offset="0.84299999" />
+      <stop
+         id="stop1563"
+         style="stop-color:#8bc961;stop-opacity:0.0692"
+         offset="0.9314" />
+      <stop
+         id="stop1565"
+         style="stop-color:#9fcb40;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="-1457.8711"
+       cy="915.73053"
+       r="9.2501001"
+       id="SVGID_70_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.0134,-1.0958,0.7445,0.0091,-608.7991,-1451.4426)">
+      <stop
+         id="stop1572"
+         style="stop-color:#1d3c6e;stop-opacity:0.36000001"
+         offset="0.54549998" />
+      <stop
+         id="stop1574"
+         style="stop-color:#30486d;stop-opacity:0.433"
+         offset="0.56900001" />
+      <stop
+         id="stop1576"
+         style="stop-color:#46566b;stop-opacity:0.54839998"
+         offset="0.60610002" />
+      <stop
+         id="stop1578"
+         style="stop-color:#56606a;stop-opacity:0.67330003"
+         offset="0.64630002" />
+      <stop
+         id="stop1580"
+         style="stop-color:#606669;stop-opacity:0.81339997"
+         offset="0.69139999" />
+      <stop
+         id="stop1582"
+         style="stop-color:#636869;stop-opacity:1"
+         offset="0.75150001" />
+      <stop
+         id="stop1584"
+         style="stop-color:#51c1bc;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="-1385.915"
+       cy="1234.9062"
+       r="12.6932"
+       id="SVGID_71_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.222,-0.9284,0.9284,0.222,-789.3549,-1407.3914)">
+      <stop
+         id="stop1589"
+         style="stop-color:#040506;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop1591"
+         style="stop-color:#050709;stop-opacity:1"
+         offset="0.3195" />
+      <stop
+         id="stop1593"
+         style="stop-color:#070c13;stop-opacity:1"
+         offset="0.55989999" />
+      <stop
+         id="stop1595"
+         style="stop-color:#0a1523;stop-opacity:1"
+         offset="0.77380002" />
+      <stop
+         id="stop1597"
+         style="stop-color:#0b1929;stop-opacity:1"
+         offset="0.83639997" />
+      <stop
+         id="stop1599"
+         style="stop-color:#23474c;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="-1698.0078"
+       cy="543.31049"
+       r="1.7839"
+       id="SVGID_72_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.0307,-0.954,0.954,-0.0307,-546.501,-1450.8168)">
+      <stop
+         id="stop1606"
+         style="stop-color:#040506;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop1608"
+         style="stop-color:#050709;stop-opacity:1"
+         offset="0.3195" />
+      <stop
+         id="stop1610"
+         style="stop-color:#070c13;stop-opacity:1"
+         offset="0.55989999" />
+      <stop
+         id="stop1612"
+         style="stop-color:#0a1523;stop-opacity:1"
+         offset="0.77380002" />
+      <stop
+         id="stop1614"
+         style="stop-color:#0b1929;stop-opacity:1"
+         offset="0.83639997" />
+      <stop
+         id="stop1616"
+         style="stop-color:#23474c;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="36.046902"
+       cy="1162.3555"
+       r="16.099899"
+       id="SVGID_73_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop1629"
+         style="stop-color:#d5e2ee;stop-opacity:1"
+         offset="0.77579999" />
+      <stop
+         id="stop1631"
+         style="stop-color:#d1dfed;stop-opacity:1"
+         offset="0.82630002" />
+      <stop
+         id="stop1633"
+         style="stop-color:#c7d6e8;stop-opacity:1"
+         offset="0.8714" />
+      <stop
+         id="stop1635"
+         style="stop-color:#b4c6e1;stop-opacity:1"
+         offset="0.91439998" />
+      <stop
+         id="stop1637"
+         style="stop-color:#9bb0d8;stop-opacity:1"
+         offset="0.9562" />
+      <stop
+         id="stop1639"
+         style="stop-color:#7a95cb;stop-opacity:1"
+         offset="0.99680001" />
+      <stop
+         id="stop1641"
+         style="stop-color:#7792ca;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="201.5274"
+       cy="704.25879"
+       r="18.0959"
+       id="SVGID_74_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9525,0.3046,-0.3046,0.9525,81.9305,-503.3005)">
+      <stop
+         id="stop1648"
+         style="stop-color:#0b1929;stop-opacity:0"
+         offset="0.41209999" />
+      <stop
+         id="stop1650"
+         style="stop-color:#0a1827;stop-opacity:0.53789997"
+         offset="0.58490002" />
+      <stop
+         id="stop1652"
+         style="stop-color:#091420;stop-opacity:0.7317"
+         offset="0.64719999" />
+      <stop
+         id="stop1654"
+         style="stop-color:#060d15;stop-opacity:0.86940002"
+         offset="0.69139999" />
+      <stop
+         id="stop1656"
+         style="stop-color:#010204;stop-opacity:0.98030001"
+         offset="0.727" />
+      <stop
+         id="stop1658"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0.73329997" />
+      <stop
+         id="stop1660"
+         style="stop-color:#03080d;stop-opacity:0.61080003"
+         offset="0.78759998" />
+      <stop
+         id="stop1662"
+         style="stop-color:#0b1929;stop-opacity:0"
+         offset="0.87269998" />
+    </radialGradient>
+    <radialGradient
+       cx="37.725601"
+       cy="1152.4668"
+       r="24.938801"
+       id="SVGID_75_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop1667"
+         style="stop-color:#b4cb80;stop-opacity:0"
+         offset="0.33329999" />
+      <stop
+         id="stop1669"
+         style="stop-color:#60bd71;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="36.048901"
+       cy="1162.1797"
+       r="16.099899"
+       id="SVGID_76_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop1674"
+         style="stop-color:#a0539f;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop1676"
+         style="stop-color:#7452a1;stop-opacity:1"
+         offset="0.29089999" />
+      <stop
+         id="stop1678"
+         style="stop-color:#2b2976;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="-1415.6758"
+       cy="-473.60889"
+       r="7.9875002"
+       id="SVGID_77_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9618,-0.6268,0.4259,-0.6535,-1092.6766,-975.8175)">
+      <stop
+         id="stop1683"
+         style="stop-color:#1d3c6e;stop-opacity:0.36000001"
+         offset="0.54549998" />
+      <stop
+         id="stop1685"
+         style="stop-color:#30486d;stop-opacity:0.433"
+         offset="0.56900001" />
+      <stop
+         id="stop1687"
+         style="stop-color:#46566b;stop-opacity:0.54839998"
+         offset="0.60610002" />
+      <stop
+         id="stop1689"
+         style="stop-color:#56606a;stop-opacity:0.67330003"
+         offset="0.64630002" />
+      <stop
+         id="stop1691"
+         style="stop-color:#606669;stop-opacity:0.81339997"
+         offset="0.69139999" />
+      <stop
+         id="stop1693"
+         style="stop-color:#636869;stop-opacity:1"
+         offset="0.75150001" />
+      <stop
+         id="stop1695"
+         style="stop-color:#51c1bc;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="-1569.333"
+       cy="121.5645"
+       r="10.9626"
+       id="SVGID_78_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.7488,-0.6628,0.6628,-0.7488,-1190.2952,-726.3312)">
+      <stop
+         id="stop1706"
+         style="stop-color:#090609;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop1708"
+         style="stop-color:#0b070c;stop-opacity:1"
+         offset="0.33090001" />
+      <stop
+         id="stop1710"
+         style="stop-color:#120916;stop-opacity:1"
+         offset="0.57990003" />
+      <stop
+         id="stop1712"
+         style="stop-color:#1e0d26;stop-opacity:1"
+         offset="0.80140001" />
+      <stop
+         id="stop1714"
+         style="stop-color:#200e29;stop-opacity:1"
+         offset="0.83639997" />
+      <stop
+         id="stop1716"
+         style="stop-color:#3f234c;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="35.719799"
+       cy="1257.248"
+       r="8.5857"
+       id="SVGID_79_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9207,24,-936.5648)">
+      <stop
+         id="stop1721"
+         style="stop-color:#eef8fb;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop1723"
+         style="stop-color:#ecf7fa;stop-opacity:0.491"
+         offset="0.509" />
+      <stop
+         id="stop1725"
+         style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+         offset="0.69239998" />
+      <stop
+         id="stop1727"
+         style="stop-color:#daf0f4;stop-opacity:0.177"
+         offset="0.82300001" />
+      <stop
+         id="stop1729"
+         style="stop-color:#c9e9ef;stop-opacity:0.0721"
+         offset="0.92790002" />
+      <stop
+         id="stop1731"
+         style="stop-color:#b8e2e9;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="35.719799"
+       cy="1256.666"
+       r="6.2817001"
+       id="SVGID_80_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9207,24,-936.5648)">
+      <stop
+         id="stop1736"
+         style="stop-color:#eef8fb;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop1738"
+         style="stop-color:#ecf7fa;stop-opacity:0.491"
+         offset="0.509" />
+      <stop
+         id="stop1740"
+         style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+         offset="0.69239998" />
+      <stop
+         id="stop1742"
+         style="stop-color:#daf0f4;stop-opacity:0.177"
+         offset="0.82300001" />
+      <stop
+         id="stop1744"
+         style="stop-color:#c9e9ef;stop-opacity:0.0721"
+         offset="0.92790002" />
+      <stop
+         id="stop1746"
+         style="stop-color:#b8e2e9;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="36.047901"
+       cy="1152.3936"
+       r="4.2860999"
+       id="SVGID_81_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop1751"
+         style="stop-color:#eef8fb;stop-opacity:1"
+         offset="0.2667" />
+      <stop
+         id="stop1753"
+         style="stop-color:#edf7f8;stop-opacity:0.80199999"
+         offset="0.41190001" />
+      <stop
+         id="stop1755"
+         style="stop-color:#ecf5ee;stop-opacity:0.65319997"
+         offset="0.52100003" />
+      <stop
+         id="stop1757"
+         style="stop-color:#e8f1de;stop-opacity:0.52060002"
+         offset="0.61830002" />
+      <stop
+         id="stop1759"
+         style="stop-color:#e4ecc7;stop-opacity:0.39719999"
+         offset="0.7087" />
+      <stop
+         id="stop1761"
+         style="stop-color:#dee5aa;stop-opacity:0.28040001"
+         offset="0.79430002" />
+      <stop
+         id="stop1763"
+         style="stop-color:#d7dc86;stop-opacity:0.1684"
+         offset="0.87650001" />
+      <stop
+         id="stop1765"
+         style="stop-color:#cfd25c;stop-opacity:0.0623"
+         offset="0.95429999" />
+      <stop
+         id="stop1767"
+         style="stop-color:#c9cb3f;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="255.62109"
+       cy="927.11517"
+       r="5.9238"
+       id="SVGID_82_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1342,0.4137,-0.3427,0.9394,81.7425,-740.2545)">
+      <stop
+         id="stop1774"
+         style="stop-color:#4cb4e1;stop-opacity:0.58999997"
+         offset="0.2667" />
+      <stop
+         id="stop1776"
+         style="stop-color:#4eb1df;stop-opacity:0.43200001"
+         offset="0.463" />
+      <stop
+         id="stop1778"
+         style="stop-color:#55a7d8;stop-opacity:0.3134"
+         offset="0.61040002" />
+      <stop
+         id="stop1780"
+         style="stop-color:#6097ce;stop-opacity:0.2077"
+         offset="0.74190003" />
+      <stop
+         id="stop1782"
+         style="stop-color:#7080be;stop-opacity:0.1094"
+         offset="0.86400002" />
+      <stop
+         id="stop1784"
+         style="stop-color:#8463aa;stop-opacity:0.0171"
+         offset="0.97869998" />
+      <stop
+         id="stop1786"
+         style="stop-color:#885da6;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="-654.77441"
+       cy="1235.373"
+       r="1.5423"
+       id="SVGID_83_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.864,-0.5034,0.5034,0.864,-3.3111,-1180.5216)">
+      <stop
+         id="stop1795"
+         style="stop-color:#040506;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop1797"
+         style="stop-color:#050709;stop-opacity:1"
+         offset="0.3195" />
+      <stop
+         id="stop1799"
+         style="stop-color:#070c13;stop-opacity:1"
+         offset="0.55989999" />
+      <stop
+         id="stop1801"
+         style="stop-color:#0a1523;stop-opacity:1"
+         offset="0.77380002" />
+      <stop
+         id="stop1803"
+         style="stop-color:#0b1929;stop-opacity:1"
+         offset="0.83639997" />
+      <stop
+         id="stop1805"
+         style="stop-color:#23474c;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="193.4532"
+       cy="1047.2227"
+       r="17.569799"
+       id="SVGID_84_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop1818"
+         style="stop-color:#d5e2ee;stop-opacity:1"
+         offset="0.77579999" />
+      <stop
+         id="stop1820"
+         style="stop-color:#d1dfed;stop-opacity:1"
+         offset="0.82630002" />
+      <stop
+         id="stop1822"
+         style="stop-color:#c7d6e8;stop-opacity:1"
+         offset="0.8714" />
+      <stop
+         id="stop1824"
+         style="stop-color:#b4c6e1;stop-opacity:1"
+         offset="0.91439998" />
+      <stop
+         id="stop1826"
+         style="stop-color:#9bb0d8;stop-opacity:1"
+         offset="0.9562" />
+      <stop
+         id="stop1828"
+         style="stop-color:#7a95cb;stop-opacity:1"
+         offset="0.99680001" />
+      <stop
+         id="stop1830"
+         style="stop-color:#7792ca;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="-1524.9443"
+       cy="266.93661"
+       r="20.006599"
+       id="SVGID_85_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.0099,-1,1,0.0099,-35.0023,-1413.4995)">
+      <stop
+         id="stop1837"
+         style="stop-color:#0b1929;stop-opacity:0"
+         offset="0.41209999" />
+      <stop
+         id="stop1839"
+         style="stop-color:#0a1827;stop-opacity:0.53789997"
+         offset="0.58490002" />
+      <stop
+         id="stop1841"
+         style="stop-color:#091420;stop-opacity:0.7317"
+         offset="0.64719999" />
+      <stop
+         id="stop1843"
+         style="stop-color:#060d15;stop-opacity:0.86940002"
+         offset="0.69139999" />
+      <stop
+         id="stop1845"
+         style="stop-color:#010204;stop-opacity:0.98030001"
+         offset="0.727" />
+      <stop
+         id="stop1847"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0.73329997" />
+      <stop
+         id="stop1849"
+         style="stop-color:#03080d;stop-opacity:0.61080003"
+         offset="0.78759998" />
+      <stop
+         id="stop1851"
+         style="stop-color:#0b1929;stop-opacity:0"
+         offset="0.87269998" />
+    </radialGradient>
+    <radialGradient
+       cx="195.2852"
+       cy="1036.4297"
+       r="27.218201"
+       id="SVGID_86_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop1856"
+         style="stop-color:#b4cb80;stop-opacity:0"
+         offset="0.33329999" />
+      <stop
+         id="stop1858"
+         style="stop-color:#60bd71;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="193.4532"
+       cy="1047.0293"
+       r="17.570299"
+       id="SVGID_87_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop1863"
+         style="stop-color:#9fcb40;stop-opacity:0"
+         offset="0.33329999" />
+      <stop
+         id="stop1865"
+         style="stop-color:#458691;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="193.6265"
+       cy="1131.9355"
+       r="9.3683996"
+       id="SVGID_88_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9207,24,-936.5648)">
+      <stop
+         id="stop1876"
+         style="stop-color:#eef8fb;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop1878"
+         style="stop-color:#ecf7fa;stop-opacity:0.491"
+         offset="0.509" />
+      <stop
+         id="stop1880"
+         style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+         offset="0.69239998" />
+      <stop
+         id="stop1882"
+         style="stop-color:#daf0f4;stop-opacity:0.177"
+         offset="0.82300001" />
+      <stop
+         id="stop1884"
+         style="stop-color:#c9e9ef;stop-opacity:0.0721"
+         offset="0.92790002" />
+      <stop
+         id="stop1886"
+         style="stop-color:#b8e2e9;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="193.3179"
+       cy="1130.7344"
+       r="6.8551998"
+       id="SVGID_89_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9207,24,-936.5648)">
+      <stop
+         id="stop1891"
+         style="stop-color:#eef8fb;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop1893"
+         style="stop-color:#ecf7fa;stop-opacity:0.491"
+         offset="0.509" />
+      <stop
+         id="stop1895"
+         style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+         offset="0.69239998" />
+      <stop
+         id="stop1897"
+         style="stop-color:#daf0f4;stop-opacity:0.177"
+         offset="0.82300001" />
+      <stop
+         id="stop1899"
+         style="stop-color:#c9e9ef;stop-opacity:0.0721"
+         offset="0.92790002" />
+      <stop
+         id="stop1901"
+         style="stop-color:#b8e2e9;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="192.69051"
+       cy="1035.5732"
+       r="4.6777"
+       id="SVGID_90_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop1906"
+         style="stop-color:#eef8fb;stop-opacity:1"
+         offset="0.2667" />
+      <stop
+         id="stop1908"
+         style="stop-color:#edf7f8;stop-opacity:0.80159998"
+         offset="0.4122" />
+      <stop
+         id="stop1910"
+         style="stop-color:#e9f5ee;stop-opacity:0.65249997"
+         offset="0.52149999" />
+      <stop
+         id="stop1912"
+         style="stop-color:#e2f1de;stop-opacity:0.51959997"
+         offset="0.61900002" />
+      <stop
+         id="stop1914"
+         style="stop-color:#d8ecc7;stop-opacity:0.396"
+         offset="0.70959997" />
+      <stop
+         id="stop1916"
+         style="stop-color:#cce4aa;stop-opacity:0.2789"
+         offset="0.79540002" />
+      <stop
+         id="stop1918"
+         style="stop-color:#bcdc86;stop-opacity:0.16670001"
+         offset="0.87769997" />
+      <stop
+         id="stop1920"
+         style="stop-color:#abd25b;stop-opacity:0.0604"
+         offset="0.95569998" />
+      <stop
+         id="stop1922"
+         style="stop-color:#9fcb40;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="-255.87691"
+       cy="1154.1875"
+       r="8.5684004"
+       id="SVGID_91_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1333,-0.416,0.3445,0.9387,114.2,-1067.6246)">
+      <stop
+         id="stop1929"
+         style="stop-color:#46c3d6;stop-opacity:0.57999998"
+         offset="0.2667" />
+      <stop
+         id="stop1931"
+         style="stop-color:#48c3d3;stop-opacity:0.45449999"
+         offset="0.4253" />
+      <stop
+         id="stop1933"
+         style="stop-color:#4dc4c9;stop-opacity:0.3603"
+         offset="0.54439998" />
+      <stop
+         id="stop1935"
+         style="stop-color:#57c5b9;stop-opacity:0.27630001"
+         offset="0.65069997" />
+      <stop
+         id="stop1937"
+         style="stop-color:#65c6a2;stop-opacity:0.1982"
+         offset="0.74940002" />
+      <stop
+         id="stop1939"
+         style="stop-color:#76c785;stop-opacity:0.1242"
+         offset="0.84299999" />
+      <stop
+         id="stop1941"
+         style="stop-color:#8bc961;stop-opacity:0.0542"
+         offset="0.9314" />
+      <stop
+         id="stop1943"
+         style="stop-color:#9fcb40;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="656.46191"
+       cy="107.9346"
+       r="8.1566"
+       id="SVGID_92_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6253,0.9628,-0.6615,0.4297,-133.8877,-557.1061)">
+      <stop
+         id="stop1950"
+         style="stop-color:#1d3c6e;stop-opacity:0.36000001"
+         offset="0.44240001" />
+      <stop
+         id="stop1952"
+         style="stop-color:#1e3c6e;stop-opacity:0.36379999"
+         offset="0.44400001" />
+      <stop
+         id="stop1954"
+         style="stop-color:#3c4f6c;stop-opacity:0.53109998"
+         offset="0.51209998" />
+      <stop
+         id="stop1956"
+         style="stop-color:#525d6a;stop-opacity:0.6954"
+         offset="0.579" />
+      <stop
+         id="stop1958"
+         style="stop-color:#5f6569;stop-opacity:0.85390002"
+         offset="0.64349997" />
+      <stop
+         id="stop1960"
+         style="stop-color:#636869;stop-opacity:1"
+         offset="0.70300001" />
+      <stop
+         id="stop1962"
+         style="stop-color:#5c8b8a;stop-opacity:0.57340002"
+         offset="0.79869998" />
+      <stop
+         id="stop1964"
+         style="stop-color:#51c1bc;stop-opacity:0"
+         offset="0.92729998" />
+    </radialGradient>
+    <radialGradient
+       cx="838.99121"
+       cy="786.27252"
+       r="11.8551"
+       id="SVGID_93_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.701,0.7131,-0.7131,0.701,184.1534,-1027.8478)">
+      <stop
+         id="stop1969"
+         style="stop-color:#040506;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop1971"
+         style="stop-color:#050709;stop-opacity:1"
+         offset="0.3195" />
+      <stop
+         id="stop1973"
+         style="stop-color:#070c13;stop-opacity:1"
+         offset="0.55989999" />
+      <stop
+         id="stop1975"
+         style="stop-color:#0a1523;stop-opacity:1"
+         offset="0.77380002" />
+      <stop
+         id="stop1977"
+         style="stop-color:#0b1929;stop-opacity:1"
+         offset="0.83639997" />
+      <stop
+         id="stop1979"
+         style="stop-color:#23474c;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="819.78131"
+       cy="-53.2729"
+       r="2.1991999"
+       id="SVGID_94_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3888,0.9213,-0.9213,0.3888,-136.7975,-625.9019)">
+      <stop
+         id="stop1986"
+         style="stop-color:#040506;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop1988"
+         style="stop-color:#050709;stop-opacity:1"
+         offset="0.3195" />
+      <stop
+         id="stop1990"
+         style="stop-color:#070c13;stop-opacity:1"
+         offset="0.55989999" />
+      <stop
+         id="stop1992"
+         style="stop-color:#0a1523;stop-opacity:1"
+         offset="0.77380002" />
+      <stop
+         id="stop1994"
+         style="stop-color:#0b1929;stop-opacity:1"
+         offset="0.83639997" />
+      <stop
+         id="stop1996"
+         style="stop-color:#23474c;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="233.9688"
+       cy="1098.083"
+       r="16.732401"
+       id="SVGID_95_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop2007"
+         style="stop-color:#d5e2ee;stop-opacity:1"
+         offset="0.77579999" />
+      <stop
+         id="stop2009"
+         style="stop-color:#d1dfed;stop-opacity:1"
+         offset="0.82630002" />
+      <stop
+         id="stop2011"
+         style="stop-color:#c7d6e8;stop-opacity:1"
+         offset="0.8714" />
+      <stop
+         id="stop2013"
+         style="stop-color:#b4c6e1;stop-opacity:1"
+         offset="0.91439998" />
+      <stop
+         id="stop2015"
+         style="stop-color:#9bb0d8;stop-opacity:1"
+         offset="0.9562" />
+      <stop
+         id="stop2017"
+         style="stop-color:#7a95cb;stop-opacity:1"
+         offset="0.99680001" />
+      <stop
+         id="stop2019"
+         style="stop-color:#7792ca;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="-1575.4067"
+       cy="307.98541"
+       r="19.052401"
+       id="SVGID_96_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.0099,-1,1,0.0099,-35.0023,-1413.4995)">
+      <stop
+         id="stop2026"
+         style="stop-color:#0b1929;stop-opacity:0"
+         offset="0.41209999" />
+      <stop
+         id="stop2028"
+         style="stop-color:#0a1827;stop-opacity:0.53789997"
+         offset="0.58490002" />
+      <stop
+         id="stop2030"
+         style="stop-color:#091420;stop-opacity:0.7317"
+         offset="0.64719999" />
+      <stop
+         id="stop2032"
+         style="stop-color:#060d15;stop-opacity:0.86940002"
+         offset="0.69139999" />
+      <stop
+         id="stop2034"
+         style="stop-color:#010204;stop-opacity:0.98030001"
+         offset="0.727" />
+      <stop
+         id="stop2036"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0.73329997" />
+      <stop
+         id="stop2038"
+         style="stop-color:#03080d;stop-opacity:0.61080003"
+         offset="0.78759998" />
+      <stop
+         id="stop2040"
+         style="stop-color:#0b1929;stop-opacity:0"
+         offset="0.87269998" />
+    </radialGradient>
+    <radialGradient
+       cx="235.7149"
+       cy="1087.8047"
+       r="25.9212"
+       id="SVGID_97_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop2045"
+         style="stop-color:#b4cb80;stop-opacity:0"
+         offset="0.33329999" />
+      <stop
+         id="stop2047"
+         style="stop-color:#60bd71;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="233.9727"
+       cy="1097.9004"
+       r="16.732401"
+       id="SVGID_98_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop2052"
+         style="stop-color:#9fcb40;stop-opacity:0"
+         offset="0.33329999" />
+      <stop
+         id="stop2054"
+         style="stop-color:#458691;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="234.4854"
+       cy="1187.084"
+       r="8.9224005"
+       id="SVGID_99_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9207,24,-936.5648)">
+      <stop
+         id="stop2065"
+         style="stop-color:#eef8fb;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2067"
+         style="stop-color:#ecf7fa;stop-opacity:0.491"
+         offset="0.509" />
+      <stop
+         id="stop2069"
+         style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+         offset="0.69239998" />
+      <stop
+         id="stop2071"
+         style="stop-color:#daf0f4;stop-opacity:0.177"
+         offset="0.82300001" />
+      <stop
+         id="stop2073"
+         style="stop-color:#c9e9ef;stop-opacity:0.0721"
+         offset="0.92790002" />
+      <stop
+         id="stop2075"
+         style="stop-color:#b8e2e9;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="233.62891"
+       cy="1186.4785"
+       r="6.5303001"
+       id="SVGID_100_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9207,24,-936.5648)">
+      <stop
+         id="stop2080"
+         style="stop-color:#eef8fb;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2082"
+         style="stop-color:#ecf7fa;stop-opacity:0.491"
+         offset="0.509" />
+      <stop
+         id="stop2084"
+         style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+         offset="0.69239998" />
+      <stop
+         id="stop2086"
+         style="stop-color:#daf0f4;stop-opacity:0.177"
+         offset="0.82300001" />
+      <stop
+         id="stop2088"
+         style="stop-color:#c9e9ef;stop-opacity:0.0721"
+         offset="0.92790002" />
+      <stop
+         id="stop2090"
+         style="stop-color:#b8e2e9;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="232.90919"
+       cy="1086.9883"
+       r="4.4551001"
+       id="SVGID_101_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop2095"
+         style="stop-color:#eef8fb;stop-opacity:1"
+         offset="0.2667" />
+      <stop
+         id="stop2097"
+         style="stop-color:#edf7f8;stop-opacity:0.80159998"
+         offset="0.4122" />
+      <stop
+         id="stop2099"
+         style="stop-color:#e9f5ee;stop-opacity:0.65249997"
+         offset="0.52149999" />
+      <stop
+         id="stop2101"
+         style="stop-color:#e2f1de;stop-opacity:0.51959997"
+         offset="0.61900002" />
+      <stop
+         id="stop2103"
+         style="stop-color:#d8ecc7;stop-opacity:0.396"
+         offset="0.70959997" />
+      <stop
+         id="stop2105"
+         style="stop-color:#cce4aa;stop-opacity:0.2789"
+         offset="0.79540002" />
+      <stop
+         id="stop2107"
+         style="stop-color:#bcdc86;stop-opacity:0.16670001"
+         offset="0.87769997" />
+      <stop
+         id="stop2109"
+         style="stop-color:#abd25b;stop-opacity:0.0604"
+         offset="0.95569998" />
+      <stop
+         id="stop2111"
+         style="stop-color:#9fcb40;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="-406.88571"
+       cy="1224.5635"
+       r="6.3197999"
+       id="SVGID_102_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.042,-0.6097,0.505,0.8631,69.3665,-1130.8982)">
+      <stop
+         id="stop2118"
+         style="stop-color:#46c3d6;stop-opacity:0.57999998"
+         offset="0.2667" />
+      <stop
+         id="stop2120"
+         style="stop-color:#48c3d3;stop-opacity:0.45449999"
+         offset="0.4253" />
+      <stop
+         id="stop2122"
+         style="stop-color:#4dc4c9;stop-opacity:0.3603"
+         offset="0.54439998" />
+      <stop
+         id="stop2124"
+         style="stop-color:#57c5b9;stop-opacity:0.27630001"
+         offset="0.65069997" />
+      <stop
+         id="stop2126"
+         style="stop-color:#65c6a2;stop-opacity:0.1982"
+         offset="0.74940002" />
+      <stop
+         id="stop2128"
+         style="stop-color:#76c785;stop-opacity:0.1242"
+         offset="0.84299999" />
+      <stop
+         id="stop2130"
+         style="stop-color:#8bc961;stop-opacity:0.0542"
+         offset="0.9314" />
+      <stop
+         id="stop2132"
+         style="stop-color:#9fcb40;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="369.51569"
+       cy="-675.33942"
+       r="7.7596998"
+       id="SVGID_103_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1013,1.1436,-0.7858,0.0696,-321.7245,-209.3378)">
+      <stop
+         id="stop2139"
+         style="stop-color:#1d3c6e;stop-opacity:0.36000001"
+         offset="0.44240001" />
+      <stop
+         id="stop2141"
+         style="stop-color:#1e3c6e;stop-opacity:0.36379999"
+         offset="0.44400001" />
+      <stop
+         id="stop2143"
+         style="stop-color:#3c4f6c;stop-opacity:0.53109998"
+         offset="0.51209998" />
+      <stop
+         id="stop2145"
+         style="stop-color:#525d6a;stop-opacity:0.6954"
+         offset="0.579" />
+      <stop
+         id="stop2147"
+         style="stop-color:#5f6569;stop-opacity:0.85390002"
+         offset="0.64349997" />
+      <stop
+         id="stop2149"
+         style="stop-color:#636869;stop-opacity:1"
+         offset="0.70300001" />
+      <stop
+         id="stop2151"
+         style="stop-color:#5c8b8a;stop-opacity:0.57340002"
+         offset="0.79869998" />
+      <stop
+         id="stop2153"
+         style="stop-color:#51c1bc;stop-opacity:0"
+         offset="0.92729998" />
+    </radialGradient>
+    <radialGradient
+       cx="875.74609"
+       cy="41.253899"
+       r="11.2916"
+       id="SVGID_104_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.108,0.9941,-0.9941,0.108,194.9519,-708.9521)">
+      <stop
+         id="stop2158"
+         style="stop-color:#040506;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2160"
+         style="stop-color:#050709;stop-opacity:1"
+         offset="0.3195" />
+      <stop
+         id="stop2162"
+         style="stop-color:#070c13;stop-opacity:1"
+         offset="0.55989999" />
+      <stop
+         id="stop2164"
+         style="stop-color:#0a1523;stop-opacity:1"
+         offset="0.77380002" />
+      <stop
+         id="stop2166"
+         style="stop-color:#0b1929;stop-opacity:1"
+         offset="0.83639997" />
+      <stop
+         id="stop2168"
+         style="stop-color:#23474c;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="786.28912"
+       cy="-464.43109"
+       r="2.0952001"
+       id="SVGID_105_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.0425,0.999,-0.999,0.0425,-225.4858,-600.7423)">
+      <stop
+         id="stop2175"
+         style="stop-color:#040506;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2177"
+         style="stop-color:#050709;stop-opacity:1"
+         offset="0.3195" />
+      <stop
+         id="stop2179"
+         style="stop-color:#070c13;stop-opacity:1"
+         offset="0.55989999" />
+      <stop
+         id="stop2181"
+         style="stop-color:#0a1523;stop-opacity:1"
+         offset="0.77380002" />
+      <stop
+         id="stop2183"
+         style="stop-color:#0b1929;stop-opacity:1"
+         offset="0.83639997" />
+      <stop
+         id="stop2185"
+         style="stop-color:#23474c;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <linearGradient
+       x1="106.7686"
+       y1="1084.6729"
+       x2="82.351196"
+       y2="1004.8064"
+       id="SVGID_106_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop2198"
+         style="stop-color:#202d36;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2200"
+         style="stop-color:#517287;stop-opacity:1"
+         offset="0.0848" />
+      <stop
+         id="stop2202"
+         style="stop-color:#6e8b9d;stop-opacity:1"
+         offset="0.1039" />
+      <stop
+         id="stop2204"
+         style="stop-color:#8da7b5;stop-opacity:1"
+         offset="0.1295" />
+      <stop
+         id="stop2206"
+         style="stop-color:#a9bfca;stop-opacity:1"
+         offset="0.1585" />
+      <stop
+         id="stop2208"
+         style="stop-color:#bfd2db;stop-opacity:1"
+         offset="0.1913" />
+      <stop
+         id="stop2210"
+         style="stop-color:#d0e1e7;stop-opacity:1"
+         offset="0.2295" />
+      <stop
+         id="stop2212"
+         style="stop-color:#dbebf0;stop-opacity:1"
+         offset="0.27680001" />
+      <stop
+         id="stop2214"
+         style="stop-color:#e2f1f6;stop-opacity:1"
+         offset="0.34310001" />
+      <stop
+         id="stop2216"
+         style="stop-color:#e4f3f7;stop-opacity:1"
+         offset="0.5273" />
+    </linearGradient>
+    <radialGradient
+       cx="87.385803"
+       cy="1019.8359"
+       r="38.459099"
+       id="SVGID_107_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop2223"
+         style="stop-color:#46c3d6;stop-opacity:0.74000001"
+         offset="0" />
+      <stop
+         id="stop2225"
+         style="stop-color:#48c3d3;stop-opacity:0.57990003"
+         offset="0.1036" />
+      <stop
+         id="stop2227"
+         style="stop-color:#4dc4c9;stop-opacity:0.45969999"
+         offset="0.1813" />
+      <stop
+         id="stop2229"
+         style="stop-color:#57c5b9;stop-opacity:0.35249999"
+         offset="0.2507" />
+      <stop
+         id="stop2231"
+         style="stop-color:#65c6a2;stop-opacity:0.2529"
+         offset="0.3152" />
+      <stop
+         id="stop2233"
+         style="stop-color:#76c785;stop-opacity:0.1584"
+         offset="0.37630001" />
+      <stop
+         id="stop2235"
+         style="stop-color:#8bc961;stop-opacity:0.0692"
+         offset="0.43399999" />
+      <stop
+         id="stop2237"
+         style="stop-color:#9fcb40;stop-opacity:0"
+         offset="0.4788" />
+    </radialGradient>
+    <linearGradient
+       x1="105.2149"
+       y1="1075.0869"
+       x2="88.587303"
+       y2="1023.8326"
+       id="SVGID_108_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop2242"
+         style="stop-color:#141a2b;stop-opacity:1"
+         offset="0.1636" />
+      <stop
+         id="stop2244"
+         style="stop-color:#142f3a;stop-opacity:0.82499999"
+         offset="0.3161" />
+      <stop
+         id="stop2246"
+         style="stop-color:#143e45;stop-opacity:0.63"
+         offset="0.486" />
+      <stop
+         id="stop2248"
+         style="stop-color:#14464b;stop-opacity:0.39840001"
+         offset="0.68769997" />
+      <stop
+         id="stop2250"
+         style="stop-color:#14494d;stop-opacity:0.04"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="321.3457"
+       y1="2027.7021"
+       x2="321.3457"
+       y2="1934.0166"
+       id="SVGID_109_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4376,-0.092,0.139,0.6612,-292.0062,-1162.1183)">
+      <stop
+         id="stop2255"
+         style="stop-color:#d5ebde;stop-opacity:0.87"
+         offset="0" />
+      <stop
+         id="stop2257"
+         style="stop-color:#f1f6e3;stop-opacity:0.91000003"
+         offset="0.5636" />
+      <stop
+         id="stop2259"
+         style="stop-color:#7ac587;stop-opacity:0.09"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="-583.29541"
+       y1="2096.6973"
+       x2="-583.29541"
+       y2="1999.1387"
+       id="SVGID_110_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.4079,0.1832,0.2768,0.6163,-686.8612,-1034.1141)">
+      <stop
+         id="stop2264"
+         style="stop-color:#d5ebde;stop-opacity:0.08"
+         offset="0" />
+      <stop
+         id="stop2266"
+         style="stop-color:#7ac587;stop-opacity:0.31999999"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="-169.5659"
+       y1="-1046.3184"
+       x2="-184.4361"
+       y2="-1092.1558"
+       id="SVGID_111_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.8184,-0.5747,-0.5747,-0.8184,-322.341,-768.7596)">
+      <stop
+         id="stop2281"
+         style="stop-color:#141a2b;stop-opacity:1"
+         offset="0.1636" />
+      <stop
+         id="stop2283"
+         style="stop-color:#142f3a;stop-opacity:0.82499999"
+         offset="0.3161" />
+      <stop
+         id="stop2285"
+         style="stop-color:#143e45;stop-opacity:0.63"
+         offset="0.486" />
+      <stop
+         id="stop2287"
+         style="stop-color:#14464b;stop-opacity:0.39840001"
+         offset="0.68769997" />
+      <stop
+         id="stop2289"
+         style="stop-color:#14494d;stop-opacity:0.04"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="697.91211"
+       y1="-1130.0562"
+       x2="697.91211"
+       y2="-1214.3638"
+       id="SVGID_112_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.411,-0.1762,-0.2662,-0.621,-449.3053,-399.6598)">
+      <stop
+         id="stop2294"
+         style="stop-color:#d5ebde;stop-opacity:0.87"
+         offset="0" />
+      <stop
+         id="stop2296"
+         style="stop-color:#f1f6e3;stop-opacity:0.91000003"
+         offset="0.5636" />
+      <stop
+         id="stop2298"
+         style="stop-color:#7ac587;stop-opacity:0.09"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="-1970.999"
+       y1="-935.42041"
+       x2="-1970.999"
+       y2="-1023.7095"
+       id="SVGID_113_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.4391,0.0845,-0.1277,-0.6635,-846.0248,-277.4889)">
+      <stop
+         id="stop2303"
+         style="stop-color:#d5ebde;stop-opacity:0.08"
+         offset="0" />
+      <stop
+         id="stop2305"
+         style="stop-color:#7ac587;stop-opacity:0.31999999"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="81.487297"
+       cy="997.10553"
+       r="26.946501"
+       id="SVGID_114_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop2322"
+         style="stop-color:#d5e2ee;stop-opacity:1"
+         offset="0.77579999" />
+      <stop
+         id="stop2324"
+         style="stop-color:#d1dfed;stop-opacity:1"
+         offset="0.82630002" />
+      <stop
+         id="stop2326"
+         style="stop-color:#c7d6e8;stop-opacity:1"
+         offset="0.8714" />
+      <stop
+         id="stop2328"
+         style="stop-color:#b4c6e1;stop-opacity:1"
+         offset="0.91439998" />
+      <stop
+         id="stop2330"
+         style="stop-color:#9bb0d8;stop-opacity:1"
+         offset="0.9562" />
+      <stop
+         id="stop2332"
+         style="stop-color:#7a95cb;stop-opacity:1"
+         offset="0.99680001" />
+      <stop
+         id="stop2334"
+         style="stop-color:#7792ca;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="193.94141"
+       cy="532.85938"
+       r="30.2852"
+       id="SVGID_115_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9525,0.3046,-0.3046,0.9525,81.9305,-503.3005)">
+      <stop
+         id="stop2341"
+         style="stop-color:#0b1929;stop-opacity:0"
+         offset="0.41209999" />
+      <stop
+         id="stop2343"
+         style="stop-color:#0a1827;stop-opacity:0.53789997"
+         offset="0.58490002" />
+      <stop
+         id="stop2345"
+         style="stop-color:#091420;stop-opacity:0.7317"
+         offset="0.64719999" />
+      <stop
+         id="stop2347"
+         style="stop-color:#060d15;stop-opacity:0.86940002"
+         offset="0.69139999" />
+      <stop
+         id="stop2349"
+         style="stop-color:#010204;stop-opacity:0.98030001"
+         offset="0.727" />
+      <stop
+         id="stop2351"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0.73329997" />
+      <stop
+         id="stop2353"
+         style="stop-color:#03080d;stop-opacity:0.61080003"
+         offset="0.78759998" />
+      <stop
+         id="stop2355"
+         style="stop-color:#0b1929;stop-opacity:0"
+         offset="0.87269998" />
+    </radialGradient>
+    <radialGradient
+       cx="84.296402"
+       cy="980.55267"
+       r="41.7421"
+       id="SVGID_116_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop2360"
+         style="stop-color:#b4cb80;stop-opacity:0"
+         offset="0.33329999" />
+      <stop
+         id="stop2362"
+         style="stop-color:#60bd71;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="81.489304"
+       cy="996.81049"
+       r="26.946501"
+       id="SVGID_117_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop2367"
+         style="stop-color:#79cccb;stop-opacity:1"
+         offset="0.0242" />
+      <stop
+         id="stop2369"
+         style="stop-color:#35aed5;stop-opacity:1"
+         offset="0.46669999" />
+      <stop
+         id="stop2371"
+         style="stop-color:#25346f;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="80.938499"
+       cy="1071.6387"
+       r="14.3689"
+       id="SVGID_118_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9207,24,-936.5648)">
+      <stop
+         id="stop2382"
+         style="stop-color:#eef8fb;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2384"
+         style="stop-color:#ecf7fa;stop-opacity:0.491"
+         offset="0.509" />
+      <stop
+         id="stop2386"
+         style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+         offset="0.69239998" />
+      <stop
+         id="stop2388"
+         style="stop-color:#daf0f4;stop-opacity:0.177"
+         offset="0.82300001" />
+      <stop
+         id="stop2390"
+         style="stop-color:#c9e9ef;stop-opacity:0.0721"
+         offset="0.92790002" />
+      <stop
+         id="stop2392"
+         style="stop-color:#b8e2e9;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="80.939003"
+       cy="1070.6641"
+       r="10.5154"
+       id="SVGID_119_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9207,24,-936.5648)">
+      <stop
+         id="stop2397"
+         style="stop-color:#eef8fb;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2399"
+         style="stop-color:#ecf7fa;stop-opacity:0.491"
+         offset="0.509" />
+      <stop
+         id="stop2401"
+         style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+         offset="0.69239998" />
+      <stop
+         id="stop2403"
+         style="stop-color:#daf0f4;stop-opacity:0.177"
+         offset="0.82300001" />
+      <stop
+         id="stop2405"
+         style="stop-color:#c9e9ef;stop-opacity:0.0721"
+         offset="0.92790002" />
+      <stop
+         id="stop2407"
+         style="stop-color:#b8e2e9;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="90.341797"
+       cy="668.60938"
+       r="8.2777996"
+       id="SVGID_120_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(16,-622)">
+      <stop
+         id="stop2412"
+         style="stop-color:#eef8fb;stop-opacity:0.75"
+         offset="0.47580001" />
+      <stop
+         id="stop2414"
+         style="stop-color:#79c88d;stop-opacity:0.0912"
+         offset="0.7615" />
+      <stop
+         id="stop2416"
+         style="stop-color:#59bb6e;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="242.2227"
+       cy="762.17578"
+       r="9.9145002"
+       id="SVGID_121_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1342,0.4137,-0.3427,0.9394,81.7425,-740.2545)">
+      <stop
+         id="stop2423"
+         style="stop-color:#5fc099;stop-opacity:0.74000001"
+         offset="0.2667" />
+      <stop
+         id="stop2425"
+         style="stop-color:#5fc094;stop-opacity:0.59170002"
+         offset="0.40270001" />
+      <stop
+         id="stop2427"
+         style="stop-color:#5ebe85;stop-opacity:0.41429999"
+         offset="0.5654" />
+      <stop
+         id="stop2429"
+         style="stop-color:#5cbc6d;stop-opacity:0.222"
+         offset="0.74180001" />
+      <stop
+         id="stop2431"
+         style="stop-color:#5ab94c;stop-opacity:0.0204"
+         offset="0.9267" />
+      <stop
+         id="stop2433"
+         style="stop-color:#5ab948;stop-opacity:0"
+         offset="0.94550002" />
+    </radialGradient>
+    <radialGradient
+       cx="-250.6884"
+       cy="1458.0879"
+       r="13.3664"
+       id="SVGID_122_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1034,-0.3171,0.2155,0.7497,71.9107,-1091.3529)">
+      <stop
+         id="stop2440"
+         style="stop-color:#1d3c6e;stop-opacity:0.36000001"
+         offset="0.54549998" />
+      <stop
+         id="stop2442"
+         style="stop-color:#30486d;stop-opacity:0.433"
+         offset="0.56900001" />
+      <stop
+         id="stop2444"
+         style="stop-color:#46566b;stop-opacity:0.54839998"
+         offset="0.60610002" />
+      <stop
+         id="stop2446"
+         style="stop-color:#56606a;stop-opacity:0.67330003"
+         offset="0.64630002" />
+      <stop
+         id="stop2448"
+         style="stop-color:#606669;stop-opacity:0.81339997"
+         offset="0.69139999" />
+      <stop
+         id="stop2450"
+         style="stop-color:#636869;stop-opacity:1"
+         offset="0.75150001" />
+      <stop
+         id="stop2452"
+         style="stop-color:#51c1bc;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="-256.10541"
+       cy="1523.5244"
+       r="18.348801"
+       id="SVGID_123_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.931,-0.365,0.365,0.931,-207.5863,-1434.8041)">
+      <stop
+         id="stop2457"
+         style="stop-color:#040506;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2459"
+         style="stop-color:#050709;stop-opacity:1"
+         offset="0.32319999" />
+      <stop
+         id="stop2461"
+         style="stop-color:#070e13;stop-opacity:1"
+         offset="0.56629997" />
+      <stop
+         id="stop2463"
+         style="stop-color:#0c1a23;stop-opacity:1"
+         offset="0.78259999" />
+      <stop
+         id="stop2465"
+         style="stop-color:#0d1e28;stop-opacity:1"
+         offset="0.83639997" />
+      <stop
+         id="stop2467"
+         style="stop-color:#234a4c;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="-532.12988"
+       cy="1105.5078"
+       r="2.5809"
+       id="SVGID_124_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.864,-0.5034,0.5034,0.864,-3.3111,-1180.5216)">
+      <stop
+         id="stop2474"
+         style="stop-color:#040506;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2476"
+         style="stop-color:#050709;stop-opacity:1"
+         offset="0.3195" />
+      <stop
+         id="stop2478"
+         style="stop-color:#070c13;stop-opacity:1"
+         offset="0.55989999" />
+      <stop
+         id="stop2480"
+         style="stop-color:#0a1523;stop-opacity:1"
+         offset="0.77380002" />
+      <stop
+         id="stop2482"
+         style="stop-color:#0b1929;stop-opacity:1"
+         offset="0.83639997" />
+      <stop
+         id="stop2484"
+         style="stop-color:#23474c;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="135.5938"
+       cy="1187.5576"
+       r="21.0791"
+       id="SVGID_125_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop2497"
+         style="stop-color:#d5e2ee;stop-opacity:1"
+         offset="0.77579999" />
+      <stop
+         id="stop2499"
+         style="stop-color:#d1dfed;stop-opacity:1"
+         offset="0.82630002" />
+      <stop
+         id="stop2501"
+         style="stop-color:#c7d6e8;stop-opacity:1"
+         offset="0.8714" />
+      <stop
+         id="stop2503"
+         style="stop-color:#b4c6e1;stop-opacity:1"
+         offset="0.91439998" />
+      <stop
+         id="stop2505"
+         style="stop-color:#9bb0d8;stop-opacity:1"
+         offset="0.9562" />
+      <stop
+         id="stop2507"
+         style="stop-color:#7a95cb;stop-opacity:1"
+         offset="0.99680001" />
+      <stop
+         id="stop2509"
+         style="stop-color:#7792ca;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="303.7735"
+       cy="697.86328"
+       r="23.690399"
+       id="SVGID_126_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9525,0.3046,-0.3046,0.9525,81.9305,-503.3005)">
+      <stop
+         id="stop2516"
+         style="stop-color:#0b1929;stop-opacity:0"
+         offset="0.41209999" />
+      <stop
+         id="stop2518"
+         style="stop-color:#0a1827;stop-opacity:0.53789997"
+         offset="0.58490002" />
+      <stop
+         id="stop2520"
+         style="stop-color:#091420;stop-opacity:0.7317"
+         offset="0.64719999" />
+      <stop
+         id="stop2522"
+         style="stop-color:#060d15;stop-opacity:0.86940002"
+         offset="0.69139999" />
+      <stop
+         id="stop2524"
+         style="stop-color:#010204;stop-opacity:0.98030001"
+         offset="0.727" />
+      <stop
+         id="stop2526"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0.73329997" />
+      <stop
+         id="stop2528"
+         style="stop-color:#03080d;stop-opacity:0.61080003"
+         offset="0.78759998" />
+      <stop
+         id="stop2530"
+         style="stop-color:#0b1929;stop-opacity:0"
+         offset="0.87269998" />
+    </radialGradient>
+    <radialGradient
+       cx="137.791"
+       cy="1174.6094"
+       r="32.652401"
+       id="SVGID_127_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop2535"
+         style="stop-color:#b4cb80;stop-opacity:0"
+         offset="0.33329999" />
+      <stop
+         id="stop2537"
+         style="stop-color:#60bd71;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="135.5948"
+       cy="1187.3271"
+       r="21.0791"
+       id="SVGID_128_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop2542"
+         style="stop-color:#3fb1cb;stop-opacity:0"
+         offset="0.33329999" />
+      <stop
+         id="stop2544"
+         style="stop-color:#458691;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="129.95171"
+       cy="1169.5059"
+       r="12.0611"
+       id="SVGID_129_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop2549"
+         style="stop-color:#181338;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2551"
+         style="stop-color:#151435;stop-opacity:1"
+         offset="0.4454" />
+      <stop
+         id="stop2553"
+         style="stop-color:#0d182b;stop-opacity:1"
+         offset="0.78009999" />
+      <stop
+         id="stop2555"
+         style="stop-color:#0b1929;stop-opacity:1"
+         offset="0.83639997" />
+      <stop
+         id="stop2557"
+         style="stop-color:#23474c;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="339.38669"
+       cy="919.37891"
+       r="7.7568002"
+       id="SVGID_130_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1342,0.4137,-0.3427,0.9394,81.7425,-740.2545)">
+      <stop
+         id="stop2568"
+         style="stop-color:#28b467;stop-opacity:0.60000002"
+         offset="0.2667" />
+      <stop
+         id="stop2570"
+         style="stop-color:#2bb566;stop-opacity:0.45789999"
+         offset="0.44029999" />
+      <stop
+         id="stop2572"
+         style="stop-color:#35b663;stop-opacity:0.35120001"
+         offset="0.57080001" />
+      <stop
+         id="stop2574"
+         style="stop-color:#45ba5e;stop-opacity:0.25600001"
+         offset="0.68709999" />
+      <stop
+         id="stop2576"
+         style="stop-color:#5cbe56;stop-opacity:0.16760001"
+         offset="0.79519999" />
+      <stop
+         id="stop2578"
+         style="stop-color:#79c44c;stop-opacity:0.0838"
+         offset="0.89749998" />
+      <stop
+         id="stop2580"
+         style="stop-color:#9dcb41;stop-opacity:0.0046"
+         offset="0.99440002" />
+      <stop
+         id="stop2582"
+         style="stop-color:#9fcb40;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="-250.15131"
+       cy="1644.1836"
+       r="10.4552"
+       id="SVGID_131_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1034,-0.3171,0.2155,0.7497,76.8658,-1074.1146)">
+      <stop
+         id="stop2589"
+         style="stop-color:#1d3c6e;stop-opacity:0.36000001"
+         offset="0.54549998" />
+      <stop
+         id="stop2591"
+         style="stop-color:#30486d;stop-opacity:0.433"
+         offset="0.56900001" />
+      <stop
+         id="stop2593"
+         style="stop-color:#46566b;stop-opacity:0.54839998"
+         offset="0.60610002" />
+      <stop
+         id="stop2595"
+         style="stop-color:#56606a;stop-opacity:0.67330003"
+         offset="0.64630002" />
+      <stop
+         id="stop2597"
+         style="stop-color:#606669;stop-opacity:0.81339997"
+         offset="0.69139999" />
+      <stop
+         id="stop2599"
+         style="stop-color:#636869;stop-opacity:1"
+         offset="0.75150001" />
+      <stop
+         id="stop2601"
+         style="stop-color:#51c1bc;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="-529.92682"
+       cy="-539.49268"
+       r="14.3531"
+       id="SVGID_132_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9545,0.3742,-0.365,-0.931,-547.4075,-60.8402)">
+      <stop
+         id="stop2606"
+         style="stop-color:#040506;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2608"
+         style="stop-color:#050709;stop-opacity:1"
+         offset="0.3195" />
+      <stop
+         id="stop2610"
+         style="stop-color:#070c13;stop-opacity:1"
+         offset="0.55989999" />
+      <stop
+         id="stop2612"
+         style="stop-color:#0a1523;stop-opacity:1"
+         offset="0.77380002" />
+      <stop
+         id="stop2614"
+         style="stop-color:#0b1929;stop-opacity:1"
+         offset="0.83639997" />
+      <stop
+         id="stop2616"
+         style="stop-color:#23474c;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="-1913.8877"
+       cy="-2069.2295"
+       r="4.7557001"
+       id="SVGID_133_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9319,0.3625,-0.224,-0.5758,-2093.0261,-261.7899)">
+      <stop
+         id="stop2623"
+         style="stop-color:#040506;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2625"
+         style="stop-color:#050709;stop-opacity:1"
+         offset="0.3195" />
+      <stop
+         id="stop2627"
+         style="stop-color:#070c13;stop-opacity:1"
+         offset="0.55989999" />
+      <stop
+         id="stop2629"
+         style="stop-color:#0a1523;stop-opacity:1"
+         offset="0.77380002" />
+      <stop
+         id="stop2631"
+         style="stop-color:#0b1929;stop-opacity:1"
+         offset="0.83639997" />
+      <stop
+         id="stop2633"
+         style="stop-color:#23474c;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="134.5264"
+       cy="1281.8086"
+       r="11.2395"
+       id="SVGID_134_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9207,24,-936.5648)">
+      <stop
+         id="stop2642"
+         style="stop-color:#eef8fb;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2644"
+         style="stop-color:#ecf7fa;stop-opacity:0.491"
+         offset="0.509" />
+      <stop
+         id="stop2646"
+         style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+         offset="0.69239998" />
+      <stop
+         id="stop2648"
+         style="stop-color:#daf0f4;stop-opacity:0.177"
+         offset="0.82300001" />
+      <stop
+         id="stop2650"
+         style="stop-color:#c9e9ef;stop-opacity:0.0721"
+         offset="0.92790002" />
+      <stop
+         id="stop2652"
+         style="stop-color:#b8e2e9;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="134.8775"
+       cy="1281.0508"
+       r="8.2236004"
+       id="SVGID_135_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9207,24,-936.5648)">
+      <stop
+         id="stop2657"
+         style="stop-color:#eef8fb;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2659"
+         style="stop-color:#ecf7fa;stop-opacity:0.491"
+         offset="0.509" />
+      <stop
+         id="stop2661"
+         style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+         offset="0.69239998" />
+      <stop
+         id="stop2663"
+         style="stop-color:#daf0f4;stop-opacity:0.177"
+         offset="0.82300001" />
+      <stop
+         id="stop2665"
+         style="stop-color:#c9e9ef;stop-opacity:0.0721"
+         offset="0.92790002" />
+      <stop
+         id="stop2667"
+         style="stop-color:#b8e2e9;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="134.5264"
+       cy="1173.8418"
+       r="5.6121001"
+       id="SVGID_136_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop2672"
+         style="stop-color:#eef8fb;stop-opacity:1"
+         offset="0.2667" />
+      <stop
+         id="stop2674"
+         style="stop-color:#edf7f8;stop-opacity:0.80159998"
+         offset="0.4122" />
+      <stop
+         id="stop2676"
+         style="stop-color:#e9f5ee;stop-opacity:0.65249997"
+         offset="0.52149999" />
+      <stop
+         id="stop2678"
+         style="stop-color:#e2f1de;stop-opacity:0.51959997"
+         offset="0.61900002" />
+      <stop
+         id="stop2680"
+         style="stop-color:#d8ecc7;stop-opacity:0.396"
+         offset="0.70959997" />
+      <stop
+         id="stop2682"
+         style="stop-color:#cce4aa;stop-opacity:0.2789"
+         offset="0.79540002" />
+      <stop
+         id="stop2684"
+         style="stop-color:#bcdc86;stop-opacity:0.16670001"
+         offset="0.87769997" />
+      <stop
+         id="stop2686"
+         style="stop-color:#abd25b;stop-opacity:0.0604"
+         offset="0.95569998" />
+      <stop
+         id="stop2688"
+         style="stop-color:#9fcb40;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <linearGradient
+       x1="132.96539"
+       y1="1066.0518"
+       x2="169.7413"
+       y2="1020.4093"
+       id="SVGID_137_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop2697"
+         style="stop-color:#202d36;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2699"
+         style="stop-color:#517287;stop-opacity:1"
+         offset="0.0821" />
+      <stop
+         id="stop2701"
+         style="stop-color:#7793a4;stop-opacity:1"
+         offset="0.1266" />
+      <stop
+         id="stop2703"
+         style="stop-color:#98b1bd;stop-opacity:1"
+         offset="0.175" />
+      <stop
+         id="stop2705"
+         style="stop-color:#b4c9d2;stop-opacity:1"
+         offset="0.2272" />
+      <stop
+         id="stop2707"
+         style="stop-color:#c9dce3;stop-opacity:1"
+         offset="0.28330001" />
+      <stop
+         id="stop2709"
+         style="stop-color:#d8e9ee;stop-opacity:1"
+         offset="0.34540001" />
+      <stop
+         id="stop2711"
+         style="stop-color:#e1f1f5;stop-opacity:1"
+         offset="0.4181" />
+      <stop
+         id="stop2713"
+         style="stop-color:#e4f3f7;stop-opacity:1"
+         offset="0.5273" />
+    </linearGradient>
+    <linearGradient
+       x1="-1192.0801"
+       y1="866.01068"
+       x2="-1205.1014"
+       y2="825.87292"
+       id="SVGID_138_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.93,-0.3675,-0.3675,0.93,-628.9186,-1117.981)">
+      <stop
+         id="stop2722"
+         style="stop-color:#141a2b;stop-opacity:1"
+         offset="0.1636" />
+      <stop
+         id="stop2724"
+         style="stop-color:#142f3a;stop-opacity:0.82499999"
+         offset="0.3161" />
+      <stop
+         id="stop2726"
+         style="stop-color:#143e45;stop-opacity:0.63"
+         offset="0.486" />
+      <stop
+         id="stop2728"
+         style="stop-color:#14464b;stop-opacity:0.39840001"
+         offset="0.68769997" />
+      <stop
+         id="stop2730"
+         style="stop-color:#14494d;stop-opacity:0.04"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="-2422.1553"
+       y1="1328.002"
+       x2="-2422.1553"
+       y2="1248.3154"
+       id="SVGID_139_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.3732,-0.2464,-0.3723,0.5639,-250.8944,-1214.951)">
+      <stop
+         id="stop2735"
+         style="stop-color:#d5ebde;stop-opacity:0.87"
+         offset="0" />
+      <stop
+         id="stop2737"
+         style="stop-color:#f1f6e3;stop-opacity:0.91000003"
+         offset="0.5636" />
+      <stop
+         id="stop2739"
+         style="stop-color:#7ac587;stop-opacity:0.09"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="1867.6152"
+       y1="1024.6885"
+       x2="1867.6152"
+       y2="941.2666"
+       id="SVGID_140_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.312,0.3203,-0.484,0.4715,69.2846,-950.7426)">
+      <stop
+         id="stop2744"
+         style="stop-color:#d5ebde;stop-opacity:0.08"
+         offset="0" />
+      <stop
+         id="stop2746"
+         style="stop-color:#7ac587;stop-opacity:0.31999999"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="3512.9297"
+       y1="-172.45261"
+       x2="3499.9082"
+       y2="-212.5916"
+       id="SVGID_141_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1764,0.2008,0.5417,-0.8371,-337.1025,-758.0223)">
+      <stop
+         id="stop2759"
+         style="stop-color:#141a2b;stop-opacity:1"
+         offset="0.1636" />
+      <stop
+         id="stop2761"
+         style="stop-color:#142f3a;stop-opacity:0.82499999"
+         offset="0.3161" />
+      <stop
+         id="stop2763"
+         style="stop-color:#143e45;stop-opacity:0.63"
+         offset="0.486" />
+      <stop
+         id="stop2765"
+         style="stop-color:#14464b;stop-opacity:0.39840001"
+         offset="0.68769997" />
+      <stop
+         id="stop2767"
+         style="stop-color:#14494d;stop-opacity:0.04"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="-760.75879"
+       cy="-1519.2607"
+       r="9.4656"
+       fx="-764.10199"
+       fy="-1518.6959"
+       id="SVGID_142_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.4849,0.8746,-0.8033,-0.4453,-1400.3799,79.0864)">
+      <stop
+         id="stop2774"
+         style="stop-color:#46c3d6;stop-opacity:0.74000001"
+         offset="0" />
+      <stop
+         id="stop2776"
+         style="stop-color:#48c3d3;stop-opacity:0.57990003"
+         offset="0.1121" />
+      <stop
+         id="stop2778"
+         style="stop-color:#4dc4c9;stop-opacity:0.45969999"
+         offset="0.1963" />
+      <stop
+         id="stop2780"
+         style="stop-color:#57c5b9;stop-opacity:0.35249999"
+         offset="0.27129999" />
+      <stop
+         id="stop2782"
+         style="stop-color:#65c6a2;stop-opacity:0.2529"
+         offset="0.34110001" />
+      <stop
+         id="stop2784"
+         style="stop-color:#76c785;stop-opacity:0.1584"
+         offset="0.40720001" />
+      <stop
+         id="stop2786"
+         style="stop-color:#8bc961;stop-opacity:0.0692"
+         offset="0.46970001" />
+      <stop
+         id="stop2788"
+         style="stop-color:#9fcb40;stop-opacity:0"
+         offset="0.51819998" />
+    </radialGradient>
+    <radialGradient
+       cx="176.45711"
+       cy="1010.1426"
+       r="13.5566"
+       id="SVGID_143_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop2797"
+         style="stop-color:#d5e2ee;stop-opacity:1"
+         offset="0.77579999" />
+      <stop
+         id="stop2799"
+         style="stop-color:#d1dfed;stop-opacity:1"
+         offset="0.82630002" />
+      <stop
+         id="stop2801"
+         style="stop-color:#c7d6e8;stop-opacity:1"
+         offset="0.8714" />
+      <stop
+         id="stop2803"
+         style="stop-color:#b4c6e1;stop-opacity:1"
+         offset="0.91439998" />
+      <stop
+         id="stop2805"
+         style="stop-color:#9bb0d8;stop-opacity:1"
+         offset="0.9562" />
+      <stop
+         id="stop2807"
+         style="stop-color:#7a95cb;stop-opacity:1"
+         offset="0.99680001" />
+      <stop
+         id="stop2809"
+         style="stop-color:#7792ca;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="289.0264"
+       cy="516.55182"
+       r="15.2356"
+       id="SVGID_144_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9525,0.3046,-0.3046,0.9525,81.9305,-503.3005)">
+      <stop
+         id="stop2816"
+         style="stop-color:#0b1929;stop-opacity:0"
+         offset="0.41209999" />
+      <stop
+         id="stop2818"
+         style="stop-color:#0a1827;stop-opacity:0.53789997"
+         offset="0.58490002" />
+      <stop
+         id="stop2820"
+         style="stop-color:#091420;stop-opacity:0.7317"
+         offset="0.64719999" />
+      <stop
+         id="stop2822"
+         style="stop-color:#060d15;stop-opacity:0.86940002"
+         offset="0.69139999" />
+      <stop
+         id="stop2824"
+         style="stop-color:#010204;stop-opacity:0.98030001"
+         offset="0.727" />
+      <stop
+         id="stop2826"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0.73329997" />
+      <stop
+         id="stop2828"
+         style="stop-color:#03080d;stop-opacity:0.61080003"
+         offset="0.78759998" />
+      <stop
+         id="stop2830"
+         style="stop-color:#0b1929;stop-opacity:0"
+         offset="0.87269998" />
+    </radialGradient>
+    <radialGradient
+       cx="177.8701"
+       cy="1001.8135"
+       r="20.998199"
+       id="SVGID_145_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop2835"
+         style="stop-color:#b4cb80;stop-opacity:0"
+         offset="0.33329999" />
+      <stop
+         id="stop2837"
+         style="stop-color:#60bd71;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="176.45799"
+       cy="1009.9941"
+       r="13.5571"
+       id="SVGID_146_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop2842"
+         style="stop-color:#9fcb40;stop-opacity:0"
+         offset="0.33329999" />
+      <stop
+         id="stop2844"
+         style="stop-color:#458691;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="174.40919"
+       cy="1093.7969"
+       r="7.2284999"
+       id="SVGID_147_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9207,24,-936.5648)">
+      <stop
+         id="stop2855"
+         style="stop-color:#eef8fb;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2857"
+         style="stop-color:#ecf7fa;stop-opacity:0.491"
+         offset="0.509" />
+      <stop
+         id="stop2859"
+         style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+         offset="0.69239998" />
+      <stop
+         id="stop2861"
+         style="stop-color:#daf0f4;stop-opacity:0.177"
+         offset="0.82300001" />
+      <stop
+         id="stop2863"
+         style="stop-color:#c9e9ef;stop-opacity:0.0721"
+         offset="0.92790002" />
+      <stop
+         id="stop2865"
+         style="stop-color:#b8e2e9;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="174.4082"
+       cy="1092.8691"
+       r="5.2909999"
+       id="SVGID_148_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9207,24,-936.5648)">
+      <stop
+         id="stop2870"
+         style="stop-color:#eef8fb;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2872"
+         style="stop-color:#ecf7fa;stop-opacity:0.491"
+         offset="0.509" />
+      <stop
+         id="stop2874"
+         style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+         offset="0.69239998" />
+      <stop
+         id="stop2876"
+         style="stop-color:#daf0f4;stop-opacity:0.177"
+         offset="0.82300001" />
+      <stop
+         id="stop2878"
+         style="stop-color:#c9e9ef;stop-opacity:0.0721"
+         offset="0.92790002" />
+      <stop
+         id="stop2880"
+         style="stop-color:#b8e2e9;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="174.0713"
+       cy="1001.5869"
+       r="3.6104"
+       id="SVGID_149_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-933)">
+      <stop
+         id="stop2885"
+         style="stop-color:#eef8fb;stop-opacity:1"
+         offset="0.2667" />
+      <stop
+         id="stop2887"
+         style="stop-color:#edf7f8;stop-opacity:0.80159998"
+         offset="0.4122" />
+      <stop
+         id="stop2889"
+         style="stop-color:#e9f5ee;stop-opacity:0.65249997"
+         offset="0.52149999" />
+      <stop
+         id="stop2891"
+         style="stop-color:#e2f1de;stop-opacity:0.51959997"
+         offset="0.61900002" />
+      <stop
+         id="stop2893"
+         style="stop-color:#d8ecc7;stop-opacity:0.396"
+         offset="0.70959997" />
+      <stop
+         id="stop2895"
+         style="stop-color:#cce4aa;stop-opacity:0.2789"
+         offset="0.79540002" />
+      <stop
+         id="stop2897"
+         style="stop-color:#bcdc86;stop-opacity:0.16670001"
+         offset="0.87769997" />
+      <stop
+         id="stop2899"
+         style="stop-color:#abd25b;stop-opacity:0.0604"
+         offset="0.95569998" />
+      <stop
+         id="stop2901"
+         style="stop-color:#9fcb40;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="-257.7392"
+       cy="1112.8301"
+       r="4.9822001"
+       id="SVGID_150_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1333,-0.416,0.3445,0.9387,114.2,-1067.6246)">
+      <stop
+         id="stop2908"
+         style="stop-color:#46c3d6;stop-opacity:0.74000001"
+         offset="0.2667" />
+      <stop
+         id="stop2910"
+         style="stop-color:#48c3d3;stop-opacity:0.57990003"
+         offset="0.4253" />
+      <stop
+         id="stop2912"
+         style="stop-color:#4dc4c9;stop-opacity:0.45969999"
+         offset="0.54439998" />
+      <stop
+         id="stop2914"
+         style="stop-color:#57c5b9;stop-opacity:0.35249999"
+         offset="0.65069997" />
+      <stop
+         id="stop2916"
+         style="stop-color:#65c6a2;stop-opacity:0.2529"
+         offset="0.74940002" />
+      <stop
+         id="stop2918"
+         style="stop-color:#76c785;stop-opacity:0.1584"
+         offset="0.84299999" />
+      <stop
+         id="stop2920"
+         style="stop-color:#8bc961;stop-opacity:0.0692"
+         offset="0.9314" />
+      <stop
+         id="stop2922"
+         style="stop-color:#9fcb40;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="525.13177"
+       cy="616.58301"
+       r="4.8049002"
+       id="SVGID_151_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9318,0.6706,-0.4608,0.6403,-12.1767,-661.0315)">
+      <stop
+         id="stop2929"
+         style="stop-color:#1d3c6e;stop-opacity:0.36000001"
+         offset="0.44240001" />
+      <stop
+         id="stop2931"
+         style="stop-color:#1e3c6e;stop-opacity:0.36379999"
+         offset="0.44400001" />
+      <stop
+         id="stop2933"
+         style="stop-color:#3c4f6c;stop-opacity:0.53109998"
+         offset="0.51209998" />
+      <stop
+         id="stop2935"
+         style="stop-color:#525d6a;stop-opacity:0.6954"
+         offset="0.579" />
+      <stop
+         id="stop2937"
+         style="stop-color:#5f6569;stop-opacity:0.85390002"
+         offset="0.64349997" />
+      <stop
+         id="stop2939"
+         style="stop-color:#636869;stop-opacity:1"
+         offset="0.70300001" />
+      <stop
+         id="stop2941"
+         style="stop-color:#5c8b8a;stop-opacity:0.57340002"
+         offset="0.79869998" />
+      <stop
+         id="stop2943"
+         style="stop-color:#51c1bc;stop-opacity:0"
+         offset="0.92729998" />
+    </radialGradient>
+    <radialGradient
+       cx="604.19531"
+       cy="1143.8135"
+       r="9.2593002"
+       id="SVGID_152_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9164,0.4002,-0.4002,0.9164,101.5593,-1206.0709)">
+      <stop
+         id="stop2948"
+         style="stop-color:#040506;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2950"
+         style="stop-color:#050709;stop-opacity:1"
+         offset="0.3195" />
+      <stop
+         id="stop2952"
+         style="stop-color:#070c13;stop-opacity:1"
+         offset="0.55989999" />
+      <stop
+         id="stop2954"
+         style="stop-color:#0a1523;stop-opacity:1"
+         offset="0.77380002" />
+      <stop
+         id="stop2956"
+         style="stop-color:#0b1929;stop-opacity:1"
+         offset="0.83639997" />
+      <stop
+         id="stop2958"
+         style="stop-color:#23474c;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="670.38177"
+       cy="507.44141"
+       r="1.2996"
+       id="SVGID_153_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7921,0.6103,-0.6103,0.7921,-12.4576,-743.2179)">
+      <stop
+         id="stop2965"
+         style="stop-color:#040506;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2967"
+         style="stop-color:#050709;stop-opacity:1"
+         offset="0.3195" />
+      <stop
+         id="stop2969"
+         style="stop-color:#070c13;stop-opacity:1"
+         offset="0.55989999" />
+      <stop
+         id="stop2971"
+         style="stop-color:#0a1523;stop-opacity:1"
+         offset="0.77380002" />
+      <stop
+         id="stop2973"
+         style="stop-color:#0b1929;stop-opacity:1"
+         offset="0.83639997" />
+      <stop
+         id="stop2975"
+         style="stop-color:#23474c;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="495.47559"
+       cy="88.252998"
+       r="8.9664001"
+       id="SVGID_154_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7838,0.621,-0.5116,0.6457,-149.5511,-279.8802)">
+      <stop
+         id="stop2980"
+         style="stop-color:#040506;stop-opacity:0.85000002"
+         offset="0" />
+      <stop
+         id="stop2982"
+         style="stop-color:#0b1929;stop-opacity:0.51999998"
+         offset="0.5273" />
+      <stop
+         id="stop2984"
+         style="stop-color:#132935;stop-opacity:0.30559999"
+         offset="0.72219998" />
+      <stop
+         id="stop2986"
+         style="stop-color:#23474c;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       cx="-1247.3779"
+       cy="1117.417"
+       r="2.1424"
+       id="SVGID_155_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2687,-0.9632,0.7107,0.1982,-302.0964,-1294.5463)">
+      <stop
+         id="stop2991"
+         style="stop-color:#eef8fb;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2993"
+         style="stop-color:#ecf7fa;stop-opacity:0.491"
+         offset="0.509" />
+      <stop
+         id="stop2995"
+         style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+         offset="0.69239998" />
+      <stop
+         id="stop2997"
+         style="stop-color:#daf0f4;stop-opacity:0.177"
+         offset="0.82300001" />
+      <stop
+         id="stop2999"
+         style="stop-color:#c9e9ef;stop-opacity:0.0721"
+         offset="0.92790002" />
+      <stop
+         id="stop3001"
+         style="stop-color:#b8e2e9;stop-opacity:0"
+         offset="1" />
+    </radialGradient>
+    <linearGradient
+       x1="4384.4502"
+       y1="-1276.5322"
+       x2="4367.8047"
+       y2="-1327.8422"
+       id="SVGID_156_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.0843,0.3112,-0.6769,0.3248,-333.9066,-802.8984)">
+      <stop
+         id="stop3010"
+         style="stop-color:#141a2b;stop-opacity:0.54000002"
+         offset="0.1636" />
+      <stop
+         id="stop3012"
+         style="stop-color:#142f3a;stop-opacity:0.4488"
+         offset="0.3161" />
+      <stop
+         id="stop3014"
+         style="stop-color:#143e45;stop-opacity:0.34729999"
+         offset="0.486" />
+      <stop
+         id="stop3016"
+         style="stop-color:#14464b;stop-opacity:0.22669999"
+         offset="0.68769997" />
+      <stop
+         id="stop3018"
+         style="stop-color:#14494d;stop-opacity:0.04"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="-4795.7344"
+       y1="391.66409"
+       x2="-4804.9072"
+       y2="363.38809"
+       id="SVGID_157_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.1142,-0.2637,0.2148,-0.7179,-509.0133,-779.4001)">
+      <stop
+         id="stop3029"
+         style="stop-color:#141a2b;stop-opacity:0.54000002"
+         offset="0.1636" />
+      <stop
+         id="stop3031"
+         style="stop-color:#142f3a;stop-opacity:0.4488"
+         offset="0.3161" />
+      <stop
+         id="stop3033"
+         style="stop-color:#143e45;stop-opacity:0.34729999"
+         offset="0.486" />
+      <stop
+         id="stop3035"
+         style="stop-color:#14464b;stop-opacity:0.22669999"
+         offset="0.68769997" />
+      <stop
+         id="stop3037"
+         style="stop-color:#14494d;stop-opacity:0.04"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="3956.2988"
+       y1="-393.34811"
+       x2="3941.5193"
+       y2="-438.90619"
+       id="SVGID_158_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2232,0.2328,0.7497,-0.0394,-488.028,-781.4999)">
+      <stop
+         id="stop3048"
+         style="stop-color:#141a2b;stop-opacity:0.54000002"
+         offset="0.1636" />
+      <stop
+         id="stop3050"
+         style="stop-color:#142f3a;stop-opacity:0.4488"
+         offset="0.3161" />
+      <stop
+         id="stop3052"
+         style="stop-color:#143e45;stop-opacity:0.34729999"
+         offset="0.486" />
+      <stop
+         id="stop3054"
+         style="stop-color:#14464b;stop-opacity:0.22669999"
+         offset="0.68769997" />
+      <stop
+         id="stop3056"
+         style="stop-color:#14494d;stop-opacity:0.04"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata10537">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(97.398359,107.17533)"
+     id="layer1">
+    <g
+       transform="translate(-117.56124,-134.23908)"
+       id="g25"
+       style="display:inline">
+      <g
+         id="g27">
+        <g
+           id="g29">
+          <radialGradient
+             cx="197.0293"
+             cy="1131.0117"
+             r="11.6563"
+             id="radialGradient7640"
+             gradientUnits="userSpaceOnUse"
+             gradientTransform="matrix(0.9999,0.017,-0.017,0.9999,26.0318,-927.0317)">
+            <stop
+               id="stop7642"
+               style="stop-color:#d5e2ee;stop-opacity:1"
+               offset="0.77579999" />
+            <stop
+               id="stop7644"
+               style="stop-color:#d1dfed;stop-opacity:1"
+               offset="0.82630002" />
+            <stop
+               id="stop7646"
+               style="stop-color:#c7d6e8;stop-opacity:1"
+               offset="0.8714" />
+            <stop
+               id="stop7648"
+               style="stop-color:#b4c6e1;stop-opacity:1"
+               offset="0.91439998" />
+            <stop
+               id="stop7650"
+               style="stop-color:#9bb0d8;stop-opacity:1"
+               offset="0.9562" />
+            <stop
+               id="stop7652"
+               style="stop-color:#7a95cb;stop-opacity:1"
+               offset="0.99680001" />
+            <stop
+               id="stop7654"
+               style="stop-color:#7792ca;stop-opacity:1"
+               offset="1" />
+          </radialGradient>
+          <circle
+             cx="203.814"
+             cy="207.215"
+             r="11.657"
+             id="circle46"
+             style="fill:url(#SVGID_1_)" />
+          <path
+             d="m 216.25,207.454 c -0.1,3.221 -1.568,6.397 -3.914,8.577 -2.334,2.203 -5.51,3.484 -8.73,3.463 -3.223,0.002 -6.417,-1.354 -8.723,-3.646 -2.318,-2.296 -3.689,-5.519 -3.674,-8.873 -0.004,-1.596 0.321,-3.297 0.958,-4.82 0.643,-1.529 1.604,-2.936 2.792,-4.104 2.377,-2.354 5.693,-3.724 9.104,-3.615 3.301,0.03 6.617,1.57 8.85,3.998 2.264,2.42 3.48,5.739 3.346,8.996 l -0.009,0.024 z m -1.561,-0.056 c -0.008,-2.856 -1.198,-5.646 -3.201,-7.604 -2.002,-1.983 -4.709,-3.063 -7.521,-3.106 -2.701,-0.025 -5.494,1.016 -7.495,2.93 -2.012,1.916 -3.255,4.583 -3.361,7.438 -0.118,2.76 0.922,5.646 2.872,7.729 1.926,2.116 4.751,3.383 7.644,3.46 2.893,0.109 5.824,-1.021 7.869,-3.082 2.063,-2.046 3.211,-4.88 3.193,-7.765 z"
+             id="path48"
+             style="fill:#39444f" />
+        </g>
+        <radialGradient
+           cx="345.58691"
+           cy="625.37598"
+           r="13.1022"
+           id="radialGradient7658"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.9472,0.3208,-0.3208,0.9472,76.6095,-496.3437)">
+          <stop
+             id="stop7660"
+             style="stop-color:#0b1929;stop-opacity:0"
+             offset="0.41209999" />
+          <stop
+             id="stop7662"
+             style="stop-color:#0a1827;stop-opacity:0.53789997"
+             offset="0.58490002" />
+          <stop
+             id="stop7664"
+             style="stop-color:#091420;stop-opacity:0.7317"
+             offset="0.64719999" />
+          <stop
+             id="stop7666"
+             style="stop-color:#060d15;stop-opacity:0.86940002"
+             offset="0.69139999" />
+          <stop
+             id="stop7668"
+             style="stop-color:#010204;stop-opacity:0.98030001"
+             offset="0.727" />
+          <stop
+             id="stop7670"
+             style="stop-color:#000000;stop-opacity:1"
+             offset="0.73329997" />
+          <stop
+             id="stop7672"
+             style="stop-color:#03080d;stop-opacity:0.61080003"
+             offset="0.78759998" />
+          <stop
+             id="stop7674"
+             style="stop-color:#0b1929;stop-opacity:0"
+             offset="0.87269998" />
+        </radialGradient>
+        <circle
+           cx="203.711"
+           cy="206.298"
+           r="12.588"
+           id="circle67"
+           style="opacity:0.36000001;fill:url(#SVGID_2_)" />
+        <radialGradient
+           cx="198.2637"
+           cy="1123.8535"
+           r="18.053499"
+           id="radialGradient7677"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.9999,0.017,-0.017,0.9999,26.0318,-927.0317)">
+          <stop
+             id="stop7679"
+             style="stop-color:#b4cb80;stop-opacity:0"
+             offset="0.33329999" />
+          <stop
+             id="stop7681"
+             style="stop-color:#60bd71;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 215.475,207.286 c -0.106,6.437 -5.42,11.563 -11.854,11.455 -6.436,-0.11 -11.566,-5.416 -11.457,-11.853 0.11,-6.438 5.417,-11.566 11.854,-11.457 6.433,0.111 11.564,5.419 11.457,11.855 z"
+           id="path74"
+           style="opacity:0.62000002;fill:url(#SVGID_3_)" />
+        <radialGradient
+           cx="197.0293"
+           cy="1130.8838"
+           r="11.6563"
+           id="radialGradient7684"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.9999,0.017,-0.017,0.9999,26.0318,-927.0317)">
+          <stop
+             id="stop7686"
+             style="stop-color:#3fb1cb;stop-opacity:0"
+             offset="0.33329999" />
+          <stop
+             id="stop7688"
+             style="stop-color:#456c90;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <circle
+           cx="203.81599"
+           cy="207.088"
+           r="11.656"
+           id="circle81"
+           style="opacity:0.62000002;fill:url(#SVGID_4_)" />
+        <path
+           d="m 193.424,205.471 c 0.755,-5.039 4.582,-8.451 9.5,-8.838 4.916,-0.383 9.354,3.155 10.936,7.04 -3.34,-4.754 -8.021,-5.989 -10.981,-5.636 -2.966,0.352 -6.571,0.824 -9.455,7.434 z"
+           id="path83"
+           style="opacity:0.36000001;fill:#f2f6fa" />
+        <path
+           d="m 192.248,208.678 c -0.501,-6.408 4.009,-12.353 10.422,-12.854 6.408,-0.501 10.637,3.15 12.598,9.08 -2.938,-6.551 -11.248,-6.825 -13.678,-6.285 -5.397,1.195 -7.773,5.117 -9.342,10.059 z"
+           id="path85"
+           style="opacity:0.11000001;fill:#ebf7fd" />
+        <path
+           d="m 193.601,210.18 c -2.029,-8.384 2.836,-13.803 9.083,-14.293 6.248,-0.486 11.955,4.393 12.547,11.321 -2.563,-10.187 -11.164,-10.067 -13.518,-9.481 -4.431,1.103 -8.668,2.33 -8.112,12.453 z"
+           id="path87"
+           style="opacity:0.22000002;fill:#ebf7fd" />
+        <radialGradient
+           cx="419.1524"
+           cy="645.20508"
+           r="4.5430002"
+           id="radialGradient7694"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(1.0012,0.6747,-0.5589,0.8292,140.3358,-604.4919)">
+          <stop
+             id="stop7696"
+             style="stop-color:#46c3d6;stop-opacity:0.74000001"
+             offset="0.2667" />
+          <stop
+             id="stop7698"
+             style="stop-color:#48c3d3;stop-opacity:0.57990003"
+             offset="0.4253" />
+          <stop
+             id="stop7700"
+             style="stop-color:#4dc4c9;stop-opacity:0.45969999"
+             offset="0.54439998" />
+          <stop
+             id="stop7702"
+             style="stop-color:#57c5b9;stop-opacity:0.35249999"
+             offset="0.65069997" />
+          <stop
+             id="stop7704"
+             style="stop-color:#65c6a2;stop-opacity:0.2529"
+             offset="0.74940002" />
+          <stop
+             id="stop7706"
+             style="stop-color:#76c785;stop-opacity:0.1584"
+             offset="0.84299999" />
+          <stop
+             id="stop7708"
+             style="stop-color:#8bc961;stop-opacity:0.0692"
+             offset="0.9314" />
+          <stop
+             id="stop7710"
+             style="stop-color:#9fcb40;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 203.934,216.38 c -1.404,2.083 -4.578,2.396 -7.085,0.704 -2.512,-1.693 -3.413,-4.754 -2.008,-6.836 1.4,-2.08 4.572,-2.395 7.088,-0.701 2.505,1.692 3.404,4.755 2.005,6.833 z"
+           id="path106"
+           style="opacity:0.51999996;fill:url(#SVGID_5_)" />
+        <path
+           d="m 201.723,217.621 c -0.168,0.345 -0.43,0.624 -0.744,0.835 -1.792,-0.271 -4.44,-2.037 -5.502,-3.329 0.036,-0.176 0.092,-0.342 0.171,-0.503 0.639,-1.295 2.515,-1.674 4.197,-0.847 1.673,0.828 2.516,2.549 1.878,3.844 z"
+           id="path108"
+           style="opacity:0.31999996;fill:#ffffff" />
+        <radialGradient
+           cx="57.870098"
+           cy="-1265.1826"
+           r="4.1327"
+           id="radialGradient7714"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(-0.7523,0.8673,-0.5959,-0.5169,-515.0956,-502.9347)">
+          <stop
+             id="stop7716"
+             style="stop-color:#1d3c6e;stop-opacity:0.36000001"
+             offset="0.44240001" />
+          <stop
+             id="stop7718"
+             style="stop-color:#1e3c6e;stop-opacity:0.36379999"
+             offset="0.44400001" />
+          <stop
+             id="stop7720"
+             style="stop-color:#3c4f6c;stop-opacity:0.53109998"
+             offset="0.51209998" />
+          <stop
+             id="stop7722"
+             style="stop-color:#525d6a;stop-opacity:0.6954"
+             offset="0.579" />
+          <stop
+             id="stop7724"
+             style="stop-color:#5f6569;stop-opacity:0.85390002"
+             offset="0.64349997" />
+          <stop
+             id="stop7726"
+             style="stop-color:#636869;stop-opacity:1"
+             offset="0.70300001" />
+          <stop
+             id="stop7728"
+             style="stop-color:#5c8b8a;stop-opacity:0.57340002"
+             offset="0.79869998" />
+          <stop
+             id="stop7730"
+             style="stop-color:#51c1bc;stop-opacity:0"
+             offset="0.92729998" />
+        </radialGradient>
+        <path
+           d="m 191.48,205.023 c -1.455,-1.268 -0.682,-3.256 1.213,-5.438 1.895,-2.188 2.914,-1.981 5.652,-2.478 1.883,-0.34 1.098,4.058 -0.799,6.242 -1.896,2.186 -4.61,2.936 -6.066,1.674 z"
+           id="path127"
+           style="opacity:0.18999999;fill:url(#SVGID_6_)" />
+        <radialGradient
+           cx="461.69919"
+           cy="-365.7695"
+           r="7.9542999"
+           id="radialGradient7733"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(-0.4207,0.9072,-0.9072,-0.4207,60.0593,-368.1773)">
+          <stop
+             id="stop7735"
+             style="stop-color:#040506;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop7737"
+             style="stop-color:#050709;stop-opacity:1"
+             offset="0.3195" />
+          <stop
+             id="stop7739"
+             style="stop-color:#070c13;stop-opacity:1"
+             offset="0.55989999" />
+          <stop
+             id="stop7741"
+             style="stop-color:#0a1523;stop-opacity:1"
+             offset="0.77380002" />
+          <stop
+             id="stop7743"
+             style="stop-color:#0b1929;stop-opacity:1"
+             offset="0.83639997" />
+          <stop
+             id="stop7745"
+             style="stop-color:#23474c;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 197.448,215.759 c -4.381,-2.604 -6.263,-8.163 -4.022,-12.993 2.242,-4.832 7.604,-7.561 11.85,-6.051 -5.918,-0.537 -9.549,4.649 -10.458,6.506 -2.301,4.703 -0.215,9.33 2.63,12.538 z"
+           id="path142"
+           style="opacity:0.38999999;fill:url(#SVGID_7_)" />
+        <path
+           d="m 213.759,204.223 c 1.949,4.711 0.106,10.313 -4.618,12.861 -4.724,2.555 -10.655,1.51 -13.155,-2.238 3.954,5.014 11.255,2.664 13.089,1.676 3.954,-2.133 6.53,-7.183 4.684,-12.299 z"
+           id="path144"
+           style="opacity:0.54000005;fill:#ffffff" />
+        <radialGradient
+           cx="186.43359"
+           cy="-936.53271"
+           r="1.1188999"
+           id="radialGradient7749"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(-0.6237,0.7816,-0.7816,-0.6237,-403.3182,-515.8688)">
+          <stop
+             id="stop7751"
+             style="stop-color:#040506;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop7753"
+             style="stop-color:#050709;stop-opacity:1"
+             offset="0.3195" />
+          <stop
+             id="stop7755"
+             style="stop-color:#070c13;stop-opacity:1"
+             offset="0.55989999" />
+          <stop
+             id="stop7757"
+             style="stop-color:#0a1523;stop-opacity:1"
+             offset="0.77380002" />
+          <stop
+             id="stop7759"
+             style="stop-color:#0b1929;stop-opacity:1"
+             offset="0.83639997" />
+          <stop
+             id="stop7761"
+             style="stop-color:#23474c;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 211.507,215.068 c -0.298,-0.239 -0.146,-0.93 0.345,-1.543 0.486,-0.611 1.127,-0.916 1.426,-0.676 0.304,0.232 0.146,0.93 -0.344,1.541 -0.491,0.611 -1.127,0.917 -1.427,0.678 z"
+           id="path159"
+           style="opacity:0.18999999;fill:url(#SVGID_8_)" />
+        <radialGradient
+           cx="-829.55078"
+           cy="1166.4326"
+           r="10.9668"
+           id="radialGradient7764"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.6235,-0.7818,0.7818,0.6235,-197.1253,-1173.7216)">
+          <stop
+             id="stop7766"
+             style="stop-color:#040506;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop7768"
+             style="stop-color:#0b1929;stop-opacity:0.51999998"
+             offset="0.5273" />
+          <stop
+             id="stop7770"
+             style="stop-color:#132935;stop-opacity:0.30559999"
+             offset="0.72219998" />
+          <stop
+             id="stop7772"
+             style="stop-color:#23474c;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 194.279,210.828 c -3.134,-2.809 -3.154,-7.982 0.036,-11.527 3.162,-3.56 8.294,-4.158 11.447,-1.344 3.146,2.8 3.146,7.979 -0.035,11.525 -3.168,3.547 -8.3,4.154 -11.448,1.346 z"
+           id="path170"
+           style="opacity:0.7;fill:url(#SVGID_9_)" />
+        <radialGradient
+           cx="196.87309"
+           cy="1226.0996"
+           r="6.2147999"
+           id="radialGradient7775"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.9999,0.017,-0.0157,0.9206,26.0913,-930.5986)">
+          <stop
+             id="stop7777"
+             style="stop-color:#eef8fb;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop7779"
+             style="stop-color:#ecf7fa;stop-opacity:0.491"
+             offset="0.509" />
+          <stop
+             id="stop7781"
+             style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+             offset="0.69239998" />
+          <stop
+             id="stop7783"
+             style="stop-color:#daf0f4;stop-opacity:0.177"
+             offset="0.82300001" />
+          <stop
+             id="stop7785"
+             style="stop-color:#c9e9ef;stop-opacity:0.0721"
+             offset="0.92790002" />
+          <stop
+             id="stop7787"
+             style="stop-color:#b8e2e9;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 209.909,201.602 c -0.056,3.159 -2.882,5.674 -6.313,5.615 -3.432,-0.057 -6.17,-2.667 -6.115,-5.828 0.054,-3.158 2.878,-5.674 6.312,-5.613 3.43,0.056 6.168,2.667 6.116,5.826 z"
+           id="path185"
+           style="opacity:0.5;fill:url(#SVGID_10_)" />
+        <radialGradient
+           cx="196.3741"
+           cy="1224.7578"
+           r="4.5488"
+           id="radialGradient7790"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.9999,0.017,-0.0157,0.9206,26.0913,-930.5986)">
+          <stop
+             id="stop7792"
+             style="stop-color:#eef8fb;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop7794"
+             style="stop-color:#ecf7fa;stop-opacity:0.491"
+             offset="0.509" />
+          <stop
+             id="stop7796"
+             style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+             offset="0.69239998" />
+          <stop
+             id="stop7798"
+             style="stop-color:#daf0f4;stop-opacity:0.177"
+             offset="0.82300001" />
+          <stop
+             id="stop7800"
+             style="stop-color:#c9e9ef;stop-opacity:0.0721"
+             offset="0.92790002" />
+          <stop
+             id="stop7802"
+             style="stop-color:#b8e2e9;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 207.766,200.33 c -0.039,2.313 -2.104,4.152 -4.619,4.109 -2.512,-0.041 -4.518,-1.951 -4.479,-4.27 0.041,-2.313 2.109,-4.146 4.621,-4.105 2.513,0.043 4.518,1.956 4.477,4.266 z"
+           id="path200"
+           style="fill:url(#SVGID_11_)" />
+        <radialGradient
+           cx="196.1597"
+           cy="1123.4746"
+           r="3.0989001"
+           id="radialGradient7805"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.9999,0.017,-0.017,0.9999,26.0318,-927.0317)">
+          <stop
+             id="stop7807"
+             style="stop-color:#eef8fb;stop-opacity:1"
+             offset="0.2667" />
+          <stop
+             id="stop7809"
+             style="stop-color:#edf7f8;stop-opacity:0.80159998"
+             offset="0.4122" />
+          <stop
+             id="stop7811"
+             style="stop-color:#e9f5ee;stop-opacity:0.65249997"
+             offset="0.52149999" />
+          <stop
+             id="stop7813"
+             style="stop-color:#e2f1de;stop-opacity:0.51959997"
+             offset="0.61900002" />
+          <stop
+             id="stop7815"
+             style="stop-color:#d8ecc7;stop-opacity:0.396"
+             offset="0.70959997" />
+          <stop
+             id="stop7817"
+             style="stop-color:#cce4aa;stop-opacity:0.2789"
+             offset="0.79540002" />
+          <stop
+             id="stop7819"
+             style="stop-color:#bcdc86;stop-opacity:0.16670001"
+             offset="0.87769997" />
+          <stop
+             id="stop7821"
+             style="stop-color:#abd25b;stop-opacity:0.0604"
+             offset="0.95569998" />
+          <stop
+             id="stop7823"
+             style="stop-color:#9fcb40;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <circle
+           cx="203.05299"
+           cy="199.66499"
+           r="3.1029999"
+           id="circle221"
+           style="fill:url(#SVGID_12_)" />
+        <circle
+           cx="202.86099"
+           cy="198.59"
+           r="1.219"
+           id="circle223"
+           style="opacity:0.62000002;fill:#ffffff" />
+        <radialGradient
+           cx="-899.35449"
+           cy="1250.8535"
+           r="4.0022998"
+           id="radialGradient7827"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.6377,-0.9894,0.791,0.5098,-216.9556,-1323.5928)">
+          <stop
+             id="stop7829"
+             style="stop-color:#c9daf0;stop-opacity:0"
+             offset="0.50910002" />
+          <stop
+             id="stop7831"
+             style="stop-color:#ccddf1;stop-opacity:0.3477"
+             offset="0.54280001" />
+          <stop
+             id="stop7833"
+             style="stop-color:#d6e4f4;stop-opacity:0.63069999"
+             offset="0.57020003" />
+          <stop
+             id="stop7835"
+             style="stop-color:#e7f1fa;stop-opacity:0.8901"
+             offset="0.59539998" />
+          <stop
+             id="stop7837"
+             style="stop-color:#f1f9fd;stop-opacity:1"
+             offset="0.60610002" />
+          <stop
+             id="stop7839"
+             style="stop-color:#d6eff2;stop-opacity:0.91769999"
+             offset="0.63849998" />
+          <stop
+             id="stop7841"
+             style="stop-color:#ade1e2;stop-opacity:0.77700001"
+             offset="0.69389999" />
+          <stop
+             id="stop7843"
+             style="stop-color:#8cd6d4;stop-opacity:0.63209999"
+             offset="0.75099999" />
+          <stop
+             id="stop7845"
+             style="stop-color:#72cdc9;stop-opacity:0.4844"
+             offset="0.80919999" />
+          <stop
+             id="stop7847"
+             style="stop-color:#60c6c2;stop-opacity:0.33270001"
+             offset="0.8689" />
+          <stop
+             id="stop7849"
+             style="stop-color:#55c2bd;stop-opacity:0.17460001"
+             offset="0.93120003" />
+          <stop
+             id="stop7851"
+             style="stop-color:#51c1bc;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 202.284,199.682 c 1.866,1.205 1.489,3.336 -0.067,5.748 -1.554,2.412 -2.707,2.275 -5.565,2.99 -1.963,0.493 -2.122,-4.136 -0.567,-6.548 1.557,-2.415 4.331,-3.395 6.199,-2.19 z"
+           id="path250"
+           style="opacity:0.54000005;fill:url(#SVGID_13_)" />
+        <radialGradient
+           cx="185.2437"
+           cy="1201.0166"
+           r="5.1918001"
+           id="radialGradient7854"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.9576,0.004,-0.004,0.952,26.6511,-939.7222)">
+          <stop
+             id="stop7856"
+             style="stop-color:#eef8fb;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop7858"
+             style="stop-color:#ecf7fa;stop-opacity:0.491"
+             offset="0.509" />
+          <stop
+             id="stop7860"
+             style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+             offset="0.69239998" />
+          <stop
+             id="stop7862"
+             style="stop-color:#daf0f4;stop-opacity:0.177"
+             offset="0.82300001" />
+          <stop
+             id="stop7864"
+             style="stop-color:#c9e9ef;stop-opacity:0.0721"
+             offset="0.92790002" />
+          <stop
+             id="stop7866"
+             style="stop-color:#b8e2e9;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 204.297,204.604 c -0.01,2.082 -1.287,3.861 -3.102,4.619 -0.608,0.256 1.101,-7.013 -1.96,-6.453 -3.126,0.57 -2.665,6.276 -3.578,5.373 -0.921,-0.918 -1.489,-2.184 -1.483,-3.582 0.011,-2.771 2.288,-5.021 5.084,-5.009 2.793,0.011 5.051,2.273 5.039,5.052 z"
+           id="path265"
+           style="opacity:0.5;fill:url(#SVGID_14_)" />
+      </g>
+      <g
+         id="g267">
+        <g
+           id="g269">
+          <radialGradient
+             cx="326.14459"
+             cy="1002.1309"
+             r="12.7158"
+             id="radialGradient7871"
+             gradientUnits="userSpaceOnUse"
+             gradientTransform="matrix(0.9687,0.2482,-0.2482,0.9687,47.035,-816.7146)">
+            <stop
+               id="stop7873"
+               style="stop-color:#d5e2ee;stop-opacity:1"
+               offset="0.77579999" />
+            <stop
+               id="stop7875"
+               style="stop-color:#d1dfed;stop-opacity:1"
+               offset="0.82630002" />
+            <stop
+               id="stop7877"
+               style="stop-color:#c7d6e8;stop-opacity:1"
+               offset="0.8714" />
+            <stop
+               id="stop7879"
+               style="stop-color:#b4c6e1;stop-opacity:1"
+               offset="0.91439998" />
+            <stop
+               id="stop7881"
+               style="stop-color:#9bb0d8;stop-opacity:1"
+               offset="0.9562" />
+            <stop
+               id="stop7883"
+               style="stop-color:#7a95cb;stop-opacity:1"
+               offset="0.99680001" />
+            <stop
+               id="stop7885"
+               style="stop-color:#7792ca;stop-opacity:1"
+               offset="1" />
+          </radialGradient>
+          <circle
+             cx="114.243"
+             cy="234.99899"
+             r="12.712"
+             id="circle286"
+             style="fill:url(#SVGID_15_)" />
+          <path
+             d="m 127.31,238.368 c -0.91,3.381 -3.255,6.373 -6.282,8.091 -3.025,1.743 -6.685,2.302 -10.111,1.455 -3.374,-0.805 -6.43,-3.046 -8.272,-6.05 -1.865,-3.007 -2.495,-6.755 -1.633,-10.282 0.4,-1.688 1.171,-3.395 2.226,-4.841 1.064,-1.455 2.428,-2.688 3.974,-3.622 3.096,-1.881 6.935,-2.488 10.498,-1.523 3.471,0.864 6.578,3.313 8.323,6.424 1.784,3.116 2.245,6.926 1.284,10.33 l 0,0 -0.007,0.018 z m -1.511,-0.411 c 0.724,-3.047 0.169,-6.326 -1.467,-8.932 -0.814,-1.303 -1.874,-2.443 -3.109,-3.334 -1.253,-0.895 -2.603,-1.522 -4.133,-1.918 -2.888,-0.727 -6.139,-0.313 -8.766,1.227 -2.639,1.537 -4.644,4.08 -5.476,7.104 -0.824,2.922 -0.439,6.27 1.116,8.979 1.529,2.747 4.201,4.806 7.294,5.624 3.023,0.84 6.455,0.385 9.152,-1.292 2.719,-1.651 4.671,-4.38 5.389,-7.458 z"
+             id="path288"
+             style="fill:#39444f" />
+        </g>
+        <radialGradient
+           cx="429.17191"
+           cy="463.30179"
+           r="14.2883"
+           id="radialGradient7889"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.8471,0.5315,-0.5315,0.8471,-3.4861,-386.0533)">
+          <stop
+             id="stop7891"
+             style="stop-color:#0b1929;stop-opacity:0"
+             offset="0.41209999" />
+          <stop
+             id="stop7893"
+             style="stop-color:#0a1827;stop-opacity:0.53789997"
+             offset="0.58490002" />
+          <stop
+             id="stop7895"
+             style="stop-color:#091420;stop-opacity:0.7317"
+             offset="0.64719999" />
+          <stop
+             id="stop7897"
+             style="stop-color:#060d15;stop-opacity:0.86940002"
+             offset="0.69139999" />
+          <stop
+             id="stop7899"
+             style="stop-color:#010204;stop-opacity:0.98030001"
+             offset="0.727" />
+          <stop
+             id="stop7901"
+             style="stop-color:#000000;stop-opacity:1"
+             offset="0.73329997" />
+          <stop
+             id="stop7903"
+             style="stop-color:#03080d;stop-opacity:0.61080003"
+             offset="0.78759998" />
+          <stop
+             id="stop7905"
+             style="stop-color:#0b1929;stop-opacity:0"
+             offset="0.87269998" />
+        </radialGradient>
+        <circle
+           cx="114.366"
+           cy="233.99899"
+           r="13.728"
+           id="circle307"
+           style="opacity:0.36000001;fill:url(#SVGID_16_)" />
+        <radialGradient
+           cx="327.48251"
+           cy="994.31049"
+           r="19.693399"
+           id="radialGradient7908"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.9687,0.2482,-0.2482,0.9687,47.035,-816.7146)">
+          <stop
+             id="stop7910"
+             style="stop-color:#b4cb80;stop-opacity:0"
+             offset="0.33329999" />
+          <stop
+             id="stop7912"
+             style="stop-color:#60bd71;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <circle
+           cx="114.277"
+           cy="234.86501"
+           r="12.712"
+           id="circle314"
+           style="opacity:0.62000002;fill:url(#SVGID_17_)" />
+        <radialGradient
+           cx="326.14359"
+           cy="1001.9922"
+           r="12.7153"
+           id="radialGradient7915"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.9687,0.2482,-0.2482,0.9687,47.035,-816.7146)">
+          <stop
+             id="stop7917"
+             style="stop-color:#3fb1cb;stop-opacity:0"
+             offset="0.33329999" />
+          <stop
+             id="stop7919"
+             style="stop-color:#456c90;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <circle
+           cx="114.276"
+           cy="234.864"
+           r="12.712"
+           id="circle321"
+           style="opacity:0.62000002;fill:url(#SVGID_18_)" />
+        <path
+           d="m 101.718,233.407 c 1.086,-6.927 7.374,-12.093 14.303,-11.007 6.927,1.089 10.49,6.033 11.072,12.82 -1.466,-7.693 -10.208,-10.091 -12.922,-10.132 -6.027,-0.086 -9.539,3.475 -12.453,8.319 z"
+           id="path323"
+           style="opacity:0.11000001;fill:#ebf7fd" />
+        <path
+           d="m 101.752,236.422 c 0.206,-9.501 7.219,-14.711 13.972,-13.652 6.75,1.063 11.571,7.686 10.448,15.186 -0.147,-11.454 -9.297,-13.441 -11.943,-13.479 -5.877,-0.073 -9.911,3.408 -12.477,11.945 z"
+           id="path325"
+           style="opacity:0.22000002;fill:#ebf7fd" />
+        <radialGradient
+           cx="91.042999"
+           cy="1160.416"
+           r="13.8324"
+           id="radialGradient7924"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="translate(24,-933)">
+          <stop
+             id="stop7926"
+             style="stop-color:#040506;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop7928"
+             style="stop-color:#0b1929;stop-opacity:0.51999998"
+             offset="0.5273" />
+          <stop
+             id="stop7930"
+             style="stop-color:#132935;stop-opacity:0.30559999"
+             offset="0.72219998" />
+          <stop
+             id="stop7932"
+             style="stop-color:#23474c;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 103.836,231.055 c 0.305,-5.298 5.391,-9.387 11.394,-9.029 6,0.32 10.626,4.908 10.33,10.23 -0.288,5.305 -5.393,9.379 -11.395,9.027 -5.987,-0.335 -10.621,-4.914 -10.329,-10.228 z"
+           id="path336"
+           style="opacity:0.7;fill:url(#SVGID_19_)" />
+        <radialGradient
+           cx="437.9317"
+           cy="677"
+           r="3.9558001"
+           id="radialGradient7935"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.996,0.6823,-0.5652,0.8249,55.119,-615.6229)">
+          <stop
+             id="stop7937"
+             style="stop-color:#b4decf;stop-opacity:1"
+             offset="0.2667" />
+          <stop
+             id="stop7939"
+             style="stop-color:#b4decc;stop-opacity:0.77960002"
+             offset="0.42829999" />
+          <stop
+             id="stop7941"
+             style="stop-color:#b2dcc2;stop-opacity:0.61409998"
+             offset="0.54970002" />
+          <stop
+             id="stop7943"
+             style="stop-color:#b0dab2;stop-opacity:0.4664"
+             offset="0.65799999" />
+          <stop
+             id="stop7945"
+             style="stop-color:#acd79b;stop-opacity:0.32929999"
+             offset="0.75849998" />
+          <stop
+             id="stop7947"
+             style="stop-color:#a8d37e;stop-opacity:0.19930001"
+             offset="0.8538" />
+          <stop
+             id="stop7949"
+             style="stop-color:#a3ce5a;stop-opacity:0.0764"
+             offset="0.94389999" />
+          <stop
+             id="stop7951"
+             style="stop-color:#9fcb40;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 112.619,244.35 c -1.235,1.801 -4,2.062 -6.176,0.563 -2.176,-1.491 -2.94,-4.16 -1.705,-5.965 1.234,-1.802 3.999,-2.056 6.176,-0.563 2.176,1.492 2.939,4.162 1.705,5.965 z"
+           id="path355"
+           style="opacity:0.86000001;fill:url(#SVGID_20_)" />
+        <path
+           d="m 110.605,246.277 c -0.082,0.218 -0.221,0.404 -0.399,0.549 -1.101,-0.053 -2.812,-0.956 -3.535,-1.674 0.011,-0.106 0.035,-0.213 0.074,-0.313 0.305,-0.821 1.417,-1.167 2.484,-0.771 1.067,0.399 1.682,1.387 1.376,2.209 z"
+           id="path357"
+           style="opacity:0.31999996;fill:#ffffff" />
+        <radialGradient
+           cx="-46.215801"
+           cy="1475.1348"
+           r="6.3042998"
+           id="radialGradient7955"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(1.1476,-0.0333,0.0226,0.7797,133.7359,-925.1971)">
+          <stop
+             id="stop7957"
+             style="stop-color:#1d3c6e;stop-opacity:0.36000001"
+             offset="0.54549998" />
+          <stop
+             id="stop7959"
+             style="stop-color:#30486d;stop-opacity:0.433"
+             offset="0.56900001" />
+          <stop
+             id="stop7961"
+             style="stop-color:#46566b;stop-opacity:0.54839998"
+             offset="0.60610002" />
+          <stop
+             id="stop7963"
+             style="stop-color:#56606a;stop-opacity:0.67330003"
+             offset="0.64630002" />
+          <stop
+             id="stop7965"
+             style="stop-color:#606669;stop-opacity:0.81339997"
+             offset="0.69139999" />
+          <stop
+             id="stop7967"
+             style="stop-color:#636869;stop-opacity:1"
+             offset="0.75150001" />
+          <stop
+             id="stop7969"
+             style="stop-color:#51c1bc;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 122.302,226.895 c 0.083,2.904 -2.95,4.086 -7.365,4.213 -4.415,0.129 -5.237,-1.215 -8.621,-3.748 -2.325,-1.74 3.427,-5.358 7.84,-5.487 4.415,-0.137 8.062,2.117 8.146,5.022 z"
+           id="path374"
+           style="opacity:0.18999999;fill:url(#SVGID_21_)" />
+        <path
+           d="m 101.929,231.843 c 0.995,-6.352 7.699,-9.999 13.596,-9.586 5.842,0.408 11.568,6.604 11.485,11.063 -2.158,-7.604 -7.605,-10.043 -12.604,-10.348 -6.28,-0.385 -10.425,4.43 -12.477,8.871 z"
+           id="path376"
+           style="opacity:0.48999999;fill:#f2f6fa" />
+        <radialGradient
+           cx="-29.955999"
+           cy="1610.1816"
+           r="8.6611996"
+           id="radialGradient7973"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.9925,-0.1225,0.1225,0.9925,-52.6962,-1360.2935)">
+          <stop
+             id="stop7975"
+             style="stop-color:#040506;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop7977"
+             style="stop-color:#050709;stop-opacity:1"
+             offset="0.3195" />
+          <stop
+             id="stop7979"
+             style="stop-color:#070c13;stop-opacity:1"
+             offset="0.55989999" />
+          <stop
+             id="stop7981"
+             style="stop-color:#0a1523;stop-opacity:1"
+             offset="0.77380002" />
+          <stop
+             id="stop7983"
+             style="stop-color:#0b1929;stop-opacity:1"
+             offset="0.83639997" />
+          <stop
+             id="stop7985"
+             style="stop-color:#23474c;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 125.31,235.159 c 0.111,5.558 -3.949,10.502 -9.712,11.214 -5.765,0.711 -11.327,-2.713 -12.375,-7.514 2.917,5.791 9.755,6.199 11.995,5.968 5.678,-0.587 8.76,-5.186 10.092,-9.668 z"
+           id="path391"
+           style="opacity:0.12000002;fill:url(#SVGID_22_)" />
+        <path
+           d="m 125.986,235.954 c 0.082,5.562 -4.221,10.536 -10.292,11.285 -6.071,0.75 -11.903,-2.644 -12.975,-7.438 2.076,6.657 10.787,7.129 13.139,6.84 5.083,-0.619 9.928,-4.752 10.128,-10.687 z"
+           id="path393"
+           style="opacity:0.75;fill:#ffffff" />
+        <radialGradient
+           cx="1378.8408"
+           cy="1000.8789"
+           r="1.6339999"
+           id="radialGradient7989"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.9798,0.1996,-0.1234,0.6054,-1115.8159,-634.5699)">
+          <stop
+             id="stop7991"
+             style="stop-color:#040506;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop7993"
+             style="stop-color:#050709;stop-opacity:1"
+             offset="0.3195" />
+          <stop
+             id="stop7995"
+             style="stop-color:#070c13;stop-opacity:1"
+             offset="0.55989999" />
+          <stop
+             id="stop7997"
+             style="stop-color:#0a1523;stop-opacity:1"
+             offset="0.77380002" />
+          <stop
+             id="stop7999"
+             style="stop-color:#0b1929;stop-opacity:1"
+             offset="0.83639997" />
+          <stop
+             id="stop8001"
+             style="stop-color:#23474c;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 109.959,246.203 c 0.115,-0.469 0.981,-0.654 1.937,-0.419 0.956,0.235 1.636,0.803 1.521,1.271 -0.115,0.465 -0.981,0.651 -1.937,0.418 -0.956,-0.237 -1.637,-0.806 -1.521,-1.27 z"
+           id="path408"
+           style="opacity:0.22999998;fill:url(#SVGID_23_)" />
+        <radialGradient
+           cx="-3.7392001"
+           cy="1224.8076"
+           r="5.1849999"
+           id="radialGradient8004"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(1.2206,0.0051,-0.004,0.952,125.5627,-939.3163)">
+          <stop
+             id="stop8006"
+             style="stop-color:#eef8fb;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop8008"
+             style="stop-color:#ecf7fa;stop-opacity:0.491"
+             offset="0.509" />
+          <stop
+             id="stop8010"
+             style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+             offset="0.69239998" />
+          <stop
+             id="stop8012"
+             style="stop-color:#daf0f4;stop-opacity:0.177"
+             offset="0.82300001" />
+          <stop
+             id="stop8014"
+             style="stop-color:#c9e9ef;stop-opacity:0.0721"
+             offset="0.92790002" />
+          <stop
+             id="stop8016"
+             style="stop-color:#b8e2e9;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 122.551,226.919 c -0.01,2.081 -1.636,3.86 -3.948,4.617 -0.775,0.253 2.124,-7.858 -3.161,-7.251 -4.009,0.461 -2.737,7.068 -3.9,6.162 -1.176,-0.918 -1.9,-2.188 -1.896,-3.583 0.012,-2.775 2.911,-5.019 6.474,-5.005 3.563,0.016 6.442,2.284 6.431,5.06 z"
+           id="path423"
+           style="opacity:0.5;fill:url(#SVGID_24_)" />
+        <radialGradient
+           cx="489.56839"
+           cy="655.89062"
+           r="2.9888999"
+           id="radialGradient8019"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.8906,0.6566,-0.5919,0.8029,69.4326,-623.5166)">
+          <stop
+             id="stop8021"
+             style="stop-color:#eef8fb;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop8023"
+             style="stop-color:#ecf7fa;stop-opacity:0.491"
+             offset="0.509" />
+          <stop
+             id="stop8025"
+             style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+             offset="0.69239998" />
+          <stop
+             id="stop8027"
+             style="stop-color:#daf0f4;stop-opacity:0.177"
+             offset="0.82300001" />
+          <stop
+             id="stop8029"
+             style="stop-color:#c9e9ef;stop-opacity:0.0721"
+             offset="0.92790002" />
+          <stop
+             id="stop8031"
+             style="stop-color:#b8e2e9;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 119.869,226.523 c -0.978,1.324 -2.96,1.521 -4.428,0.438 -1.468,-1.083 -1.867,-3.034 -0.89,-4.357 0.975,-1.317 2.956,-1.521 4.426,-0.437 1.468,1.083 1.866,3.033 0.892,4.356 z"
+           id="path438"
+           style="opacity:0.51999996;fill:url(#SVGID_25_)" />
+        <path
+           d="m 124.452,241.381 c 0.491,-1.102 2.707,-4.957 1.042,-10.613 -0.069,-0.229 1.257,8.315 -1.789,9.422 -0.772,0.279 -1.831,0.498 -1.846,1.317 -0.013,0.584 0.27,1.056 0.793,1.231 0.779,0.262 1.465,-0.602 1.8,-1.357 z"
+           id="path440"
+           style="opacity:0.87000002;fill:#ffffff" />
+        <radialGradient
+           cx="127.0777"
+           cy="1299.1113"
+           r="5.5640998"
+           id="radialGradient8035"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(1.1309,0.1977,-0.1343,0.7684,146.6669,-796.4049)">
+          <stop
+             id="stop8037"
+             style="stop-color:#c9daf0;stop-opacity:0.17"
+             offset="0" />
+          <stop
+             id="stop8039"
+             style="stop-color:#ccddf1;stop-opacity:0.45860001"
+             offset="0.21070001" />
+          <stop
+             id="stop8041"
+             style="stop-color:#d6e4f4;stop-opacity:0.69340003"
+             offset="0.3822" />
+          <stop
+             id="stop8043"
+             style="stop-color:#e7f1fa;stop-opacity:0.90880001"
+             offset="0.5395" />
+          <stop
+             id="stop8045"
+             style="stop-color:#f1f9fd;stop-opacity:1"
+             offset="0.60610002" />
+          <stop
+             id="stop8047"
+             style="stop-color:#ceedef;stop-opacity:0.90020001"
+             offset="0.64539999" />
+          <stop
+             id="stop8049"
+             style="stop-color:#a8dfdf;stop-opacity:0.7701"
+             offset="0.69660002" />
+          <stop
+             id="stop8051"
+             style="stop-color:#89d4d3;stop-opacity:0.63459998"
+             offset="0.75" />
+          <stop
+             id="stop8053"
+             style="stop-color:#70ccc9;stop-opacity:0.49430001"
+             offset="0.8053" />
+          <stop
+             id="stop8055"
+             style="stop-color:#5fc6c2;stop-opacity:0.34720001"
+             offset="0.86320001" />
+          <stop
+             id="stop8057"
+             style="stop-color:#54c2bd;stop-opacity:0.1891"
+             offset="0.92549998" />
+          <stop
+             id="stop8059"
+             style="stop-color:#51c1bc;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 122.99,228.748 c -0.442,2.527 -3.276,3.012 -7.119,2.339 -3.84,-0.671 -4.315,-1.978 -6.792,-4.771 -1.702,-1.92 3.914,-4.032 7.755,-3.359 3.843,0.67 6.598,3.264 6.156,5.791 z"
+           id="path467"
+           style="opacity:0.54000005;fill:url(#SVGID_26_)" />
+      </g>
+      <g
+         id="g469">
+        <g
+           id="g471">
+          <radialGradient
+             cx="262.31549"
+             cy="893.60059"
+             r="12.7148"
+             id="radialGradient8064"
+             gradientUnits="userSpaceOnUse"
+             gradientTransform="matrix(0.9687,0.2482,-0.2482,0.9687,47.035,-816.7146)">
+            <stop
+               id="stop8066"
+               style="stop-color:#d5e2ee;stop-opacity:1"
+               offset="0.77579999" />
+            <stop
+               id="stop8068"
+               style="stop-color:#d1dfed;stop-opacity:1"
+               offset="0.82630002" />
+            <stop
+               id="stop8070"
+               style="stop-color:#c7d6e8;stop-opacity:1"
+               offset="0.8714" />
+            <stop
+               id="stop8072"
+               style="stop-color:#b4c6e1;stop-opacity:1"
+               offset="0.91439998" />
+            <stop
+               id="stop8074"
+               style="stop-color:#9bb0d8;stop-opacity:1"
+               offset="0.9562" />
+            <stop
+               id="stop8076"
+               style="stop-color:#7a95cb;stop-opacity:1"
+               offset="0.99680001" />
+            <stop
+               id="stop8078"
+               style="stop-color:#7792ca;stop-opacity:1"
+               offset="1" />
+          </radialGradient>
+          <circle
+             cx="79.348"
+             cy="114.023"
+             r="12.712"
+             id="circle488"
+             style="fill:url(#SVGID_27_)" />
+          <path
+             d="m 92.415,117.392 c -0.909,3.382 -3.255,6.374 -6.282,8.091 -3.025,1.743 -6.684,2.303 -10.111,1.456 -3.374,-0.804 -6.429,-3.046 -8.272,-6.05 -1.865,-3.007 -2.496,-6.755 -1.633,-10.282 0.401,-1.688 1.171,-3.395 2.227,-4.84 1.064,-1.455 2.428,-2.689 3.974,-3.623 3.083,-1.884 6.962,-2.48 10.469,-1.531 3.527,0.879 6.595,3.313 8.352,6.432 1.784,3.117 2.244,6.926 1.283,10.329 l -0.007,0.018 z m -1.511,-0.408 c 0.725,-3.048 0.17,-6.328 -1.466,-8.935 -1.615,-2.632 -4.275,-4.499 -7.214,-5.245 -2.944,-0.736 -6.154,-0.317 -8.793,1.219 -2.64,1.537 -4.644,4.08 -5.477,7.103 -0.825,2.923 -0.439,6.265 1.116,8.98 1.529,2.747 4.201,4.805 7.294,5.626 3.023,0.839 6.455,0.383 9.152,-1.293 2.724,-1.654 4.679,-4.39 5.394,-7.475 l -0.006,0.02 z"
+             id="path490"
+             style="fill:#39444f" />
+        </g>
+        <radialGradient
+           cx="335.31741"
+           cy="379.37601"
+           r="14.2871"
+           id="radialGradient8082"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.8471,0.5315,-0.5315,0.8471,-3.4861,-386.0533)">
+          <stop
+             id="stop8084"
+             style="stop-color:#0b1929;stop-opacity:0"
+             offset="0.41209999" />
+          <stop
+             id="stop8086"
+             style="stop-color:#0a1827;stop-opacity:0.53789997"
+             offset="0.58490002" />
+          <stop
+             id="stop8088"
+             style="stop-color:#091420;stop-opacity:0.7317"
+             offset="0.64719999" />
+          <stop
+             id="stop8090"
+             style="stop-color:#060d15;stop-opacity:0.86940002"
+             offset="0.69139999" />
+          <stop
+             id="stop8092"
+             style="stop-color:#010204;stop-opacity:0.98030001"
+             offset="0.727" />
+          <stop
+             id="stop8094"
+             style="stop-color:#000000;stop-opacity:1"
+             offset="0.73329997" />
+          <stop
+             id="stop8096"
+             style="stop-color:#03080d;stop-opacity:0.61080003"
+             offset="0.78759998" />
+          <stop
+             id="stop8098"
+             style="stop-color:#0b1929;stop-opacity:0"
+             offset="0.87269998" />
+        </radialGradient>
+        <path
+           d="m 91.099,120.319 c -4.03,6.423 -12.502,8.363 -18.925,4.333 -6.421,-4.029 -8.359,-12.502 -4.331,-18.924 4.027,-6.422 12.5,-8.362 18.924,-4.332 6.421,4.029 8.36,12.501 4.332,18.923 z"
+           id="path509"
+           style="opacity:0.36000001;fill:url(#SVGID_28_)" />
+        <radialGradient
+           cx="263.65039"
+           cy="885.78522"
+           r="19.692101"
+           id="radialGradient8101"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.9687,0.2482,-0.2482,0.9687,47.035,-816.7146)">
+          <stop
+             id="stop8103"
+             style="stop-color:#b4cb80;stop-opacity:0"
+             offset="0.33329999" />
+          <stop
+             id="stop8105"
+             style="stop-color:#60bd71;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <circle
+           cx="79.382004"
+           cy="113.889"
+           r="12.712"
+           id="circle516"
+           style="opacity:0.62000002;fill:url(#SVGID_29_)" />
+        <radialGradient
+           cx="262.31641"
+           cy="893.46289"
+           r="12.7158"
+           id="radialGradient8108"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.9687,0.2482,-0.2482,0.9687,47.035,-816.7146)">
+          <stop
+             id="stop8110"
+             style="stop-color:#3fb1cb;stop-opacity:0"
+             offset="0.33329999" />
+          <stop
+             id="stop8112"
+             style="stop-color:#456c90;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <circle
+           cx="79.383003"
+           cy="113.889"
+           r="12.713"
+           id="circle523"
+           style="opacity:0.62000002;fill:url(#SVGID_30_)" />
+        <path
+           d="m 66.823,112.432 c 1.086,-6.928 7.375,-12.091 14.304,-11.006 6.927,1.089 10.49,6.032 11.073,12.82 -1.466,-7.693 -10.208,-10.085 -12.923,-10.126 -6.027,-0.093 -9.539,3.464 -12.454,8.312 z"
+           id="path525"
+           style="opacity:0.11000001;fill:#ebf7fd" />
+        <path
+           d="m 66.858,115.446 c 0.205,-9.501 7.22,-14.712 13.973,-13.655 6.75,1.062 12.146,6.962 10.447,15.181 -0.147,-11.453 -9.259,-11.628 -11.904,-11.659 -5.877,-0.069 -9.951,1.597 -12.516,10.133 z"
+           id="path527"
+           style="opacity:0.22000002;fill:#ebf7fd" />
+        <radialGradient
+           cx="58.565899"
+           cy="1049.8984"
+           r="11.0627"
+           id="radialGradient8117"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="translate(24,-933)">
+          <stop
+             id="stop8119"
+             style="stop-color:#040506;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop8121"
+             style="stop-color:#0b1929;stop-opacity:0.51999998"
+             offset="0.5273" />
+          <stop
+             id="stop8123"
+             style="stop-color:#132935;stop-opacity:0.30559999"
+             offset="0.72219998" />
+          <stop
+             id="stop8125"
+             style="stop-color:#23474c;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 74.863,124.994 c -3.905,-3.597 -3.84,-10.12 0.244,-14.538 4.052,-4.435 10.534,-5.103 14.461,-1.498 3.918,3.586 3.831,10.117 -0.245,14.537 -4.056,4.416 -10.538,5.093 -14.46,1.499 z"
+           id="path538"
+           style="opacity:0.7;fill:url(#SVGID_31_)" />
+        <radialGradient
+           cx="58.370098"
+           cy="1049.9414"
+           r="4.8829002"
+           id="radialGradient8128"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="translate(24,-933)">
+          <stop
+             id="stop8130"
+             style="stop-color:#040506;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop8132"
+             style="stop-color:#0b1929;stop-opacity:0.51999998"
+             offset="0.5273" />
+          <stop
+             id="stop8134"
+             style="stop-color:#132935;stop-opacity:0.30559999"
+             offset="0.72219998" />
+          <stop
+             id="stop8136"
+             style="stop-color:#23474c;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 78.97,120.515 c -1.723,-1.588 -1.694,-4.467 0.108,-6.417 1.79,-1.958 4.649,-2.252 6.384,-0.661 1.729,1.583 1.69,4.465 -0.109,6.416 -1.791,1.95 -4.651,2.248 -6.383,0.662 z"
+           id="path549"
+           style="opacity:0.62000002;fill:url(#SVGID_32_)" />
+        <radialGradient
+           cx="357.45511"
+           cy="596.91602"
+           r="3.9574001"
+           id="radialGradient8139"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.996,0.6823,-0.5652,0.8249,55.119,-615.6229)">
+          <stop
+             id="stop8141"
+             style="stop-color:#26b481;stop-opacity:0.60000002"
+             offset="0.2667" />
+          <stop
+             id="stop8143"
+             style="stop-color:#29b57f;stop-opacity:0.45879999"
+             offset="0.43920001" />
+          <stop
+             id="stop8145"
+             style="stop-color:#33b67a;stop-opacity:0.35280001"
+             offset="0.56879997" />
+          <stop
+             id="stop8147"
+             style="stop-color:#43b972;stop-opacity:0.25830001"
+             offset="0.68430001" />
+          <stop
+             id="stop8149"
+             style="stop-color:#5abe65;stop-opacity:0.17039999"
+             offset="0.79170001" />
+          <stop
+             id="stop8151"
+             style="stop-color:#77c355;stop-opacity:0.0872"
+             offset="0.89340001" />
+          <stop
+             id="stop8153"
+             style="stop-color:#9bca42;stop-opacity:0.0085"
+             offset="0.9896" />
+          <stop
+             id="stop8155"
+             style="stop-color:#9fcb40;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 77.724,123.374 c -1.235,1.802 -4,2.056 -6.176,0.565 -2.177,-1.493 -2.94,-4.163 -1.706,-5.965 1.234,-1.802 4,-2.056 6.177,-0.564 2.177,1.491 2.94,4.16 1.705,5.964 z"
+           id="path568"
+           style="opacity:0.51999996;fill:url(#SVGID_33_)" />
+        <path
+           d="m 75.711,125.303 c -0.083,0.218 -0.221,0.404 -0.4,0.549 -1.1,-0.053 -2.812,-0.956 -3.535,-1.673 0.012,-0.107 0.035,-0.212 0.074,-0.315 0.305,-0.821 1.417,-1.166 2.484,-0.769 1.067,0.395 1.683,1.385 1.377,2.208 z"
+           id="path570"
+           style="opacity:0.31999996;fill:#ffffff" />
+        <radialGradient
+           cx="-73.388199"
+           cy="1333.8066"
+           r="6.3053999"
+           id="radialGradient8159"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(1.1476,-0.0333,0.0226,0.7797,133.3413,-938.8114)">
+          <stop
+             id="stop8161"
+             style="stop-color:#1d3c6e;stop-opacity:0.36000001"
+             offset="0.54549998" />
+          <stop
+             id="stop8163"
+             style="stop-color:#30486d;stop-opacity:0.433"
+             offset="0.56900001" />
+          <stop
+             id="stop8165"
+             style="stop-color:#46566b;stop-opacity:0.54839998"
+             offset="0.60610002" />
+          <stop
+             id="stop8167"
+             style="stop-color:#56606a;stop-opacity:0.67330003"
+             offset="0.64630002" />
+          <stop
+             id="stop8169"
+             style="stop-color:#606669;stop-opacity:0.81339997"
+             offset="0.69139999" />
+          <stop
+             id="stop8171"
+             style="stop-color:#636869;stop-opacity:1"
+             offset="0.75150001" />
+          <stop
+             id="stop8173"
+             style="stop-color:#51c1bc;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 87.53,103.994 c 0.084,2.906 -2.951,4.085 -7.365,4.212 -4.414,0.128 -5.237,-1.214 -8.621,-3.749 -2.325,-1.743 3.427,-5.363 7.84,-5.491 4.415,-0.128 8.062,2.124 8.146,5.028 z"
+           id="path587"
+           style="opacity:0.18999999;fill:url(#SVGID_34_)" />
+        <path
+           d="m 67.035,110.868 c 0.995,-6.352 7.699,-10 13.596,-9.587 5.842,0.409 11.569,6.604 11.486,11.062 -2.159,-7.602 -7.783,-8.538 -12.783,-8.844 -6.279,-0.385 -10.248,2.929 -12.299,7.369 z"
+           id="path589"
+           style="opacity:0.48999999;fill:#f2f6fa" />
+        <radialGradient
+           cx="-605.86432"
+           cy="1553.4648"
+           r="8.6555004"
+           id="radialGradient8177"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.8182,-0.5749,0.5749,0.8182,-314.1375,-1499.7417)">
+          <stop
+             id="stop8179"
+             style="stop-color:#040506;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop8181"
+             style="stop-color:#050709;stop-opacity:1"
+             offset="0.3195" />
+          <stop
+             id="stop8183"
+             style="stop-color:#070c13;stop-opacity:1"
+             offset="0.55989999" />
+          <stop
+             id="stop8185"
+             style="stop-color:#0a1523;stop-opacity:1"
+             offset="0.77380002" />
+          <stop
+             id="stop8187"
+             style="stop-color:#0b1929;stop-opacity:1"
+             offset="0.83639997" />
+          <stop
+             id="stop8189"
+             style="stop-color:#23474c;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 89.526,109.116 c 2.715,4.851 1.457,11.125 -3.294,14.464 -4.753,3.338 -11.271,2.935 -14.455,-0.809 5.299,3.738 11.525,0.881 13.392,-0.376 4.734,-3.189 5.291,-8.698 4.357,-13.279 z"
+           id="path604"
+           style="opacity:0.3;fill:url(#SVGID_35_)" />
+        <path
+           d="m 91.093,114.98 c 0.082,5.56 -4.222,10.536 -10.294,11.285 -6.07,0.749 -11.903,-2.642 -12.974,-7.439 2.075,6.658 10.787,7.129 13.139,6.841 5.083,-0.622 9.928,-4.753 10.129,-10.687 z"
+           id="path606"
+           style="opacity:0.75;fill:#ffffff" />
+        <radialGradient
+           cx="-1129.0967"
+           cy="-2510.5957"
+           r="1.6341"
+           id="radialGradient8193"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(-0.6927,0.7212,-0.4456,-0.428,-1831.28,-153.949)">
+          <stop
+             id="stop8195"
+             style="stop-color:#040506;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop8197"
+             style="stop-color:#050709;stop-opacity:1"
+             offset="0.3195" />
+          <stop
+             id="stop8199"
+             style="stop-color:#070c13;stop-opacity:1"
+             offset="0.55989999" />
+          <stop
+             id="stop8201"
+             style="stop-color:#0a1523;stop-opacity:1"
+             offset="0.77380002" />
+          <stop
+             id="stop8203"
+             style="stop-color:#0b1929;stop-opacity:1"
+             offset="0.83639997" />
+          <stop
+             id="stop8205"
+             style="stop-color:#23474c;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 70.85,105.04 c 0.333,0.347 0.027,1.178 -0.682,1.861 -0.709,0.682 -1.554,0.952 -1.887,0.606 -0.332,-0.346 -0.027,-1.179 0.682,-1.861 0.709,-0.681 1.555,-0.952 1.887,-0.606 z"
+           id="path621"
+           style="opacity:0.22999998;fill:url(#SVGID_36_)" />
+        <radialGradient
+           cx="260.07819"
+           cy="966.93848"
+           r="6.7708998"
+           id="radialGradient8208"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.9687,0.2482,-0.2286,0.8919,47.918,-820.168)">
+          <stop
+             id="stop8210"
+             style="stop-color:#eef8fb;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop8212"
+             style="stop-color:#ecf7fa;stop-opacity:0.491"
+             offset="0.509" />
+          <stop
+             id="stop8214"
+             style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+             offset="0.69239998" />
+          <stop
+             id="stop8216"
+             style="stop-color:#daf0f4;stop-opacity:0.177"
+             offset="0.82300001" />
+          <stop
+             id="stop8218"
+             style="stop-color:#c9e9ef;stop-opacity:0.0721"
+             offset="0.92790002" />
+          <stop
+             id="stop8220"
+             style="stop-color:#b8e2e9;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 85.382,108.478 c -0.856,3.339 -4.49,5.293 -8.116,4.365 -3.627,-0.931 -5.874,-4.391 -5.019,-7.731 0.856,-3.335 4.49,-5.291 8.118,-4.361 3.625,0.929 5.871,4.39 5.017,7.727 z"
+           id="path636"
+           style="opacity:0.5;fill:url(#SVGID_37_)" />
+        <radialGradient
+           cx="260.19629"
+           cy="1098.9199"
+           r="6.0444999"
+           id="radialGradient8223"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.9687,0.2482,-0.1964,0.7666,43.0603,-801.2024)">
+          <stop
+             id="stop8225"
+             style="stop-color:#eef8fb;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop8227"
+             style="stop-color:#ecf7fa;stop-opacity:0.491"
+             offset="0.509" />
+          <stop
+             id="stop8229"
+             style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+             offset="0.69239998" />
+          <stop
+             id="stop8231"
+             style="stop-color:#daf0f4;stop-opacity:0.177"
+             offset="0.82300001" />
+          <stop
+             id="stop8233"
+             style="stop-color:#c9e9ef;stop-opacity:0.0721"
+             offset="0.92790002" />
+          <stop
+             id="stop8235"
+             style="stop-color:#b8e2e9;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 85.126,107.306 c -0.655,2.56 -3.809,3.963 -7.042,3.135 -3.234,-0.83 -5.323,-3.577 -4.667,-6.135 0.654,-2.558 3.808,-3.961 7.043,-3.132 3.232,0.828 5.32,3.575 4.666,6.132 z"
+           id="path651"
+           style="opacity:0.65;fill:url(#SVGID_38_)" />
+        <radialGradient
+           cx="55.575199"
+           cy="1037.6338"
+           r="2.9777999"
+           id="radialGradient8238"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="translate(24,-933)">
+          <stop
+             id="stop8240"
+             style="stop-color:#eef8fb;stop-opacity:1"
+             offset="0.2667" />
+          <stop
+             id="stop8242"
+             style="stop-color:#edf7f8;stop-opacity:0.80159998"
+             offset="0.4122" />
+          <stop
+             id="stop8244"
+             style="stop-color:#e9f5ee;stop-opacity:0.65249997"
+             offset="0.52149999" />
+          <stop
+             id="stop8246"
+             style="stop-color:#e2f1de;stop-opacity:0.51959997"
+             offset="0.61900002" />
+          <stop
+             id="stop8248"
+             style="stop-color:#d8ecc7;stop-opacity:0.396"
+             offset="0.70959997" />
+          <stop
+             id="stop8250"
+             style="stop-color:#cce4aa;stop-opacity:0.2789"
+             offset="0.79540002" />
+          <stop
+             id="stop8252"
+             style="stop-color:#bcdc86;stop-opacity:0.16670001"
+             offset="0.87769997" />
+          <stop
+             id="stop8254"
+             style="stop-color:#abd25b;stop-opacity:0.0604"
+             offset="0.95569998" />
+          <stop
+             id="stop8256"
+             style="stop-color:#9fcb40;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <circle
+           cx="79.574997"
+           cy="104.634"
+           r="2.9779999"
+           id="circle672"
+           style="fill:url(#SVGID_39_)" />
+        <circle
+           cx="79.984001"
+           cy="103.588"
+           r="1.171"
+           id="circle674"
+           style="opacity:0.62000002;fill:#ffffff" />
+        <path
+           d="m 90.218,109.018 c 0.357,1.01 2.049,4.559 0.196,9.433 -0.077,0.202 1.673,-7.249 -0.937,-8.43 -0.662,-0.301 -1.579,-0.562 -1.538,-1.289 0.029,-0.515 0.31,-0.911 0.782,-1.029 0.707,-0.18 1.253,0.63 1.497,1.315 z"
+           id="path676"
+           style="opacity:0.87000002;fill:#ffffff" />
+        <path
+           d="m 67.231,114.264 c 0.305,1.372 1.045,6.729 6.454,9.802 0.248,0.139 -6.89,-5.417 -4.832,-10.025 0.389,-0.873 1.363,-1.727 0.813,-2.506 -0.394,-0.553 -0.979,-0.797 -1.59,-0.601 -0.908,0.295 -1.053,2.399 -0.845,3.33 z"
+           id="path678"
+           style="opacity:0.43000004;fill:#ffffff" />
+        <radialGradient
+           cx="-661.57318"
+           cy="1094.1963"
+           r="4.9277"
+           id="radialGradient8262"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.9395,-0.6599,0.6365,0.9061,6.9776,-1311.354)">
+          <stop
+             id="stop8264"
+             style="stop-color:#c9daf0;stop-opacity:0.17"
+             offset="0" />
+          <stop
+             id="stop8266"
+             style="stop-color:#ccddf1;stop-opacity:0.45860001"
+             offset="0.21070001" />
+          <stop
+             id="stop8268"
+             style="stop-color:#d6e4f4;stop-opacity:0.69340003"
+             offset="0.3822" />
+          <stop
+             id="stop8270"
+             style="stop-color:#e7f1fa;stop-opacity:0.90880001"
+             offset="0.5395" />
+          <stop
+             id="stop8272"
+             style="stop-color:#f1f9fd;stop-opacity:1"
+             offset="0.60610002" />
+          <stop
+             id="stop8274"
+             style="stop-color:#ceedef;stop-opacity:0.90020001"
+             offset="0.64539999" />
+          <stop
+             id="stop8276"
+             style="stop-color:#a8dfdf;stop-opacity:0.7701"
+             offset="0.69660002" />
+          <stop
+             id="stop8278"
+             style="stop-color:#89d4d3;stop-opacity:0.63459998"
+             offset="0.75" />
+          <stop
+             id="stop8280"
+             style="stop-color:#70ccc9;stop-opacity:0.49430001"
+             offset="0.8053" />
+          <stop
+             id="stop8282"
+             style="stop-color:#5fc6c2;stop-opacity:0.34720001"
+             offset="0.86320001" />
+          <stop
+             id="stop8284"
+             style="stop-color:#54c2bd;stop-opacity:0.1891"
+             offset="0.92549998" />
+          <stop
+             id="stop8286"
+             style="stop-color:#51c1bc;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 87.562,113.538 c 1.851,2.638 0.586,5.007 -2.238,6.989 -2.822,1.984 -4.193,1.096 -7.986,0.193 -2.607,-0.622 -1.065,-6.382 1.758,-8.365 2.823,-1.985 6.613,-1.455 8.466,1.183 z"
+           id="path705"
+           style="opacity:0.54000005;fill:url(#SVGID_40_)" />
+      </g>
+      <g
+         id="g707">
+        <linearGradient
+           x1="142.21539"
+           y1="1125.166"
+           x2="176.2896"
+           y2="1125.166"
+           id="linearGradient8290"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="translate(24,-933)">
+          <stop
+             id="stop8292"
+             style="stop-color:#517287;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop8294"
+             style="stop-color:#5c7b8f;stop-opacity:1"
+             offset="0.0118" />
+          <stop
+             id="stop8296"
+             style="stop-color:#809bab;stop-opacity:1"
+             offset="0.057" />
+          <stop
+             id="stop8298"
+             style="stop-color:#9fb7c3;stop-opacity:1"
+             offset="0.1063" />
+          <stop
+             id="stop8300"
+             style="stop-color:#b8cdd6;stop-opacity:1"
+             offset="0.15970001" />
+          <stop
+             id="stop8302"
+             style="stop-color:#ccdee5;stop-opacity:1"
+             offset="0.219" />
+          <stop
+             id="stop8304"
+             style="stop-color:#daeaef;stop-opacity:1"
+             offset="0.2872" />
+          <stop
+             id="stop8306"
+             style="stop-color:#e2f1f5;stop-opacity:1"
+             offset="0.37239999" />
+          <stop
+             id="stop8308"
+             style="stop-color:#e4f3f7;stop-opacity:1"
+             offset="0.5273" />
+        </linearGradient>
+        <path
+           d="m 173.005,179.977 26.599,21.987 c 0.805,0.664 0.917,1.854 0.25,2.659 -0.608,0.741 -1.667,0.896 -2.458,0.398 L 168.16,186.687 c -1.941,-1.225 -2.526,-3.778 -1.312,-5.724 1.218,-1.938 3.776,-2.522 5.717,-1.31 0.149,0.102 0.31,0.217 0.44,0.324 z"
+           id="path728"
+           style="fill:url(#SVGID_41_)" />
+        <path
+           d="m 173.542,179.35 16.771,14.328 c 2.793,2.396 5.611,4.76 8.441,7.108 l 1.059,0.884 c 0.407,0.328 0.723,0.854 0.798,1.385 0.197,1.09 -0.536,2.236 -1.604,2.523 -0.524,0.152 -1.104,0.104 -1.598,-0.137 -0.467,-0.26 -0.803,-0.489 -1.211,-0.735 l -2.345,-1.453 c -6.242,-3.894 -12.56,-7.666 -18.84,-11.498 l -4.717,-2.862 -2.358,-1.433 c -0.882,-0.483 -1.727,-1.356 -2.144,-2.36 -0.912,-2.021 -0.288,-4.627 1.572,-5.953 0.894,-0.664 2.011,-1.022 3.124,-0.979 1.11,0.032 2.206,0.477 3.033,1.168 l 0.019,0.014 z m -1.054,1.267 c -1.173,-0.963 -2.913,-0.954 -4.081,-0.072 -0.289,0.211 -0.55,0.49 -0.743,0.773 -0.223,0.313 -0.375,0.635 -0.48,0.988 -0.205,0.693 -0.169,1.476 0.108,2.157 0.286,0.701 0.752,1.259 1.466,1.687 l 2.316,1.5 4.632,3 c 6.184,3.979 12.332,8.029 18.555,11.953 l 2.329,1.479 c 0.376,0.232 0.804,0.521 1.138,0.711 0.332,0.167 0.728,0.204 1.088,0.104 0.734,-0.182 1.252,-0.979 1.1,-1.729 -0.069,-0.378 -0.251,-0.693 -0.56,-0.945 l -1.067,-0.873 c -2.84,-2.338 -5.693,-4.66 -8.569,-6.953 l -17.239,-13.785 0.007,0.005 z"
+           id="path730"
+           style="fill:#535a5f" />
+      </g>
+      <radialGradient
+         cx="176.3282"
+         cy="1137.2598"
+         r="11.5198"
+         id="radialGradient8312"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="translate(24,-933)">
+        <stop
+           id="stop8314"
+           style="stop-color:#46c3d6;stop-opacity:0.74000001"
+           offset="0" />
+        <stop
+           id="stop8316"
+           style="stop-color:#48c3d3;stop-opacity:0.57990003"
+           offset="0.1036" />
+        <stop
+           id="stop8318"
+           style="stop-color:#4dc4c9;stop-opacity:0.45969999"
+           offset="0.1813" />
+        <stop
+           id="stop8320"
+           style="stop-color:#57c5b9;stop-opacity:0.35249999"
+           offset="0.2507" />
+        <stop
+           id="stop8322"
+           style="stop-color:#65c6a2;stop-opacity:0.2529"
+           offset="0.3152" />
+        <stop
+           id="stop8324"
+           style="stop-color:#76c785;stop-opacity:0.1584"
+           offset="0.37630001" />
+        <stop
+           id="stop8326"
+           style="stop-color:#8bc961;stop-opacity:0.0692"
+           offset="0.43399999" />
+        <stop
+           id="stop8328"
+           style="stop-color:#9fcb40;stop-opacity:0"
+           offset="0.4788" />
+      </radialGradient>
+      <path
+         d="m 199.605,201.964 -3.69,-3.051 c 0.373,0.896 0.57,1.821 0.215,2.887 -0.399,0.603 -0.898,1.097 -1.443,1.521 l 2.71,1.701 c 0.792,0.498 1.85,0.348 2.458,-0.396 0.667,-0.808 0.555,-1.998 -0.25,-2.662 z"
+         id="path749"
+         style="opacity:0.51999996;fill:url(#SVGID_42_)" />
+      <g
+         id="g751">
+        <path
+           d="m 116.302,228.251 c -0.247,0 -0.493,-0.03 -0.744,-0.096 -1.553,-0.407 -2.48,-1.998 -2.072,-3.552 l 6.979,-26.506 c 0.409,-1.557 1.999,-2.479 3.553,-2.07 1.553,0.408 2.482,2 2.072,3.554 l -6.98,26.503 c -0.343,1.305 -1.521,2.167 -2.808,2.167 z"
+           id="path753"
+           style="fill:#e4f3f7" />
+        <path
+           d="m 116.29,228.631 c -0.383,-0.001 -0.88,-0.107 -1.229,-0.256 -0.42,-0.172 -0.774,-0.398 -1.088,-0.702 -0.622,-0.599 -0.995,-1.452 -1.005,-2.327 -0.015,-0.434 0.099,-0.891 0.187,-1.234 l 0.271,-1.104 0.543,-2.219 2.17,-8.875 2.189,-8.87 1.133,-4.426 0.143,-0.558 0.088,-0.313 c 0.032,-0.1 0.045,-0.163 0.107,-0.311 0.206,-0.513 0.468,-0.893 0.819,-1.252 0.691,-0.701 1.666,-1.11 2.657,-1.111 0.247,-0.008 0.495,0.021 0.736,0.064 l 0.181,0.038 0.045,0.011 0.078,0.021 0.068,0.021 c 0.096,0.031 0.164,0.045 0.309,0.104 0.515,0.207 0.893,0.479 1.253,0.831 0.698,0.7 1.103,1.684 1.096,2.668 0.008,0.484 -0.136,1.021 -0.227,1.338 l -0.296,1.104 -0.593,2.205 -2.445,8.806 -2.485,8.792 -1.244,4.396 c -0.11,0.358 -0.186,0.729 -0.354,1.139 -0.179,0.422 -0.426,0.774 -0.743,1.08 -0.624,0.61 -1.49,0.951 -2.353,0.938 l -0.011,0.002 0,0 z m 0.012,-0.76 c 0.661,-0.016 1.308,-0.301 1.756,-0.773 0.484,-0.473 0.615,-1.063 0.797,-1.854 l 1.083,-4.438 2.168,-8.877 2.208,-8.861 0.57,-2.211 c 0.161,-0.715 0.46,-1.566 0.443,-2.016 -0.001,-0.529 -0.229,-1.063 -0.611,-1.438 -0.177,-0.188 -0.445,-0.346 -0.634,-0.426 -0.027,-0.021 -0.144,-0.059 -0.229,-0.084 l -0.068,-0.021 c 0.008,0.002 -0.066,-0.021 0.01,0.002 l -0.025,-0.005 -0.099,-0.021 c -0.13,-0.026 -0.264,-0.047 -0.397,-0.043 -0.532,-0.009 -1.069,0.213 -1.452,0.592 -0.187,0.178 -0.355,0.438 -0.438,0.637 -0.022,0.027 -0.055,0.146 -0.083,0.229 l -0.022,0.067 c 0.002,-0.011 -0.02,0.063 0.001,-0.011 l -0.009,0.035 -0.037,0.141 -0.148,0.552 -1.193,4.409 -2.463,8.798 -2.482,8.793 -0.621,2.198 c -0.177,0.725 -0.493,1.504 -0.508,2.104 -0.043,1.317 1.074,2.578 2.494,2.523 h -0.011 v -0.001 z"
+           id="path755"
+           style="fill:#535a5f" />
+      </g>
+      <radialGradient
+         cx="91.282303"
+         cy="1160.7344"
+         r="17.0993"
+         id="radialGradient8334"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="translate(24,-933)">
+        <stop
+           id="stop8336"
+           style="stop-color:#46c3d6;stop-opacity:0.74000001"
+           offset="0" />
+        <stop
+           id="stop8338"
+           style="stop-color:#48c3d3;stop-opacity:0.57990003"
+           offset="0.1036" />
+        <stop
+           id="stop8340"
+           style="stop-color:#4dc4c9;stop-opacity:0.45969999"
+           offset="0.1813" />
+        <stop
+           id="stop8342"
+           style="stop-color:#57c5b9;stop-opacity:0.35249999"
+           offset="0.2507" />
+        <stop
+           id="stop8344"
+           style="stop-color:#65c6a2;stop-opacity:0.2529"
+           offset="0.3152" />
+        <stop
+           id="stop8346"
+           style="stop-color:#76c785;stop-opacity:0.1584"
+           offset="0.37630001" />
+        <stop
+           id="stop8348"
+           style="stop-color:#8bc961;stop-opacity:0.0692"
+           offset="0.43399999" />
+        <stop
+           id="stop8350"
+           style="stop-color:#9fcb40;stop-opacity:0"
+           offset="0.4788" />
+      </radialGradient>
+      <path
+         d="m 115.016,218.796 -1.53,5.808 c -0.408,1.56 0.519,3.146 2.072,3.558 0.25,0.063 0.497,0.096 0.744,0.096 1.287,0 2.465,-0.856 2.809,-2.167 l 1.144,-4.351 c -2.174,0.084 -3.951,-1.166 -5.239,-2.944 z"
+         id="path774"
+         style="opacity:0.51999996;fill:url(#SVGID_43_)" />
+      <linearGradient
+         x1="99.228104"
+         y1="1131.8906"
+         x2="96.127197"
+         y2="1143.5513"
+         id="linearGradient8353"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="translate(24,-933)">
+        <stop
+           id="stop8355"
+           style="stop-color:#517287;stop-opacity:1"
+           offset="0.18790001" />
+        <stop
+           id="stop8357"
+           style="stop-color:#7895a5;stop-opacity:0.847"
+           offset="0.23980001" />
+        <stop
+           id="stop8359"
+           style="stop-color:#9fb6c2;stop-opacity:0.66949999"
+           offset="0.30000001" />
+        <stop
+           id="stop8361"
+           style="stop-color:#bdd1d9;stop-opacity:0.4932"
+           offset="0.3599" />
+        <stop
+           id="stop8363"
+           style="stop-color:#d3e4ea;stop-opacity:0.32089999"
+           offset="0.41839999" />
+        <stop
+           id="stop8365"
+           style="stop-color:#e0eff4;stop-opacity:0.1543"
+           offset="0.47490001" />
+        <stop
+           id="stop8367"
+           style="stop-color:#e4f3f7;stop-opacity:0"
+           offset="0.5273" />
+      </linearGradient>
+      <path
+         d="m 124.019,196.027 c -1.554,-0.408 -2.86,2.602 -3.269,4.154 l -1.349,4.656 c 2.005,0.271 2.498,0.241 4.188,1.137 l 1.722,-6.469 c 0.41,-1.546 0.261,-3.067 -1.292,-3.478 z"
+         id="path791"
+         style="fill:url(#SVGID_44_)" />
+      <g
+         id="g793">
+        <linearGradient
+           x1="84.858902"
+           y1="1074.5898"
+           x2="55.6236"
+           y2="1044.1366"
+           id="linearGradient8371"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="translate(24,-933)">
+          <stop
+             id="stop8373"
+             style="stop-color:#517287;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop8375"
+             style="stop-color:#698799;stop-opacity:1"
+             offset="0.0517" />
+          <stop
+             id="stop8377"
+             style="stop-color:#95adba;stop-opacity:1"
+             offset="0.1601" />
+          <stop
+             id="stop8379"
+             style="stop-color:#b7ccd5;stop-opacity:1"
+             offset="0.26480001" />
+          <stop
+             id="stop8381"
+             style="stop-color:#d0e1e8;stop-opacity:1"
+             offset="0.36340001" />
+          <stop
+             id="stop8383"
+             style="stop-color:#dfeef3;stop-opacity:1"
+             offset="0.4535" />
+          <stop
+             id="stop8385"
+             style="stop-color:#e4f3f7;stop-opacity:1"
+             offset="0.5273" />
+          <stop
+             id="stop8387"
+             style="stop-color:#e0eff4;stop-opacity:1"
+             offset="0.60890001" />
+          <stop
+             id="stop8389"
+             style="stop-color:#d4e4ea;stop-opacity:1"
+             offset="0.6925" />
+          <stop
+             id="stop8391"
+             style="stop-color:#bfd1da;stop-opacity:1"
+             offset="0.77710003" />
+          <stop
+             id="stop8393"
+             style="stop-color:#a2b7c4;stop-opacity:1"
+             offset="0.8624" />
+          <stop
+             id="stop8395"
+             style="stop-color:#7e96a7;stop-opacity:1"
+             offset="0.94739997" />
+          <stop
+             id="stop8397"
+             style="stop-color:#637e92;stop-opacity:1"
+             offset="1" />
+        </linearGradient>
+        <path
+           d="M 101.716,140.504 80.644,118.569 c -0.877,-0.912 -0.845,-2.36 0.066,-3.237 0.834,-0.803 2.12,-0.846 3.001,-0.148 l 23.907,18.806 c 1.91,1.503 2.243,4.275 0.737,6.186 -1.503,1.913 -4.274,2.246 -6.188,0.742 -0.154,-0.125 -0.317,-0.275 -0.451,-0.414 z"
+           id="path822"
+           style="fill:url(#SVGID_45_)" />
+        <path
+           d="m 101.13,141.067 -13.938,-15.093 -3.5,-3.758 c -1.18,-1.268 -2.355,-2.423 -3.539,-3.782 -0.556,-0.812 -0.578,-1.917 -0.08,-2.748 0.501,-0.854 1.444,-1.352 2.426,-1.278 0.481,0.031 0.954,0.209 1.343,0.497 l 1.021,0.79 2.028,1.574 c 5.403,4.205 10.886,8.31 16.347,12.441 l 4.091,3.104 c 0.333,0.261 0.687,0.506 1.048,0.819 0.391,0.347 0.707,0.729 0.973,1.162 0.529,0.86 0.797,1.878 0.764,2.894 -0.038,2.044 -1.413,4.008 -3.365,4.703 -1.919,0.76 -4.253,0.185 -5.619,-1.325 z m 1.173,-1.127 c 0.983,1.017 2.548,1.308 3.836,0.819 1.286,-0.479 2.257,-1.748 2.332,-3.146 0.045,-0.695 -0.118,-1.407 -0.467,-2.017 -0.17,-0.302 -0.4,-0.593 -0.643,-0.821 -0.277,-0.258 -0.62,-0.513 -0.952,-0.79 l -3.98,-3.246 c -5.301,-4.335 -10.582,-8.696 -15.941,-12.958 l -2.008,-1.601 -1,-0.793 c -0.294,-0.224 -0.655,-0.366 -1.027,-0.395 -0.731,-0.084 -1.543,0.331 -1.887,0.979 -0.383,0.646 -0.346,1.514 0.078,2.117 2.269,2.434 4.736,4.907 7.137,7.318 l 14.522,14.534 z"
+           id="path824"
+           style="fill:#535a5f" />
+      </g>
+      <radialGradient
+         cx="57.035198"
+         cy="1049.2236"
+         r="11.4001"
+         id="radialGradient8401"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="translate(24,-933)">
+        <stop
+           id="stop8403"
+           style="stop-color:#46c3d6;stop-opacity:0.74000001"
+           offset="0" />
+        <stop
+           id="stop8405"
+           style="stop-color:#48c3d3;stop-opacity:0.57990003"
+           offset="0.1036" />
+        <stop
+           id="stop8407"
+           style="stop-color:#4dc4c9;stop-opacity:0.45969999"
+           offset="0.1813" />
+        <stop
+           id="stop8409"
+           style="stop-color:#57c5b9;stop-opacity:0.35249999"
+           offset="0.2507" />
+        <stop
+           id="stop8411"
+           style="stop-color:#65c6a2;stop-opacity:0.2529"
+           offset="0.3152" />
+        <stop
+           id="stop8413"
+           style="stop-color:#76c785;stop-opacity:0.1584"
+           offset="0.37630001" />
+        <stop
+           id="stop8415"
+           style="stop-color:#8bc961;stop-opacity:0.0692"
+           offset="0.43399999" />
+        <stop
+           id="stop8417"
+           style="stop-color:#9fcb40;stop-opacity:0"
+           offset="0.4788" />
+      </radialGradient>
+      <path
+         d="m 85.383,118.512 c 0.375,-0.375 0.871,-0.669 1.438,-0.882 l -3.109,-2.447 c -0.882,-0.697 -2.167,-0.654 -3.001,0.148 -0.911,0.877 -0.943,2.325 -0.066,3.237 l 4.586,4.773 c -1.236,-1.658 -1.829,-3.243 0.152,-4.829 z"
+         id="path843"
+         style="opacity:0.51999996;fill:url(#SVGID_46_)" />
+      <g
+         id="blackball_2_">
+        <radialGradient
+           cx="107.7227"
+           cy="1101.1846"
+           r="47.014"
+           id="radialGradient8421"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="translate(24,-933)">
+          <stop
+             id="stop8423"
+             style="stop-color:#000000;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop8425"
+             style="stop-color:#010203;stop-opacity:1"
+             offset="0.3003" />
+          <stop
+             id="stop8427"
+             style="stop-color:#03080d;stop-opacity:1"
+             offset="0.5262" />
+          <stop
+             id="stop8429"
+             style="stop-color:#08111d;stop-opacity:1"
+             offset="0.72719997" />
+          <stop
+             id="stop8431"
+             style="stop-color:#0b1929;stop-opacity:1"
+             offset="0.83639997" />
+          <stop
+             id="stop8433"
+             style="stop-color:#23474c;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 176.311,162.557 c 0,22.381 -18.141,40.521 -40.519,40.521 -22.378,0 -40.517,-18.141 -40.517,-40.521 0,-22.375 18.139,-40.517 40.517,-40.517 22.378,0 40.519,18.141 40.519,40.517 z"
+           id="path859"
+           style="fill:url(#SVGID_47_)" />
+        <radialGradient
+           cx="253.53709"
+           cy="619.94043"
+           r="42.171398"
+           id="radialGradient8436"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.9525,0.3046,-0.3046,0.9525,81.9305,-503.3005)">
+          <stop
+             id="stop8438"
+             style="stop-color:#0b1929;stop-opacity:0"
+             offset="0" />
+          <stop
+             id="stop8440"
+             style="stop-color:#0d1b2c;stop-opacity:0.2447"
+             offset="0.20469999" />
+          <stop
+             id="stop8442"
+             style="stop-color:#132234;stop-opacity:0.40290001"
+             offset="0.33700001" />
+          <stop
+             id="stop8444"
+             style="stop-color:#1d2d43;stop-opacity:0.53649998"
+             offset="0.44870001" />
+          <stop
+             id="stop8446"
+             style="stop-color:#2b3d58;stop-opacity:0.6566"
+             offset="0.54909998" />
+          <stop
+             id="stop8448"
+             style="stop-color:#3d5173;stop-opacity:0.76740003"
+             offset="0.64179999" />
+          <stop
+             id="stop8450"
+             style="stop-color:#536a95;stop-opacity:0.87150002"
+             offset="0.72890002" />
+          <stop
+             id="stop8452"
+             style="stop-color:#6d87bc;stop-opacity:0.96859998"
+             offset="0.81010002" />
+          <stop
+             id="stop8454"
+             style="stop-color:#7792ca;stop-opacity:1"
+             offset="0.83639997" />
+        </radialGradient>
+        <path
+           d="m 174.387,174.898 c -6.815,21.313 -29.621,33.063 -50.936,26.254 -21.315,-6.815 -33.065,-29.623 -26.25,-50.938 6.813,-21.314 29.615,-33.068 50.931,-26.252 21.316,6.818 33.07,29.623 26.255,50.936 z"
+           id="path880"
+           style="opacity:0.36000001;fill:url(#SVGID_48_)" />
+        <radialGradient
+           cx="102.2515"
+           cy="1105.4219"
+           r="33.175598"
+           id="radialGradient8457"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="translate(24,-933)">
+          <stop
+             id="stop8459"
+             style="stop-color:#0b1929;stop-opacity:0"
+             offset="0" />
+          <stop
+             id="stop8461"
+             style="stop-color:#0d1b2c;stop-opacity:0.2447"
+             offset="0.20469999" />
+          <stop
+             id="stop8463"
+             style="stop-color:#132234;stop-opacity:0.40290001"
+             offset="0.33700001" />
+          <stop
+             id="stop8465"
+             style="stop-color:#1d2d43;stop-opacity:0.53649998"
+             offset="0.44870001" />
+          <stop
+             id="stop8467"
+             style="stop-color:#2b3d58;stop-opacity:0.6566"
+             offset="0.54909998" />
+          <stop
+             id="stop8469"
+             style="stop-color:#3d5173;stop-opacity:0.76740003"
+             offset="0.64179999" />
+          <stop
+             id="stop8471"
+             style="stop-color:#536a95;stop-opacity:0.87150002"
+             offset="0.72890002" />
+          <stop
+             id="stop8473"
+             style="stop-color:#6d87bc;stop-opacity:0.96859998"
+             offset="0.81010002" />
+          <stop
+             id="stop8475"
+             style="stop-color:#7792ca;stop-opacity:1"
+             offset="0.83639997" />
+        </radialGradient>
+        <path
+           d="m 120.624,195.932 c -13.427,-6.793 -31.579,-23.455 -17.321,-57.583 -2.607,3.5 -4.699,7.478 -6.102,11.869 -6.815,21.313 4.934,44.119 26.25,50.935 12.161,3.895 24.802,1.729 34.687,-4.801 -12.522,2.97 -28.795,3.988 -37.514,-0.42 z"
+           id="path901"
+           style="opacity:0.36000001;fill:url(#SVGID_49_)" />
+        <radialGradient
+           cx="125.5313"
+           cy="1069.5029"
+           r="52.926998"
+           id="radialGradient8478"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="translate(24,-933)">
+          <stop
+             id="stop8480"
+             style="stop-color:#f5f9ed;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop8482"
+             style="stop-color:#f3f8eb;stop-opacity:0.52960002"
+             offset="0.3506" />
+          <stop
+             id="stop8484"
+             style="stop-color:#ecf5e5;stop-opacity:0.36019999"
+             offset="0.477" />
+          <stop
+             id="stop8486"
+             style="stop-color:#e1f0da;stop-opacity:0.2395"
+             offset="0.56690001" />
+          <stop
+             id="stop8488"
+             style="stop-color:#d0e8cb;stop-opacity:0.1418"
+             offset="0.6397" />
+          <stop
+             id="stop8490"
+             style="stop-color:#badeb7;stop-opacity:0.0591"
+             offset="0.70139998" />
+          <stop
+             id="stop8492"
+             style="stop-color:#a5d4a4;stop-opacity:0"
+             offset="0.74550003" />
+          <stop
+             id="stop8494"
+             style="stop-color:#000000;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 176.003,163.064 c -6.85,11.393 -14.59,19.354 -29.731,19.354 -22.2,0 -40.194,-16.566 -40.194,-37.013 0,-6.141 2.97,-10.512 5.848,-15.61 20.226,-13.362 40.774,-7.032 51.682,3.726 10.7,10.561 12.737,22.059 12.395,29.543 z"
+           id="path920"
+           style="opacity:0.22999998;fill:url(#SVGID_50_)" />
+        <radialGradient
+           cx="123.9854"
+           cy="1169.793"
+           r="22.649401"
+           id="radialGradient8497"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(1,0,0,0.9207,24,-936.5648)">
+          <stop
+             id="stop8499"
+             style="stop-color:#f5f9ed;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop8501"
+             style="stop-color:#f3f8eb;stop-opacity:0.52960002"
+             offset="0.3506" />
+          <stop
+             id="stop8503"
+             style="stop-color:#ecf5e5;stop-opacity:0.36019999"
+             offset="0.477" />
+          <stop
+             id="stop8505"
+             style="stop-color:#e1f0da;stop-opacity:0.2395"
+             offset="0.56690001" />
+          <stop
+             id="stop8507"
+             style="stop-color:#d0e8cb;stop-opacity:0.1418"
+             offset="0.6397" />
+          <stop
+             id="stop8509"
+             style="stop-color:#badeb7;stop-opacity:0.0591"
+             offset="0.70139998" />
+          <stop
+             id="stop8511"
+             style="stop-color:#a5d4a4;stop-opacity:0"
+             offset="0.74550003" />
+          <stop
+             id="stop8513"
+             style="stop-color:#000000;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 172.915,146.34 c -4.531,7.537 -13.253,12.641 -23.271,12.641 -14.685,0 -26.589,-10.959 -26.589,-24.481 0,-4.063 1.076,-7.895 2.979,-11.267 29.824,-7.467 46.301,19.846 46.881,23.107 z"
+           id="path939"
+           style="opacity:0.1;fill:url(#SVGID_51_)" />
+        <radialGradient
+           cx="125.9678"
+           cy="1163.1113"
+           r="2.9981"
+           id="radialGradient8516"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(1,0,0,0.9207,24,-936.5648)">
+          <stop
+             id="stop8518"
+             style="stop-color:#dcecef;stop-opacity:1"
+             offset="0.44850001" />
+          <stop
+             id="stop8520"
+             style="stop-color:#d3e9ed;stop-opacity:0.63789999"
+             offset="0.64819998" />
+          <stop
+             id="stop8522"
+             style="stop-color:#bae3e9;stop-opacity:0.0435"
+             offset="0.97600001" />
+          <stop
+             id="stop8524"
+             style="stop-color:#b8e2e9;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 153.086,134.421 c 0,1.455 -1.658,2.536 -2.911,2.536 -1.835,0 -3.325,-1.371 -3.325,-3.062 0,-0.509 0.637,-1.922 2.121,-2.195 2.881,-0.316 4.115,1.59 4.115,2.721 z"
+           id="path950"
+           style="opacity:0.67000002;fill:url(#SVGID_52_)" />
+        <radialGradient
+           cx="-300.06741"
+           cy="1151.0977"
+           r="7.9678001"
+           id="radialGradient8527"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(1.1755,-0.3579,0.3156,1.0363,129.1247,-1121.3802)">
+          <stop
+             id="stop8529"
+             style="stop-color:#c9daf0;stop-opacity:0.88999999"
+             offset="0.39390001" />
+          <stop
+             id="stop8531"
+             style="stop-color:#c6daee;stop-opacity:0.5772"
+             offset="0.44929999" />
+          <stop
+             id="stop8533"
+             style="stop-color:#bcdae8;stop-opacity:0.32269999"
+             offset="0.49439999" />
+          <stop
+             id="stop8535"
+             style="stop-color:#abd9dd;stop-opacity:0.0893"
+             offset="0.53570002" />
+          <stop
+             id="stop8537"
+             style="stop-color:#a2d9d8;stop-opacity:0"
+             offset="0.55150002" />
+          <stop
+             id="stop8539"
+             style="stop-color:#a5dada;stop-opacity:0.1564"
+             offset="0.60589999" />
+          <stop
+             id="stop8541"
+             style="stop-color:#b0dfde;stop-opacity:0.287"
+             offset="0.65130001" />
+          <stop
+             id="stop8543"
+             style="stop-color:#c1e6e6;stop-opacity:0.4082"
+             offset="0.69340003" />
+          <stop
+             id="stop8545"
+             style="stop-color:#d9eff2;stop-opacity:0.523"
+             offset="0.73339999" />
+          <stop
+             id="stop8547"
+             style="stop-color:#f1f9fd;stop-opacity:0.61000001"
+             offset="0.76359999" />
+          <stop
+             id="stop8549"
+             style="stop-color:#ceedef;stop-opacity:0.54909998"
+             offset="0.78719997" />
+          <stop
+             id="stop8551"
+             style="stop-color:#a8dfdf;stop-opacity:0.4698"
+             offset="0.81800002" />
+          <stop
+             id="stop8553"
+             style="stop-color:#89d4d3;stop-opacity:0.38710001"
+             offset="0.85000002" />
+          <stop
+             id="stop8555"
+             style="stop-color:#70ccc9;stop-opacity:0.30149999"
+             offset="0.88319999" />
+          <stop
+             id="stop8557"
+             style="stop-color:#5fc6c2;stop-opacity:0.21179999"
+             offset="0.91790003" />
+          <stop
+             id="stop8559"
+             style="stop-color:#54c2bd;stop-opacity:0.1153"
+             offset="0.95529997" />
+          <stop
+             id="stop8561"
+             style="stop-color:#51c1bc;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 150.355,176.872 c 1.57,5.155 -2.034,8.368 -8.074,10.204 -6.035,1.84 -9.8,0.506 -12.545,-4.268 -2.329,-4.055 0.809,-10.104 6.845,-11.939 6.039,-1.842 12.204,0.847 13.774,6.003 z"
+           id="tublightreflection_23_"
+           style="opacity:0.15;fill:url(#tublightreflection_1_)" />
+        <radialGradient
+           cx="334.8067"
+           cy="-527.68262"
+           r="6.8185"
+           id="radialGradient8564"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(-0.0457,1.2279,-1.0825,-0.0403,-452.0393,-273.2723)">
+          <stop
+             id="stop8566"
+             style="stop-color:#c9daf0;stop-opacity:0.88999999"
+             offset="0.39390001" />
+          <stop
+             id="stop8568"
+             style="stop-color:#c6daee;stop-opacity:0.5772"
+             offset="0.44929999" />
+          <stop
+             id="stop8570"
+             style="stop-color:#bcdae8;stop-opacity:0.32269999"
+             offset="0.49439999" />
+          <stop
+             id="stop8572"
+             style="stop-color:#abd9dd;stop-opacity:0.0893"
+             offset="0.53570002" />
+          <stop
+             id="stop8574"
+             style="stop-color:#a2d9d8;stop-opacity:0"
+             offset="0.55150002" />
+          <stop
+             id="stop8576"
+             style="stop-color:#a5dada;stop-opacity:0.1564"
+             offset="0.60589999" />
+          <stop
+             id="stop8578"
+             style="stop-color:#b0dfde;stop-opacity:0.287"
+             offset="0.65130001" />
+          <stop
+             id="stop8580"
+             style="stop-color:#c1e6e6;stop-opacity:0.4082"
+             offset="0.69340003" />
+          <stop
+             id="stop8582"
+             style="stop-color:#d9eff2;stop-opacity:0.523"
+             offset="0.73339999" />
+          <stop
+             id="stop8584"
+             style="stop-color:#f1f9fd;stop-opacity:0.61000001"
+             offset="0.76359999" />
+          <stop
+             id="stop8586"
+             style="stop-color:#ceedef;stop-opacity:0.54909998"
+             offset="0.78719997" />
+          <stop
+             id="stop8588"
+             style="stop-color:#a8dfdf;stop-opacity:0.4698"
+             offset="0.81800002" />
+          <stop
+             id="stop8590"
+             style="stop-color:#89d4d3;stop-opacity:0.38710001"
+             offset="0.85000002" />
+          <stop
+             id="stop8592"
+             style="stop-color:#70ccc9;stop-opacity:0.30149999"
+             offset="0.88319999" />
+          <stop
+             id="stop8594"
+             style="stop-color:#5fc6c2;stop-opacity:0.21179999"
+             offset="0.91790003" />
+          <stop
+             id="stop8596"
+             style="stop-color:#54c2bd;stop-opacity:0.1153"
+             offset="0.95529997" />
+          <stop
+             id="stop8598"
+             style="stop-color:#51c1bc;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 102.529,168.346 c -4.607,-0.172 -6.198,-3.979 -5.993,-9.378 0.198,-5.393 2.328,-8.063 6.954,-8.951 3.922,-0.75 7.94,3.478 7.74,8.87 -0.2,5.397 -4.093,9.631 -8.701,9.459 z"
+           id="tublightreflection_22_"
+           style="opacity:0.15;fill:url(#tublightreflection_2_)" />
+        <radialGradient
+           cx="-575.8125"
+           cy="-1028.6616"
+           r="6.9545002"
+           id="radialGradient8601"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(-1.1372,0.4656,-0.4104,-1.0025,-946.634,-614.2469)">
+          <stop
+             id="stop8603"
+             style="stop-color:#c9daf0;stop-opacity:0.88999999"
+             offset="0.39390001" />
+          <stop
+             id="stop8605"
+             style="stop-color:#c6daee;stop-opacity:0.5772"
+             offset="0.44929999" />
+          <stop
+             id="stop8607"
+             style="stop-color:#bcdae8;stop-opacity:0.32269999"
+             offset="0.49439999" />
+          <stop
+             id="stop8609"
+             style="stop-color:#abd9dd;stop-opacity:0.0893"
+             offset="0.53570002" />
+          <stop
+             id="stop8611"
+             style="stop-color:#a2d9d8;stop-opacity:0"
+             offset="0.55150002" />
+          <stop
+             id="stop8613"
+             style="stop-color:#a5dada;stop-opacity:0.1564"
+             offset="0.60589999" />
+          <stop
+             id="stop8615"
+             style="stop-color:#b0dfde;stop-opacity:0.287"
+             offset="0.65130001" />
+          <stop
+             id="stop8617"
+             style="stop-color:#c1e6e6;stop-opacity:0.4082"
+             offset="0.69340003" />
+          <stop
+             id="stop8619"
+             style="stop-color:#d9eff2;stop-opacity:0.523"
+             offset="0.73339999" />
+          <stop
+             id="stop8621"
+             style="stop-color:#f1f9fd;stop-opacity:0.61000001"
+             offset="0.76359999" />
+          <stop
+             id="stop8623"
+             style="stop-color:#ceedef;stop-opacity:0.54909998"
+             offset="0.78719997" />
+          <stop
+             id="stop8625"
+             style="stop-color:#a8dfdf;stop-opacity:0.4698"
+             offset="0.81800002" />
+          <stop
+             id="stop8627"
+             style="stop-color:#89d4d3;stop-opacity:0.38710001"
+             offset="0.85000002" />
+          <stop
+             id="stop8629"
+             style="stop-color:#70ccc9;stop-opacity:0.30149999"
+             offset="0.88319999" />
+          <stop
+             id="stop8631"
+             style="stop-color:#5fc6c2;stop-opacity:0.21179999"
+             offset="0.91790003" />
+          <stop
+             id="stop8633"
+             style="stop-color:#54c2bd;stop-opacity:0.1153"
+             offset="0.95529997" />
+          <stop
+             id="stop8635"
+             style="stop-color:#51c1bc;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 121.256,151.454 c -1.783,-4.353 1.09,-7.438 6.189,-9.522 5.096,-2.088 8.476,-1.234 11.249,2.69 2.352,3.331 0.116,8.849 -4.981,10.935 -5.099,2.086 -10.674,0.252 -12.457,-4.103 z"
+           id="tublightreflection_21_"
+           style="opacity:0.15;fill:url(#tublightreflection_3_)" />
+        <radialGradient
+           cx="-1493.042"
+           cy="13.3194"
+           r="6.5349998"
+           id="radialGradient8638"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(-0.6244,-0.9876,0.9156,-0.5789,-787.8409,-1316.5985)">
+          <stop
+             id="stop8640"
+             style="stop-color:#c9daf0;stop-opacity:0.88999999"
+             offset="0.39390001" />
+          <stop
+             id="stop8642"
+             style="stop-color:#c6daee;stop-opacity:0.5772"
+             offset="0.44929999" />
+          <stop
+             id="stop8644"
+             style="stop-color:#bcdae8;stop-opacity:0.32269999"
+             offset="0.49439999" />
+          <stop
+             id="stop8646"
+             style="stop-color:#abd9dd;stop-opacity:0.0893"
+             offset="0.53570002" />
+          <stop
+             id="stop8648"
+             style="stop-color:#a2d9d8;stop-opacity:0"
+             offset="0.55150002" />
+          <stop
+             id="stop8650"
+             style="stop-color:#a5dada;stop-opacity:0.1564"
+             offset="0.60589999" />
+          <stop
+             id="stop8652"
+             style="stop-color:#b0dfde;stop-opacity:0.287"
+             offset="0.65130001" />
+          <stop
+             id="stop8654"
+             style="stop-color:#c1e6e6;stop-opacity:0.4082"
+             offset="0.69340003" />
+          <stop
+             id="stop8656"
+             style="stop-color:#d9eff2;stop-opacity:0.523"
+             offset="0.73339999" />
+          <stop
+             id="stop8658"
+             style="stop-color:#f1f9fd;stop-opacity:0.61000001"
+             offset="0.76359999" />
+          <stop
+             id="stop8660"
+             style="stop-color:#ceedef;stop-opacity:0.54909998"
+             offset="0.78719997" />
+          <stop
+             id="stop8662"
+             style="stop-color:#a8dfdf;stop-opacity:0.4698"
+             offset="0.81800002" />
+          <stop
+             id="stop8664"
+             style="stop-color:#89d4d3;stop-opacity:0.38710001"
+             offset="0.85000002" />
+          <stop
+             id="stop8666"
+             style="stop-color:#70ccc9;stop-opacity:0.30149999"
+             offset="0.88319999" />
+          <stop
+             id="stop8668"
+             style="stop-color:#5fc6c2;stop-opacity:0.21179999"
+             offset="0.91790003" />
+          <stop
+             id="stop8670"
+             style="stop-color:#54c2bd;stop-opacity:0.1153"
+             offset="0.95529997" />
+          <stop
+             id="stop8672"
+             style="stop-color:#51c1bc;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 152.919,142.645 c 3.736,-2.362 6.967,-0.359 9.595,3.804 2.631,4.158 2.327,7.316 -0.878,10.482 -2.719,2.686 -8.086,1.683 -10.715,-2.479 -2.632,-4.158 -1.739,-9.444 1.998,-11.807 z"
+           id="tublightreflection_20_"
+           style="opacity:0.15;fill:url(#tublightreflection_4_)" />
+        <radialGradient
+           cx="-1302.3652"
+           cy="-518.05469"
+           r="7.7940001"
+           id="radialGradient8675"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(-1.0609,-0.7135,0.4489,-0.6946,-991.0353,-1157.8248)">
+          <stop
+             id="stop8677"
+             style="stop-color:#c9daf0;stop-opacity:0.88999999"
+             offset="0.39390001" />
+          <stop
+             id="stop8679"
+             style="stop-color:#c6daee;stop-opacity:0.5772"
+             offset="0.44929999" />
+          <stop
+             id="stop8681"
+             style="stop-color:#bcdae8;stop-opacity:0.32269999"
+             offset="0.49439999" />
+          <stop
+             id="stop8683"
+             style="stop-color:#abd9dd;stop-opacity:0.0893"
+             offset="0.53570002" />
+          <stop
+             id="stop8685"
+             style="stop-color:#a2d9d8;stop-opacity:0"
+             offset="0.55150002" />
+          <stop
+             id="stop8687"
+             style="stop-color:#a5dada;stop-opacity:0.1564"
+             offset="0.60589999" />
+          <stop
+             id="stop8689"
+             style="stop-color:#b0dfde;stop-opacity:0.287"
+             offset="0.65130001" />
+          <stop
+             id="stop8691"
+             style="stop-color:#c1e6e6;stop-opacity:0.4082"
+             offset="0.69340003" />
+          <stop
+             id="stop8693"
+             style="stop-color:#d9eff2;stop-opacity:0.523"
+             offset="0.73339999" />
+          <stop
+             id="stop8695"
+             style="stop-color:#f1f9fd;stop-opacity:0.61000001"
+             offset="0.76359999" />
+          <stop
+             id="stop8697"
+             style="stop-color:#ceedef;stop-opacity:0.54909998"
+             offset="0.78719997" />
+          <stop
+             id="stop8699"
+             style="stop-color:#a8dfdf;stop-opacity:0.4698"
+             offset="0.81800002" />
+          <stop
+             id="stop8701"
+             style="stop-color:#89d4d3;stop-opacity:0.38710001"
+             offset="0.85000002" />
+          <stop
+             id="stop8703"
+             style="stop-color:#70ccc9;stop-opacity:0.30149999"
+             offset="0.88319999" />
+          <stop
+             id="stop8705"
+             style="stop-color:#5fc6c2;stop-opacity:0.21179999"
+             offset="0.91790003" />
+          <stop
+             id="stop8707"
+             style="stop-color:#54c2bd;stop-opacity:0.1153"
+             offset="0.95529997" />
+          <stop
+             id="stop8709"
+             style="stop-color:#51c1bc;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 151.495,125.699 c 0.587,-0.666 3.806,1.783 8.146,4.976 4.342,3.188 6.915,4.769 6.477,6.056 -1.094,3.225 -6.565,3.581 -10.908,0.391 -4.343,-3.19 -6.279,-8.517 -3.715,-11.423 z"
+           id="tublightreflection_19_"
+           style="opacity:0.22000002;fill:url(#tublightreflection_5_)" />
+        <radialGradient
+           cx="-1306.2578"
+           cy="-399.98871"
+           r="6.0194001"
+           id="radialGradient8712"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(-1.0163,-0.7763,0.6764,-0.8708,-900.0159,-1232.0898)">
+          <stop
+             id="stop8714"
+             style="stop-color:#c9daf0;stop-opacity:0.88999999"
+             offset="0.39390001" />
+          <stop
+             id="stop8716"
+             style="stop-color:#c6daee;stop-opacity:0.5772"
+             offset="0.44929999" />
+          <stop
+             id="stop8718"
+             style="stop-color:#bcdae8;stop-opacity:0.32269999"
+             offset="0.49439999" />
+          <stop
+             id="stop8720"
+             style="stop-color:#abd9dd;stop-opacity:0.0893"
+             offset="0.53570002" />
+          <stop
+             id="stop8722"
+             style="stop-color:#a2d9d8;stop-opacity:0"
+             offset="0.55150002" />
+          <stop
+             id="stop8724"
+             style="stop-color:#a5dada;stop-opacity:0.1564"
+             offset="0.60589999" />
+          <stop
+             id="stop8726"
+             style="stop-color:#b0dfde;stop-opacity:0.287"
+             offset="0.65130001" />
+          <stop
+             id="stop8728"
+             style="stop-color:#c1e6e6;stop-opacity:0.4082"
+             offset="0.69340003" />
+          <stop
+             id="stop8730"
+             style="stop-color:#d9eff2;stop-opacity:0.523"
+             offset="0.73339999" />
+          <stop
+             id="stop8732"
+             style="stop-color:#f1f9fd;stop-opacity:0.61000001"
+             offset="0.76359999" />
+          <stop
+             id="stop8734"
+             style="stop-color:#ceedef;stop-opacity:0.54909998"
+             offset="0.78719997" />
+          <stop
+             id="stop8736"
+             style="stop-color:#a8dfdf;stop-opacity:0.4698"
+             offset="0.81800002" />
+          <stop
+             id="stop8738"
+             style="stop-color:#89d4d3;stop-opacity:0.38710001"
+             offset="0.85000002" />
+          <stop
+             id="stop8740"
+             style="stop-color:#70ccc9;stop-opacity:0.30149999"
+             offset="0.88319999" />
+          <stop
+             id="stop8742"
+             style="stop-color:#5fc6c2;stop-opacity:0.21179999"
+             offset="0.91790003" />
+          <stop
+             id="stop8744"
+             style="stop-color:#54c2bd;stop-opacity:0.1153"
+             offset="0.95529997" />
+          <stop
+             id="stop8746"
+             style="stop-color:#51c1bc;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 151.495,125.699 c 0.587,-0.666 3.806,1.783 8.146,4.976 4.342,3.188 -4.854,-2.648 -5.04,-1.302 -0.286,2.066 4.622,4.18 0.609,7.749 -4.343,-3.19 -6.279,-8.517 -3.715,-11.423 z"
+           id="tublightreflection_18_"
+           style="opacity:0.16000001;fill:url(#tublightreflection_6_)" />
+        <radialGradient
+           cx="-1340.5571"
+           cy="656.08008"
+           r="6.5285001"
+           id="radialGradient8749"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.0701,-1.2144,1.0815,0.0624,-444.2149,-1502.1295)">
+          <stop
+             id="stop8751"
+             style="stop-color:#c9daf0;stop-opacity:0.88999999"
+             offset="0.39390001" />
+          <stop
+             id="stop8753"
+             style="stop-color:#c6daee;stop-opacity:0.5772"
+             offset="0.44929999" />
+          <stop
+             id="stop8755"
+             style="stop-color:#bcdae8;stop-opacity:0.32269999"
+             offset="0.49439999" />
+          <stop
+             id="stop8757"
+             style="stop-color:#abd9dd;stop-opacity:0.0893"
+             offset="0.53570002" />
+          <stop
+             id="stop8759"
+             style="stop-color:#a2d9d8;stop-opacity:0"
+             offset="0.55150002" />
+          <stop
+             id="stop8761"
+             style="stop-color:#a5dada;stop-opacity:0.1564"
+             offset="0.60589999" />
+          <stop
+             id="stop8763"
+             style="stop-color:#b0dfde;stop-opacity:0.287"
+             offset="0.65130001" />
+          <stop
+             id="stop8765"
+             style="stop-color:#c1e6e6;stop-opacity:0.4082"
+             offset="0.69340003" />
+          <stop
+             id="stop8767"
+             style="stop-color:#d9eff2;stop-opacity:0.523"
+             offset="0.73339999" />
+          <stop
+             id="stop8769"
+             style="stop-color:#f1f9fd;stop-opacity:0.61000001"
+             offset="0.76359999" />
+          <stop
+             id="stop8771"
+             style="stop-color:#ceedef;stop-opacity:0.54909998"
+             offset="0.78719997" />
+          <stop
+             id="stop8773"
+             style="stop-color:#a8dfdf;stop-opacity:0.4698"
+             offset="0.81800002" />
+          <stop
+             id="stop8775"
+             style="stop-color:#89d4d3;stop-opacity:0.38710001"
+             offset="0.85000002" />
+          <stop
+             id="stop8777"
+             style="stop-color:#70ccc9;stop-opacity:0.30149999"
+             offset="0.88319999" />
+          <stop
+             id="stop8779"
+             style="stop-color:#5fc6c2;stop-opacity:0.21179999"
+             offset="0.91790003" />
+          <stop
+             id="stop8781"
+             style="stop-color:#54c2bd;stop-opacity:0.1153"
+             offset="0.95529997" />
+          <stop
+             id="stop8783"
+             style="stop-color:#51c1bc;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 172.824,158.135 c 4.413,0.256 5.866,3.903 5.568,9.02 -0.293,5.117 -2.385,7.607 -6.837,8.355 -3.775,0.635 -7.547,-3.457 -7.253,-8.57 0.296,-5.12 4.108,-9.061 8.522,-8.805 z"
+           id="tublightreflection_17_"
+           style="opacity:0.15;fill:url(#tublightreflection_7_)" />
+        <radialGradient
+           cx="341.46881"
+           cy="147.9659"
+           r="6.0193"
+           id="radialGradient8786"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.8294,1.1696,-0.8836,0.6266,-46.2313,-305.4576)">
+          <stop
+             id="stop8788"
+             style="stop-color:#c9daf0;stop-opacity:0.88999999"
+             offset="0.39390001" />
+          <stop
+             id="stop8790"
+             style="stop-color:#c6daee;stop-opacity:0.5772"
+             offset="0.44929999" />
+          <stop
+             id="stop8792"
+             style="stop-color:#bcdae8;stop-opacity:0.32269999"
+             offset="0.49439999" />
+          <stop
+             id="stop8794"
+             style="stop-color:#abd9dd;stop-opacity:0.0893"
+             offset="0.53570002" />
+          <stop
+             id="stop8796"
+             style="stop-color:#a2d9d8;stop-opacity:0"
+             offset="0.55150002" />
+          <stop
+             id="stop8798"
+             style="stop-color:#a5dada;stop-opacity:0.1564"
+             offset="0.60589999" />
+          <stop
+             id="stop8800"
+             style="stop-color:#b0dfde;stop-opacity:0.287"
+             offset="0.65130001" />
+          <stop
+             id="stop8802"
+             style="stop-color:#c1e6e6;stop-opacity:0.4082"
+             offset="0.69340003" />
+          <stop
+             id="stop8804"
+             style="stop-color:#d9eff2;stop-opacity:0.523"
+             offset="0.73339999" />
+          <stop
+             id="stop8806"
+             style="stop-color:#f1f9fd;stop-opacity:0.61000001"
+             offset="0.76359999" />
+          <stop
+             id="stop8808"
+             style="stop-color:#ceedef;stop-opacity:0.54909998"
+             offset="0.78719997" />
+          <stop
+             id="stop8810"
+             style="stop-color:#a8dfdf;stop-opacity:0.4698"
+             offset="0.81800002" />
+          <stop
+             id="stop8812"
+             style="stop-color:#89d4d3;stop-opacity:0.38710001"
+             offset="0.85000002" />
+          <stop
+             id="stop8814"
+             style="stop-color:#70ccc9;stop-opacity:0.30149999"
+             offset="0.88319999" />
+          <stop
+             id="stop8816"
+             style="stop-color:#5fc6c2;stop-opacity:0.21179999"
+             offset="0.91790003" />
+          <stop
+             id="stop8818"
+             style="stop-color:#54c2bd;stop-opacity:0.1153"
+             offset="0.95529997" />
+          <stop
+             id="stop8820"
+             style="stop-color:#51c1bc;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 111.895,195.299 c 0,0 -3.978,-3.076 -7.545,-8.113 -3.57,-5.024 -4.786,-7.537 -4.364,-9.156 1.043,-4.014 8.545,-1.604 12.114,3.432 3.57,5.029 3.481,11.226 -0.205,13.837 z"
+           id="tublightreflection_16_"
+           style="opacity:0.15;fill:url(#tublightreflection_8_)" />
+      </g>
+      <g
+         id="g1240">
+        <linearGradient
+           x1="130.314"
+           y1="1067.9688"
+           x2="184.4834"
+           y2="1067.9688"
+           id="linearGradient8824"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="translate(24,-933)">
+          <stop
+             id="stop8826"
+             style="stop-color:#517287;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop8828"
+             style="stop-color:#6e8b9d;stop-opacity:1"
+             offset="0.0227" />
+          <stop
+             id="stop8830"
+             style="stop-color:#8da7b5;stop-opacity:1"
+             offset="0.0532" />
+          <stop
+             id="stop8832"
+             style="stop-color:#a9bfca;stop-opacity:1"
+             offset="0.0878" />
+          <stop
+             id="stop8834"
+             style="stop-color:#bfd2db;stop-opacity:1"
+             offset="0.1268" />
+          <stop
+             id="stop8836"
+             style="stop-color:#d0e1e7;stop-opacity:1"
+             offset="0.1724" />
+          <stop
+             id="stop8838"
+             style="stop-color:#dbebf0;stop-opacity:1"
+             offset="0.2288" />
+          <stop
+             id="stop8840"
+             style="stop-color:#e2f1f6;stop-opacity:1"
+             offset="0.30779999" />
+          <stop
+             id="stop8842"
+             style="stop-color:#e4f3f7;stop-opacity:1"
+             offset="0.5273" />
+        </linearGradient>
+        <path
+           d="m 205.166,128.536 -46.103,24.173 c -1.585,0.832 -3.547,0.221 -4.378,-1.367 -0.773,-1.479 -0.298,-3.277 1.052,-4.19 l 43.077,-29.226 c 2.829,-1.92 6.679,-1.183 8.601,1.648 1.92,2.83 1.183,6.681 -1.649,8.604 -0.194,0.131 -0.398,0.251 -0.6,0.358 z"
+           id="path1261"
+           style="fill:url(#SVGID_53_)" />
+        <path
+           d="m 205.547,129.259 -29.797,15.363 -14.874,7.728 c -0.633,0.32 -1.209,0.646 -1.89,0.963 -0.798,0.314 -1.615,0.359 -2.403,0.146 -0.78,-0.207 -1.485,-0.684 -1.977,-1.318 -0.253,-0.32 -0.434,-0.676 -0.571,-1.047 -0.144,-0.396 -0.213,-0.787 -0.224,-1.195 -0.015,-0.808 0.239,-1.615 0.713,-2.271 0.236,-0.329 0.526,-0.62 0.858,-0.853 l 0.871,-0.601 3.457,-2.368 27.644,-18.963 6.903,-4.752 3.452,-2.375 c 0.297,-0.201 0.555,-0.39 0.883,-0.6 0.339,-0.213 0.7,-0.4 1.061,-0.55 0.73,-0.304 1.514,-0.478 2.304,-0.522 1.582,-0.085 3.188,0.381 4.48,1.313 1.291,0.93 2.262,2.302 2.668,3.849 0.418,1.539 0.291,3.216 -0.357,4.667 -0.641,1.45 -1.801,2.667 -3.201,3.386 z m -0.762,-1.445 c 2.188,-1.129 3.316,-3.831 2.643,-6.159 -0.316,-1.154 -1.029,-2.207 -1.996,-2.922 -0.967,-0.717 -2.188,-1.092 -3.396,-1.043 -0.604,0.026 -1.205,0.15 -1.768,0.375 -0.286,0.116 -0.549,0.248 -0.803,0.401 -0.264,0.161 -0.573,0.379 -0.857,0.566 l -3.483,2.33 -6.967,4.658 -27.836,18.678 -3.478,2.337 -0.859,0.581 c -0.243,0.166 -0.454,0.375 -0.627,0.612 -0.348,0.473 -0.541,1.062 -0.535,1.652 0.002,0.29 0.061,0.599 0.15,0.856 0.099,0.283 0.242,0.563 0.426,0.785 0.363,0.465 0.88,0.809 1.453,0.955 0.56,0.162 1.207,0.097 1.707,-0.104 0.585,-0.271 1.226,-0.646 1.836,-0.954 l 14.814,-7.84 29.576,-15.764 z"
+           id="path1263"
+           style="fill:#535a5f" />
+      </g>
+      <radialGradient
+         cx="177.8506"
+         cy="1057.0029"
+         r="20.2362"
+         id="radialGradient8846"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="translate(24,-933)">
+        <stop
+           id="stop8848"
+           style="stop-color:#46c3d6;stop-opacity:0.74000001"
+           offset="0" />
+        <stop
+           id="stop8850"
+           style="stop-color:#48c3d3;stop-opacity:0.57990003"
+           offset="0.1036" />
+        <stop
+           id="stop8852"
+           style="stop-color:#4dc4c9;stop-opacity:0.45969999"
+           offset="0.1813" />
+        <stop
+           id="stop8854"
+           style="stop-color:#57c5b9;stop-opacity:0.35249999"
+           offset="0.2507" />
+        <stop
+           id="stop8856"
+           style="stop-color:#65c6a2;stop-opacity:0.2529"
+           offset="0.3152" />
+        <stop
+           id="stop8858"
+           style="stop-color:#76c785;stop-opacity:0.1584"
+           offset="0.37630001" />
+        <stop
+           id="stop8860"
+           style="stop-color:#8bc961;stop-opacity:0.0692"
+           offset="0.43399999" />
+        <stop
+           id="stop8862"
+           style="stop-color:#9fcb40;stop-opacity:0"
+           offset="0.4788" />
+      </radialGradient>
+      <path
+         d="m 205.766,128.177 c 2.832,-1.922 3.569,-5.774 1.649,-8.604 -1.922,-2.832 -5.772,-3.568 -8.601,-1.648 l -5.358,3.636 c -0.234,4.088 0.646,8.11 2.308,11.903 l 9.402,-4.929 c 0.202,-0.106 0.406,-0.226 0.6,-0.358 z"
+         id="path1282"
+         style="opacity:0.51999996;fill:url(#SVGID_54_)" />
+      <g
+         id="g1284">
+        <linearGradient
+           x1="164.02789"
+           y1="1079.2363"
+           x2="205.2583"
+           y2="1120.4667"
+           id="linearGradient8866"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="translate(24,-933)">
+          <stop
+             id="stop8868"
+             style="stop-color:#517287;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop8870"
+             style="stop-color:#6e8b9d;stop-opacity:1"
+             offset="0.0227" />
+          <stop
+             id="stop8872"
+             style="stop-color:#8da7b5;stop-opacity:1"
+             offset="0.0532" />
+          <stop
+             id="stop8874"
+             style="stop-color:#a9bfca;stop-opacity:1"
+             offset="0.0878" />
+          <stop
+             id="stop8876"
+             style="stop-color:#bfd2db;stop-opacity:1"
+             offset="0.1268" />
+          <stop
+             id="stop8878"
+             style="stop-color:#d0e1e7;stop-opacity:1"
+             offset="0.1724" />
+          <stop
+             id="stop8880"
+             style="stop-color:#dbebf0;stop-opacity:1"
+             offset="0.2288" />
+          <stop
+             id="stop8882"
+             style="stop-color:#e2f1f6;stop-opacity:1"
+             offset="0.30779999" />
+          <stop
+             id="stop8884"
+             style="stop-color:#e4f3f7;stop-opacity:1"
+             offset="0.5273" />
+        </linearGradient>
+        <path
+           d="m 241.759,172.475 -69.237,-1.938 c -2.038,-0.057 -3.642,-1.756 -3.583,-3.791 0.054,-1.964 1.645,-3.525 3.583,-3.585 l 69.237,-1.938 c 3.106,-0.084 5.697,2.362 5.783,5.471 0.085,3.105 -2.36,5.693 -5.468,5.781 -0.097,0.002 -0.219,0.002 -0.315,0 z"
+           id="path1305"
+           style="fill:url(#SVGID_55_)" />
+        <path
+           d="m 241.734,173.298 -41.949,-1.465 -20.977,-0.666 -5.244,-0.167 c -0.446,-0.02 -0.853,-0.014 -1.332,-0.057 -0.479,-0.047 -0.979,-0.188 -1.407,-0.398 -0.879,-0.425 -1.588,-1.179 -1.966,-2.076 -0.19,-0.447 -0.299,-0.929 -0.322,-1.412 0,-0.129 -0.009,-0.229 -0.001,-0.38 l 0.024,-0.327 c 0.036,-0.257 0.085,-0.504 0.157,-0.729 0.29,-0.934 0.923,-1.745 1.75,-2.264 0.413,-0.258 0.872,-0.439 1.35,-0.541 0.238,-0.053 0.485,-0.07 0.724,-0.088 l 0.656,-0.021 2.622,-0.084 41.953,-1.377 20.979,-0.729 2.622,-0.094 0.677,-0.016 c 0.271,0.007 0.521,0.021 0.771,0.058 0.496,0.067 0.982,0.191 1.455,0.371 1.883,0.713 3.379,2.354 3.91,4.31 0.563,1.941 0.104,4.144 -1.16,5.719 -1.236,1.599 -3.281,2.52 -5.272,2.438 h -0.011 V 173.3 l -0.009,-0.002 0,0 z m 0.041,-1.648 c 1.514,0.035 2.976,-0.678 3.886,-1.856 0.926,-1.165 1.231,-2.765 0.854,-4.198 -0.367,-1.435 -1.461,-2.671 -2.854,-3.22 -0.349,-0.138 -0.708,-0.235 -1.078,-0.29 -0.188,-0.029 -0.371,-0.042 -0.538,-0.051 l -0.635,0.006 -2.623,0.057 -20.98,0.444 -41.967,0.974 -2.623,0.063 -0.655,0.017 c -0.198,0.014 -0.387,0.023 -0.578,0.063 -0.379,0.073 -0.744,0.219 -1.074,0.421 -0.662,0.4 -1.173,1.05 -1.41,1.788 -0.061,0.188 -0.096,0.368 -0.127,0.547 l -0.027,0.327 0.005,0.273 c 0.022,0.389 0.112,0.771 0.266,1.127 0.305,0.713 0.876,1.313 1.577,1.644 0.357,0.169 0.713,0.271 1.103,0.307 0.393,0.034 0.862,0.027 1.289,0.044 l 5.245,0.129 20.981,0.508 41.965,0.886 h -0.008 v -0.007 h 0.004 v -0.002 h 0.002 l 0,-0.001 z"
+           id="path1307"
+           style="fill:#535a5f" />
+      </g>
+      <radialGradient
+         cx="215.1465"
+         cy="1101.0889"
+         r="18.8706"
+         id="radialGradient8888"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="translate(24,-933)">
+        <stop
+           id="stop8890"
+           style="stop-color:#46c3d6;stop-opacity:0.74000001"
+           offset="0" />
+        <stop
+           id="stop8892"
+           style="stop-color:#48c3d3;stop-opacity:0.57990003"
+           offset="0.1036" />
+        <stop
+           id="stop8894"
+           style="stop-color:#4dc4c9;stop-opacity:0.45969999"
+           offset="0.1813" />
+        <stop
+           id="stop8896"
+           style="stop-color:#57c5b9;stop-opacity:0.35249999"
+           offset="0.2507" />
+        <stop
+           id="stop8898"
+           style="stop-color:#65c6a2;stop-opacity:0.2529"
+           offset="0.3152" />
+        <stop
+           id="stop8900"
+           style="stop-color:#76c785;stop-opacity:0.1584"
+           offset="0.37630001" />
+        <stop
+           id="stop8902"
+           style="stop-color:#8bc961;stop-opacity:0.0692"
+           offset="0.43399999" />
+        <stop
+           id="stop8904"
+           style="stop-color:#9fcb40;stop-opacity:0"
+           offset="0.4788" />
+      </radialGradient>
+      <path
+         d="m 242.074,172.475 c 3.107,-0.088 5.553,-2.676 5.468,-5.781 -0.086,-3.104 -2.677,-5.555 -5.783,-5.471 l -11.776,0.332 c -0.221,3.576 0.271,7.168 1.365,10.629 l 10.411,0.291 c 0.096,0.002 0.218,0.002 0.315,0 z"
+         id="path1326"
+         style="opacity:0.51999996;fill:url(#SVGID_56_)" />
+      <g
+         id="g1328">
+        <linearGradient
+           x1="116.8828"
+           y1="1108.6611"
+           x2="131.2825"
+           y2="1172.244"
+           id="linearGradient8908"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="translate(24,-933)">
+          <stop
+             id="stop8910"
+             style="stop-color:#202d36;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop8912"
+             style="stop-color:#517287;stop-opacity:1"
+             offset="0.0732" />
+          <stop
+             id="stop8914"
+             style="stop-color:#7895a5;stop-opacity:1"
+             offset="0.1426" />
+          <stop
+             id="stop8916"
+             style="stop-color:#9fb6c2;stop-opacity:1"
+             offset="0.22319999" />
+          <stop
+             id="stop8918"
+             style="stop-color:#bdd1d9;stop-opacity:1"
+             offset="0.30329999" />
+          <stop
+             id="stop8920"
+             style="stop-color:#d3e4ea;stop-opacity:1"
+             offset="0.38159999" />
+          <stop
+             id="stop8922"
+             style="stop-color:#e0eff4;stop-opacity:1"
+             offset="0.45719999" />
+          <stop
+             id="stop8924"
+             style="stop-color:#e4f3f7;stop-opacity:1"
+             offset="0.5273" />
+        </linearGradient>
+        <path
+           d="m 144.025,178.781 17.471,54.305 c 1.259,3.918 -0.896,8.114 -4.812,9.374 -3.917,1.263 -8.111,-0.894 -9.371,-4.81 -0.09,-0.271 -0.157,-0.545 -0.212,-0.815 l -11.224,-55.931 c -0.459,-2.285 1.022,-4.506 3.304,-4.967 2.127,-0.425 4.199,0.829 4.844,2.844 z"
+           id="path1347"
+           style="fill:url(#SVGID_57_)" />
+        <path
+           d="m 144.484,178.634 11.826,35.88 5.854,17.957 c 0.583,1.563 0.707,3.449 0.227,5.122 -0.46,1.69 -1.478,3.224 -2.856,4.314 -1.379,1.095 -3.109,1.726 -4.869,1.771 -1.76,0.057 -3.522,-0.476 -4.96,-1.476 -1.446,-0.99 -2.552,-2.466 -3.114,-4.117 -0.077,-0.21 -0.131,-0.429 -0.184,-0.604 l -0.142,-0.646 -0.227,-1.159 -0.455,-2.316 -1.818,-9.268 -3.619,-18.539 -3.586,-18.546 -0.896,-4.636 -0.224,-1.159 c -0.081,-0.386 -0.146,-0.846 -0.124,-1.28 0.03,-0.877 0.315,-1.74 0.806,-2.463 0.978,-1.468 2.796,-2.262 4.535,-2.015 1.733,0.228 3.292,1.491 3.826,3.18 z m -0.919,0.296 c -0.397,-1.342 -1.629,-2.402 -3.031,-2.584 -1.388,-0.221 -2.889,0.447 -3.641,1.639 -0.386,0.586 -0.603,1.279 -0.617,1.979 -0.025,0.659 0.224,1.438 0.362,2.22 l 0.961,4.621 3.846,18.492 3.814,18.5 1.898,9.252 0.475,2.313 0.237,1.156 0.113,0.506 c 0.062,0.203 0.102,0.367 0.164,0.523 0.463,1.323 1.353,2.487 2.514,3.268 1.154,0.789 2.56,1.197 3.949,1.145 1.387,-0.061 2.764,-0.547 3.861,-1.396 1.096,-0.854 1.918,-2.065 2.295,-3.412 0.382,-1.36 0.33,-2.767 -0.173,-4.162 l -5.715,-18.002 -11.312,-36.058 z"
+           id="path1349"
+           style="fill:#535a5f" />
+      </g>
+      <radialGradient
+         cx="-2251.0732"
+         cy="1565.3145"
+         r="24.297501"
+         id="radialGradient8928"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(-0.2616,-0.9652,0.6428,-0.1743,-1441.7035,-1668.0449)">
+        <stop
+           id="stop8930"
+           style="stop-color:#46c3d6;stop-opacity:0.74000001"
+           offset="0" />
+        <stop
+           id="stop8932"
+           style="stop-color:#48c3d3;stop-opacity:0.57990003"
+           offset="0.14040001" />
+        <stop
+           id="stop8934"
+           style="stop-color:#4dc4c9;stop-opacity:0.45969999"
+           offset="0.2458" />
+        <stop
+           id="stop8936"
+           style="stop-color:#57c5b9;stop-opacity:0.35249999"
+           offset="0.33989999" />
+        <stop
+           id="stop8938"
+           style="stop-color:#65c6a2;stop-opacity:0.2529"
+           offset="0.42730001" />
+        <stop
+           id="stop8940"
+           style="stop-color:#76c785;stop-opacity:0.1584"
+           offset="0.51010001" />
+        <stop
+           id="stop8942"
+           style="stop-color:#8bc961;stop-opacity:0.0692"
+           offset="0.58829999" />
+        <stop
+           id="stop8944"
+           style="stop-color:#9fcb40;stop-opacity:0"
+           offset="0.64899999" />
+      </radialGradient>
+      <path
+         d="m 149.451,215.529 c -1.866,1.066 -3.963,2.132 -5.955,3.336 l 3.605,17.97 c 0.055,0.271 0.122,0.545 0.212,0.815 1.26,3.916 5.454,6.07 9.371,4.81 3.917,-1.26 6.071,-5.456 4.812,-9.374 l -5.972,-18.561 c -2.299,-0.021 -4.508,0.377 -6.073,1.004 z"
+         id="path1368"
+         style="opacity:0.51999996;fill:url(#SVGID_58_)" />
+      <path
+         d="M 107.278,190.825 73.16,225.299 c -2.395,2.419 -6.296,2.44 -8.715,0.045 -2.417,-2.396 -2.439,-6.296 -0.045,-8.715 0.136,-0.14 0.286,-0.273 0.431,-0.396 l 37.225,-31.088 c 1.639,-1.369 4.074,-1.146 5.442,0.487 1.281,1.539 1.154,3.793 -0.22,5.193 z"
+         id="path1370"
+         style="fill:#e4f3f7;stroke:#535a5f;stroke-width:1.74479997;stroke-miterlimit:10" />
+      <radialGradient
+         cx="47.6558"
+         cy="1150.9707"
+         r="24.728399"
+         id="radialGradient8948"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="translate(24,-933)">
+        <stop
+           id="stop8950"
+           style="stop-color:#46c3d6;stop-opacity:0.74000001"
+           offset="0" />
+        <stop
+           id="stop8952"
+           style="stop-color:#48c3d3;stop-opacity:0.57990003"
+           offset="0.1036" />
+        <stop
+           id="stop8954"
+           style="stop-color:#4dc4c9;stop-opacity:0.45969999"
+           offset="0.1813" />
+        <stop
+           id="stop8956"
+           style="stop-color:#57c5b9;stop-opacity:0.35249999"
+           offset="0.2507" />
+        <stop
+           id="stop8958"
+           style="stop-color:#65c6a2;stop-opacity:0.2529"
+           offset="0.3152" />
+        <stop
+           id="stop8960"
+           style="stop-color:#76c785;stop-opacity:0.1584"
+           offset="0.37630001" />
+        <stop
+           id="stop8962"
+           style="stop-color:#8bc961;stop-opacity:0.0692"
+           offset="0.43399999" />
+        <stop
+           id="stop8964"
+           style="stop-color:#9fcb40;stop-opacity:0"
+           offset="0.4788" />
+      </radialGradient>
+      <path
+         d="m 78.062,206.377 c -0.293,-0.176 -0.586,-0.327 -0.878,-0.459 l -12.353,10.314 c -0.145,0.121 -0.295,0.257 -0.431,0.396 -2.395,2.419 -2.372,6.319 0.045,8.715 2.419,2.396 6.321,2.374 8.715,-0.045 l 12.212,-12.34 c -1.843,-2.49 -4.277,-4.715 -7.31,-6.581 z"
+         id="path1389"
+         style="opacity:0.51999996;fill:url(#SVGID_59_)" />
+      <g
+         id="g1391">
+        <linearGradient
+           x1="65.777397"
+           y1="1106.8008"
+           x2="37.484001"
+           y2="1070.5869"
+           id="linearGradient8968"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="translate(24,-933)">
+          <stop
+             id="stop8970"
+             style="stop-color:#517287;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop8972"
+             style="stop-color:#5c7b8f;stop-opacity:1"
+             offset="0.0118" />
+          <stop
+             id="stop8974"
+             style="stop-color:#809bab;stop-opacity:1"
+             offset="0.057" />
+          <stop
+             id="stop8976"
+             style="stop-color:#9fb7c3;stop-opacity:1"
+             offset="0.1063" />
+          <stop
+             id="stop8978"
+             style="stop-color:#b8cdd6;stop-opacity:1"
+             offset="0.15970001" />
+          <stop
+             id="stop8980"
+             style="stop-color:#ccdee5;stop-opacity:1"
+             offset="0.219" />
+          <stop
+             id="stop8982"
+             style="stop-color:#daeaef;stop-opacity:1"
+             offset="0.2872" />
+          <stop
+             id="stop8984"
+             style="stop-color:#e2f1f5;stop-opacity:1"
+             offset="0.37239999" />
+          <stop
+             id="stop8986"
+             style="stop-color:#e4f3f7;stop-opacity:1"
+             offset="0.5273" />
+        </linearGradient>
+        <path
+           d="m 54.304,146.159 48.887,8.844 c 2.137,0.39 3.557,2.437 3.171,4.574 -0.359,1.976 -2.136,3.339 -4.094,3.228 l -49.6,-2.787 c -3.853,-0.219 -6.803,-3.518 -6.589,-7.373 0.218,-3.852 3.517,-6.802 7.372,-6.583 0.276,0.013 0.587,0.051 0.853,0.097 z"
+           id="path1412"
+           style="fill:url(#SVGID_60_)" />
+        <path
+           d="m 54.443,145.375 32.926,6.266 8.234,1.551 4.121,0.761 2.06,0.377 c 0.695,0.146 1.347,0.196 2.11,0.438 1.472,0.489 2.607,1.823 2.866,3.354 0.282,1.521 -0.326,3.16 -1.533,4.131 -0.596,0.484 -1.323,0.813 -2.087,0.934 -0.797,0.115 -1.482,-0.008 -2.176,-0.021 l -4.184,-0.223 c -11.155,-0.604 -22.316,-1.088 -33.474,-1.641 l -8.369,-0.396 -2.092,-0.104 -0.542,-0.031 c -0.18,-0.021 -0.405,-0.043 -0.589,-0.076 -0.383,-0.063 -0.76,-0.156 -1.13,-0.275 -1.48,-0.479 -2.804,-1.424 -3.753,-2.66 -1.947,-2.459 -2.183,-6.154 -0.464,-8.825 0.827,-1.333 2.057,-2.414 3.496,-3.035 1.433,-0.643 3.062,-0.812 4.58,-0.525 z m -0.279,1.569 c -2.469,-0.444 -5.057,0.774 -6.325,2.887 -0.317,0.523 -0.557,1.091 -0.707,1.683 -0.076,0.301 -0.129,0.596 -0.165,0.885 l -0.024,0.267 -0.01,0.214 c -0.01,0.148 -0.002,0.313 -10e-4,0.46 0.043,1.229 0.471,2.438 1.209,3.423 0.734,0.991 1.772,1.764 2.943,2.162 0.293,0.104 0.592,0.188 0.898,0.233 0.159,0.028 0.282,0.049 0.448,0.065 l 0.502,0.039 2.09,0.135 8.361,0.541 c 11.149,0.705 22.294,1.479 33.447,2.125 l 4.182,0.25 c 0.698,0.021 1.414,0.14 2.004,0.041 0.617,-0.09 1.209,-0.352 1.697,-0.744 0.988,-0.771 1.49,-2.111 1.251,-3.354 -0.216,-1.236 -1.146,-2.318 -2.338,-2.711 -0.572,-0.18 -1.321,-0.261 -1.992,-0.396 l -2.062,-0.369 -4.124,-0.73 -8.255,-1.438 -33.029,-5.668 z"
+           id="path1414"
+           style="fill:#535a5f" />
+      </g>
+      <radialGradient
+         cx="33.9258"
+         cy="1086.5967"
+         r="23.272499"
+         id="radialGradient8990"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="translate(24,-933)">
+        <stop
+           id="stop8992"
+           style="stop-color:#46c3d6;stop-opacity:0.74000001"
+           offset="0" />
+        <stop
+           id="stop8994"
+           style="stop-color:#48c3d3;stop-opacity:0.57990003"
+           offset="0.1036" />
+        <stop
+           id="stop8996"
+           style="stop-color:#4dc4c9;stop-opacity:0.45969999"
+           offset="0.1813" />
+        <stop
+           id="stop8998"
+           style="stop-color:#57c5b9;stop-opacity:0.35249999"
+           offset="0.2507" />
+        <stop
+           id="stop9000"
+           style="stop-color:#65c6a2;stop-opacity:0.2529"
+           offset="0.3152" />
+        <stop
+           id="stop9002"
+           style="stop-color:#76c785;stop-opacity:0.1584"
+           offset="0.37630001" />
+        <stop
+           id="stop9004"
+           style="stop-color:#8bc961;stop-opacity:0.0692"
+           offset="0.43399999" />
+        <stop
+           id="stop9006"
+           style="stop-color:#9fcb40;stop-opacity:0"
+           offset="0.4788" />
+      </radialGradient>
+      <path
+         d="m 66.826,148.424 -12.522,-2.265 c -0.266,-0.046 -0.577,-0.084 -0.853,-0.1 -3.855,-0.216 -7.154,2.733 -7.372,6.585 -0.214,3.854 2.736,7.148 6.589,7.371 l 15.652,0.879 c 0.882,-3.893 0.517,-8.113 -1.494,-12.47 z"
+         id="path1433"
+         style="opacity:0.51999996;fill:url(#SVGID_61_)" />
+      <g
+         id="g1435">
+        <g
+           id="g1437">
+          <radialGradient
+             cx="42.487801"
+             cy="1133.252"
+             r="18.6436"
+             id="radialGradient9011"
+             gradientUnits="userSpaceOnUse"
+             gradientTransform="matrix(0.9545,0,0,0.9545,-0.1888,-930.3677)">
+            <stop
+               id="stop9013"
+               style="stop-color:#d5e2ee;stop-opacity:1"
+               offset="0.77579999" />
+            <stop
+               id="stop9015"
+               style="stop-color:#d1dfed;stop-opacity:1"
+               offset="0.82630002" />
+            <stop
+               id="stop9017"
+               style="stop-color:#c7d6e8;stop-opacity:1"
+               offset="0.8714" />
+            <stop
+               id="stop9019"
+               style="stop-color:#b4c6e1;stop-opacity:1"
+               offset="0.91439998" />
+            <stop
+               id="stop9021"
+               style="stop-color:#9bb0d8;stop-opacity:1"
+               offset="0.9562" />
+            <stop
+               id="stop9023"
+               style="stop-color:#7a95cb;stop-opacity:1"
+               offset="0.99680001" />
+            <stop
+               id="stop9025"
+               style="stop-color:#7792ca;stop-opacity:1"
+               offset="1" />
+          </radialGradient>
+          <circle
+             cx="40.366001"
+             cy="151.321"
+             r="17.795"
+             id="circle1454"
+             style="fill:url(#SVGID_62_)" />
+          <path
+             d="m 58.944,151.331 c -0.033,4.854 -2.113,9.646 -5.566,13.002 -3.432,3.387 -8.172,5.387 -13.02,5.409 -4.817,0.066 -9.645,-1.897 -13.117,-5.297 -3.5,-3.383 -5.593,-8.196 -5.625,-13.137 -0.032,-2.434 0.421,-4.917 1.34,-7.205 0.924,-2.289 2.318,-4.386 4.054,-6.144 3.463,-3.538 8.375,-5.63 13.37,-5.571 4.939,-0.034 9.859,2.113 13.267,5.646 3.449,3.513 5.392,8.413 5.296,13.275 l 0.001,0.022 0,0 z m -1.566,-0.011 c -0.045,-4.464 -1.948,-8.828 -5.127,-11.884 -1.582,-1.531 -3.455,-2.751 -5.487,-3.562 -2.04,-0.806 -4.2,-1.216 -6.412,-1.217 -4.339,0.009 -8.689,1.763 -11.795,4.853 -3.123,3.076 -4.984,7.378 -5.031,11.822 -0.083,4.395 1.672,8.841 4.8,12.027 3.097,3.229 7.531,5.104 12.048,5.127 4.486,0.072 9.009,-1.771 12.146,-5.014 3.175,-3.211 4.941,-7.688 4.858,-12.162 v 0.01 z"
+             id="path1456"
+             style="fill:#39444f" />
+        </g>
+        <radialGradient
+           cx="198.6104"
+           cy="674.43457"
+           r="20.9529"
+           id="radialGradient9029"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.9092,0.2908,-0.2908,0.9092,55.1576,-520.1451)">
+          <stop
+             id="stop9031"
+             style="stop-color:#0b1929;stop-opacity:0"
+             offset="0.41209999" />
+          <stop
+             id="stop9033"
+             style="stop-color:#0a1827;stop-opacity:0.53789997"
+             offset="0.58490002" />
+          <stop
+             id="stop9035"
+             style="stop-color:#091420;stop-opacity:0.7317"
+             offset="0.64719999" />
+          <stop
+             id="stop9037"
+             style="stop-color:#060d15;stop-opacity:0.86940002"
+             offset="0.69139999" />
+          <stop
+             id="stop9039"
+             style="stop-color:#010204;stop-opacity:0.98030001"
+             offset="0.727" />
+          <stop
+             id="stop9041"
+             style="stop-color:#000000;stop-opacity:1"
+             offset="0.73329997" />
+          <stop
+             id="stop9043"
+             style="stop-color:#03080d;stop-opacity:0.61080003"
+             offset="0.78759998" />
+          <stop
+             id="stop9045"
+             style="stop-color:#0b1929;stop-opacity:0"
+             offset="0.87269998" />
+        </radialGradient>
+        <circle
+           cx="40.187"
+           cy="149.92599"
+           r="19.216"
+           id="circle1475"
+           style="opacity:0.36000001;fill:url(#SVGID_63_)" />
+        <radialGradient
+           cx="44.429699"
+           cy="1121.793"
+           r="28.879"
+           id="radialGradient9048"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.9545,0,0,0.9545,-0.1888,-930.3677)">
+          <stop
+             id="stop9050"
+             style="stop-color:#b4cb80;stop-opacity:0"
+             offset="0.33329999" />
+          <stop
+             id="stop9052"
+             style="stop-color:#60bd71;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <circle
+           cx="40.368"
+           cy="151.127"
+           r="17.795"
+           id="circle1482"
+           style="opacity:0.62000002;fill:url(#SVGID_64_)" />
+        <radialGradient
+           cx="42.491199"
+           cy="1133.0498"
+           r="18.6443"
+           id="radialGradient9055"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.9545,0,0,0.9545,-0.1888,-930.3677)">
+          <stop
+             id="stop9057"
+             style="stop-color:#9fcb40;stop-opacity:0"
+             offset="0.33329999" />
+          <stop
+             id="stop9059"
+             style="stop-color:#458691;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <circle
+           cx="40.368999"
+           cy="151.12801"
+           r="17.796"
+           id="circle1489"
+           style="opacity:0.62000002;fill:url(#SVGID_65_)" />
+        <path
+           d="m 25.006,152.037 c -0.775,-8.092 5.16,-15.283 13.254,-16.057 8.092,-0.772 15.991,3.641 17.272,10.397 -6.04,-7.997 -15.256,-7.997 -18.316,-7.262 -6.796,1.631 -10.331,6.64 -12.21,12.922 z"
+           id="path1491"
+           style="opacity:0.48999999;fill:#f2f6fa" />
+        <path
+           d="m 22.753,153.857 c -0.934,-9.772 5.798,-18.961 15.57,-19.896 9.771,-0.931 16.319,4.533 19.467,13.535 -4.66,-9.921 -17.346,-10.127 -21.041,-9.239 -8.203,1.969 -11.728,8.015 -13.996,15.6 z"
+           id="path1493"
+           style="opacity:0.11000001;fill:#ebf7fd" />
+        <path
+           d="m 24.147,158.452 c -3.024,-12.956 4.676,-22.458 14.202,-23.369 9.522,-0.908 18.36,6.393 19.442,16.954 -4.181,-15.48 -17.278,-14.999 -20.877,-14.121 -7.993,1.949 -12.255,8.07 -12.767,20.536 z"
+           id="path1495"
+           style="opacity:0.22000002;fill:#ebf7fd" />
+        <radialGradient
+           cx="42.109402"
+           cy="1224.0742"
+           r="9.9401999"
+           id="radialGradient9065"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.9545,0,0,0.8789,-0.1888,-933.7701)">
+          <stop
+             id="stop9067"
+             style="stop-color:#eef8fb;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop9069"
+             style="stop-color:#ecf7fa;stop-opacity:0.491"
+             offset="0.509" />
+          <stop
+             id="stop9071"
+             style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+             offset="0.69239998" />
+          <stop
+             id="stop9073"
+             style="stop-color:#daf0f4;stop-opacity:0.177"
+             offset="0.82300001" />
+          <stop
+             id="stop9075"
+             style="stop-color:#c9e9ef;stop-opacity:0.0721"
+             offset="0.92790002" />
+          <stop
+             id="stop9077"
+             style="stop-color:#b8e2e9;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 49.492,142.067 c 0,4.825 -4.246,8.738 -9.486,8.738 -5.24,0 -9.489,-3.914 -9.489,-8.738 0,-4.823 4.249,-8.736 9.489,-8.736 5.24,0 9.486,3.913 9.486,8.736 z"
+           id="path1510"
+           style="opacity:0.5;fill:url(#SVGID_66_)" />
+        <radialGradient
+           cx="42.110901"
+           cy="1223.4004"
+           r="7.2747002"
+           id="radialGradient9080"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.9545,0,0,0.8789,-0.1888,-933.7701)">
+          <stop
+             id="stop9082"
+             style="stop-color:#eef8fb;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop9084"
+             style="stop-color:#ecf7fa;stop-opacity:0.491"
+             offset="0.509" />
+          <stop
+             id="stop9086"
+             style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+             offset="0.69239998" />
+          <stop
+             id="stop9088"
+             style="stop-color:#daf0f4;stop-opacity:0.177"
+             offset="0.82300001" />
+          <stop
+             id="stop9090"
+             style="stop-color:#c9e9ef;stop-opacity:0.0721"
+             offset="0.92790002" />
+          <stop
+             id="stop9092"
+             style="stop-color:#b8e2e9;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <ellipse
+           cx="40.006001"
+           cy="141.476"
+           rx="6.9439998"
+           ry="6.3940001"
+           id="ellipse1525"
+           style="fill:url(#SVGID_67_)" />
+        <radialGradient
+           cx="43.5"
+           cy="1121.7168"
+           r="4.9622002"
+           id="radialGradient9095"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.9545,0,0,0.9545,-0.1888,-930.3677)">
+          <stop
+             id="stop9097"
+             style="stop-color:#eef8fb;stop-opacity:1"
+             offset="0.2667" />
+          <stop
+             id="stop9099"
+             style="stop-color:#edf7f8;stop-opacity:0.80159998"
+             offset="0.4122" />
+          <stop
+             id="stop9101"
+             style="stop-color:#e9f5ee;stop-opacity:0.65249997"
+             offset="0.52149999" />
+          <stop
+             id="stop9103"
+             style="stop-color:#e2f1de;stop-opacity:0.51959997"
+             offset="0.61900002" />
+          <stop
+             id="stop9105"
+             style="stop-color:#d8ecc7;stop-opacity:0.396"
+             offset="0.70959997" />
+          <stop
+             id="stop9107"
+             style="stop-color:#cce4aa;stop-opacity:0.2789"
+             offset="0.79540002" />
+          <stop
+             id="stop9109"
+             style="stop-color:#bcdc86;stop-opacity:0.16670001"
+             offset="0.87769997" />
+          <stop
+             id="stop9111"
+             style="stop-color:#abd25b;stop-opacity:0.0604"
+             offset="0.95569998" />
+          <stop
+             id="stop9113"
+             style="stop-color:#9fcb40;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <circle
+           cx="41.332001"
+           cy="140.31"
+           r="4.737"
+           id="circle1546"
+           style="fill:url(#SVGID_68_)" />
+        <circle
+           cx="42.049999"
+           cy="138.349"
+           r="1.862"
+           id="circle1548"
+           style="opacity:0.62000002;fill:#ffffff" />
+        <radialGradient
+           cx="251.91409"
+           cy="898.89258"
+           r="6.8579001"
+           id="radialGradient9117"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(1.0826,0.3949,-0.3271,0.8967,54.9292,-746.3787)">
+          <stop
+             id="stop9119"
+             style="stop-color:#46c3d6;stop-opacity:0.74000001"
+             offset="0.2667" />
+          <stop
+             id="stop9121"
+             style="stop-color:#48c3d3;stop-opacity:0.57990003"
+             offset="0.4253" />
+          <stop
+             id="stop9123"
+             style="stop-color:#4dc4c9;stop-opacity:0.45969999"
+             offset="0.54439998" />
+          <stop
+             id="stop9125"
+             style="stop-color:#57c5b9;stop-opacity:0.35249999"
+             offset="0.65069997" />
+          <stop
+             id="stop9127"
+             style="stop-color:#65c6a2;stop-opacity:0.2529"
+             offset="0.74940002" />
+          <stop
+             id="stop9129"
+             style="stop-color:#76c785;stop-opacity:0.1584"
+             offset="0.84299999" />
+          <stop
+             id="stop9131"
+             style="stop-color:#8bc961;stop-opacity:0.0692"
+             offset="0.9314" />
+          <stop
+             id="stop9133"
+             style="stop-color:#9fcb40;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 41.05,161.848 c -1.24,3.396 -5.568,4.938 -9.669,3.44 -4.101,-1.493 -6.422,-5.462 -5.183,-8.858 1.239,-3.395 5.569,-4.938 9.67,-3.438 4.1,1.492 6.419,5.459 5.182,8.856 z"
+           id="path1567"
+           style="opacity:0.51999996;fill:url(#SVGID_69_)" />
+        <path
+           d="m 36.418,166.998 c -0.269,0.521 -0.668,0.941 -1.159,1.255 -2.728,-0.456 -6.732,-3.212 -8.324,-5.217 0.057,-0.265 0.147,-0.519 0.272,-0.765 1.005,-1.957 3.883,-2.49 6.426,-1.188 2.544,1.306 3.79,3.954 2.785,5.915 z"
+           id="path1569"
+           style="opacity:0.31999996;fill:#ffffff" />
+        <radialGradient
+           cx="-1457.8711"
+           cy="915.73053"
+           r="9.2501001"
+           id="radialGradient9137"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.0134,-1.0958,0.7445,0.0091,-608.7991,-1451.4426)">
+          <stop
+             id="stop9139"
+             style="stop-color:#1d3c6e;stop-opacity:0.36000001"
+             offset="0.54549998" />
+          <stop
+             id="stop9141"
+             style="stop-color:#30486d;stop-opacity:0.433"
+             offset="0.56900001" />
+          <stop
+             id="stop9143"
+             style="stop-color:#46566b;stop-opacity:0.54839998"
+             offset="0.60610002" />
+          <stop
+             id="stop9145"
+             style="stop-color:#56606a;stop-opacity:0.67330003"
+             offset="0.64630002" />
+          <stop
+             id="stop9147"
+             style="stop-color:#606669;stop-opacity:0.81339997"
+             offset="0.69139999" />
+          <stop
+             id="stop9149"
+             style="stop-color:#636869;stop-opacity:1"
+             offset="0.75150001" />
+          <stop
+             id="stop9151"
+             style="stop-color:#51c1bc;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 54.453,142.89 c 4.068,0.05 5.542,4.363 5.467,10.545 -0.075,6.182 -1.999,7.254 -5.742,11.84 -2.572,3.146 -7.304,-5.104 -7.228,-11.283 0.077,-6.181 3.436,-11.152 7.503,-11.102 z"
+           id="path1586"
+           style="opacity:0.18999999;fill:url(#SVGID_70_)" />
+        <radialGradient
+           cx="-1385.915"
+           cy="1234.9062"
+           r="12.6932"
+           id="radialGradient9154"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.222,-0.9284,0.9284,0.222,-789.3549,-1407.3914)">
+          <stop
+             id="stop9156"
+             style="stop-color:#040506;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop9158"
+             style="stop-color:#050709;stop-opacity:1"
+             offset="0.3195" />
+          <stop
+             id="stop9160"
+             style="stop-color:#070c13;stop-opacity:1"
+             offset="0.55989999" />
+          <stop
+             id="stop9162"
+             style="stop-color:#0a1523;stop-opacity:1"
+             offset="0.77380002" />
+          <stop
+             id="stop9164"
+             style="stop-color:#0b1929;stop-opacity:1"
+             offset="0.83639997" />
+          <stop
+             id="stop9166"
+             style="stop-color:#23474c;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 46.334,136.593 c 7.341,2.575 11.838,10.322 9.948,18.229 -1.893,7.906 -9.105,13.523 -15.913,12.547 9.025,-0.988 12.906,-9.758 13.699,-12.807 2.012,-7.734 -2.511,-14.027 -7.734,-17.969 z"
+           id="path1601"
+           style="opacity:0.4;fill:url(#SVGID_71_)" />
+        <path
+           d="m 56.626,148.539 c 2.043,7.511 -2.063,15.754 -10.037,18.879 -7.972,3.124 -17.057,0.555 -20.178,-5.58 5.126,8.309 17.104,5.918 20.194,4.711 6.677,-2.608 11.811,-9.895 10.021,-18.01 z"
+           id="path1603"
+           style="opacity:0.75;fill:#ffffff" />
+        <radialGradient
+           cx="-1698.0078"
+           cy="543.31049"
+           r="1.7839"
+           id="radialGradient9170"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(-0.0307,-0.954,0.954,-0.0307,-546.501,-1450.8168)">
+          <stop
+             id="stop9172"
+             style="stop-color:#040506;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop9174"
+             style="stop-color:#050709;stop-opacity:1"
+             offset="0.3195" />
+          <stop
+             id="stop9176"
+             style="stop-color:#070c13;stop-opacity:1"
+             offset="0.55989999" />
+          <stop
+             id="stop9178"
+             style="stop-color:#0a1523;stop-opacity:1"
+             offset="0.77380002" />
+          <stop
+             id="stop9180"
+             style="stop-color:#0b1929;stop-opacity:1"
+             offset="0.83639997" />
+          <stop
+             id="stop9182"
+             style="stop-color:#23474c;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 23.857,150.251 c 0.583,-0.018 1.09,0.935 1.127,2.132 0.039,1.195 -0.403,2.18 -0.986,2.198 -0.584,0.021 -1.09,-0.937 -1.128,-2.132 -0.038,-1.193 0.404,-2.178 0.987,-2.198 z"
+           id="path1618"
+           style="opacity:0.18999999;fill:url(#SVGID_72_)" />
+        <path
+           d="m 51.424,138.665 c 1.025,1.105 5.187,4.75 5.504,12.082 0.014,0.302 -1.872,-10.3 -5.902,-10.375 -1.023,-0.018 -2.354,0.152 -2.706,-0.808 -0.25,-0.683 -0.107,-1.351 0.438,-1.768 0.813,-0.624 1.97,0.12 2.666,0.869 z"
+           id="path1620"
+           style="opacity:0.87000002;fill:#ffffff" />
+        <path
+           d="m 24.636,158.24 c 1.158,1.602 5.1,8.113 13.799,9.072 0.396,0.043 -11.921,-3.166 -11.827,-10.271 0.018,-1.345 0.803,-2.985 -0.344,-3.688 -0.814,-0.498 -1.709,-0.485 -2.388,0.105 -1.011,0.892 -0.025,3.69 0.76,4.782 z"
+           id="path1622"
+           style="opacity:0.43000004;fill:#ffffff" />
+      </g>
+      <g
+         id="g1624">
+        <g
+           id="g1626">
+          <radialGradient
+             cx="36.046902"
+             cy="1162.3555"
+             r="16.099899"
+             id="radialGradient9189"
+             gradientUnits="userSpaceOnUse"
+             gradientTransform="translate(24,-933)">
+            <stop
+               id="stop9191"
+               style="stop-color:#d5e2ee;stop-opacity:1"
+               offset="0.77579999" />
+            <stop
+               id="stop9193"
+               style="stop-color:#d1dfed;stop-opacity:1"
+               offset="0.82630002" />
+            <stop
+               id="stop9195"
+               style="stop-color:#c7d6e8;stop-opacity:1"
+               offset="0.8714" />
+            <stop
+               id="stop9197"
+               style="stop-color:#b4c6e1;stop-opacity:1"
+               offset="0.91439998" />
+            <stop
+               id="stop9199"
+               style="stop-color:#9bb0d8;stop-opacity:1"
+               offset="0.9562" />
+            <stop
+               id="stop9201"
+               style="stop-color:#7a95cb;stop-opacity:1"
+               offset="0.99680001" />
+            <stop
+               id="stop9203"
+               style="stop-color:#7792ca;stop-opacity:1"
+               offset="1" />
+          </radialGradient>
+          <circle
+             cx="60.047001"
+             cy="229.355"
+             r="16.1"
+             id="circle1643"
+             style="fill:url(#SVGID_73_)" />
+          <path
+             d="m 76.93,229.364 c -0.035,4.409 -1.932,8.759 -5.069,11.803 -3.115,3.072 -7.425,4.89 -11.813,4.914 -4.388,0.065 -8.764,-1.716 -11.926,-4.8 -3.185,-3.063 -5.094,-7.454 -5.129,-11.926 -0.031,-2.23 0.377,-4.479 1.211,-6.563 0.839,-2.084 2.106,-3.993 3.686,-5.595 3.144,-3.223 7.635,-5.131 12.157,-5.074 4.523,-0.032 8.981,1.932 12.083,5.148 3.133,3.194 4.894,7.658 4.8,12.082 v 0.011 z m -1.566,-0.009 c -0.048,-4.021 -1.767,-7.943 -4.631,-10.688 -1.425,-1.374 -3.11,-2.468 -4.938,-3.19 -1.829,-0.724 -3.787,-1.088 -5.749,-1.088 -3.923,0.01 -7.812,1.582 -10.611,4.354 -2.807,2.758 -4.485,6.636 -4.533,10.608 -0.08,3.976 1.491,7.961 4.303,10.842 2.781,2.912 6.785,4.607 10.842,4.633 4.058,0.066 8.127,-1.596 10.955,-4.521 2.859,-2.896 4.442,-6.93 4.361,-10.965 l 0.001,0.015 0,0 z"
+             id="path1645"
+             style="fill:#39444f" />
+        </g>
+        <radialGradient
+           cx="201.5274"
+           cy="704.25879"
+           r="18.0959"
+           id="radialGradient9207"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.9525,0.3046,-0.3046,0.9525,81.9305,-503.3005)">
+          <stop
+             id="stop9209"
+             style="stop-color:#0b1929;stop-opacity:0"
+             offset="0.41209999" />
+          <stop
+             id="stop9211"
+             style="stop-color:#0a1827;stop-opacity:0.53789997"
+             offset="0.58490002" />
+          <stop
+             id="stop9213"
+             style="stop-color:#091420;stop-opacity:0.7317"
+             offset="0.64719999" />
+          <stop
+             id="stop9215"
+             style="stop-color:#060d15;stop-opacity:0.86940002"
+             offset="0.69139999" />
+          <stop
+             id="stop9217"
+             style="stop-color:#010204;stop-opacity:0.98030001"
+             offset="0.727" />
+          <stop
+             id="stop9219"
+             style="stop-color:#000000;stop-opacity:1"
+             offset="0.73329997" />
+          <stop
+             id="stop9221"
+             style="stop-color:#03080d;stop-opacity:0.61080003"
+             offset="0.78759998" />
+          <stop
+             id="stop9223"
+             style="stop-color:#0b1929;stop-opacity:0"
+             offset="0.87269998" />
+        </radialGradient>
+        <path
+           d="m 76.443,233.389 c -2.924,9.146 -12.709,14.188 -21.854,11.271 -9.146,-2.931 -14.187,-12.718 -11.264,-21.857 2.924,-9.146 12.708,-14.188 21.855,-11.263 9.144,2.916 14.188,12.701 11.263,21.849 z"
+           id="path1664"
+           style="opacity:0.36000001;fill:url(#SVGID_74_)" />
+        <radialGradient
+           cx="37.725601"
+           cy="1152.4668"
+           r="24.938801"
+           id="radialGradient9226"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="translate(24,-933)">
+          <stop
+             id="stop9228"
+             style="stop-color:#b4cb80;stop-opacity:0"
+             offset="0.33329999" />
+          <stop
+             id="stop9230"
+             style="stop-color:#60bd71;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <circle
+           cx="60.048"
+           cy="229.17999"
+           r="16.1"
+           id="circle1671"
+           style="opacity:0.62000002;fill:url(#SVGID_75_)" />
+        <radialGradient
+           cx="36.048901"
+           cy="1162.1797"
+           r="16.099899"
+           id="radialGradient9233"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="translate(24,-933)">
+          <stop
+             id="stop9235"
+             style="stop-color:#a0539f;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop9237"
+             style="stop-color:#7452a1;stop-opacity:1"
+             offset="0.29089999" />
+          <stop
+             id="stop9239"
+             style="stop-color:#2b2976;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <circle
+           cx="60.049"
+           cy="229.17999"
+           r="16.1"
+           id="circle1680"
+           style="opacity:0.62000002;fill:url(#SVGID_76_)" />
+        <radialGradient
+           cx="-1415.6758"
+           cy="-473.60889"
+           r="7.9875002"
+           id="radialGradient9242"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(-0.9618,-0.6268,0.4259,-0.6535,-1092.6766,-975.8175)">
+          <stop
+             id="stop9244"
+             style="stop-color:#1d3c6e;stop-opacity:0.36000001"
+             offset="0.54549998" />
+          <stop
+             id="stop9246"
+             style="stop-color:#30486d;stop-opacity:0.433"
+             offset="0.56900001" />
+          <stop
+             id="stop9248"
+             style="stop-color:#46566b;stop-opacity:0.54839998"
+             offset="0.60610002" />
+          <stop
+             id="stop9250"
+             style="stop-color:#56606a;stop-opacity:0.67330003"
+             offset="0.64630002" />
+          <stop
+             id="stop9252"
+             style="stop-color:#606669;stop-opacity:0.81339997"
+             offset="0.69139999" />
+          <stop
+             id="stop9254"
+             style="stop-color:#636869;stop-opacity:1"
+             offset="0.75150001" />
+          <stop
+             id="stop9256"
+             style="stop-color:#51c1bc;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 58.87,214.62 c 2.008,-3.085 6.019,-2.119 10.706,0.935 4.686,3.053 4.573,5.043 6.263,10.123 1.161,3.494 -7.438,3.108 -12.124,0.057 -4.686,-3.055 -6.856,-8.03 -4.845,-11.115 z"
+           id="path1697"
+           style="opacity:0.18999999;fill:url(#SVGID_77_)" />
+        <path
+           d="m 46.148,230.002 c -0.7,-7.322 4.668,-13.827 11.992,-14.527 7.322,-0.697 14.468,3.295 15.627,9.407 -5.464,-7.233 -13.803,-7.233 -16.572,-6.569 -6.147,1.475 -9.347,6.005 -11.047,11.689 z"
+           id="path1699"
+           style="opacity:0.48999999;fill:#f2f6fa" />
+        <path
+           d="m 44.11,231.648 c -0.844,-8.84 5.246,-17.154 14.088,-18 8.84,-0.842 14.765,4.104 17.613,12.244 -4.217,-8.979 -15.694,-9.162 -19.037,-8.357 -7.422,1.781 -10.613,7.25 -12.664,14.113 z"
+           id="path1701"
+           style="opacity:0.11000001;fill:#ebf7fd" />
+        <path
+           d="m 45.371,235.809 c -2.735,-11.724 4.231,-20.322 12.85,-21.146 8.615,-0.82 16.61,5.785 17.591,15.34 -3.783,-14.007 -15.633,-13.569 -18.89,-12.774 -7.231,1.761 -11.087,7.298 -11.551,18.58 z"
+           id="path1703"
+           style="opacity:0.22000002;fill:#ebf7fd" />
+        <radialGradient
+           cx="-1569.333"
+           cy="121.5645"
+           r="10.9626"
+           id="radialGradient9262"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(-0.7488,-0.6628,0.6628,-0.7488,-1190.2952,-726.3312)">
+          <stop
+             id="stop9264"
+             style="stop-color:#090609;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop9266"
+             style="stop-color:#0b070c;stop-opacity:1"
+             offset="0.33090001" />
+          <stop
+             id="stop9268"
+             style="stop-color:#120916;stop-opacity:1"
+             offset="0.57990003" />
+          <stop
+             id="stop9270"
+             style="stop-color:#1e0d26;stop-opacity:1"
+             offset="0.80140001" />
+          <stop
+             id="stop9272"
+             style="stop-color:#200e29;stop-opacity:1"
+             offset="0.83639997" />
+          <stop
+             id="stop9274"
+             style="stop-color:#3f234c;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 50.613,218.118 c 5.182,-4.765 13.279,-5.058 18.788,-0.183 5.507,4.873 6.92,13.021 3.243,18.045 3.052,-7.625 -2.296,-14.457 -4.391,-16.394 -5.319,-4.893 -12.27,-3.96 -17.64,-1.468 z"
+           id="path1718"
+           style="opacity:0.47999998;fill:url(#SVGID_78_)" />
+        <radialGradient
+           cx="35.719799"
+           cy="1257.248"
+           r="8.5857"
+           id="radialGradient9277"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(1,0,0,0.9207,24,-936.5648)">
+          <stop
+             id="stop9279"
+             style="stop-color:#eef8fb;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop9281"
+             style="stop-color:#ecf7fa;stop-opacity:0.491"
+             offset="0.509" />
+          <stop
+             id="stop9283"
+             style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+             offset="0.69239998" />
+          <stop
+             id="stop9285"
+             style="stop-color:#daf0f4;stop-opacity:0.177"
+             offset="0.82300001" />
+          <stop
+             id="stop9287"
+             style="stop-color:#c9e9ef;stop-opacity:0.0721"
+             offset="0.92790002" />
+          <stop
+             id="stop9289"
+             style="stop-color:#b8e2e9;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 68.304,220.982 c 0,4.367 -3.842,7.906 -8.583,7.906 -4.742,0 -8.586,-3.539 -8.586,-7.906 0,-4.362 3.844,-7.904 8.586,-7.904 4.74,0 8.583,3.542 8.583,7.904 z"
+           id="path1733"
+           style="opacity:0.5;fill:url(#SVGID_79_)" />
+        <radialGradient
+           cx="35.719799"
+           cy="1256.666"
+           r="6.2817001"
+           id="radialGradient9292"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(1,0,0,0.9207,24,-936.5648)">
+          <stop
+             id="stop9294"
+             style="stop-color:#eef8fb;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop9296"
+             style="stop-color:#ecf7fa;stop-opacity:0.491"
+             offset="0.509" />
+          <stop
+             id="stop9298"
+             style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+             offset="0.69239998" />
+          <stop
+             id="stop9300"
+             style="stop-color:#daf0f4;stop-opacity:0.177"
+             offset="0.82300001" />
+          <stop
+             id="stop9302"
+             style="stop-color:#c9e9ef;stop-opacity:0.0721"
+             offset="0.92790002" />
+          <stop
+             id="stop9304"
+             style="stop-color:#b8e2e9;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <ellipse
+           cx="59.720001"
+           cy="220.44701"
+           rx="6.2820001"
+           ry="5.783"
+           id="ellipse1748"
+           style="fill:url(#SVGID_80_)" />
+        <radialGradient
+           cx="36.047901"
+           cy="1152.3936"
+           r="4.2860999"
+           id="radialGradient9307"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="translate(24,-933)">
+          <stop
+             id="stop9309"
+             style="stop-color:#eef8fb;stop-opacity:1"
+             offset="0.2667" />
+          <stop
+             id="stop9311"
+             style="stop-color:#edf7f8;stop-opacity:0.80199999"
+             offset="0.41190001" />
+          <stop
+             id="stop9313"
+             style="stop-color:#ecf5ee;stop-opacity:0.65319997"
+             offset="0.52100003" />
+          <stop
+             id="stop9315"
+             style="stop-color:#e8f1de;stop-opacity:0.52060002"
+             offset="0.61830002" />
+          <stop
+             id="stop9317"
+             style="stop-color:#e4ecc7;stop-opacity:0.39719999"
+             offset="0.7087" />
+          <stop
+             id="stop9319"
+             style="stop-color:#dee5aa;stop-opacity:0.28040001"
+             offset="0.79430002" />
+          <stop
+             id="stop9321"
+             style="stop-color:#d7dc86;stop-opacity:0.1684"
+             offset="0.87650001" />
+          <stop
+             id="stop9323"
+             style="stop-color:#cfd25c;stop-opacity:0.0623"
+             offset="0.95429999" />
+          <stop
+             id="stop9325"
+             style="stop-color:#c9cb3f;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <circle
+           cx="60.048"
+           cy="219.394"
+           r="4.2859998"
+           id="circle1769"
+           style="fill:url(#SVGID_81_)" />
+        <circle
+           cx="60.966"
+           cy="217.741"
+           r="1.6849999"
+           id="circle1771"
+           style="opacity:0.62000002;fill:#ffffff" />
+        <radialGradient
+           cx="255.62109"
+           cy="927.11517"
+           r="5.9238"
+           id="radialGradient9329"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(1.1342,0.4137,-0.3427,0.9394,81.7425,-740.2545)">
+          <stop
+             id="stop9331"
+             style="stop-color:#4cb4e1;stop-opacity:0.58999997"
+             offset="0.2667" />
+          <stop
+             id="stop9333"
+             style="stop-color:#4eb1df;stop-opacity:0.43200001"
+             offset="0.463" />
+          <stop
+             id="stop9335"
+             style="stop-color:#55a7d8;stop-opacity:0.3134"
+             offset="0.61040002" />
+          <stop
+             id="stop9337"
+             style="stop-color:#6097ce;stop-opacity:0.2077"
+             offset="0.74190003" />
+          <stop
+             id="stop9339"
+             style="stop-color:#7080be;stop-opacity:0.1094"
+             offset="0.86400002" />
+          <stop
+             id="stop9341"
+             style="stop-color:#8463aa;stop-opacity:0.0171"
+             offset="0.97869998" />
+          <stop
+             id="stop9343"
+             style="stop-color:#885da6;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 60.664,238.879 c -1.122,3.073 -5.037,4.467 -8.748,3.114 -3.711,-1.354 -5.811,-4.944 -4.689,-8.019 1.122,-3.07 5.038,-4.473 8.749,-3.111 3.711,1.354 5.809,4.944 4.688,8.016 z"
+           id="path1788"
+           style="opacity:0.51999996;fill:url(#SVGID_82_)" />
+        <path
+           d="m 56.474,243.536 c -0.243,0.474 -0.605,0.854 -1.049,1.137 -2.468,-0.411 -6.09,-2.907 -7.531,-4.718 0.052,-0.238 0.133,-0.471 0.248,-0.691 0.909,-1.771 3.513,-2.257 5.814,-1.074 2.299,1.178 3.427,3.574 2.518,5.346 z"
+           id="path1790"
+           style="opacity:0.31999996;fill:#ffffff" />
+        <path
+           d="m 74.757,226.837 c 1.848,6.795 -1.867,14.254 -9.081,17.082 -7.212,2.828 -15.434,0.5 -18.256,-5.047 4.638,7.515 15.474,5.353 18.271,4.258 6.04,-2.358 10.685,-8.95 9.066,-16.293 z"
+           id="path1792"
+           style="opacity:0.75;fill:#ffffff" />
+        <radialGradient
+           cx="-654.77441"
+           cy="1235.373"
+           r="1.5423"
+           id="radialGradient9348"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.864,-0.5034,0.5034,0.864,-3.3111,-1180.5216)">
+          <stop
+             id="stop9350"
+             style="stop-color:#040506;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop9352"
+             style="stop-color:#050709;stop-opacity:1"
+             offset="0.3195" />
+          <stop
+             id="stop9354"
+             style="stop-color:#070c13;stop-opacity:1"
+             offset="0.55989999" />
+          <stop
+             id="stop9356"
+             style="stop-color:#0a1523;stop-opacity:1"
+             offset="0.77380002" />
+          <stop
+             id="stop9358"
+             style="stop-color:#0b1929;stop-opacity:1"
+             offset="0.83639997" />
+          <stop
+             id="stop9360"
+             style="stop-color:#23474c;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 54.544,215.467 c 0.266,0.457 -0.276,1.27 -1.212,1.814 -0.935,0.546 -1.909,0.613 -2.174,0.16 -0.266,-0.457 0.276,-1.271 1.211,-1.815 0.935,-0.543 1.908,-0.614 2.175,-0.159 z"
+           id="path1807"
+           style="opacity:0.18999999;fill:url(#SVGID_83_)" />
+        <path
+           d="m 73.767,223.721 c 0.456,1.283 2.61,5.803 0.25,12.006 -0.097,0.26 2.13,-9.227 -1.193,-10.729 -0.844,-0.383 -2.01,-0.719 -1.958,-1.643 0.038,-0.655 0.394,-1.16 0.997,-1.313 0.898,-0.226 1.593,0.806 1.904,1.679 z"
+           id="path1809"
+           style="opacity:0.87000002;fill:#ffffff" />
+        <path
+           d="m 44.502,230.398 c 0.388,1.746 1.333,8.563 8.217,12.478 0.314,0.179 -8.772,-6.896 -6.153,-12.763 0.496,-1.111 1.737,-2.198 1.037,-3.189 -0.5,-0.705 -1.248,-1.017 -2.024,-0.765 -1.156,0.373 -1.34,3.055 -1.077,4.239 z"
+           id="path1811"
+           style="opacity:0.43000004;fill:#ffffff" />
+      </g>
+      <g
+         id="g1813">
+        <g
+           id="g1815">
+          <radialGradient
+             cx="193.4532"
+             cy="1047.2227"
+             r="17.569799"
+             id="radialGradient9367"
+             gradientUnits="userSpaceOnUse"
+             gradientTransform="translate(24,-933)">
+            <stop
+               id="stop9369"
+               style="stop-color:#d5e2ee;stop-opacity:1"
+               offset="0.77579999" />
+            <stop
+               id="stop9371"
+               style="stop-color:#d1dfed;stop-opacity:1"
+               offset="0.82630002" />
+            <stop
+               id="stop9373"
+               style="stop-color:#c7d6e8;stop-opacity:1"
+               offset="0.8714" />
+            <stop
+               id="stop9375"
+               style="stop-color:#b4c6e1;stop-opacity:1"
+               offset="0.91439998" />
+            <stop
+               id="stop9377"
+               style="stop-color:#9bb0d8;stop-opacity:1"
+               offset="0.9562" />
+            <stop
+               id="stop9379"
+               style="stop-color:#7a95cb;stop-opacity:1"
+               offset="0.99680001" />
+            <stop
+               id="stop9381"
+               style="stop-color:#7792ca;stop-opacity:1"
+               offset="1" />
+          </radialGradient>
+          <circle
+             cx="217.453"
+             cy="114.222"
+             r="17.57"
+             id="circle1832"
+             style="fill:url(#SVGID_84_)" />
+          <path
+             d="m 235.805,114.232 c -0.033,4.795 -2.089,9.526 -5.5,12.841 -3.387,3.345 -8.078,5.321 -12.852,5.343 -4.773,0.067 -9.531,-1.873 -12.965,-5.23 -3.457,-3.34 -5.525,-8.096 -5.557,-12.976 -0.031,-2.398 0.416,-4.854 1.324,-7.112 0.913,-2.261 2.289,-4.333 4.005,-6.07 3.422,-3.495 8.273,-5.562 13.208,-5.503 4.88,-0.033 9.74,2.089 13.104,5.579 3.408,3.471 5.326,8.311 5.229,13.12 v 0.008 h 0.004 z m -1.562,-0.01 c -0.046,-4.407 -1.925,-8.712 -5.062,-11.727 -1.563,-1.511 -3.41,-2.714 -5.416,-3.514 -2.019,-0.794 -4.146,-1.199 -6.326,-1.2 -4.281,0.008 -8.573,1.738 -11.645,4.788 -3.081,3.035 -4.919,7.279 -4.966,11.664 -0.082,4.335 1.646,8.725 4.729,11.871 3.059,3.187 7.439,5.044 11.887,5.062 4.439,0.071 8.896,-1.749 11.992,-4.948 3.14,-3.17 4.877,-7.584 4.797,-12.005 l 0.01,0.009 0,0 z"
+             id="path1834"
+             style="fill:#39444f" />
+        </g>
+        <radialGradient
+           cx="-1524.9443"
+           cy="266.93661"
+           r="20.006599"
+           id="radialGradient9385"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.0099,-1,1,0.0099,-35.0023,-1413.4995)">
+          <stop
+             id="stop9387"
+             style="stop-color:#0b1929;stop-opacity:0"
+             offset="0.41209999" />
+          <stop
+             id="stop9389"
+             style="stop-color:#0a1827;stop-opacity:0.53789997"
+             offset="0.58490002" />
+          <stop
+             id="stop9391"
+             style="stop-color:#091420;stop-opacity:0.7317"
+             offset="0.64719999" />
+          <stop
+             id="stop9393"
+             style="stop-color:#060d15;stop-opacity:0.86940002"
+             offset="0.69139999" />
+          <stop
+             id="stop9395"
+             style="stop-color:#010204;stop-opacity:0.98030001"
+             offset="0.727" />
+          <stop
+             id="stop9397"
+             style="stop-color:#000000;stop-opacity:1"
+             offset="0.73329997" />
+          <stop
+             id="stop9399"
+             style="stop-color:#03080d;stop-opacity:0.61080003"
+             offset="0.78759998" />
+          <stop
+             id="stop9401"
+             style="stop-color:#0b1929;stop-opacity:0"
+             offset="0.87269998" />
+        </radialGradient>
+        <path
+           d="m 216.066,94.565 c 10.613,0.106 19.134,8.795 19.029,19.412 -0.107,10.615 -8.803,19.129 -19.412,19.027 -10.613,-0.103 -19.137,-8.793 -19.027,-19.412 0.108,-10.61 8.795,-19.132 19.41,-19.027 z"
+           id="path1853"
+           style="opacity:0.27999998;fill:url(#SVGID_85_)" />
+        <radialGradient
+           cx="195.2852"
+           cy="1036.4297"
+           r="27.218201"
+           id="radialGradient9404"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="translate(24,-933)">
+          <stop
+             id="stop9406"
+             style="stop-color:#b4cb80;stop-opacity:0"
+             offset="0.33329999" />
+          <stop
+             id="stop9408"
+             style="stop-color:#60bd71;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 235.023,114.031 c 0,9.702 -7.866,17.567 -17.57,17.567 -9.701,0 -17.57,-7.865 -17.57,-17.567 0,-9.705 7.869,-17.571 17.57,-17.571 9.704,0 17.57,7.866 17.57,17.571 z"
+           id="path1860"
+           style="opacity:0.62000002;fill:url(#SVGID_86_)" />
+        <radialGradient
+           cx="193.4532"
+           cy="1047.0293"
+           r="17.570299"
+           id="radialGradient9411"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="translate(24,-933)">
+          <stop
+             id="stop9413"
+             style="stop-color:#9fcb40;stop-opacity:0"
+             offset="0.33329999" />
+          <stop
+             id="stop9415"
+             style="stop-color:#458691;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 229.846,101.575 c 6.881,6.843 6.908,17.966 0.063,24.845 -6.843,6.879 -17.97,6.908 -24.845,0.066 -6.881,-6.844 -6.917,-17.968 -0.064,-24.846 6.842,-6.88 17.965,-6.909 24.846,-0.065 z"
+           id="path1867"
+           style="opacity:0.62000002;fill:url(#SVGID_87_)" />
+        <path
+           d="m 201.751,111.86 c 1.009,-7.616 6.688,-12.854 14.089,-13.565 7.4,-0.702 14.176,4.516 16.659,10.333 -5.153,-7.081 -12.251,-8.823 -16.703,-8.216 -4.448,0.606 -9.87,1.415 -14.045,11.448 z"
+           id="path1869"
+           style="opacity:0.36000001;fill:#f2f6fa" />
+        <path
+           d="m 200.06,116.725 c -0.92,-9.646 5.726,-18.719 15.375,-19.643 9.646,-0.919 16.104,4.476 19.219,13.364 -4.604,-9.796 -17.125,-9.999 -20.774,-9.124 -8.101,1.945 -11.58,7.914 -13.82,15.403 z"
+           id="path1871"
+           style="opacity:0.11000001;fill:#ebf7fd" />
+        <path
+           d="m 202.139,118.951 c -3.276,-12.581 3.918,-20.873 13.32,-21.771 9.398,-0.896 18.127,6.313 19.195,16.738 -4.127,-15.282 -17.078,-14.886 -20.612,-13.939 -6.645,1.776 -13.001,3.733 -11.903,18.972 z"
+           id="path1873"
+           style="opacity:0.22000002;fill:#ebf7fd" />
+        <radialGradient
+           cx="193.6265"
+           cy="1131.9355"
+           r="9.3683996"
+           id="radialGradient9421"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(1,0,0,0.9207,24,-936.5648)">
+          <stop
+             id="stop9423"
+             style="stop-color:#eef8fb;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop9425"
+             style="stop-color:#ecf7fa;stop-opacity:0.491"
+             offset="0.509" />
+          <stop
+             id="stop9427"
+             style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+             offset="0.69239998" />
+          <stop
+             id="stop9429"
+             style="stop-color:#daf0f4;stop-opacity:0.177"
+             offset="0.82300001" />
+          <stop
+             id="stop9431"
+             style="stop-color:#c9e9ef;stop-opacity:0.0721"
+             offset="0.92790002" />
+          <stop
+             id="stop9433"
+             style="stop-color:#b8e2e9;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 226.994,105.605 c 0,4.766 -4.193,8.629 -9.366,8.629 -5.176,0 -9.369,-3.863 -9.369,-8.629 0,-4.759 4.193,-8.624 9.369,-8.624 5.173,0 9.366,3.865 9.366,8.624 z"
+           id="path1888"
+           style="opacity:0.5;fill:url(#SVGID_88_)" />
+        <radialGradient
+           cx="193.3179"
+           cy="1130.7344"
+           r="6.8551998"
+           id="radialGradient9436"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(1,0,0,0.9207,24,-936.5648)">
+          <stop
+             id="stop9438"
+             style="stop-color:#eef8fb;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop9440"
+             style="stop-color:#ecf7fa;stop-opacity:0.491"
+             offset="0.509" />
+          <stop
+             id="stop9442"
+             style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+             offset="0.69239998" />
+          <stop
+             id="stop9444"
+             style="stop-color:#daf0f4;stop-opacity:0.177"
+             offset="0.82300001" />
+          <stop
+             id="stop9446"
+             style="stop-color:#c9e9ef;stop-opacity:0.0721"
+             offset="0.92790002" />
+          <stop
+             id="stop9448"
+             style="stop-color:#b8e2e9;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 224.173,104.5 c 0,3.486 -3.071,6.314 -6.854,6.314 -3.789,0 -6.855,-2.828 -6.855,-6.314 0,-3.485 3.066,-6.311 6.855,-6.311 3.783,0 6.854,2.826 6.854,6.311 z"
+           id="path1903"
+           style="fill:url(#SVGID_89_)" />
+        <radialGradient
+           cx="192.69051"
+           cy="1035.5732"
+           r="4.6777"
+           id="radialGradient9451"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="translate(24,-933)">
+          <stop
+             id="stop9453"
+             style="stop-color:#eef8fb;stop-opacity:1"
+             offset="0.2667" />
+          <stop
+             id="stop9455"
+             style="stop-color:#edf7f8;stop-opacity:0.80159998"
+             offset="0.4122" />
+          <stop
+             id="stop9457"
+             style="stop-color:#e9f5ee;stop-opacity:0.65249997"
+             offset="0.52149999" />
+          <stop
+             id="stop9459"
+             style="stop-color:#e2f1de;stop-opacity:0.51959997"
+             offset="0.61900002" />
+          <stop
+             id="stop9461"
+             style="stop-color:#d8ecc7;stop-opacity:0.396"
+             offset="0.70959997" />
+          <stop
+             id="stop9463"
+             style="stop-color:#cce4aa;stop-opacity:0.2789"
+             offset="0.79540002" />
+          <stop
+             id="stop9465"
+             style="stop-color:#bcdc86;stop-opacity:0.16670001"
+             offset="0.87769997" />
+          <stop
+             id="stop9467"
+             style="stop-color:#abd25b;stop-opacity:0.0604"
+             offset="0.95569998" />
+          <stop
+             id="stop9469"
+             style="stop-color:#9fcb40;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 221.369,102.571 c 0,2.584 -2.094,4.679 -4.68,4.679 -2.582,0 -4.678,-2.095 -4.678,-4.679 0,-2.581 2.096,-4.675 4.678,-4.675 2.586,0 4.68,2.095 4.68,4.675 z"
+           id="path1924"
+           style="fill:url(#SVGID_90_)" />
+        <circle
+           cx="216.44099"
+           cy="100.983"
+           r="1.837"
+           id="circle1926"
+           style="opacity:0.62000002;fill:#ffffff" />
+        <radialGradient
+           cx="-255.87691"
+           cy="1154.1875"
+           r="8.5684004"
+           id="radialGradient9473"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(1.1333,-0.416,0.3445,0.9387,114.2,-1067.6246)">
+          <stop
+             id="stop9475"
+             style="stop-color:#46c3d6;stop-opacity:0.57999998"
+             offset="0.2667" />
+          <stop
+             id="stop9477"
+             style="stop-color:#48c3d3;stop-opacity:0.45449999"
+             offset="0.4253" />
+          <stop
+             id="stop9479"
+             style="stop-color:#4dc4c9;stop-opacity:0.3603"
+             offset="0.54439998" />
+          <stop
+             id="stop9481"
+             style="stop-color:#57c5b9;stop-opacity:0.27630001"
+             offset="0.65069997" />
+          <stop
+             id="stop9483"
+             style="stop-color:#65c6a2;stop-opacity:0.1982"
+             offset="0.74940002" />
+          <stop
+             id="stop9485"
+             style="stop-color:#76c785;stop-opacity:0.1242"
+             offset="0.84299999" />
+          <stop
+             id="stop9487"
+             style="stop-color:#8bc961;stop-opacity:0.0542"
+             offset="0.9314" />
+          <stop
+             id="stop9489"
+             style="stop-color:#9fcb40;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 231.559,118.682 c 1.635,4.453 -1.396,9.659 -6.767,11.63 -5.376,1.972 -11.056,-0.036 -12.687,-4.487 -1.643,-4.447 1.396,-9.653 6.77,-11.627 5.371,-1.971 11.052,0.038 12.684,4.484 z"
+           id="path1945"
+           style="opacity:0.51999996;fill:url(#SVGID_91_)" />
+        <path
+           d="m 230.295,123.416 c 0.377,0.442 0.609,0.967 0.708,1.532 -1.446,2.313 -5.479,4.922 -7.909,5.615 -0.215,-0.153 -0.414,-0.333 -0.588,-0.54 -1.41,-1.659 -0.807,-4.482 1.348,-6.307 2.148,-1.826 5.037,-1.958 6.441,-0.3 z"
+           id="path1947"
+           style="opacity:0.31999996;fill:#ffffff" />
+        <radialGradient
+           cx="656.46191"
+           cy="107.9346"
+           r="8.1566"
+           id="radialGradient9493"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.6253,0.9628,-0.6615,0.4297,-133.8877,-557.1061)">
+          <stop
+             id="stop9495"
+             style="stop-color:#1d3c6e;stop-opacity:0.36000001"
+             offset="0.44240001" />
+          <stop
+             id="stop9497"
+             style="stop-color:#1e3c6e;stop-opacity:0.36379999"
+             offset="0.44400001" />
+          <stop
+             id="stop9499"
+             style="stop-color:#3c4f6c;stop-opacity:0.53109998"
+             offset="0.51209998" />
+          <stop
+             id="stop9501"
+             style="stop-color:#525d6a;stop-opacity:0.6954"
+             offset="0.579" />
+          <stop
+             id="stop9503"
+             style="stop-color:#5f6569;stop-opacity:0.85390002"
+             offset="0.64349997" />
+          <stop
+             id="stop9505"
+             style="stop-color:#636869;stop-opacity:1"
+             offset="0.70300001" />
+          <stop
+             id="stop9507"
+             style="stop-color:#5c8b8a;stop-opacity:0.57340002"
+             offset="0.79869998" />
+          <stop
+             id="stop9509"
+             style="stop-color:#51c1bc;stop-opacity:0"
+             offset="0.92729998" />
+        </radialGradient>
+        <path
+           d="m 210.302,130.714 c -3.186,2.071 -6.544,-0.481 -9.649,-5.267 -3.109,-4.786 -2.167,-6.606 -1.605,-12.067 0.386,-3.754 8.29,0.134 11.396,4.923 3.105,4.783 3.047,10.344 -0.142,12.411 z"
+           id="path1966"
+           style="opacity:0.18999999;fill:url(#SVGID_92_)" />
+        <radialGradient
+           cx="838.99121"
+           cy="786.27252"
+           r="11.8551"
+           id="radialGradient9512"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.701,0.7131,-0.7131,0.701,184.1534,-1027.8478)">
+          <stop
+             id="stop9514"
+             style="stop-color:#040506;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop9516"
+             style="stop-color:#050709;stop-opacity:1"
+             offset="0.3195" />
+          <stop
+             id="stop9518"
+             style="stop-color:#070c13;stop-opacity:1"
+             offset="0.55989999" />
+          <stop
+             id="stop9520"
+             style="stop-color:#0a1523;stop-opacity:1"
+             offset="0.77380002" />
+          <stop
+             id="stop9522"
+             style="stop-color:#0b1929;stop-opacity:1"
+             offset="0.83639997" />
+          <stop
+             id="stop9524"
+             style="stop-color:#23474c;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 227.326,127.526 c -6,4.796 -16.163,3.975 -21.694,-1.84 -4.104,-4.315 -5.717,-12.938 -1.335,-18.125 -3.899,8.073 0.729,14.473 2.995,16.604 6.435,6.046 13.998,5.67 20.034,3.361 z"
+           id="path1981"
+           style="opacity:0.41000001;fill:url(#SVGID_93_)" />
+        <path
+           d="m 213.34,130.282 c -3.176,-0.825 -7.734,-3.693 -10.152,-8.272 0.334,1.313 1.354,2.457 1.852,3.703 1.941,2.479 4.607,4.397 7.906,5.3 8.152,2.231 16.313,-2.202 19.123,-9.354 -3.37,7.48 -11.88,10.403 -18.729,8.623 z"
+           id="path1983"
+           style="opacity:0.54000005;fill:#ffffff" />
+        <radialGradient
+           cx="819.78131"
+           cy="-53.2729"
+           r="2.1991999"
+           id="radialGradient9528"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.3888,0.9213,-0.9213,0.3888,-136.7975,-625.9019)">
+          <stop
+             id="stop9530"
+             style="stop-color:#040506;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop9532"
+             style="stop-color:#050709;stop-opacity:1"
+             offset="0.3195" />
+          <stop
+             id="stop9534"
+             style="stop-color:#070c13;stop-opacity:1"
+             offset="0.55989999" />
+          <stop
+             id="stop9536"
+             style="stop-color:#0a1523;stop-opacity:1"
+             offset="0.77380002" />
+          <stop
+             id="stop9538"
+             style="stop-color:#0b1929;stop-opacity:1"
+             offset="0.83639997" />
+          <stop
+             id="stop9540"
+             style="stop-color:#23474c;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 232.091,111.199 c -0.694,0.291 -1.745,-0.621 -2.346,-2.045 -0.601,-1.423 -0.522,-2.815 0.172,-3.108 0.694,-0.293 1.747,0.622 2.345,2.049 0.599,1.418 0.524,2.812 -0.171,3.104 z"
+           id="path1998"
+           style="opacity:0.18999999;fill:url(#SVGID_94_)" />
+        <path
+           d="m 233.783,113.712 c -0.021,1.437 0.451,6.698 -4.158,11.969 -0.191,0.219 5.494,-8.346 2.758,-11.052 -0.693,-0.688 -1.725,-1.446 -1.336,-2.342 0.278,-0.636 0.818,-1.002 1.469,-0.933 0.972,0.106 1.282,1.381 1.267,2.358 z"
+           id="path2000"
+           style="opacity:0.87000002;fill:#ffffff" />
+      </g>
+      <g
+         id="g2002">
+        <g
+           id="g2004">
+          <radialGradient
+             cx="233.9688"
+             cy="1098.083"
+             r="16.732401"
+             id="radialGradient9546"
+             gradientUnits="userSpaceOnUse"
+             gradientTransform="translate(24,-933)">
+            <stop
+               id="stop9548"
+               style="stop-color:#d5e2ee;stop-opacity:1"
+               offset="0.77579999" />
+            <stop
+               id="stop9550"
+               style="stop-color:#d1dfed;stop-opacity:1"
+               offset="0.82630002" />
+            <stop
+               id="stop9552"
+               style="stop-color:#c7d6e8;stop-opacity:1"
+               offset="0.8714" />
+            <stop
+               id="stop9554"
+               style="stop-color:#b4c6e1;stop-opacity:1"
+               offset="0.91439998" />
+            <stop
+               id="stop9556"
+               style="stop-color:#9bb0d8;stop-opacity:1"
+               offset="0.9562" />
+            <stop
+               id="stop9558"
+               style="stop-color:#7a95cb;stop-opacity:1"
+               offset="0.99680001" />
+            <stop
+               id="stop9560"
+               style="stop-color:#7792ca;stop-opacity:1"
+               offset="1" />
+          </radialGradient>
+          <path
+             d="m 274.702,165.085 c 0,9.24 -7.491,16.729 -16.733,16.729 -9.238,0 -16.732,-7.489 -16.732,-16.729 0,-9.244 7.494,-16.734 16.732,-16.734 9.242,0 16.733,7.49 16.733,16.734 z"
+             id="path2021"
+             style="fill:url(#SVGID_95_)" />
+          <path
+             d="m 275.482,165.096 c -0.033,4.574 -2,9.088 -5.256,12.248 -3.234,3.188 -7.699,5.072 -12.271,5.096 -4.538,0.065 -9.09,-1.778 -12.363,-4.98 -3.304,-3.188 -5.275,-7.729 -5.313,-12.389 -0.029,-2.284 0.396,-4.637 1.263,-6.793 0.871,-2.153 2.188,-4.139 3.821,-5.797 3.27,-3.334 7.902,-5.313 12.617,-5.252 4.66,-0.032 9.305,2 12.516,5.333 3.25,3.314 5.076,7.938 4.98,12.526 v 0.013 h 0.004 v -0.002 h 0.002 v -0.003 z m -1.56,-0.011 c -0.047,-4.188 -1.834,-8.274 -4.814,-11.136 -1.479,-1.434 -3.234,-2.575 -5.145,-3.333 -1.911,-0.752 -3.934,-1.136 -6.006,-1.136 -4.063,0.009 -8.137,1.648 -11.047,4.542 -2.926,2.881 -4.674,6.906 -4.723,11.072 -0.082,4.115 1.559,8.287 4.483,11.278 2.901,3.03 7.063,4.798 11.304,4.817 4.209,0.064 8.455,-1.658 11.396,-4.701 2.979,-3.016 4.63,-7.213 4.549,-11.413 l 0.003,0.01 0,0 z"
+             id="path2023"
+             style="fill:#39444f" />
+        </g>
+        <radialGradient
+           cx="-1575.4067"
+           cy="307.98541"
+           r="19.052401"
+           id="radialGradient9564"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.0099,-1,1,0.0099,-35.0023,-1413.4995)">
+          <stop
+             id="stop9566"
+             style="stop-color:#0b1929;stop-opacity:0"
+             offset="0.41209999" />
+          <stop
+             id="stop9568"
+             style="stop-color:#0a1827;stop-opacity:0.53789997"
+             offset="0.58490002" />
+          <stop
+             id="stop9570"
+             style="stop-color:#091420;stop-opacity:0.7317"
+             offset="0.64719999" />
+          <stop
+             id="stop9572"
+             style="stop-color:#060d15;stop-opacity:0.86940002"
+             offset="0.69139999" />
+          <stop
+             id="stop9574"
+             style="stop-color:#010204;stop-opacity:0.98030001"
+             offset="0.727" />
+          <stop
+             id="stop9576"
+             style="stop-color:#000000;stop-opacity:1"
+             offset="0.73329997" />
+          <stop
+             id="stop9578"
+             style="stop-color:#03080d;stop-opacity:0.61080003"
+             offset="0.78759998" />
+          <stop
+             id="stop9580"
+             style="stop-color:#0b1929;stop-opacity:0"
+             offset="0.87269998" />
+        </radialGradient>
+        <path
+           d="m 256.647,146.363 c 10.109,0.102 18.229,8.377 18.125,18.485 -0.104,10.109 -8.379,18.221 -18.48,18.123 -10.104,-0.098 -18.227,-8.375 -18.123,-18.486 0.097,-10.106 8.37,-18.224 18.478,-18.122 z"
+           id="path2042"
+           style="opacity:0.27999998;fill:url(#SVGID_96_)" />
+        <radialGradient
+           cx="235.7149"
+           cy="1087.8047"
+           r="25.9212"
+           id="radialGradient9583"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="translate(24,-933)">
+          <stop
+             id="stop9585"
+             style="stop-color:#b4cb80;stop-opacity:0"
+             offset="0.33329999" />
+          <stop
+             id="stop9587"
+             style="stop-color:#60bd71;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 274.705,164.902 c 0,9.238 -7.494,16.729 -16.735,16.729 -9.237,0 -16.733,-7.49 -16.733,-16.729 0,-9.243 7.496,-16.735 16.733,-16.735 9.241,0 16.735,7.492 16.735,16.735 z"
+           id="path2049"
+           style="opacity:0.62000002;fill:url(#SVGID_97_)" />
+        <radialGradient
+           cx="233.9727"
+           cy="1097.9004"
+           r="16.732401"
+           id="radialGradient9590"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="translate(24,-933)">
+          <stop
+             id="stop9592"
+             style="stop-color:#9fcb40;stop-opacity:0"
+             offset="0.33329999" />
+          <stop
+             id="stop9594"
+             style="stop-color:#458691;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 269.772,153.038 c 6.558,6.519 6.578,17.11 0.063,23.662 -6.515,6.552 -17.108,6.581 -23.66,0.063 -6.554,-6.521 -6.581,-17.113 -0.063,-23.664 6.513,-6.55 17.107,-6.578 23.66,-0.061 z"
+           id="path2056"
+           style="opacity:0.62000002;fill:url(#SVGID_98_)" />
+        <path
+           d="m 250.096,152.15 c 5.975,-4.229 13.313,-3.646 18.596,1.063 5.283,4.717 6.021,12.823 3.564,18.325 1.611,-8.185 -1.766,-14.271 -5.07,-16.987 -3.306,-2.714 -7.377,-5.979 -17.09,-2.401 z"
+           id="path2058"
+           style="opacity:0.36000001;fill:#f2f6fa" />
+        <path
+           d="m 241.404,167.468 c -0.879,-9.188 5.453,-17.829 14.644,-18.708 9.187,-0.874 15.345,4.264 18.306,12.729 -4.385,-9.33 -16.313,-9.522 -19.787,-8.689 -7.715,1.85 -11.03,7.536 -13.163,14.668 z"
+           id="path2060"
+           style="opacity:0.11000001;fill:#ebf7fd" />
+        <path
+           d="m 243.383,169.587 c -3.119,-11.979 3.73,-19.879 12.688,-20.735 8.951,-0.853 17.271,6.013 18.283,15.941 -3.932,-14.555 -16.268,-14.176 -19.633,-13.275 -6.328,1.692 -12.382,3.556 -11.338,18.069 z"
+           id="path2062"
+           style="opacity:0.22000002;fill:#ebf7fd" />
+        <radialGradient
+           cx="234.4854"
+           cy="1187.084"
+           r="8.9224005"
+           id="radialGradient9600"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(1,0,0,0.9207,24,-936.5648)">
+          <stop
+             id="stop9602"
+             style="stop-color:#eef8fb;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop9604"
+             style="stop-color:#ecf7fa;stop-opacity:0.491"
+             offset="0.509" />
+          <stop
+             id="stop9606"
+             style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+             offset="0.69239998" />
+          <stop
+             id="stop9608"
+             style="stop-color:#daf0f4;stop-opacity:0.177"
+             offset="0.82300001" />
+          <stop
+             id="stop9610"
+             style="stop-color:#c9e9ef;stop-opacity:0.0721"
+             offset="0.92790002" />
+          <stop
+             id="stop9612"
+             style="stop-color:#b8e2e9;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 267.406,156.382 c 0,4.537 -3.992,8.218 -8.92,8.218 -4.93,0 -8.922,-3.681 -8.922,-8.218 0,-4.534 3.992,-8.215 8.922,-8.215 4.928,0 8.92,3.681 8.92,8.215 z"
+           id="path2077"
+           style="opacity:0.5;fill:url(#SVGID_99_)" />
+        <radialGradient
+           cx="233.62891"
+           cy="1186.4785"
+           r="6.5303001"
+           id="radialGradient9615"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(1,0,0,0.9207,24,-936.5648)">
+          <stop
+             id="stop9617"
+             style="stop-color:#eef8fb;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop9619"
+             style="stop-color:#ecf7fa;stop-opacity:0.491"
+             offset="0.509" />
+          <stop
+             id="stop9621"
+             style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+             offset="0.69239998" />
+          <stop
+             id="stop9623"
+             style="stop-color:#daf0f4;stop-opacity:0.177"
+             offset="0.82300001" />
+          <stop
+             id="stop9625"
+             style="stop-color:#c9e9ef;stop-opacity:0.0721"
+             offset="0.92790002" />
+          <stop
+             id="stop9627"
+             style="stop-color:#b8e2e9;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <ellipse
+           cx="257.62799"
+           cy="155.825"
+           rx="6.5310001"
+           ry="6.013"
+           id="ellipse2092"
+           style="fill:url(#SVGID_100_)" />
+        <radialGradient
+           cx="232.90919"
+           cy="1086.9883"
+           r="4.4551001"
+           id="radialGradient9630"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="translate(24,-933)">
+          <stop
+             id="stop9632"
+             style="stop-color:#eef8fb;stop-opacity:1"
+             offset="0.2667" />
+          <stop
+             id="stop9634"
+             style="stop-color:#edf7f8;stop-opacity:0.80159998"
+             offset="0.4122" />
+          <stop
+             id="stop9636"
+             style="stop-color:#e9f5ee;stop-opacity:0.65249997"
+             offset="0.52149999" />
+          <stop
+             id="stop9638"
+             style="stop-color:#e2f1de;stop-opacity:0.51959997"
+             offset="0.61900002" />
+          <stop
+             id="stop9640"
+             style="stop-color:#d8ecc7;stop-opacity:0.396"
+             offset="0.70959997" />
+          <stop
+             id="stop9642"
+             style="stop-color:#cce4aa;stop-opacity:0.2789"
+             offset="0.79540002" />
+          <stop
+             id="stop9644"
+             style="stop-color:#bcdc86;stop-opacity:0.16670001"
+             offset="0.87769997" />
+          <stop
+             id="stop9646"
+             style="stop-color:#abd25b;stop-opacity:0.0604"
+             offset="0.95569998" />
+          <stop
+             id="stop9648"
+             style="stop-color:#9fcb40;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 261.364,153.988 c 0,2.46 -1.991,4.455 -4.456,4.455 -2.46,0 -4.454,-1.995 -4.454,-4.455 0,-2.459 1.994,-4.454 4.454,-4.454 2.465,0 4.456,1.995 4.456,4.454 z"
+           id="path2113"
+           style="fill:url(#SVGID_101_)" />
+        <circle
+           cx="256.73401"
+           cy="152.47501"
+           r="1.75"
+           id="circle2115"
+           style="opacity:0.62000002;fill:#ffffff" />
+        <radialGradient
+           cx="-406.88571"
+           cy="1224.5635"
+           r="6.3197999"
+           id="radialGradient9652"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(1.042,-0.6097,0.505,0.8631,69.3665,-1130.8982)">
+          <stop
+             id="stop9654"
+             style="stop-color:#46c3d6;stop-opacity:0.57999998"
+             offset="0.2667" />
+          <stop
+             id="stop9656"
+             style="stop-color:#48c3d3;stop-opacity:0.45449999"
+             offset="0.4253" />
+          <stop
+             id="stop9658"
+             style="stop-color:#4dc4c9;stop-opacity:0.3603"
+             offset="0.54439998" />
+          <stop
+             id="stop9660"
+             style="stop-color:#57c5b9;stop-opacity:0.27630001"
+             offset="0.65069997" />
+          <stop
+             id="stop9662"
+             style="stop-color:#65c6a2;stop-opacity:0.1982"
+             offset="0.74940002" />
+          <stop
+             id="stop9664"
+             style="stop-color:#76c785;stop-opacity:0.1242"
+             offset="0.84299999" />
+          <stop
+             id="stop9666"
+             style="stop-color:#8bc961;stop-opacity:0.0542"
+             offset="0.9314" />
+          <stop
+             id="stop9668"
+             style="stop-color:#9fcb40;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 270.391,170.242 c 1.771,3.018 0.243,7.189 -3.396,9.32 -3.646,2.131 -8.028,1.414 -9.792,-1.604 -1.768,-3.015 -0.244,-7.188 3.396,-9.319 3.644,-2.129 8.026,-1.412 9.792,1.603 z"
+           id="path2134"
+           style="opacity:0.51999996;fill:url(#SVGID_102_)" />
+        <path
+           d="m 268.417,176.277 c 0.255,0.425 0.373,0.895 0.377,1.384 -1.536,1.731 -5.278,3.346 -7.409,3.585 -0.16,-0.159 -0.299,-0.335 -0.416,-0.536 -0.947,-1.587 -0.044,-3.864 2.014,-5.088 2.057,-1.225 4.494,-0.933 5.434,0.655 z"
+           id="path2136"
+           style="opacity:0.31999996;fill:#ffffff" />
+        <radialGradient
+           cx="369.51569"
+           cy="-675.33942"
+           r="7.7596998"
+           id="radialGradient9672"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.1013,1.1436,-0.7858,0.0696,-321.7245,-209.3378)">
+          <stop
+             id="stop9674"
+             style="stop-color:#1d3c6e;stop-opacity:0.36000001"
+             offset="0.44240001" />
+          <stop
+             id="stop9676"
+             style="stop-color:#1e3c6e;stop-opacity:0.36379999"
+             offset="0.44400001" />
+          <stop
+             id="stop9678"
+             style="stop-color:#3c4f6c;stop-opacity:0.53109998"
+             offset="0.51209998" />
+          <stop
+             id="stop9680"
+             style="stop-color:#525d6a;stop-opacity:0.6954"
+             offset="0.579" />
+          <stop
+             id="stop9682"
+             style="stop-color:#5f6569;stop-opacity:0.85390002"
+             offset="0.64349997" />
+          <stop
+             id="stop9684"
+             style="stop-color:#636869;stop-opacity:1"
+             offset="0.70300001" />
+          <stop
+             id="stop9686"
+             style="stop-color:#5c8b8a;stop-opacity:0.57340002"
+             offset="0.79869998" />
+          <stop
+             id="stop9688"
+             style="stop-color:#51c1bc;stop-opacity:0"
+             offset="0.92729998" />
+        </radialGradient>
+        <path
+           d="m 246.522,176.419 c -3.604,0.32 -5.291,-3.323 -5.769,-8.735 -0.483,-5.418 1.125,-6.522 4.031,-10.873 1.999,-2.982 6.913,3.813 7.394,9.229 0.479,5.409 -2.052,10.064 -5.656,10.379 z"
+           id="path2155"
+           style="opacity:0.18999999;fill:url(#SVGID_103_)" />
+        <radialGradient
+           cx="875.74609"
+           cy="41.253899"
+           r="11.2916"
+           id="radialGradient9691"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.108,0.9941,-0.9941,0.108,194.9519,-708.9521)">
+          <stop
+             id="stop9693"
+             style="stop-color:#040506;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop9695"
+             style="stop-color:#050709;stop-opacity:1"
+             offset="0.3195" />
+          <stop
+             id="stop9697"
+             style="stop-color:#070c13;stop-opacity:1"
+             offset="0.55989999" />
+          <stop
+             id="stop9699"
+             style="stop-color:#0a1523;stop-opacity:1"
+             offset="0.77380002" />
+          <stop
+             id="stop9701"
+             style="stop-color:#0b1929;stop-opacity:1"
+             offset="0.83639997" />
+          <stop
+             id="stop9703"
+             style="stop-color:#23474c;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 256.807,179.816 c -7.313,0.045 -14.425,-6.569 -15.125,-14.188 -0.521,-5.646 3.364,-13.042 9.703,-14.331 -7.68,3.729 -8,11.247 -7.563,14.182 1.237,8.317 7.112,12.501 12.985,14.337 z"
+           id="path2170"
+           style="opacity:0.41999996;fill:url(#SVGID_104_)" />
+        <path
+           d="m 245.775,175.023 c -1.887,-2.491 -4.405,-7.34 -3.51,-12.189 -0.525,1.18 -0.476,1.766 -0.479,3.688 0.271,3.271 1.322,6.192 3.255,8.813 4.774,6.481 13.489,7.983 19.813,4.3 -6.928,3.601 -15.01,0.762 -19.079,-4.612 z"
+           id="path2172"
+           style="opacity:0.54000005;fill:#ffffff" />
+        <radialGradient
+           cx="786.28912"
+           cy="-464.43109"
+           r="2.0952001"
+           id="radialGradient9707"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.0425,0.999,-0.999,0.0425,-225.4858,-600.7423)">
+          <stop
+             id="stop9709"
+             style="stop-color:#040506;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop9711"
+             style="stop-color:#050709;stop-opacity:1"
+             offset="0.3195" />
+          <stop
+             id="stop9713"
+             style="stop-color:#070c13;stop-opacity:1"
+             offset="0.55989999" />
+          <stop
+             id="stop9715"
+             style="stop-color:#0a1523;stop-opacity:1"
+             offset="0.77380002" />
+          <stop
+             id="stop9717"
+             style="stop-color:#0b1929;stop-opacity:1"
+             offset="0.83639997" />
+          <stop
+             id="stop9719"
+             style="stop-color:#23474c;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 272.002,167.745 c -0.718,0.026 -1.352,-1.136 -1.412,-2.606 -0.063,-1.47 0.469,-2.688 1.188,-2.716 0.723,-0.032 1.354,1.136 1.41,2.606 0.064,1.468 -0.469,2.685 -1.186,2.716 z"
+           id="path2187"
+           style="opacity:0.18999999;fill:url(#SVGID_105_)" />
+        <path
+           d="m 273.139,162.708 c 0.172,1.356 1.317,6.256 -2.328,11.841 -0.148,0.23 4.07,-8.604 1.129,-10.789 -0.744,-0.557 -1.813,-1.133 -1.564,-2.031 0.177,-0.636 0.637,-1.053 1.26,-1.067 0.925,-0.039 1.386,1.125 1.503,2.046 z"
+           id="path2189"
+           style="opacity:0.87000002;fill:#ffffff" />
+        <path
+           d="m 242.686,162.416 c 0.006,2.029 -0.906,6.975 3.754,11.68 0.242,0.247 -5.053,-6.938 -1.76,-11.478 0.688,-0.946 2.123,-1.659 1.693,-2.746 -0.309,-0.771 -0.936,-1.231 -1.719,-1.175 -1.166,0.086 -1.97,2.549 -1.968,3.719 z"
+           id="path2191"
+           style="opacity:0.43000004;fill:#ffffff" />
+      </g>
+      <g
+         id="g2193">
+        <g
+           id="g2195">
+          <linearGradient
+             x1="106.7686"
+             y1="1084.6729"
+             x2="82.351196"
+             y2="1004.8064"
+             id="linearGradient9726"
+             gradientUnits="userSpaceOnUse"
+             gradientTransform="translate(24,-933)">
+            <stop
+               id="stop9728"
+               style="stop-color:#202d36;stop-opacity:1"
+               offset="0" />
+            <stop
+               id="stop9730"
+               style="stop-color:#517287;stop-opacity:1"
+               offset="0.0848" />
+            <stop
+               id="stop9732"
+               style="stop-color:#6e8b9d;stop-opacity:1"
+               offset="0.1039" />
+            <stop
+               id="stop9734"
+               style="stop-color:#8da7b5;stop-opacity:1"
+               offset="0.1295" />
+            <stop
+               id="stop9736"
+               style="stop-color:#a9bfca;stop-opacity:1"
+               offset="0.1585" />
+            <stop
+               id="stop9738"
+               style="stop-color:#bfd2db;stop-opacity:1"
+               offset="0.1913" />
+            <stop
+               id="stop9740"
+               style="stop-color:#d0e1e7;stop-opacity:1"
+               offset="0.2295" />
+            <stop
+               id="stop9742"
+               style="stop-color:#dbebf0;stop-opacity:1"
+               offset="0.27680001" />
+            <stop
+               id="stop9744"
+               style="stop-color:#e2f1f6;stop-opacity:1"
+               offset="0.34310001" />
+            <stop
+               id="stop9746"
+               style="stop-color:#e4f3f7;stop-opacity:1"
+               offset="0.5273" />
+          </linearGradient>
+          <path
+             d="m 121.731,81.898 13.116,64.383 c 0.453,2.422 -1.145,4.751 -3.566,5.205 -2.021,0.377 -3.985,-0.68 -4.834,-2.45 L 99.612,89.728 c -3.154,-6.548 -0.402,-14.414 6.145,-17.564 6.547,-3.153 11.739,-0.113 14.893,6.434 0.509,1.053 0.872,2.204 1.081,3.3 z"
+             id="path2218"
+             style="fill:url(#SVGID_106_)" />
+          <path
+             d="m 122.495,81.757 8.905,45.684 2.264,11.417 1.148,5.705 0.288,1.426 c 0.108,0.481 0.158,1.021 0.106,1.533 -0.09,1.034 -0.536,2.027 -1.236,2.789 -0.703,0.764 -1.643,1.287 -2.681,1.466 -0.996,0.188 -2.09,0.027 -3.005,-0.446 -0.923,-0.474 -1.682,-1.246 -2.131,-2.194 l -1.208,-2.647 -4.831,-10.589 -19.491,-42.282 -1.219,-2.642 -0.609,-1.322 c -0.203,-0.434 -0.404,-0.96 -0.559,-1.432 -0.646,-1.944 -0.828,-4.038 -0.569,-6.073 0.503,-4.082 2.925,-7.891 6.456,-10.065 0.446,-0.271 0.881,-0.515 1.368,-0.749 0.42,-0.199 0.918,-0.423 1.411,-0.591 0.976,-0.34 2,-0.592 3.057,-0.666 2.111,-0.194 4.311,0.392 6.069,1.55 1.78,1.148 3.128,2.773 4.189,4.487 0.53,0.866 0.996,1.749 1.397,2.682 0.408,0.97 0.686,1.943 0.878,2.955 l 0.003,0.004 z m -1.528,0.284 c -0.182,-0.889 -0.456,-1.786 -0.813,-2.598 -0.377,-0.844 -0.833,-1.674 -1.328,-2.454 -0.993,-1.563 -2.237,-2.955 -3.73,-3.914 -1.487,-0.965 -3.241,-1.427 -5.003,-1.266 -0.88,0.063 -1.757,0.28 -2.61,0.579 -0.424,0.15 -0.817,0.31 -1.277,0.52 -0.39,0.181 -0.805,0.403 -1.192,0.631 -3.124,1.86 -5.324,5.188 -5.827,8.817 -0.256,1.808 -0.124,3.677 0.43,5.426 0.144,0.451 0.28,0.836 0.479,1.285 l 0.589,1.329 1.18,2.66 18.893,42.552 4.765,10.619 1.191,2.655 c 0.377,0.809 1.041,1.501 1.844,1.917 0.807,0.418 1.734,0.569 2.648,0.403 0.875,-0.152 1.721,-0.621 2.326,-1.291 0.61,-0.67 0.996,-1.541 1.07,-2.442 0.041,-0.457 0.001,-0.893 -0.103,-1.357 l -0.294,-1.425 -1.174,-5.7 -2.383,-11.393 -9.679,-45.542 -0.002,-0.011 z"
+             id="path2220"
+             style="fill:#535a5f" />
+        </g>
+        <radialGradient
+           cx="87.385803"
+           cy="1019.8359"
+           r="38.459099"
+           id="radialGradient9750"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="translate(24,-933)">
+          <stop
+             id="stop9752"
+             style="stop-color:#46c3d6;stop-opacity:0.74000001"
+             offset="0" />
+          <stop
+             id="stop9754"
+             style="stop-color:#48c3d3;stop-opacity:0.57990003"
+             offset="0.1036" />
+          <stop
+             id="stop9756"
+             style="stop-color:#4dc4c9;stop-opacity:0.45969999"
+             offset="0.1813" />
+          <stop
+             id="stop9758"
+             style="stop-color:#57c5b9;stop-opacity:0.35249999"
+             offset="0.2507" />
+          <stop
+             id="stop9760"
+             style="stop-color:#65c6a2;stop-opacity:0.2529"
+             offset="0.3152" />
+          <stop
+             id="stop9762"
+             style="stop-color:#76c785;stop-opacity:0.1584"
+             offset="0.37630001" />
+          <stop
+             id="stop9764"
+             style="stop-color:#8bc961;stop-opacity:0.0692"
+             offset="0.43399999" />
+          <stop
+             id="stop9766"
+             style="stop-color:#9fcb40;stop-opacity:0"
+             offset="0.4788" />
+        </radialGradient>
+        <path
+           d="m 127.139,104.906 -5.408,-23.008 c -0.209,-1.096 -0.572,-2.247 -1.082,-3.3 -3.154,-6.547 -8.346,-9.587 -14.893,-6.434 -6.547,3.15 -9.298,11.016 -6.145,17.564 l 6.387,16.851 c 6.797,3.422 14.462,2.152 21.141,-1.673 z"
+           id="path2239"
+           style="opacity:0.51999996;fill:url(#SVGID_107_)" />
+        <linearGradient
+           x1="105.2149"
+           y1="1075.0869"
+           x2="88.587303"
+           y2="1023.8326"
+           id="linearGradient9769"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="translate(24,-933)">
+          <stop
+             id="stop9771"
+             style="stop-color:#141a2b;stop-opacity:1"
+             offset="0.1636" />
+          <stop
+             id="stop9773"
+             style="stop-color:#142f3a;stop-opacity:0.82499999"
+             offset="0.3161" />
+          <stop
+             id="stop9775"
+             style="stop-color:#143e45;stop-opacity:0.63"
+             offset="0.486" />
+          <stop
+             id="stop9777"
+             style="stop-color:#14464b;stop-opacity:0.39840001"
+             offset="0.68769997" />
+          <stop
+             id="stop9779"
+             style="stop-color:#14494d;stop-opacity:0.04"
+             offset="1" />
+        </linearGradient>
+        <path
+           d="m 131.948,145.632 c 0.491,1.591 0.03,2.719 -0.697,2.944 -0.726,0.225 -1.859,-0.365 -2.354,-1.958 L 110.181,92.301 109.3,80.778 l 5.699,8.602 16.949,56.252 z"
+           id="path2252"
+           style="opacity:0.36000001;fill:url(#SVGID_108_)" />
+        <linearGradient
+           x1="321.3457"
+           y1="2027.7021"
+           x2="321.3457"
+           y2="1934.0166"
+           id="linearGradient9782"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.4376,-0.092,0.139,0.6612,-292.0062,-1162.1183)">
+          <stop
+             id="stop9784"
+             style="stop-color:#d5ebde;stop-opacity:0.87"
+             offset="0" />
+          <stop
+             id="stop9786"
+             style="stop-color:#f1f6e3;stop-opacity:0.91000003"
+             offset="0.5636" />
+          <stop
+             id="stop9788"
+             style="stop-color:#7ac587;stop-opacity:0.09"
+             offset="1" />
+        </linearGradient>
+        <path
+           d="m 132.294,144.863 c 0.271,1.296 0.768,2.823 -0.501,3.741 -0.346,0.25 -1.019,0.568 -1.705,-0.075 0.67,0.365 1.19,0.22 1.5,-0.014 0.772,-0.586 0.843,-1.4 0.327,-3.438 l -16.916,-55.697 2.515,-1.206 2.731,-1.673 12.049,58.362 z"
+           id="path2261"
+           style="fill:url(#SVGID_109_)" />
+        <linearGradient
+           x1="-583.29541"
+           y1="2096.6973"
+           x2="-583.29541"
+           y2="1999.1387"
+           id="linearGradient9791"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(-0.4079,0.1832,0.2768,0.6163,-686.8612,-1034.1141)">
+          <stop
+             id="stop9793"
+             style="stop-color:#d5ebde;stop-opacity:0.08"
+             offset="0" />
+          <stop
+             id="stop9795"
+             style="stop-color:#7ac587;stop-opacity:0.31999999"
+             offset="1" />
+        </linearGradient>
+        <path
+           d="m 127.71,148.516 c 0.5,1.192 2.331,4.509 5.686,1.496 -3.222,2.593 -4.728,-0.419 -5.252,-1.546 l -21.131,-57.034 -0.048,2.917 -2.781,-3.146 23.526,57.313 z"
+           id="path2268"
+           style="fill:url(#SVGID_110_)" />
+        <polygon
+           points="102.925,90.933 125.054,145.483 100.865,90.625 "
+           id="polygon2270"
+           style="fill:#ffffff" />
+        <path
+           d="m 133.396,150.012 c 0,0 -19.263,-59.018 -19.664,-60.221 2.153,-0.743 4.354,-1.674 6.513,-3.29 0.096,0.551 11.162,44.224 14.047,58.982 0.607,3.102 -0.896,4.529 -0.896,4.529 z"
+           id="path2272"
+           style="opacity:0.56000001;fill:#ffffff" />
+        <polygon
+           points="121.361,85.671 132.625,143.371 119.554,86.985 "
+           id="polygon2274"
+           style="fill:#ffffff" />
+        <path
+           d="m 133.839,146.265 c 0.665,1.82 -0.271,3.834 -2.092,4.499 -1.82,0.666 -3.834,-0.271 -4.5,-2.091 0.471,1.291 2.471,2.183 4.291,1.518 1.82,-0.663 2.71,-2.809 2.301,-3.926 z"
+           id="path2276"
+           style="opacity:0.43999999;fill:#131415" />
+      </g>
+      <g
+         id="g2278">
+        <linearGradient
+           x1="-169.5659"
+           y1="-1046.3184"
+           x2="-184.4361"
+           y2="-1092.1558"
+           id="linearGradient9803"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.8184,-0.5747,-0.5747,-0.8184,-322.341,-768.7596)">
+          <stop
+             id="stop9805"
+             style="stop-color:#141a2b;stop-opacity:1"
+             offset="0.1636" />
+          <stop
+             id="stop9807"
+             style="stop-color:#142f3a;stop-opacity:0.82499999"
+             offset="0.3161" />
+          <stop
+             id="stop9809"
+             style="stop-color:#143e45;stop-opacity:0.63"
+             offset="0.486" />
+          <stop
+             id="stop9811"
+             style="stop-color:#14464b;stop-opacity:0.39840001"
+             offset="0.68769997" />
+          <stop
+             id="stop9813"
+             style="stop-color:#14494d;stop-opacity:0.04"
+             offset="1" />
+        </linearGradient>
+        <path
+           d="m 142.173,180.471 c -0.461,-1.431 -1.388,-2.021 -2.042,-1.813 -0.651,0.21 -1.182,1.23 -0.721,2.665 l 11.701,50.034 5.323,8.961 0.523,-9.998 -14.784,-49.849 z"
+           id="path2291"
+           style="opacity:0.36000001;fill:url(#SVGID_111_)" />
+        <linearGradient
+           x1="697.91211"
+           y1="-1130.0562"
+           x2="697.91211"
+           y2="-1214.3638"
+           id="linearGradient9816"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.411,-0.1762,-0.2662,-0.621,-449.3053,-399.6598)">
+          <stop
+             id="stop9818"
+             style="stop-color:#d5ebde;stop-opacity:0.87"
+             offset="0" />
+          <stop
+             id="stop9820"
+             style="stop-color:#f1f6e3;stop-opacity:0.91000003"
+             offset="0.5636" />
+          <stop
+             id="stop9822"
+             style="stop-color:#7ac587;stop-opacity:0.09"
+             offset="1" />
+        </linearGradient>
+        <path
+           d="m 142.827,180.855 c -0.472,-1.102 -0.895,-2.481 -2.309,-2.5 -0.386,-0.008 -1.049,0.104 -1.22,0.938 0.306,-0.617 0.763,-0.777 1.116,-0.77 0.871,0.035 1.347,0.598 2.021,2.369 l 14.91,51.252 2.187,-0.113 -16.705,-51.176 z"
+           id="path2300"
+           style="fill:url(#SVGID_112_)" />
+        <linearGradient
+           x1="-1970.999"
+           y1="-935.42041"
+           x2="-1970.999"
+           y2="-1023.7095"
+           id="linearGradient9825"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(-0.4391,0.0845,-0.1277,-0.6635,-846.0248,-277.4889)">
+          <stop
+             id="stop9827"
+             style="stop-color:#d5ebde;stop-opacity:0.08"
+             offset="0" />
+          <stop
+             id="stop9829"
+             style="stop-color:#7ac587;stop-opacity:0.31999999"
+             offset="1" />
+        </linearGradient>
+        <path
+           d="m 137.55,180.537 c -0.248,-1.139 -0.617,-4.537 3.421,-4.051 -3.723,-0.246 -3.273,2.761 -3.075,3.861 l 12.623,53.521 -1.548,-2.127 -0.422,3.763 -10.999,-54.967 z"
+           id="path2307"
+           style="fill:url(#SVGID_113_)" />
+        <polygon
+           points="148.393,235.436 137.163,184.152 147.377,236.037 "
+           id="polygon2309"
+           style="fill:#ffffff" />
+        <path
+           d="m 139.655,176.302 c 0,0 13.718,55.409 14.046,56.505 1.976,-0.563 4.082,-1.021 6.513,-0.947 -0.215,-0.457 -14.996,-42.101 -18.186,-54.885 -0.9,-0.83 -2.373,-0.673 -2.373,-0.673 z"
+           id="path2311"
+           style="opacity:0.56000001;fill:#ffffff" />
+        <polygon
+           points="159.532,232.346 142.123,177.343 157.518,232.314 "
+           id="polygon2313"
+           style="fill:#ffffff" />
+        <path
+           d="m 143.242,179.022 c -0.454,-1.688 -2.188,-2.688 -3.876,-2.231 -1.688,0.453 -2.691,2.188 -2.237,3.876 -0.321,-1.195 0.693,-2.896 2.379,-3.348 1.688,-0.456 3.455,0.667 3.734,1.703 z"
+           id="path2315"
+           style="opacity:0.43999999;fill:#131415" />
+      </g>
+      <g
+         id="g2317">
+        <g
+           id="g2319">
+          <radialGradient
+             cx="81.487297"
+             cy="997.10553"
+             r="26.946501"
+             id="radialGradient9838"
+             gradientUnits="userSpaceOnUse"
+             gradientTransform="translate(24,-933)">
+            <stop
+               id="stop9840"
+               style="stop-color:#d5e2ee;stop-opacity:1"
+               offset="0.77579999" />
+            <stop
+               id="stop9842"
+               style="stop-color:#d1dfed;stop-opacity:1"
+               offset="0.82630002" />
+            <stop
+               id="stop9844"
+               style="stop-color:#c7d6e8;stop-opacity:1"
+               offset="0.8714" />
+            <stop
+               id="stop9846"
+               style="stop-color:#b4c6e1;stop-opacity:1"
+               offset="0.91439998" />
+            <stop
+               id="stop9848"
+               style="stop-color:#9bb0d8;stop-opacity:1"
+               offset="0.9562" />
+            <stop
+               id="stop9850"
+               style="stop-color:#7a95cb;stop-opacity:1"
+               offset="0.99680001" />
+            <stop
+               id="stop9852"
+               style="stop-color:#7792ca;stop-opacity:1"
+               offset="1" />
+          </radialGradient>
+          <circle
+             cx="105.487"
+             cy="64.105003"
+             r="26.947001"
+             id="circle2336"
+             style="fill:url(#SVGID_114_)" />
+          <path
+             d="m 133.217,64.115 c -0.03,3.608 -0.774,7.243 -2.192,10.568 -1.415,3.332 -3.493,6.366 -6.045,8.914 -5.113,5.117 -12.261,8.052 -19.501,8.093 -7.216,0.09 -14.456,-2.843 -19.606,-7.973 -5.2,-5.087 -8.262,-12.288 -8.286,-19.626 -0.032,-3.626 0.656,-7.311 2.036,-10.702 1.383,-3.396 3.456,-6.507 6.04,-9.112 2.584,-2.606 5.685,-4.703 9.078,-6.124 3.396,-1.433 7.065,-2.129 10.764,-2.127 7.34,-0.047 14.641,3.09 19.737,8.327 5.153,5.203 8.085,12.484 7.977,19.752 v 0.01 h -0.002 z m -1.566,-0.01 c -0.033,-6.866 -2.923,-13.611 -7.807,-18.356 -2.429,-2.379 -5.316,-4.279 -8.456,-5.548 -3.146,-1.266 -6.504,-1.912 -9.914,-1.912 -6.74,-0.004 -13.472,2.738 -18.267,7.533 -4.827,4.765 -7.678,11.449 -7.712,18.292 -0.102,6.796 2.659,13.622 7.497,18.482 4.797,4.908 11.583,7.797 18.502,7.813 3.425,0.016 6.903,-0.603 10.081,-1.949 3.184,-1.33 6.098,-3.295 8.527,-5.741 4.9,-4.881 7.641,-11.75 7.549,-18.625 v 0.011 z"
+             id="path2338"
+             style="fill:#39444f" />
+        </g>
+        <radialGradient
+           cx="193.94141"
+           cy="532.85938"
+           r="30.2852"
+           id="radialGradient9856"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.9525,0.3046,-0.3046,0.9525,81.9305,-503.3005)">
+          <stop
+             id="stop9858"
+             style="stop-color:#0b1929;stop-opacity:0"
+             offset="0.41209999" />
+          <stop
+             id="stop9860"
+             style="stop-color:#0a1827;stop-opacity:0.53789997"
+             offset="0.58490002" />
+          <stop
+             id="stop9862"
+             style="stop-color:#091420;stop-opacity:0.7317"
+             offset="0.64719999" />
+          <stop
+             id="stop9864"
+             style="stop-color:#060d15;stop-opacity:0.86940002"
+             offset="0.69139999" />
+          <stop
+             id="stop9866"
+             style="stop-color:#010204;stop-opacity:0.98030001"
+             offset="0.727" />
+          <stop
+             id="stop9868"
+             style="stop-color:#000000;stop-opacity:1"
+             offset="0.73329997" />
+          <stop
+             id="stop9870"
+             style="stop-color:#03080d;stop-opacity:0.61080003"
+             offset="0.78759998" />
+          <stop
+             id="stop9872"
+             style="stop-color:#0b1929;stop-opacity:0"
+             offset="0.87269998" />
+        </radialGradient>
+        <circle
+           cx="105.214"
+           cy="61.990002"
+           r="29.098"
+           id="circle2357"
+           style="opacity:0.36000001;fill:url(#SVGID_115_)" />
+        <radialGradient
+           cx="84.296402"
+           cy="980.55267"
+           r="41.7421"
+           id="radialGradient9875"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="translate(24,-933)">
+          <stop
+             id="stop9877"
+             style="stop-color:#b4cb80;stop-opacity:0"
+             offset="0.33329999" />
+          <stop
+             id="stop9879"
+             style="stop-color:#60bd71;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <circle
+           cx="105.488"
+           cy="63.811001"
+           r="26.947001"
+           id="circle2364"
+           style="opacity:0.62000002;fill:url(#SVGID_116_)" />
+        <radialGradient
+           cx="81.489304"
+           cy="996.81049"
+           r="26.946501"
+           id="radialGradient9882"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="translate(24,-933)">
+          <stop
+             id="stop9884"
+             style="stop-color:#79cccb;stop-opacity:1"
+             offset="0.0242" />
+          <stop
+             id="stop9886"
+             style="stop-color:#35aed5;stop-opacity:1"
+             offset="0.46669999" />
+          <stop
+             id="stop9888"
+             style="stop-color:#25346f;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <circle
+           cx="105.489"
+           cy="63.810001"
+           r="26.947001"
+           id="circle2373"
+           style="opacity:0.62000002;fill:url(#SVGID_117_)" />
+        <path
+           d="M 82.225,65.187 C 81.054,52.932 90.038,42.045 102.296,40.874 114.55,39.706 126.51,46.387 128.449,56.618 119.306,44.51 105.348,44.51 100.714,45.622 90.424,48.091 85.069,55.673 82.225,65.187 z"
+           id="path2375"
+           style="opacity:0.48999999;fill:#f2f6fa" />
+        <path
+           d="m 78.813,67.942 c -1.415,-14.795 8.78,-28.709 23.58,-30.125 14.795,-1.411 24.712,6.865 29.479,20.496 C 124.814,43.29 105.605,42.978 100.009,44.32 87.585,47.301 82.246,56.458 78.813,67.942 z"
+           id="path2377"
+           style="opacity:0.11000001;fill:#ebf7fd" />
+        <path
+           d="M 80.923,74.902 C 76.345,55.284 88.006,40.893 102.43,39.513 116.848,38.138 130.231,49.195 131.871,65.186 125.54,41.744 105.707,42.475 100.256,43.804 88.153,46.755 81.7,56.022 80.923,74.902 z"
+           id="path2379"
+           style="opacity:0.22000002;fill:#ebf7fd" />
+        <radialGradient
+           cx="80.938499"
+           cy="1071.6387"
+           r="14.3689"
+           id="radialGradient9894"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(1,0,0,0.9207,24,-936.5648)">
+          <stop
+             id="stop9896"
+             style="stop-color:#eef8fb;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop9898"
+             style="stop-color:#ecf7fa;stop-opacity:0.491"
+             offset="0.509" />
+          <stop
+             id="stop9900"
+             style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+             offset="0.69239998" />
+          <stop
+             id="stop9902"
+             style="stop-color:#daf0f4;stop-opacity:0.177"
+             offset="0.82300001" />
+          <stop
+             id="stop9904"
+             style="stop-color:#c9e9ef;stop-opacity:0.0721"
+             offset="0.92790002" />
+          <stop
+             id="stop9906"
+             style="stop-color:#b8e2e9;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 119.307,50.09 c 0,7.307 -6.432,13.232 -14.366,13.232 -7.936,0 -14.371,-5.926 -14.371,-13.232 0,-7.302 6.435,-13.227 14.371,-13.227 7.934,0 14.366,5.925 14.366,13.227 z"
+           id="path2394"
+           style="opacity:0.5;fill:url(#SVGID_118_)" />
+        <radialGradient
+           cx="80.939003"
+           cy="1070.6641"
+           r="10.5154"
+           id="radialGradient9909"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(1,0,0,0.9207,24,-936.5648)">
+          <stop
+             id="stop9911"
+             style="stop-color:#eef8fb;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop9913"
+             style="stop-color:#ecf7fa;stop-opacity:0.491"
+             offset="0.509" />
+          <stop
+             id="stop9915"
+             style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+             offset="0.69239998" />
+          <stop
+             id="stop9917"
+             style="stop-color:#daf0f4;stop-opacity:0.177"
+             offset="0.82300001" />
+          <stop
+             id="stop9919"
+             style="stop-color:#c9e9ef;stop-opacity:0.0721"
+             offset="0.92790002" />
+          <stop
+             id="stop9921"
+             style="stop-color:#b8e2e9;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 115.454,49.193 c 0,5.348 -4.707,9.684 -10.514,9.684 -5.808,0 -10.516,-4.335 -10.516,-9.684 0,-5.344 4.708,-9.68 10.516,-9.68 5.808,0.001 10.514,4.337 10.514,9.68 z"
+           id="path2409"
+           style="fill:url(#SVGID_119_)" />
+        <radialGradient
+           cx="90.341797"
+           cy="668.60938"
+           r="8.2777996"
+           id="radialGradient9924"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="translate(16,-622)">
+          <stop
+             id="stop9926"
+             style="stop-color:#eef8fb;stop-opacity:0.75"
+             offset="0.47580001" />
+          <stop
+             id="stop9928"
+             style="stop-color:#79c88d;stop-opacity:0.0912"
+             offset="0.7615" />
+          <stop
+             id="stop9930"
+             style="stop-color:#59bb6e;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 112.663,47.429 c 0,3.962 -3.212,7.174 -7.173,7.174 -3.962,0 -7.174,-3.212 -7.174,-7.174 0,-3.959 3.212,-7.172 7.174,-7.172 3.961,0 7.173,3.213 7.173,7.172 z"
+           id="path2418"
+           style="fill:url(#SVGID_120_)" />
+        <circle
+           cx="107.024"
+           cy="44.665001"
+           r="2.8199999"
+           id="circle2420"
+           style="opacity:0.62000002;fill:#ffffff" />
+        <radialGradient
+           cx="242.2227"
+           cy="762.17578"
+           r="9.9145002"
+           id="radialGradient9934"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(1.1342,0.4137,-0.3427,0.9394,81.7425,-740.2545)">
+          <stop
+             id="stop9936"
+             style="stop-color:#5fc099;stop-opacity:0.74000001"
+             offset="0.2667" />
+          <stop
+             id="stop9938"
+             style="stop-color:#5fc094;stop-opacity:0.59170002"
+             offset="0.40270001" />
+          <stop
+             id="stop9940"
+             style="stop-color:#5ebe85;stop-opacity:0.41429999"
+             offset="0.5654" />
+          <stop
+             id="stop9942"
+             style="stop-color:#5cbc6d;stop-opacity:0.222"
+             offset="0.74180001" />
+          <stop
+             id="stop9944"
+             style="stop-color:#5ab94c;stop-opacity:0.0204"
+             offset="0.9267" />
+          <stop
+             id="stop9946"
+             style="stop-color:#5ab948;stop-opacity:0"
+             offset="0.94550002" />
+        </radialGradient>
+        <path
+           d="m 106.52,80.042 c -1.877,5.144 -8.432,7.478 -14.642,5.213 -6.211,-2.265 -9.725,-8.272 -7.849,-13.416 1.876,-5.143 8.432,-7.477 14.644,-5.211 6.21,2.265 9.722,8.272 7.847,13.414 z"
+           id="path2435"
+           style="opacity:0.66000001;fill:url(#SVGID_121_)" />
+        <path
+           d="m 99.506,87.84 c -0.406,0.792 -1.012,1.428 -1.756,1.9 -4.129,-0.688 -10.193,-4.863 -12.605,-7.896 0.086,-0.398 0.224,-0.785 0.414,-1.156 1.522,-2.968 5.88,-3.774 9.732,-1.799 3.85,1.974 5.737,5.984 4.215,8.951 z"
+           id="path2437"
+           style="opacity:0.31999996;fill:#ffffff" />
+        <radialGradient
+           cx="-250.6884"
+           cy="1458.0879"
+           r="13.3664"
+           id="radialGradient9950"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(1.1034,-0.3171,0.2155,0.7497,71.9107,-1091.3529)">
+          <stop
+             id="stop9952"
+             style="stop-color:#1d3c6e;stop-opacity:0.36000001"
+             offset="0.54549998" />
+          <stop
+             id="stop9954"
+             style="stop-color:#30486d;stop-opacity:0.433"
+             offset="0.56900001" />
+          <stop
+             id="stop9956"
+             style="stop-color:#46566b;stop-opacity:0.54839998"
+             offset="0.60610002" />
+          <stop
+             id="stop9958"
+             style="stop-color:#56606a;stop-opacity:0.67330003"
+             offset="0.64630002" />
+          <stop
+             id="stop9960"
+             style="stop-color:#606669;stop-opacity:0.81339997"
+             offset="0.69139999" />
+          <stop
+             id="stop9962"
+             style="stop-color:#636869;stop-opacity:1"
+             offset="0.75150001" />
+          <stop
+             id="stop9964"
+             style="stop-color:#51c1bc;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 126.697,77.728 c 1.703,5.92 -3.911,9.939 -12.907,12.525 -8.998,2.586 -11.393,0.264 -19.674,-3.163 -5.692,-2.355 4.213,-12.815 13.21,-15.403 8.997,-2.585 17.67,0.118 19.371,6.041 z"
+           id="path2454"
+           style="opacity:0.18999999;fill:url(#SVGID_122_)" />
+        <radialGradient
+           cx="-256.10541"
+           cy="1523.5244"
+           r="18.348801"
+           id="radialGradient9967"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.931,-0.365,0.365,0.931,-207.5863,-1434.8041)">
+          <stop
+             id="stop9969"
+             style="stop-color:#040506;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop9971"
+             style="stop-color:#050709;stop-opacity:1"
+             offset="0.32319999" />
+          <stop
+             id="stop9973"
+             style="stop-color:#070e13;stop-opacity:1"
+             offset="0.56629997" />
+          <stop
+             id="stop9975"
+             style="stop-color:#0c1a23;stop-opacity:1"
+             offset="0.78259999" />
+          <stop
+             id="stop9977"
+             style="stop-color:#0d1e28;stop-opacity:1"
+             offset="0.83639997" />
+          <stop
+             id="stop9979"
+             style="stop-color:#234a4c;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 128.298,58.611 c 3.154,11.353 -2.58,23.644 -14.042,28.138 -11.463,4.492 -24.686,0.388 -29.364,-8.917 9.039,10.36 23.293,7.595 27.77,5.942 11.354,-4.193 15.259,-15.26 15.636,-25.163 z"
+           id="path2469"
+           style="opacity:0.37999998;fill:url(#SVGID_123_)" />
+        <path
+           d="m 130.106,59.889 c 3.094,11.375 -3.126,23.857 -15.198,28.592 -12.072,4.729 -25.831,0.835 -30.557,-8.451 7.765,12.579 25.901,8.961 30.581,7.132 10.111,-3.95 17.886,-14.983 15.174,-27.273 z"
+           id="path2471"
+           style="opacity:0.75;fill:#ffffff" />
+        <radialGradient
+           cx="-532.12988"
+           cy="1105.5078"
+           r="2.5809"
+           id="radialGradient9983"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.864,-0.5034,0.5034,0.864,-3.3111,-1180.5216)">
+          <stop
+             id="stop9985"
+             style="stop-color:#040506;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop9987"
+             style="stop-color:#050709;stop-opacity:1"
+             offset="0.3195" />
+          <stop
+             id="stop9989"
+             style="stop-color:#070c13;stop-opacity:1"
+             offset="0.55989999" />
+          <stop
+             id="stop9991"
+             style="stop-color:#0a1523;stop-opacity:1"
+             offset="0.77380002" />
+          <stop
+             id="stop9993"
+             style="stop-color:#0b1929;stop-opacity:1"
+             offset="0.83639997" />
+          <stop
+             id="stop9995"
+             style="stop-color:#23474c;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 96.275,40.86 c 0.445,0.764 -0.462,2.124 -2.027,3.035 -1.566,0.912 -3.195,1.031 -3.641,0.267 -0.445,-0.764 0.463,-2.123 2.029,-3.036 1.564,-0.911 3.194,-1.03 3.639,-0.266 z"
+           id="path2486"
+           style="opacity:0.18999999;fill:url(#SVGID_124_)" />
+        <path
+           d="m 128.449,54.672 c 0.764,2.149 4.37,9.712 0.421,20.098 -0.164,0.429 3.565,-15.445 -1.996,-17.961 -1.412,-0.639 -3.365,-1.198 -3.279,-2.746 0.062,-1.099 0.66,-1.941 1.668,-2.197 1.503,-0.379 2.667,1.346 3.186,2.806 z"
+           id="path2488"
+           style="opacity:0.87000002;fill:#ffffff" />
+        <path
+           d="m 79.47,65.851 c 0.648,2.922 2.23,14.34 13.754,20.884 0.525,0.298 -14.684,-11.542 -10.298,-21.362 0.829,-1.857 2.906,-3.677 1.732,-5.337 -0.836,-1.18 -2.087,-1.7 -3.387,-1.28 -1.934,0.624 -2.242,5.11 -1.801,7.095 z"
+           id="path2490"
+           style="opacity:0.43000004;fill:#ffffff" />
+      </g>
+      <g
+         id="g2492">
+        <g
+           id="g2494">
+          <radialGradient
+             cx="135.5938"
+             cy="1187.5576"
+             r="21.0791"
+             id="radialGradient10002"
+             gradientUnits="userSpaceOnUse"
+             gradientTransform="translate(24,-933)">
+            <stop
+               id="stop10004"
+               style="stop-color:#d5e2ee;stop-opacity:1"
+               offset="0.77579999" />
+            <stop
+               id="stop10006"
+               style="stop-color:#d1dfed;stop-opacity:1"
+               offset="0.82630002" />
+            <stop
+               id="stop10008"
+               style="stop-color:#c7d6e8;stop-opacity:1"
+               offset="0.8714" />
+            <stop
+               id="stop10010"
+               style="stop-color:#b4c6e1;stop-opacity:1"
+               offset="0.91439998" />
+            <stop
+               id="stop10012"
+               style="stop-color:#9bb0d8;stop-opacity:1"
+               offset="0.9562" />
+            <stop
+               id="stop10014"
+               style="stop-color:#7a95cb;stop-opacity:1"
+               offset="0.99680001" />
+            <stop
+               id="stop10016"
+               style="stop-color:#7792ca;stop-opacity:1"
+               offset="1" />
+          </radialGradient>
+          <circle
+             cx="159.59399"
+             cy="254.558"
+             r="21.079"
+             id="circle2511"
+             style="fill:url(#SVGID_125_)" />
+          <path
+             d="m 181.456,254.566 c -0.028,5.716 -2.463,11.354 -6.528,15.322 -4.038,3.993 -9.633,6.354 -15.342,6.366 -5.678,0.072 -11.361,-2.241 -15.439,-6.258 -4.112,-3.983 -6.559,-9.658 -6.586,-15.459 -0.032,-2.854 0.505,-5.771 1.59,-8.456 1.088,-2.688 2.726,-5.146 4.766,-7.21 2.041,-2.063 4.492,-3.729 7.175,-4.854 2.687,-1.139 5.587,-1.685 8.518,-1.682 5.801,-0.039 11.575,2.463 15.588,6.605 4.061,4.119 6.359,9.873 6.259,15.604 l -0.001,0.022 0,0 z m -1.566,-0.009 c -0.041,-5.326 -2.298,-10.545 -6.089,-14.205 -1.886,-1.836 -4.123,-3.3 -6.553,-4.271 -2.437,-0.976 -5.026,-1.47 -7.668,-1.47 -5.2,0.008 -10.405,2.111 -14.118,5.813 -3.734,3.684 -5.95,8.84 -5.992,14.145 -0.087,5.26 2.021,10.562 5.761,14.354 3.704,3.846 8.992,6.076 14.371,6.089 5.348,0.077 10.725,-2.118 14.468,-5.975 3.788,-3.816 5.908,-9.146 5.821,-14.485 l -0.001,0.005 0,0 z"
+             id="path2513"
+             style="fill:#39444f" />
+        </g>
+        <radialGradient
+           cx="303.7735"
+           cy="697.86328"
+           r="23.690399"
+           id="radialGradient10020"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.9525,0.3046,-0.3046,0.9525,81.9305,-503.3005)">
+          <stop
+             id="stop10022"
+             style="stop-color:#0b1929;stop-opacity:0"
+             offset="0.41209999" />
+          <stop
+             id="stop10024"
+             style="stop-color:#0a1827;stop-opacity:0.53789997"
+             offset="0.58490002" />
+          <stop
+             id="stop10026"
+             style="stop-color:#091420;stop-opacity:0.7317"
+             offset="0.64719999" />
+          <stop
+             id="stop10028"
+             style="stop-color:#060d15;stop-opacity:0.86940002"
+             offset="0.69139999" />
+          <stop
+             id="stop10030"
+             style="stop-color:#010204;stop-opacity:0.98030001"
+             offset="0.727" />
+          <stop
+             id="stop10032"
+             style="stop-color:#000000;stop-opacity:1"
+             offset="0.73329997" />
+          <stop
+             id="stop10034"
+             style="stop-color:#03080d;stop-opacity:0.61080003"
+             offset="0.78759998" />
+          <stop
+             id="stop10036"
+             style="stop-color:#0b1929;stop-opacity:0"
+             offset="0.87269998" />
+        </radialGradient>
+        <circle
+           cx="159.38"
+           cy="252.903"
+           r="22.763"
+           id="circle2532"
+           style="opacity:0.36000001;fill:url(#SVGID_126_)" />
+        <radialGradient
+           cx="137.791"
+           cy="1174.6094"
+           r="32.652401"
+           id="radialGradient10039"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="translate(24,-933)">
+          <stop
+             id="stop10041"
+             style="stop-color:#b4cb80;stop-opacity:0"
+             offset="0.33329999" />
+          <stop
+             id="stop10043"
+             style="stop-color:#60bd71;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <circle
+           cx="159.59399"
+           cy="254.328"
+           r="21.08"
+           id="circle2539"
+           style="opacity:0.62000002;fill:url(#SVGID_127_)" />
+        <radialGradient
+           cx="135.5948"
+           cy="1187.3271"
+           r="21.0791"
+           id="radialGradient10046"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="translate(24,-933)">
+          <stop
+             id="stop10048"
+             style="stop-color:#3fb1cb;stop-opacity:0"
+             offset="0.33329999" />
+          <stop
+             id="stop10050"
+             style="stop-color:#458691;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <circle
+           cx="159.595"
+           cy="254.327"
+           r="21.079"
+           id="circle2546"
+           style="opacity:0.62000002;fill:url(#SVGID_128_)" />
+        <radialGradient
+           cx="129.95171"
+           cy="1169.5059"
+           r="12.0611"
+           id="radialGradient10053"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="translate(24,-933)">
+          <stop
+             id="stop10055"
+             style="stop-color:#181338;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop10057"
+             style="stop-color:#151435;stop-opacity:1"
+             offset="0.4454" />
+          <stop
+             id="stop10059"
+             style="stop-color:#0d182b;stop-opacity:1"
+             offset="0.78009999" />
+          <stop
+             id="stop10061"
+             style="stop-color:#0b1929;stop-opacity:1"
+             offset="0.83639997" />
+          <stop
+             id="stop10063"
+             style="stop-color:#23474c;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 167.638,235.452 c 1.139,3.319 -3.452,7.899 -10.247,10.239 -6.802,2.332 -13.235,1.533 -14.372,-1.783 -1.144,-3.325 3.444,-7.903 10.241,-10.245 6.802,-2.333 13.245,-1.522 14.378,1.789 z"
+           id="path2559"
+           style="opacity:0.16000001;fill:url(#SVGID_129_)" />
+        <path
+           d="m 141.397,255.404 c -0.917,-9.586 6.112,-18.104 15.7,-19.021 9.585,-0.916 18.941,4.313 20.459,12.314 -7.151,-9.473 -18.071,-9.473 -21.697,-8.604 -8.049,1.938 -12.239,7.869 -14.462,15.311 z"
+           id="path2561"
+           style="opacity:0.48999999;fill:#f2f6fa" />
+        <path
+           d="m 138.727,257.559 c -1.107,-11.572 6.869,-22.457 18.446,-23.563 11.573,-1.104 19.331,5.367 23.06,16.029 -5.52,-11.75 -20.547,-11.993 -24.925,-10.942 -9.719,2.329 -13.895,9.491 -16.581,18.476 z"
+           id="path2563"
+           style="opacity:0.11000001;fill:#ebf7fd" />
+        <path
+           d="m 140.377,263.003 c -3.581,-15.346 5.542,-26.603 16.824,-27.681 11.28,-1.076 21.748,7.57 23.031,20.082 -4.952,-18.34 -20.468,-17.766 -24.73,-16.729 -9.468,2.309 -14.517,9.559 -15.125,24.328 z"
+           id="path2565"
+           style="opacity:0.22000002;fill:#ebf7fd" />
+        <radialGradient
+           cx="339.38669"
+           cy="919.37891"
+           r="7.7568002"
+           id="radialGradient10069"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(1.1342,0.4137,-0.3427,0.9394,81.7425,-740.2545)">
+          <stop
+             id="stop10071"
+             style="stop-color:#28b467;stop-opacity:0.60000002"
+             offset="0.2667" />
+          <stop
+             id="stop10073"
+             style="stop-color:#2bb566;stop-opacity:0.45789999"
+             offset="0.44029999" />
+          <stop
+             id="stop10075"
+             style="stop-color:#35b663;stop-opacity:0.35120001"
+             offset="0.57080001" />
+          <stop
+             id="stop10077"
+             style="stop-color:#45ba5e;stop-opacity:0.25600001"
+             offset="0.68709999" />
+          <stop
+             id="stop10079"
+             style="stop-color:#5cbe56;stop-opacity:0.16760001"
+             offset="0.79519999" />
+          <stop
+             id="stop10081"
+             style="stop-color:#79c44c;stop-opacity:0.0838"
+             offset="0.89749998" />
+          <stop
+             id="stop10083"
+             style="stop-color:#9dcb41;stop-opacity:0.0046"
+             offset="0.99440002" />
+          <stop
+             id="stop10085"
+             style="stop-color:#9fcb40;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 160.401,267.023 c -1.468,4.021 -6.597,5.851 -11.454,4.078 -4.858,-1.772 -7.606,-6.478 -6.14,-10.496 1.468,-4.022 6.596,-5.854 11.455,-4.076 4.858,1.776 7.606,6.472 6.139,10.494 z"
+           id="path2584"
+           style="opacity:0.51999996;fill:url(#SVGID_130_)" />
+        <path
+           d="m 154.915,273.124 c -0.318,0.619 -0.792,1.119 -1.374,1.487 -3.231,-0.539 -7.973,-3.807 -9.86,-6.176 0.069,-0.313 0.175,-0.615 0.324,-0.906 1.189,-2.322 4.599,-2.951 7.612,-1.407 3.012,1.544 4.488,4.68 3.298,7.002 z"
+           id="path2586"
+           style="opacity:0.31999996;fill:#ffffff" />
+        <radialGradient
+           cx="-250.15131"
+           cy="1644.1836"
+           r="10.4552"
+           id="radialGradient10089"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(1.1034,-0.3171,0.2155,0.7497,76.8658,-1074.1146)">
+          <stop
+             id="stop10091"
+             style="stop-color:#1d3c6e;stop-opacity:0.36000001"
+             offset="0.54549998" />
+          <stop
+             id="stop10093"
+             style="stop-color:#30486d;stop-opacity:0.433"
+             offset="0.56900001" />
+          <stop
+             id="stop10095"
+             style="stop-color:#46566b;stop-opacity:0.54839998"
+             offset="0.60610002" />
+          <stop
+             id="stop10097"
+             style="stop-color:#56606a;stop-opacity:0.67330003"
+             offset="0.64630002" />
+          <stop
+             id="stop10099"
+             style="stop-color:#606669;stop-opacity:0.81339997"
+             offset="0.69139999" />
+          <stop
+             id="stop10101"
+             style="stop-color:#636869;stop-opacity:1"
+             offset="0.75150001" />
+          <stop
+             id="stop10103"
+             style="stop-color:#51c1bc;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 168.608,235.081 c 1.331,4.632 -3.059,7.776 -10.097,9.799 -7.039,2.022 -8.911,0.206 -15.39,-2.474 -4.454,-1.844 3.296,-10.025 10.333,-12.049 7.039,-2.023 13.823,0.092 15.154,4.724 z"
+           id="path2603"
+           style="opacity:0.18999999;fill:url(#SVGID_131_)" />
+        <radialGradient
+           cx="-529.92682"
+           cy="-539.49268"
+           r="14.3531"
+           id="radialGradient10106"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(-0.9545,0.3742,-0.365,-0.931,-547.4075,-60.8402)">
+          <stop
+             id="stop10108"
+             style="stop-color:#040506;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop10110"
+             style="stop-color:#050709;stop-opacity:1"
+             offset="0.3195" />
+          <stop
+             id="stop10112"
+             style="stop-color:#070c13;stop-opacity:1"
+             offset="0.55989999" />
+          <stop
+             id="stop10114"
+             style="stop-color:#0a1523;stop-opacity:1"
+             offset="0.77380002" />
+          <stop
+             id="stop10116"
+             style="stop-color:#0b1929;stop-opacity:1"
+             offset="0.83639997" />
+          <stop
+             id="stop10118"
+             style="stop-color:#23474c;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 140.625,257.743 c -2.446,-8.888 2.219,-18.575 11.413,-22.179 9.194,-3.604 19.735,-0.477 23.414,6.803 -7.156,-8.071 -18.57,-5.807 -22.159,-4.477 -9.104,3.369 -12.3,12.078 -12.668,19.853 z"
+           id="path2618"
+           style="opacity:0.4;fill:url(#SVGID_132_)" />
+        <path
+           d="m 178.852,251.259 c 2.42,8.898 -2.445,18.664 -11.888,22.366 -9.444,3.701 -20.208,0.654 -23.904,-6.609 6.075,9.838 20.262,7.008 23.923,5.578 7.908,-3.091 13.99,-11.721 11.869,-21.335 z"
+           id="path2620"
+           style="opacity:0.75;fill:#ffffff" />
+        <radialGradient
+           cx="-1913.8877"
+           cy="-2069.2295"
+           r="4.7557001"
+           id="radialGradient10122"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(-0.9319,0.3625,-0.224,-0.5758,-2093.0261,-261.7899)">
+          <stop
+             id="stop10124"
+             style="stop-color:#040506;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop10126"
+             style="stop-color:#050709;stop-opacity:1"
+             offset="0.3195" />
+          <stop
+             id="stop10128"
+             style="stop-color:#070c13;stop-opacity:1"
+             offset="0.55989999" />
+          <stop
+             id="stop10130"
+             style="stop-color:#0a1523;stop-opacity:1"
+             offset="0.77380002" />
+          <stop
+             id="stop10132"
+             style="stop-color:#0b1929;stop-opacity:1"
+             offset="0.83639997" />
+          <stop
+             id="stop10134"
+             style="stop-color:#23474c;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 158.936,234.206 c 0.454,1.321 -1.374,3.146 -4.081,4.078 -2.708,0.928 -5.269,0.608 -5.722,-0.711 -0.456,-1.324 1.372,-3.146 4.078,-4.08 2.708,-0.929 5.273,-0.604 5.725,0.713 z"
+           id="path2635"
+           style="opacity:0.31000001;fill:url(#SVGID_133_)" />
+        <path
+           d="m 177.556,247.182 c 0.598,1.68 3.417,7.596 0.33,15.721 -0.129,0.341 2.789,-12.082 -1.562,-14.051 -1.104,-0.502 -2.633,-0.938 -2.565,-2.146 0.048,-0.858 0.517,-1.521 1.306,-1.722 1.173,-0.296 2.084,1.053 2.491,2.198 z"
+           id="path2637"
+           style="opacity:0.87000002;fill:#ffffff" />
+        <path
+           d="m 139.241,255.925 c 0.507,2.284 1.744,11.214 10.76,16.334 0.41,0.232 -11.486,-9.026 -8.056,-16.71 0.649,-1.451 2.273,-2.875 1.355,-4.173 -0.654,-0.925 -1.633,-1.332 -2.651,-1.002 -1.512,0.485 -1.753,3.996 -1.408,5.551 z"
+           id="path2639"
+           style="opacity:0.43000004;fill:#ffffff" />
+        <radialGradient
+           cx="134.5264"
+           cy="1281.8086"
+           r="11.2395"
+           id="radialGradient10139"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(1,0,0,0.9207,24,-936.5648)">
+          <stop
+             id="stop10141"
+             style="stop-color:#eef8fb;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop10143"
+             style="stop-color:#ecf7fa;stop-opacity:0.491"
+             offset="0.509" />
+          <stop
+             id="stop10145"
+             style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+             offset="0.69239998" />
+          <stop
+             id="stop10147"
+             style="stop-color:#daf0f4;stop-opacity:0.177"
+             offset="0.82300001" />
+          <stop
+             id="stop10149"
+             style="stop-color:#c9e9ef;stop-opacity:0.0721"
+             offset="0.92790002" />
+          <stop
+             id="stop10151"
+             style="stop-color:#b8e2e9;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 169.767,243.596 c 0,5.717 -5.032,10.348 -11.239,10.348 -6.208,0 -11.242,-4.631 -11.242,-10.348 0,-5.712 5.034,-10.348 11.242,-10.348 6.206,0 11.239,4.636 11.239,10.348 z"
+           id="path2654"
+           style="opacity:0.5;fill:url(#SVGID_134_)" />
+        <radialGradient
+           cx="134.8775"
+           cy="1281.0508"
+           r="8.2236004"
+           id="radialGradient10154"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(1,0,0,0.9207,24,-936.5648)">
+          <stop
+             id="stop10156"
+             style="stop-color:#eef8fb;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop10158"
+             style="stop-color:#ecf7fa;stop-opacity:0.491"
+             offset="0.509" />
+          <stop
+             id="stop10160"
+             style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+             offset="0.69239998" />
+          <stop
+             id="stop10162"
+             style="stop-color:#daf0f4;stop-opacity:0.177"
+             offset="0.82300001" />
+          <stop
+             id="stop10164"
+             style="stop-color:#c9e9ef;stop-opacity:0.0721"
+             offset="0.92790002" />
+          <stop
+             id="stop10166"
+             style="stop-color:#b8e2e9;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 167.103,242.893 c 0,4.188 -3.681,7.575 -8.224,7.575 -4.544,0 -8.227,-3.392 -8.227,-7.575 0,-4.18 3.683,-7.564 8.227,-7.564 4.543,-0.007 8.224,3.384 8.224,7.564 z"
+           id="path2669"
+           style="fill:url(#SVGID_135_)" />
+        <radialGradient
+           cx="134.5264"
+           cy="1173.8418"
+           r="5.6121001"
+           id="radialGradient10169"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="translate(24,-933)">
+          <stop
+             id="stop10171"
+             style="stop-color:#eef8fb;stop-opacity:1"
+             offset="0.2667" />
+          <stop
+             id="stop10173"
+             style="stop-color:#edf7f8;stop-opacity:0.80159998"
+             offset="0.4122" />
+          <stop
+             id="stop10175"
+             style="stop-color:#e9f5ee;stop-opacity:0.65249997"
+             offset="0.52149999" />
+          <stop
+             id="stop10177"
+             style="stop-color:#e2f1de;stop-opacity:0.51959997"
+             offset="0.61900002" />
+          <stop
+             id="stop10179"
+             style="stop-color:#d8ecc7;stop-opacity:0.396"
+             offset="0.70959997" />
+          <stop
+             id="stop10181"
+             style="stop-color:#cce4aa;stop-opacity:0.2789"
+             offset="0.79540002" />
+          <stop
+             id="stop10183"
+             style="stop-color:#bcdc86;stop-opacity:0.16670001"
+             offset="0.87769997" />
+          <stop
+             id="stop10185"
+             style="stop-color:#abd25b;stop-opacity:0.0604"
+             offset="0.95569998" />
+          <stop
+             id="stop10187"
+             style="stop-color:#9fcb40;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <circle
+           cx="158.526"
+           cy="240.842"
+           r="5.612"
+           id="circle2690"
+           style="fill:url(#SVGID_136_)" />
+        <circle
+           cx="158.524"
+           cy="238.425"
+           r="2.207"
+           id="circle2692"
+           style="opacity:0.62000002;fill:#ffffff" />
+      </g>
+      <g
+         id="g2694">
+        <linearGradient
+           x1="132.96539"
+           y1="1066.0518"
+           x2="169.7413"
+           y2="1020.4093"
+           id="linearGradient10192"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="translate(24,-933)">
+          <stop
+             id="stop10194"
+             style="stop-color:#202d36;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop10196"
+             style="stop-color:#517287;stop-opacity:1"
+             offset="0.0821" />
+          <stop
+             id="stop10198"
+             style="stop-color:#7793a4;stop-opacity:1"
+             offset="0.1266" />
+          <stop
+             id="stop10200"
+             style="stop-color:#98b1bd;stop-opacity:1"
+             offset="0.175" />
+          <stop
+             id="stop10202"
+             style="stop-color:#b4c9d2;stop-opacity:1"
+             offset="0.2272" />
+          <stop
+             id="stop10204"
+             style="stop-color:#c9dce3;stop-opacity:1"
+             offset="0.28330001" />
+          <stop
+             id="stop10206"
+             style="stop-color:#d8e9ee;stop-opacity:1"
+             offset="0.34540001" />
+          <stop
+             id="stop10208"
+             style="stop-color:#e1f1f5;stop-opacity:1"
+             offset="0.4181" />
+          <stop
+             id="stop10210"
+             style="stop-color:#e4f3f7;stop-opacity:1"
+             offset="0.5273" />
+        </linearGradient>
+        <path
+           d="m 193.984,87.626 -30.212,44.652 c -1.49,2.203 -3.807,2.051 -6.312,0.306 -2.384,-1.659 -3.157,-3.505 -1.665,-5.709 0.071,-0.105 0.154,-0.216 0.234,-0.313 L 189.83,84.558 c 0.896,-1.11 2.521,-1.287 3.63,-0.395 1.056,0.848 1.265,2.361 0.524,3.463 z"
+           id="path2715"
+           style="fill:url(#SVGID_137_)" />
+        <path
+           d="m 194.415,87.916 -17.968,27.117 -9.095,13.483 c -0.771,1.115 -1.576,2.207 -2.394,3.29 l -0.61,0.814 c -0.205,0.277 -0.489,0.612 -0.78,0.854 -0.59,0.521 -1.376,0.874 -2.164,0.926 -1.596,0.093 -2.932,-0.64 -4.073,-1.418 -0.568,-0.399 -1.133,-0.846 -1.61,-1.388 -0.477,-0.539 -0.882,-1.205 -1.02,-1.967 -0.142,-0.762 0.026,-1.55 0.346,-2.205 0.302,-0.669 0.794,-1.219 1.21,-1.734 l 2.561,-3.158 5.096,-6.337 10.161,-12.699 10.153,-12.706 5.08,-6.35 0.176,-0.217 0.171,-0.191 c 0.157,-0.158 0.318,-0.289 0.48,-0.401 0.334,-0.225 0.713,-0.382 1.108,-0.461 0.788,-0.162 1.642,0.003 2.312,0.456 0.087,0.064 0.152,0.104 0.256,0.191 0.066,0.061 0.122,0.103 0.196,0.177 0.16,0.159 0.288,0.315 0.4,0.482 0.226,0.336 0.382,0.717 0.461,1.114 0.164,0.791 0.001,1.65 -0.453,2.328 z m -0.862,-0.581 c 0.643,-0.894 0.396,-2.289 -0.546,-2.894 -0.922,-0.637 -2.278,-0.41 -2.948,0.6 l -5.116,6.321 -10.24,12.636 -10.231,12.642 -5.1,6.333 -2.538,3.177 c -0.882,0.996 -1.605,2.151 -1.376,3.338 0.228,1.172 1.257,2.11 2.327,2.828 1.071,0.713 2.348,1.259 3.495,1.054 0.563,-0.1 1.051,-0.384 1.439,-0.799 0.207,-0.22 0.347,-0.418 0.521,-0.703 l 0.529,-0.869 c 0.701,-1.162 1.416,-2.315 2.164,-3.446 l 9.133,-13.457 18.487,-26.761 z"
+           id="path2717"
+           style="fill:#535a5f" />
+      </g>
+      <g
+         id="g2719">
+        <linearGradient
+           x1="-1192.0801"
+           y1="866.01068"
+           x2="-1205.1014"
+           y2="825.87292"
+           id="linearGradient10215"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(-0.93,-0.3675,-0.3675,0.93,-628.9186,-1117.981)">
+          <stop
+             id="stop10217"
+             style="stop-color:#141a2b;stop-opacity:1"
+             offset="0.1636" />
+          <stop
+             id="stop10219"
+             style="stop-color:#142f3a;stop-opacity:0.82499999"
+             offset="0.3161" />
+          <stop
+             id="stop10221"
+             style="stop-color:#143e45;stop-opacity:0.63"
+             offset="0.486" />
+          <stop
+             id="stop10223"
+             style="stop-color:#14464b;stop-opacity:0.39840001"
+             offset="0.68769997" />
+          <stop
+             id="stop10225"
+             style="stop-color:#14494d;stop-opacity:0.04"
+             offset="1" />
+        </linearGradient>
+        <path
+           d="m 159.016,126.885 c -1.042,1.299 -1.735,2.059 -0.569,3.096 1.286,1.144 1.998,0.243 3.044,-1.057 l 30.772,-41.324 0.493,-1.657 -2.416,1.089 -31.324,39.853 z"
+           id="path2732"
+           style="opacity:0.21000001;fill:url(#SVGID_138_)" />
+        <linearGradient
+           x1="-2422.1553"
+           y1="1328.002"
+           x2="-2422.1553"
+           y2="1248.3154"
+           id="linearGradient10228"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(-0.3732,-0.2464,-0.3723,0.5639,-250.8944,-1214.951)">
+          <stop
+             id="stop10230"
+             style="stop-color:#d5ebde;stop-opacity:0.87"
+             offset="0" />
+          <stop
+             id="stop10232"
+             style="stop-color:#f1f6e3;stop-opacity:0.91000003"
+             offset="0.5636" />
+          <stop
+             id="stop10234"
+             style="stop-color:#7ac587;stop-opacity:0.09"
+             offset="1" />
+        </linearGradient>
+        <path
+           d="m 158.976,126.114 c -0.729,1.106 -2.243,2.18 -1.451,3.532 0.264,0.45 1.205,1.382 2.08,1.036 -0.757,0.092 -1.653,-0.711 -1.855,-1.044 -0.502,-0.829 0.272,-1.479 1.501,-3.184 l 31.09,-39.351 -0.378,-0.227 -0.37,-0.299 -30.617,39.537 z"
+           id="path2741"
+           style="fill:url(#SVGID_139_)" />
+        <linearGradient
+           x1="1867.6152"
+           y1="1024.6885"
+           x2="1867.6152"
+           y2="941.2666"
+           id="linearGradient10237"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.312,0.3203,-0.484,0.4715,69.2846,-950.7426)">
+          <stop
+             id="stop10239"
+             style="stop-color:#d5ebde;stop-opacity:0.08"
+             offset="0" />
+          <stop
+             id="stop10241"
+             style="stop-color:#7ac587;stop-opacity:0.31999999"
+             offset="1" />
+        </linearGradient>
+        <path
+           d="m 163.423,130.817 c -0.882,1.18 -2.503,3.826 -6.039,1.166 3.736,2.002 4.738,-0.317 5.652,-1.373 l 29.226,-43.01 -0.325,0.417 0.935,-0.385 -29.449,43.185 z"
+           id="path2748"
+           style="fill:url(#SVGID_140_)" />
+        <path
+           d="m 160.48,132.158 c 0,0 -0.103,0.101 -1.404,0.33 1.459,0.343 2.045,-0.215 2.045,-0.215 l 31.573,-43.697 -1.446,-1.015 -30.768,44.597 z"
+           id="path2750"
+           style="fill:#ffffff" />
+        <path
+           d="m 159.318,132.373 c 0,0 0.973,0.057 2.167,-1.562 6.883,-9.328 29.9,-41.906 29.984,-42.123 0.241,0.306 0.504,0.592 0.84,0.771 -0.053,0.099 -21.814,30.101 -30.488,42.787 -1.013,1.482 -2.503,0.127 -2.503,0.127 z"
+           id="path2752"
+           style="opacity:0.56000001;fill:#ffffff" />
+        <polygon
+           points="189.251,86.063 157.84,127.558 189.68,86.591 "
+           id="polygon2754"
+           style="fill:#ffffff" />
+        <path
+           d="m 157.202,126.602 c -1.459,1.403 -1.518,3.425 0.268,4.798 0.151,0.117 0.972,0.648 1.135,0.745 1.751,1.038 2.301,-0.479 3.315,-1.953 -0.99,0.95 -1.314,2.562 -3.082,1.367 -0.084,-0.055 -0.829,-0.54 -0.91,-0.602 -1.783,-1.371 -1.623,-3.493 -0.726,-4.355 z"
+           id="path2756"
+           style="opacity:0.43999999;fill:#131415" />
+        <linearGradient
+           x1="3512.9297"
+           y1="-172.45261"
+           x2="3499.9082"
+           y2="-212.5916"
+           id="linearGradient10248"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.1764,0.2008,0.5417,-0.8371,-337.1025,-758.0223)">
+          <stop
+             id="stop10250"
+             style="stop-color:#141a2b;stop-opacity:1"
+             offset="0.1636" />
+          <stop
+             id="stop10252"
+             style="stop-color:#142f3a;stop-opacity:0.82499999"
+             offset="0.3161" />
+          <stop
+             id="stop10254"
+             style="stop-color:#143e45;stop-opacity:0.63"
+             offset="0.486" />
+          <stop
+             id="stop10256"
+             style="stop-color:#14464b;stop-opacity:0.39840001"
+             offset="0.68769997" />
+          <stop
+             id="stop10258"
+             style="stop-color:#14494d;stop-opacity:0.04"
+             offset="1" />
+        </linearGradient>
+        <path
+           d="m 190.652,90.26 c 0.948,-1.235 1.534,-1.964 1.566,-2.709 0.034,-0.819 -0.619,0.036 -1.57,1.271 l -29.316,38.942 -0.906,1.473 1.357,-1.222 28.869,-37.755 z"
+           id="path2769"
+           style="opacity:0.21000001;fill:url(#SVGID_141_)" />
+        <path
+           d="m 159.408,129.259 c 0,0.236 -0.144,0.426 -0.322,0.426 -0.178,0 -0.322,-0.189 -0.322,-0.426 0,-0.234 5.733,-7.765 5.912,-7.765 0.179,0 -5.268,7.531 -5.268,7.765 z"
+           id="path2771"
+           style="opacity:0.36000001;fill:#ffffff" />
+      </g>
+      <radialGradient
+         cx="-760.75879"
+         cy="-1519.2607"
+         r="9.4656"
+         fx="-764.10199"
+         fy="-1518.6959"
+         id="radialGradient10262"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(-0.4849,0.8746,-0.8033,-0.4453,-1400.3799,79.0864)">
+        <stop
+           id="stop10264"
+           style="stop-color:#46c3d6;stop-opacity:0.74000001"
+           offset="0" />
+        <stop
+           id="stop10266"
+           style="stop-color:#48c3d3;stop-opacity:0.57990003"
+           offset="0.1121" />
+        <stop
+           id="stop10268"
+           style="stop-color:#4dc4c9;stop-opacity:0.45969999"
+           offset="0.1963" />
+        <stop
+           id="stop10270"
+           style="stop-color:#57c5b9;stop-opacity:0.35249999"
+           offset="0.27129999" />
+        <stop
+           id="stop10272"
+           style="stop-color:#65c6a2;stop-opacity:0.2529"
+           offset="0.34110001" />
+        <stop
+           id="stop10274"
+           style="stop-color:#76c785;stop-opacity:0.1584"
+           offset="0.40720001" />
+        <stop
+           id="stop10276"
+           style="stop-color:#8bc961;stop-opacity:0.0692"
+           offset="0.46970001" />
+        <stop
+           id="stop10278"
+           style="stop-color:#9fcb40;stop-opacity:0"
+           offset="0.51819998" />
+      </radialGradient>
+      <path
+         d="m 193.461,84.163 c -1.109,-0.892 -2.734,-0.715 -3.63,0.395 l -4.544,5.647 c 0.824,1.958 2.123,3.543 3.872,4.553 l 4.825,-7.132 c 0.741,-1.102 0.532,-2.615 -0.523,-3.463 z"
+         id="path2790"
+         style="opacity:0.51999996;fill:url(#SVGID_142_)" />
+      <g
+         id="g2792">
+        <g
+           id="g2794">
+          <radialGradient
+             cx="176.45711"
+             cy="1010.1426"
+             r="13.5566"
+             id="radialGradient10283"
+             gradientUnits="userSpaceOnUse"
+             gradientTransform="translate(24,-933)">
+            <stop
+               id="stop10285"
+               style="stop-color:#d5e2ee;stop-opacity:1"
+               offset="0.77579999" />
+            <stop
+               id="stop10287"
+               style="stop-color:#d1dfed;stop-opacity:1"
+               offset="0.82630002" />
+            <stop
+               id="stop10289"
+               style="stop-color:#c7d6e8;stop-opacity:1"
+               offset="0.8714" />
+            <stop
+               id="stop10291"
+               style="stop-color:#b4c6e1;stop-opacity:1"
+               offset="0.91439998" />
+            <stop
+               id="stop10293"
+               style="stop-color:#9bb0d8;stop-opacity:1"
+               offset="0.9562" />
+            <stop
+               id="stop10295"
+               style="stop-color:#7a95cb;stop-opacity:1"
+               offset="0.99680001" />
+            <stop
+               id="stop10297"
+               style="stop-color:#7792ca;stop-opacity:1"
+               offset="1" />
+          </radialGradient>
+          <circle
+             cx="200.457"
+             cy="77.141998"
+             r="13.557"
+             id="circle2811"
+             style="fill:url(#SVGID_143_)" />
+          <path
+             d="m 214.794,77.162 c -0.04,3.722 -1.66,7.422 -4.323,9.994 -2.652,2.597 -6.277,4.138 -10.03,4.167 -3.689,0.059 -7.425,-1.446 -10.111,-4.056 -2.71,-2.605 -4.342,-6.299 -4.381,-10.151 -0.031,-1.844 0.314,-3.799 1.02,-5.563 0.712,-1.775 1.79,-3.403 3.133,-4.769 2.688,-2.747 6.475,-4.379 10.386,-4.328 3.799,-0.026 7.635,1.662 10.254,4.404 2.658,2.731 4.141,6.526 4.054,10.283 v 0.019 h -0.002 z m -1.562,-0.02 c -0.053,-3.354 -1.496,-6.615 -3.885,-8.891 -1.189,-1.139 -2.6,-2.044 -4.113,-2.642 -1.539,-0.594 -3.113,-0.894 -4.805,-0.897 -3.2,0.018 -6.468,1.312 -8.787,3.613 -2.333,2.3 -3.735,5.482 -3.791,8.839 -0.074,3.259 1.221,6.621 3.56,9.021 2.32,2.439 5.639,3.861 9.061,3.887 3.36,0.063 6.792,-1.321 9.143,-3.772 2.387,-2.435 3.691,-5.79 3.617,-9.179 v 0.021 l 0,0 z"
+             id="path2813"
+             style="fill:#39444f" />
+        </g>
+        <radialGradient
+           cx="289.0264"
+           cy="516.55182"
+           r="15.2356"
+           id="radialGradient10301"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.9525,0.3046,-0.3046,0.9525,81.9305,-503.3005)">
+          <stop
+             id="stop10303"
+             style="stop-color:#0b1929;stop-opacity:0"
+             offset="0.41209999" />
+          <stop
+             id="stop10305"
+             style="stop-color:#0a1827;stop-opacity:0.53789997"
+             offset="0.58490002" />
+          <stop
+             id="stop10307"
+             style="stop-color:#091420;stop-opacity:0.7317"
+             offset="0.64719999" />
+          <stop
+             id="stop10309"
+             style="stop-color:#060d15;stop-opacity:0.86940002"
+             offset="0.69139999" />
+          <stop
+             id="stop10311"
+             style="stop-color:#010204;stop-opacity:0.98030001"
+             offset="0.727" />
+          <stop
+             id="stop10313"
+             style="stop-color:#000000;stop-opacity:1"
+             offset="0.73329997" />
+          <stop
+             id="stop10315"
+             style="stop-color:#03080d;stop-opacity:0.61080003"
+             offset="0.78759998" />
+          <stop
+             id="stop10317"
+             style="stop-color:#0b1929;stop-opacity:0"
+             offset="0.87269998" />
+        </radialGradient>
+        <circle
+           cx="200.32001"
+           cy="76.078003"
+           r="14.641"
+           id="circle2832"
+           style="opacity:0.36000001;fill:url(#SVGID_144_)" />
+        <radialGradient
+           cx="177.8701"
+           cy="1001.8135"
+           r="20.998199"
+           id="radialGradient10320"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="translate(24,-933)">
+          <stop
+             id="stop10322"
+             style="stop-color:#b4cb80;stop-opacity:0"
+             offset="0.33329999" />
+          <stop
+             id="stop10324"
+             style="stop-color:#60bd71;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <circle
+           cx="200.457"
+           cy="76.994003"
+           r="13.557"
+           id="circle2839"
+           style="opacity:0.62000002;fill:url(#SVGID_145_)" />
+        <radialGradient
+           cx="176.45799"
+           cy="1009.9941"
+           r="13.5571"
+           id="radialGradient10327"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="translate(24,-933)">
+          <stop
+             id="stop10329"
+             style="stop-color:#9fcb40;stop-opacity:0"
+             offset="0.33329999" />
+          <stop
+             id="stop10331"
+             style="stop-color:#458691;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <circle
+           cx="200.45799"
+           cy="76.994003"
+           r="13.557"
+           id="circle2846"
+           style="opacity:0.62000002;fill:url(#SVGID_146_)" />
+        <path
+           d="m 188.342,75.319 c 0.777,-5.876 5.159,-9.919 10.869,-10.466 5.71,-0.543 10.938,3.484 12.855,7.971 -3.979,-5.463 -9.455,-6.808 -12.888,-6.339 -3.432,0.469 -7.614,1.092 -10.836,8.834 z"
+           id="path2848"
+           style="opacity:0.36000001;fill:#f2f6fa" />
+        <path
+           d="m 187.036,79.072 c -0.711,-7.443 4.418,-14.444 11.865,-15.156 7.445,-0.709 12.431,3.454 14.832,10.312 -3.551,-7.558 -13.217,-7.715 -16.026,-7.04 -6.259,1.5 -8.942,6.106 -10.671,11.884 z"
+           id="path2850"
+           style="opacity:0.11000001;fill:#ebf7fd" />
+        <path
+           d="m 188.639,80.79 c -2.527,-9.707 3.025,-16.105 10.28,-16.799 7.253,-0.691 13.987,4.871 14.812,12.916 -3.186,-11.793 -13.18,-11.487 -15.9,-10.757 -5.136,1.37 -10.037,2.882 -9.192,14.64 z"
+           id="path2852"
+           style="opacity:0.22000002;fill:#ebf7fd" />
+        <radialGradient
+           cx="174.40919"
+           cy="1093.7969"
+           r="7.2284999"
+           id="radialGradient10337"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(1,0,0,0.9207,24,-936.5648)">
+          <stop
+             id="stop10339"
+             style="stop-color:#eef8fb;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop10341"
+             style="stop-color:#ecf7fa;stop-opacity:0.491"
+             offset="0.509" />
+          <stop
+             id="stop10343"
+             style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+             offset="0.69239998" />
+          <stop
+             id="stop10345"
+             style="stop-color:#daf0f4;stop-opacity:0.177"
+             offset="0.82300001" />
+          <stop
+             id="stop10347"
+             style="stop-color:#c9e9ef;stop-opacity:0.0721"
+             offset="0.92790002" />
+          <stop
+             id="stop10349"
+             style="stop-color:#b8e2e9;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 205.637,70.492 c 0,3.678 -3.236,6.658 -7.227,6.658 -3.995,0 -7.229,-2.98 -7.229,-6.658 0,-3.672 3.235,-6.654 7.229,-6.654 3.99,0 7.227,2.982 7.227,6.654 z"
+           id="path2867"
+           style="opacity:0.5;fill:url(#SVGID_147_)" />
+        <radialGradient
+           cx="174.4082"
+           cy="1092.8691"
+           r="5.2909999"
+           id="radialGradient10352"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(1,0,0,0.9207,24,-936.5648)">
+          <stop
+             id="stop10354"
+             style="stop-color:#eef8fb;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop10356"
+             style="stop-color:#ecf7fa;stop-opacity:0.491"
+             offset="0.509" />
+          <stop
+             id="stop10358"
+             style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+             offset="0.69239998" />
+          <stop
+             id="stop10360"
+             style="stop-color:#daf0f4;stop-opacity:0.177"
+             offset="0.82300001" />
+          <stop
+             id="stop10362"
+             style="stop-color:#c9e9ef;stop-opacity:0.0721"
+             offset="0.92790002" />
+          <stop
+             id="stop10364"
+             style="stop-color:#b8e2e9;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <ellipse
+           cx="198.408"
+           cy="69.639"
+           rx="5.29"
+           ry="4.8730001"
+           id="ellipse2882"
+           style="fill:url(#SVGID_148_)" />
+        <radialGradient
+           cx="174.0713"
+           cy="1001.5869"
+           r="3.6104"
+           id="radialGradient10367"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="translate(24,-933)">
+          <stop
+             id="stop10369"
+             style="stop-color:#eef8fb;stop-opacity:1"
+             offset="0.2667" />
+          <stop
+             id="stop10371"
+             style="stop-color:#edf7f8;stop-opacity:0.80159998"
+             offset="0.4122" />
+          <stop
+             id="stop10373"
+             style="stop-color:#e9f5ee;stop-opacity:0.65249997"
+             offset="0.52149999" />
+          <stop
+             id="stop10375"
+             style="stop-color:#e2f1de;stop-opacity:0.51959997"
+             offset="0.61900002" />
+          <stop
+             id="stop10377"
+             style="stop-color:#d8ecc7;stop-opacity:0.396"
+             offset="0.70959997" />
+          <stop
+             id="stop10379"
+             style="stop-color:#cce4aa;stop-opacity:0.2789"
+             offset="0.79540002" />
+          <stop
+             id="stop10381"
+             style="stop-color:#bcdc86;stop-opacity:0.16670001"
+             offset="0.87769997" />
+          <stop
+             id="stop10383"
+             style="stop-color:#abd25b;stop-opacity:0.0604"
+             offset="0.95569998" />
+          <stop
+             id="stop10385"
+             style="stop-color:#9fcb40;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <circle
+           cx="198.071"
+           cy="68.586998"
+           r="3.6099999"
+           id="circle2903"
+           style="fill:url(#SVGID_149_)" />
+        <circle
+           cx="197.879"
+           cy="67.361"
+           r="1.419"
+           id="circle2905"
+           style="opacity:0.62000002;fill:#ffffff" />
+        <radialGradient
+           cx="-257.7392"
+           cy="1112.8301"
+           r="4.9822001"
+           id="radialGradient10389"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(1.1333,-0.416,0.3445,0.9387,114.2,-1067.6246)">
+          <stop
+             id="stop10391"
+             style="stop-color:#46c3d6;stop-opacity:0.74000001"
+             offset="0.2667" />
+          <stop
+             id="stop10393"
+             style="stop-color:#48c3d3;stop-opacity:0.57990003"
+             offset="0.4253" />
+          <stop
+             id="stop10395"
+             style="stop-color:#4dc4c9;stop-opacity:0.45969999"
+             offset="0.54439998" />
+          <stop
+             id="stop10397"
+             style="stop-color:#57c5b9;stop-opacity:0.35249999"
+             offset="0.65069997" />
+          <stop
+             id="stop10399"
+             style="stop-color:#65c6a2;stop-opacity:0.2529"
+             offset="0.74940002" />
+          <stop
+             id="stop10401"
+             style="stop-color:#76c785;stop-opacity:0.1584"
+             offset="0.84299999" />
+          <stop
+             id="stop10403"
+             style="stop-color:#8bc961;stop-opacity:0.0692"
+             offset="0.9314" />
+          <stop
+             id="stop10405"
+             style="stop-color:#9fcb40;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 211.123,82.118 c 0.952,2.588 -0.811,5.612 -3.932,6.759 -3.123,1.146 -6.426,-0.022 -7.375,-2.608 -0.952,-2.583 0.81,-5.61 3.934,-6.757 3.124,-1.145 6.427,0.023 7.373,2.606 z"
+           id="path2924"
+           style="opacity:0.51999996;fill:url(#SVGID_150_)" />
+        <path
+           d="m 208.698,86.228 c 0.21,0.395 0.296,0.83 0.278,1.272 -1.479,1.504 -4.945,2.8 -6.896,2.921 -0.141,-0.151 -0.257,-0.319 -0.354,-0.505 -0.785,-1.483 0.14,-3.511 2.063,-4.53 1.927,-1.02 4.125,-0.642 4.909,0.842 z"
+           id="path2926"
+           style="opacity:0.31999996;fill:#ffffff" />
+        <radialGradient
+           cx="525.13177"
+           cy="616.58301"
+           r="4.8049002"
+           id="radialGradient10409"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.9318,0.6706,-0.4608,0.6403,-12.1767,-661.0315)">
+          <stop
+             id="stop10411"
+             style="stop-color:#1d3c6e;stop-opacity:0.36000001"
+             offset="0.44240001" />
+          <stop
+             id="stop10413"
+             style="stop-color:#1e3c6e;stop-opacity:0.36379999"
+             offset="0.44400001" />
+          <stop
+             id="stop10415"
+             style="stop-color:#3c4f6c;stop-opacity:0.53109998"
+             offset="0.51209998" />
+          <stop
+             id="stop10417"
+             style="stop-color:#525d6a;stop-opacity:0.6954"
+             offset="0.579" />
+          <stop
+             id="stop10419"
+             style="stop-color:#5f6569;stop-opacity:0.85390002"
+             offset="0.64349997" />
+          <stop
+             id="stop10421"
+             style="stop-color:#636869;stop-opacity:1"
+             offset="0.70300001" />
+          <stop
+             id="stop10423"
+             style="stop-color:#5c8b8a;stop-opacity:0.57340002"
+             offset="0.79869998" />
+          <stop
+             id="stop10425"
+             style="stop-color:#51c1bc;stop-opacity:0"
+             offset="0.92729998" />
+        </radialGradient>
+        <path
+           d="m 197.868,89.985 c -1.307,1.818 -3.696,1.133 -6.427,-0.832 -2.732,-1.965 -2.6,-3.167 -3.461,-6.286 -0.592,-2.144 4.582,-1.697 7.313,0.269 2.729,1.965 3.884,5.032 2.575,6.849 z"
+           id="path2945"
+           style="opacity:0.18999999;fill:url(#SVGID_151_)" />
+        <radialGradient
+           cx="604.19531"
+           cy="1143.8135"
+           r="9.2593002"
+           id="radialGradient10428"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.9164,0.4002,-0.4002,0.9164,101.5593,-1206.0709)">
+          <stop
+             id="stop10430"
+             style="stop-color:#040506;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop10432"
+             style="stop-color:#050709;stop-opacity:1"
+             offset="0.3195" />
+          <stop
+             id="stop10434"
+             style="stop-color:#070c13;stop-opacity:1"
+             offset="0.55989999" />
+          <stop
+             id="stop10436"
+             style="stop-color:#0a1523;stop-opacity:1"
+             offset="0.77380002" />
+          <stop
+             id="stop10438"
+             style="stop-color:#0b1929;stop-opacity:1"
+             offset="0.83639997" />
+          <stop
+             id="stop10440"
+             style="stop-color:#23474c;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 210.564,83.87 c -2.916,5.161 -9.326,7.495 -15.003,5.017 -5.676,-2.48 -8.992,-8.646 -7.346,-13.621 -0.468,6.902 5.656,10.99 7.837,11.994 5.531,2.546 10.856,0 14.512,-3.39 z"
+           id="path2960"
+           style="opacity:0.41999996;fill:url(#SVGID_152_)" />
+        <path
+           d="m 211.736,82.878 c -2.176,5.519 -8.438,8.683 -14.729,6.962 -6.293,-1.722 -10.673,-7.431 -9.785,-12.598 -0.652,7.408 7.752,11.403 10.19,12.073 5.27,1.449 11.723,-0.664 14.324,-6.437 z"
+           id="path2962"
+           style="opacity:0.54000005;fill:#ffffff" />
+        <radialGradient
+           cx="670.38177"
+           cy="507.44141"
+           r="1.2996"
+           id="radialGradient10444"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.7921,0.6103,-0.6103,0.7921,-12.4576,-743.2179)">
+          <stop
+             id="stop10446"
+             style="stop-color:#040506;stop-opacity:1"
+             offset="0" />
+          <stop
+             id="stop10448"
+             style="stop-color:#050709;stop-opacity:1"
+             offset="0.3195" />
+          <stop
+             id="stop10450"
+             style="stop-color:#070c13;stop-opacity:1"
+             offset="0.55989999" />
+          <stop
+             id="stop10452"
+             style="stop-color:#0a1523;stop-opacity:1"
+             offset="0.77380002" />
+          <stop
+             id="stop10454"
+             style="stop-color:#0b1929;stop-opacity:1"
+             offset="0.83639997" />
+          <stop
+             id="stop10456"
+             style="stop-color:#23474c;stop-opacity:1"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 210.177,68.873 c -0.272,0.351 -1.077,0.189 -1.801,-0.37 -0.722,-0.555 -1.087,-1.293 -0.815,-1.644 0.271,-0.353 1.08,-0.189 1.801,0.37 0.719,0.554 1.083,1.292 0.815,1.644 z"
+           id="path2977"
+           style="opacity:0.18999999;fill:url(#SVGID_153_)" />
+        <radialGradient
+           cx="495.47559"
+           cy="88.252998"
+           r="8.9664001"
+           id="radialGradient10459"
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(0.7838,0.621,-0.5116,0.6457,-149.5511,-279.8802)">
+          <stop
+             id="stop10461"
+             style="stop-color:#040506;stop-opacity:0.85000002"
+             offset="0" />
+          <stop
+             id="stop10463"
+             style="stop-color:#0b1929;stop-opacity:0.51999998"
+             offset="0.5273" />
+          <stop
+             id="stop10465"
+             style="stop-color:#132935;stop-opacity:0.30559999"
+             offset="0.72219998" />
+          <stop
+             id="stop10467"
+             style="stop-color:#23474c;stop-opacity:0"
+             offset="1" />
+        </radialGradient>
+        <path
+           d="m 204.773,89.556 c -1.479,2.081 -9.792,0.143 -12.792,-1.992 -3.009,-2.116 -6.564,-8.478 -5.084,-10.57 1.469,-2.087 8.507,-0.302 11.509,1.827 3.001,2.119 7.841,8.645 6.367,10.735 z"
+           id="path2988"
+           style="opacity:0.22999998;fill:url(#SVGID_154_)" />
+      </g>
+      <radialGradient
+         cx="-1247.3779"
+         cy="1117.417"
+         r="2.1424"
+         id="radialGradient10470"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(0.2687,-0.9632,0.7107,0.1982,-302.0964,-1294.5463)">
+        <stop
+           id="stop10472"
+           style="stop-color:#eef8fb;stop-opacity:1"
+           offset="0" />
+        <stop
+           id="stop10474"
+           style="stop-color:#ecf7fa;stop-opacity:0.491"
+           offset="0.509" />
+        <stop
+           id="stop10476"
+           style="stop-color:#e5f4f8;stop-opacity:0.30759999"
+           offset="0.69239998" />
+        <stop
+           id="stop10478"
+           style="stop-color:#daf0f4;stop-opacity:0.177"
+           offset="0.82300001" />
+        <stop
+           id="stop10480"
+           style="stop-color:#c9e9ef;stop-opacity:0.0721"
+           offset="0.92790002" />
+        <stop
+           id="stop10482"
+           style="stop-color:#b8e2e9;stop-opacity:0"
+           offset="1" />
+      </radialGradient>
+      <path
+         d="m 157.539,126.247 c 0.804,0.223 1.081,1.53 0.841,2.393 -0.354,1.264 -1.394,2.078 -2.327,1.817 -0.28,-0.078 -0.938,-0.733 -0.803,-1.796 0.377,-2.032 1.666,-2.588 2.289,-2.414 z"
+         id="path3003"
+         style="opacity:0.62999998;fill:url(#SVGID_155_)" />
+      <polygon
+         points="200.022,120.674 156.318,148.664 200.022,122.255 "
+         id="polygon3005"
+         style="fill:#ffffff" />
+      <path
+         d="m 155.934,150.469 c 1.24,1.764 3.683,0.311 3.683,0.311 l 45.129,-23.217 -1.529,-1.342 -43.683,24.33 c 0,-0.005 -2.089,1.325 -3.6,-0.082 z"
+         id="path3007"
+         style="fill:#ffffff" />
+      <linearGradient
+         x1="4384.4502"
+         y1="-1276.5322"
+         x2="4367.8047"
+         y2="-1327.8422"
+         id="linearGradient10487"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(-0.0843,0.3112,-0.6769,0.3248,-333.9066,-802.8984)">
+        <stop
+           id="stop10489"
+           style="stop-color:#141a2b;stop-opacity:0.54000002"
+           offset="0.1636" />
+        <stop
+           id="stop10491"
+           style="stop-color:#142f3a;stop-opacity:0.4488"
+           offset="0.3161" />
+        <stop
+           id="stop10493"
+           style="stop-color:#143e45;stop-opacity:0.34729999"
+           offset="0.486" />
+        <stop
+           id="stop10495"
+           style="stop-color:#14464b;stop-opacity:0.22669999"
+           offset="0.68769997" />
+        <stop
+           id="stop10497"
+           style="stop-color:#14494d;stop-opacity:0.04"
+           offset="1" />
+      </linearGradient>
+      <path
+         d="m 157.385,149.931 c -1.117,0.668 -1.348,-0.407 -1.44,-0.56 -0.09,-0.153 0.404,-0.697 1.524,-1.369 l 38.343,-23.465 7.874,-4.017 -6.49,4.968 -39.811,24.443 z"
+         id="path3020"
+         style="opacity:0.36000001;fill:url(#SVGID_156_)" />
+      <path
+         d="m 238.721,164.564 c 0,0.506 -65.954,1.689 -66.456,1.689 -0.501,0 -0.907,-0.406 -0.907,-0.916 0,-0.506 0.406,-0.915 0.907,-0.915 0.039,0 0.588,0.708 1.341,0.704 9.041,-0.037 65.115,-1.026 65.115,-0.562 z"
+         id="path3022"
+         style="fill:#ffffff" />
+      <path
+         d="m 198.876,203.088 c -0.311,0.398 -27.932,-19.713 -28.145,-19.878 0.156,-0.382 0.409,-0.614 0.72,-1.397 3.859,2.957 27.712,20.908 27.425,21.275 z"
+         id="path3024"
+         style="fill:#ffffff" />
+      <path
+         d="m 82.215,115.233 c 0.342,-0.372 23.256,19.933 23.455,20.116 -0.187,0.366 -0.454,0.499 -0.967,1.21 -3.608,-3.256 -22.804,-20.984 -22.488,-21.326 z"
+         id="path3026"
+         style="fill:#ffffff" />
+      <linearGradient
+         x1="-4795.7344"
+         y1="391.66409"
+         x2="-4804.9072"
+         y2="363.38809"
+         id="linearGradient10503"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(-0.1142,-0.2637,0.2148,-0.7179,-509.0133,-779.4001)">
+        <stop
+           id="stop10505"
+           style="stop-color:#141a2b;stop-opacity:0.54000002"
+           offset="0.1636" />
+        <stop
+           id="stop10507"
+           style="stop-color:#142f3a;stop-opacity:0.4488"
+           offset="0.3161" />
+        <stop
+           id="stop10509"
+           style="stop-color:#143e45;stop-opacity:0.34729999"
+           offset="0.486" />
+        <stop
+           id="stop10511"
+           style="stop-color:#14464b;stop-opacity:0.22669999"
+           offset="0.68769997" />
+        <stop
+           id="stop10513"
+           style="stop-color:#14494d;stop-opacity:0.04"
+           offset="1" />
+      </linearGradient>
+      <path
+         d="m 122.551,202.01 c 0.285,-1.271 0.977,-0.751 1.108,-0.723 0.13,0.029 0.134,0.752 -0.151,2.027 l -6.469,23.547 1.563,4.675 -2.844,-4.246 6.793,-25.28 z"
+         id="path3039"
+         style="opacity:0.36000001;fill:url(#SVGID_157_)" />
+      <path
+         d="m 70.754,215.016 c 0.335,0.379 33.987,-27.742 34.237,-27.965 0.25,-0.22 0.181,-0.705 -0.153,-1.085 -0.334,-0.379 -0.809,-0.508 -1.058,-0.286 -0.02,0.021 0.176,0.791 -0.202,1.119 -4.535,3.941 -33.132,27.867 -32.824,28.217 z"
+         id="path3041"
+         style="fill:#ffffff" />
+      <polygon
+         points="58.783,147.87 103.867,156.626 58.932,149.071 "
+         id="polygon3043"
+         style="fill:#ffffff" />
+      <path
+         d="m 105.23,158.889 c -0.04,3.258 -2.94,2.819 -2.94,2.819 l -44.499,-3.063 0.263,-1.646 44.172,4.333 c -0.001,-0.003 2.529,0.493 3.004,-2.443 z"
+         id="path3045"
+         style="fill:#ffffff" />
+      <linearGradient
+         x1="3956.2988"
+         y1="-393.34811"
+         x2="3941.5193"
+         y2="-438.90619"
+         id="linearGradient10519"
+         gradientUnits="userSpaceOnUse"
+         gradientTransform="matrix(0.2232,0.2328,0.7497,-0.0394,-488.028,-781.4999)">
+        <stop
+           id="stop10521"
+           style="stop-color:#141a2b;stop-opacity:0.54000002"
+           offset="0.1636" />
+        <stop
+           id="stop10523"
+           style="stop-color:#142f3a;stop-opacity:0.4488"
+           offset="0.3161" />
+        <stop
+           id="stop10525"
+           style="stop-color:#143e45;stop-opacity:0.34729999"
+           offset="0.486" />
+        <stop
+           id="stop10527"
+           style="stop-color:#14464b;stop-opacity:0.22669999"
+           offset="0.68769997" />
+        <stop
+           id="stop10529"
+           style="stop-color:#14494d;stop-opacity:0.04"
+           offset="1" />
+      </linearGradient>
+      <path
+         d="m 103.135,158.611 c 1.33,0.205 1.454,-0.521 1.454,-1.047 0,-0.588 -0.741,-0.904 -2.075,-1.114 l -45.86,-6.809 -1.122,0.047 0.496,2.175 47.107,6.748 z"
+         id="path3058"
+         style="opacity:0.36000001;fill:url(#SVGID_158_)" />
+    </g>
+  </g>
+</svg>
diff --git a/data/icons/local-xmpp.svg b/data/icons/local-xmpp.svg
new file mode 100644
index 000000000..fc5a7dc99
--- /dev/null
+++ b/data/icons/local-xmpp.svg
@@ -0,0 +1,16338 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg11300"
+   sodipodi:docname="local-xmpp.svg"
+   inkscape:export-xdpi="90.000000"
+   sodipodi:version="0.32"
+   inkscape:export-ydpi="90.000000"
+   inkscape:version="0.48.1 r9760"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/lapo/firewall.png"
+   x="0px"
+   y="0px"
+   width="400px"
+   height="300px"
+   viewBox="0 0 400 300"
+   enable-background="new 0 0 400 300"
+   xml:space="preserve"><metadata
+   id="metadata6355"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs6353" />
+<title
+   id="title4872">Firewall</title>
+<sodipodi:namedview
+   height="300px"
+   width="400px"
+   fill="#f57900"
+   stroke="#ef2929"
+   borderopacity="0.25490196"
+   showguides="false"
+   bordercolor="#666666"
+   inkscape:cx="192.11329"
+   inkscape:cy="180.78084"
+   showgrid="false"
+   pagecolor="#474747"
+   gridtolerance="10000"
+   inkscape:zoom="2"
+   inkscape:current-layer="layer2"
+   inkscape:pageshadow="2"
+   inkscape:pageopacity="0"
+   inkscape:grid-bbox="true"
+   inkscape:snap-grids="true"
+   inkscape:guide-bbox="true"
+   inkscape:document-units="px"
+   inkscape:window-height="840"
+   inkscape:window-y="26"
+   inkscape:window-width="1192"
+   inkscape:snap-nodes="false"
+   inkscape:showpageshadow="false"
+   inkscape:window-x="127"
+   inkscape:snap-bbox="true"
+   inkscape:object-nodes="true"
+   id="base"
+   inkscape:window-maximized="0">
+	
+		<inkscape:grid
+   type="xygrid"
+   empspacing="4"
+   spacingy="1px"
+   spacingx="1px"
+   enabled="true"
+   visible="true"
+   id="grid5883"
+   snapvisiblegridlinesonly="true">
+		</inkscape:grid>
+	
+		<inkscape:grid
+   type="xygrid"
+   color="#ff0000"
+   empopacity="0.25098039"
+   empcolor="#ff0000"
+   empspacing="2"
+   spacingy="0.5px"
+   spacingx="0.5px"
+   opacity="0.1254902"
+   enabled="false"
+   visible="true"
+   id="grid11592"
+   snapvisiblegridlinesonly="true">
+		</inkscape:grid>
+	<sodipodi:guide
+   position="309.8125,173.625"
+   orientation="-0.70710678,0.70710678"
+   id="guide9630" />
+</sodipodi:namedview>
+<g
+   id="layer1"
+   inkscape:label="artwork"
+   inkscape:groupmode="layer"
+   display="none"
+   style="display:none">
+	<g
+   id="layer2"
+   inkscape:label="baseplate"
+   inkscape:groupmode="layer"
+   display="inline"
+   style="display:none">
+		<rect
+   id="rect6284"
+   x="296.06299"
+   y="51.995998"
+   inkscape:label="48x48"
+   width="48"
+   height="48"
+   style="fill:#353535">
+		</rect>
+		<rect
+   id="rect6592"
+   x="296.06299"
+   y="127.996"
+   inkscape:label="32x32"
+   width="32"
+   height="32"
+   style="fill:#353535">
+		</rect>
+		<rect
+   id="rect5028"
+   x="296.06299"
+   y="178"
+   inkscape:label="24x24"
+   width="24"
+   height="24"
+   style="fill:#353535">
+		</rect>
+		<rect
+   id="rect6833"
+   x="296.06299"
+   y="221"
+   inkscape:label="16x16"
+   width="16"
+   height="16"
+   style="fill:#353535">
+		</rect>
+		<text
+   transform="translate(31.8706,18.8604)"
+   font-size="18"
+   id="text14"
+   style="font-size:18px;font-family:ArialMT"
+   inkscape:label="context">apps</text>
+
+		<text
+   font-size="18"
+   id="text16"
+   style="font-size:18px;font-family:Arial-BoldMT"
+   x="253.37109"
+   y="18.860399"
+   inkscape:label="icon-name">local-xmpp</text>
+
+		
+			<rect
+   id="rect6282"
+   x="20"
+   y="32"
+   inkscape:label="256x256"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   width="256"
+   height="256"
+   style="fill:#353535">
+		</rect>
+	</g>
+	<g
+   id="layer4"
+   inkscape:label="smallsizes"
+   inkscape:groupmode="layer"
+   display="inline"
+   style="display:inline">
+		<g
+   id="g6154"
+   transform="matrix(1.25,0,0,1.25,-78,-47.25)">
+		</g>
+	</g>
+	<g
+   id="layer5"
+   inkscape:label="hires"
+   inkscape:groupmode="layer"
+   display="inline"
+   style="display:inline">
+		<g
+   id="g8198"
+   transform="matrix(5.0928038,0,0,2.2388776,20.301687,129.4805)"
+   style="opacity:0.4">
+		</g>
+		<g
+   id="g8230"
+   transform="matrix(4.8890868,0,0,4.8890868,322.06038,251.81989)"
+   inkscape:label="base">
+		</g>
+		
+			<path
+   id="path5171-2"
+   inkscape:radius="-1.0153296"
+   sodipodi:type="inkscape:offset"
+   inkscape:original="M 711.96875 227 C 709.68001 227.00001 707.67461 227.86289 706.5 229.1875 L 706.5 231.625 C 706.5 232.11623 706.8838 232.5 707.375 232.5 L 716.625 232.5 C 717.11622 232.50001 717.5 232.11622 717.5 231.625 L 717.5 229.25 C 716.33242 227.89578 714.28785 227 711.96875 227 z "
+   enable-background="new    "
+   d="m 711.96875,228 c -1.90789,1e-5 -3.49694,0.75848 -4.46875,1.71875 l 0,1.78125 9,0 0,-1.75 c -0.96562,-0.98703 -2.59089,-1.75 -4.53125,-1.75 z"
+   style="opacity:0.35;fill:none;stroke:#ffffff" />
+	</g>
+</g>
+<g
+   id="g25">
+	<g
+   id="g27">
+		<g
+   id="g29">
+			
+				<radialGradient
+   id="SVGID_1_"
+   cx="197.0293"
+   cy="1131.0117"
+   r="11.6563"
+   gradientTransform="matrix(0.9999 0.017 -0.017 0.9999 26.0318 -927.0317)"
+   gradientUnits="userSpaceOnUse">
+				<stop
+   offset="0.7758"
+   style="stop-color:#D5E2EE"
+   id="stop32" />
+				<stop
+   offset="0.8263"
+   style="stop-color:#D1DFED"
+   id="stop34" />
+				<stop
+   offset="0.8714"
+   style="stop-color:#C7D6E8"
+   id="stop36" />
+				<stop
+   offset="0.9144"
+   style="stop-color:#B4C6E1"
+   id="stop38" />
+				<stop
+   offset="0.9562"
+   style="stop-color:#9BB0D8"
+   id="stop40" />
+				<stop
+   offset="0.9968"
+   style="stop-color:#7A95CB"
+   id="stop42" />
+				<stop
+   offset="1"
+   style="stop-color:#7792CA"
+   id="stop44" />
+			</radialGradient>
+			<circle
+   fill="url(#SVGID_1_)"
+   cx="203.814"
+   cy="207.215"
+   r="11.657"
+   id="circle46" />
+			<path
+   fill="#39444F"
+   d="M216.25,207.454c-0.1,3.221-1.568,6.397-3.914,8.577c-2.334,2.203-5.51,3.484-8.73,3.463     c-3.223,0.002-6.417-1.354-8.723-3.646c-2.318-2.296-3.689-5.519-3.674-8.873c-0.004-1.596,0.321-3.297,0.958-4.82     c0.643-1.529,1.604-2.936,2.792-4.104c2.377-2.354,5.693-3.724,9.104-3.615c3.301,0.03,6.617,1.57,8.85,3.998     c2.264,2.42,3.48,5.739,3.346,8.996L216.25,207.454z M214.689,207.398c-0.008-2.856-1.198-5.646-3.201-7.604     c-2.002-1.983-4.709-3.063-7.521-3.106c-2.701-0.025-5.494,1.016-7.495,2.93c-2.012,1.916-3.255,4.583-3.361,7.438     c-0.118,2.76,0.922,5.646,2.872,7.729c1.926,2.116,4.751,3.383,7.644,3.46c2.893,0.109,5.824-1.021,7.869-3.082     C213.559,213.117,214.707,210.283,214.689,207.398z"
+   id="path48" />
+		</g>
+		
+			<radialGradient
+   id="SVGID_2_"
+   cx="345.5869"
+   cy="625.376"
+   r="13.1022"
+   gradientTransform="matrix(0.9472 0.3208 -0.3208 0.9472 76.6095 -496.3437)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.4121"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop51" />
+			<stop
+   offset="0.5849"
+   style="stop-color:#0A1827;stop-opacity:0.5379"
+   id="stop53" />
+			<stop
+   offset="0.6472"
+   style="stop-color:#091420;stop-opacity:0.7317"
+   id="stop55" />
+			<stop
+   offset="0.6914"
+   style="stop-color:#060D15;stop-opacity:0.8694"
+   id="stop57" />
+			<stop
+   offset="0.727"
+   style="stop-color:#010204;stop-opacity:0.9803"
+   id="stop59" />
+			<stop
+   offset="0.7333"
+   style="stop-color:#000000"
+   id="stop61" />
+			<stop
+   offset="0.7876"
+   style="stop-color:#03080D;stop-opacity:0.6108"
+   id="stop63" />
+			<stop
+   offset="0.8727"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop65" />
+		</radialGradient>
+		<circle
+   opacity="0.36"
+   fill="url(#SVGID_2_)"
+   enable-background="new    "
+   cx="203.711"
+   cy="206.298"
+   r="12.588"
+   id="circle67" />
+		
+			<radialGradient
+   id="SVGID_3_"
+   cx="198.2637"
+   cy="1123.8535"
+   r="18.0535"
+   gradientTransform="matrix(0.9999 0.017 -0.017 0.9999 26.0318 -927.0317)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#B4CB80;stop-opacity:0"
+   id="stop70" />
+			<stop
+   offset="1"
+   style="stop-color:#60BD71"
+   id="stop72" />
+		</radialGradient>
+		<path
+   opacity="0.62"
+   fill="url(#SVGID_3_)"
+   enable-background="new    "
+   d="M215.475,207.286    c-0.106,6.437-5.42,11.563-11.854,11.455c-6.436-0.11-11.566-5.416-11.457-11.853c0.11-6.438,5.417-11.566,11.854-11.457    C210.451,195.542,215.582,200.85,215.475,207.286z"
+   id="path74" />
+		
+			<radialGradient
+   id="SVGID_4_"
+   cx="197.0293"
+   cy="1130.8838"
+   r="11.6563"
+   gradientTransform="matrix(0.9999 0.017 -0.017 0.9999 26.0318 -927.0317)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#3FB1CB;stop-opacity:0"
+   id="stop77" />
+			<stop
+   offset="1"
+   style="stop-color:#456C90"
+   id="stop79" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_4_)"
+   enable-background="new    "
+   cx="203.816"
+   cy="207.088"
+   r="11.656"
+   id="circle81" />
+		<path
+   opacity="0.36"
+   fill="#F2F6FA"
+   enable-background="new    "
+   d="M193.424,205.471c0.755-5.039,4.582-8.451,9.5-8.838    c4.916-0.383,9.354,3.155,10.936,7.04c-3.34-4.754-8.021-5.989-10.981-5.636C199.913,198.389,196.308,198.861,193.424,205.471z"
+   id="path83" />
+		<path
+   opacity="0.11"
+   fill="#EBF7FD"
+   enable-background="new    "
+   d="M192.248,208.678c-0.501-6.408,4.009-12.353,10.422-12.854    c6.408-0.501,10.637,3.15,12.598,9.08c-2.938-6.551-11.248-6.825-13.678-6.285C196.193,199.814,193.817,203.736,192.248,208.678z"
+   id="path85" />
+		<path
+   opacity="0.22"
+   fill="#EBF7FD"
+   enable-background="new    "
+   d="M193.601,210.18c-2.029-8.384,2.836-13.803,9.083-14.293    c6.248-0.486,11.955,4.393,12.547,11.321c-2.563-10.187-11.164-10.067-13.518-9.481    C197.282,198.83,193.045,200.057,193.601,210.18z"
+   id="path87" />
+		
+			<radialGradient
+   id="SVGID_5_"
+   cx="419.1524"
+   cy="645.2051"
+   r="4.543"
+   gradientTransform="matrix(1.0012 0.6747 -0.5589 0.8292 140.3358 -604.4919)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#46C3D6;stop-opacity:0.74"
+   id="stop90" />
+			<stop
+   offset="0.4253"
+   style="stop-color:#48C3D3;stop-opacity:0.5799"
+   id="stop92" />
+			<stop
+   offset="0.5444"
+   style="stop-color:#4DC4C9;stop-opacity:0.4597"
+   id="stop94" />
+			<stop
+   offset="0.6507"
+   style="stop-color:#57C5B9;stop-opacity:0.3525"
+   id="stop96" />
+			<stop
+   offset="0.7494"
+   style="stop-color:#65C6A2;stop-opacity:0.2529"
+   id="stop98" />
+			<stop
+   offset="0.843"
+   style="stop-color:#76C785;stop-opacity:0.1584"
+   id="stop100" />
+			<stop
+   offset="0.9314"
+   style="stop-color:#8BC961;stop-opacity:0.0692"
+   id="stop102" />
+			<stop
+   offset="1"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop104" />
+		</radialGradient>
+		<path
+   opacity="0.52"
+   fill="url(#SVGID_5_)"
+   enable-background="new    "
+   d="M203.934,216.38c-1.404,2.083-4.578,2.396-7.085,0.704    c-2.512-1.693-3.413-4.754-2.008-6.836c1.4-2.08,4.572-2.395,7.088-0.701C204.434,211.239,205.333,214.302,203.934,216.38z"
+   id="path106" />
+		<path
+   opacity="0.32"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M201.723,217.621c-0.168,0.345-0.43,0.624-0.744,0.835    c-1.792-0.271-4.44-2.037-5.502-3.329c0.036-0.176,0.092-0.342,0.171-0.503c0.639-1.295,2.515-1.674,4.197-0.847    C201.518,214.605,202.361,216.326,201.723,217.621z"
+   id="path108" />
+		
+			<radialGradient
+   id="SVGID_6_"
+   cx="57.8701"
+   cy="-1265.1826"
+   r="4.1327"
+   gradientTransform="matrix(-0.7523 0.8673 -0.5959 -0.5169 -515.0956 -502.9347)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.4424"
+   style="stop-color:#1D3C6E;stop-opacity:0.36"
+   id="stop111" />
+			<stop
+   offset="0.444"
+   style="stop-color:#1E3C6E;stop-opacity:0.3638"
+   id="stop113" />
+			<stop
+   offset="0.5121"
+   style="stop-color:#3C4F6C;stop-opacity:0.5311"
+   id="stop115" />
+			<stop
+   offset="0.579"
+   style="stop-color:#525D6A;stop-opacity:0.6954"
+   id="stop117" />
+			<stop
+   offset="0.6435"
+   style="stop-color:#5F6569;stop-opacity:0.8539"
+   id="stop119" />
+			<stop
+   offset="0.703"
+   style="stop-color:#636869"
+   id="stop121" />
+			<stop
+   offset="0.7987"
+   style="stop-color:#5C8B8A;stop-opacity:0.5734"
+   id="stop123" />
+			<stop
+   offset="0.9273"
+   style="stop-color:#51C1BC;stop-opacity:0"
+   id="stop125" />
+		</radialGradient>
+		<path
+   opacity="0.19"
+   fill="url(#SVGID_6_)"
+   enable-background="new    "
+   d="M191.48,205.023c-1.455-1.268-0.682-3.256,1.213-5.438    c1.895-2.188,2.914-1.981,5.652-2.478c1.883-0.34,1.098,4.058-0.799,6.242C195.65,205.535,192.936,206.285,191.48,205.023z"
+   id="path127" />
+		
+			<radialGradient
+   id="SVGID_7_"
+   cx="461.6992"
+   cy="-365.7695"
+   r="7.9543"
+   gradientTransform="matrix(-0.4207 0.9072 -0.9072 -0.4207 60.0593 -368.1773)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop130" />
+			<stop
+   offset="0.3195"
+   style="stop-color:#050709"
+   id="stop132" />
+			<stop
+   offset="0.5599"
+   style="stop-color:#070C13"
+   id="stop134" />
+			<stop
+   offset="0.7738"
+   style="stop-color:#0A1523"
+   id="stop136" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0B1929"
+   id="stop138" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C"
+   id="stop140" />
+		</radialGradient>
+		<path
+   opacity="0.39"
+   fill="url(#SVGID_7_)"
+   enable-background="new    "
+   d="M197.448,215.759    c-4.381-2.604-6.263-8.163-4.022-12.993c2.242-4.832,7.604-7.561,11.85-6.051c-5.918-0.537-9.549,4.649-10.458,6.506    C192.517,207.924,194.603,212.551,197.448,215.759z"
+   id="path142" />
+		<path
+   opacity="0.54"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M213.759,204.223c1.949,4.711,0.106,10.313-4.618,12.861    c-4.724,2.555-10.655,1.51-13.155-2.238c3.954,5.014,11.255,2.664,13.089,1.676C213.029,214.389,215.605,209.339,213.759,204.223z    "
+   id="path144" />
+		
+			<radialGradient
+   id="SVGID_8_"
+   cx="186.4336"
+   cy="-936.5327"
+   r="1.1189"
+   gradientTransform="matrix(-0.6237 0.7816 -0.7816 -0.6237 -403.3182 -515.8688)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop147" />
+			<stop
+   offset="0.3195"
+   style="stop-color:#050709"
+   id="stop149" />
+			<stop
+   offset="0.5599"
+   style="stop-color:#070C13"
+   id="stop151" />
+			<stop
+   offset="0.7738"
+   style="stop-color:#0A1523"
+   id="stop153" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0B1929"
+   id="stop155" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C"
+   id="stop157" />
+		</radialGradient>
+		<path
+   opacity="0.19"
+   fill="url(#SVGID_8_)"
+   enable-background="new    "
+   d="M211.507,215.068c-0.298-0.239-0.146-0.93,0.345-1.543    c0.486-0.611,1.127-0.916,1.426-0.676c0.304,0.232,0.146,0.93-0.344,1.541C212.443,215.001,211.807,215.307,211.507,215.068z"
+   id="path159" />
+		
+			<radialGradient
+   id="SVGID_9_"
+   cx="-829.5508"
+   cy="1166.4326"
+   r="10.9668"
+   gradientTransform="matrix(0.6235 -0.7818 0.7818 0.6235 -197.1253 -1173.7216)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop162" />
+			<stop
+   offset="0.5273"
+   style="stop-color:#0B1929;stop-opacity:0.52"
+   id="stop164" />
+			<stop
+   offset="0.7222"
+   style="stop-color:#132935;stop-opacity:0.3056"
+   id="stop166" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C;stop-opacity:0"
+   id="stop168" />
+		</radialGradient>
+		<path
+   opacity="0.7"
+   fill="url(#SVGID_9_)"
+   enable-background="new    "
+   d="M194.279,210.828    c-3.134-2.809-3.154-7.982,0.036-11.527c3.162-3.56,8.294-4.158,11.447-1.344c3.146,2.8,3.146,7.979-0.035,11.525    C202.559,213.029,197.427,213.636,194.279,210.828z"
+   id="path170" />
+		
+			<radialGradient
+   id="SVGID_10_"
+   cx="196.8731"
+   cy="1226.0996"
+   r="6.2148"
+   gradientTransform="matrix(0.9999 0.017 -0.0157 0.9206 26.0913 -930.5986)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop173" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop175" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop177" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop179" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop181" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop183" />
+		</radialGradient>
+		<path
+   opacity="0.5"
+   fill="url(#SVGID_10_)"
+   enable-background="new    "
+   d="M209.909,201.602    c-0.056,3.159-2.882,5.674-6.313,5.615c-3.432-0.057-6.17-2.667-6.115-5.828c0.054-3.158,2.878-5.674,6.312-5.613    C207.223,195.832,209.961,198.443,209.909,201.602z"
+   id="path185" />
+		
+			<radialGradient
+   id="SVGID_11_"
+   cx="196.3741"
+   cy="1224.7578"
+   r="4.5488"
+   gradientTransform="matrix(0.9999 0.017 -0.0157 0.9206 26.0913 -930.5986)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop188" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop190" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop192" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop194" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop196" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop198" />
+		</radialGradient>
+		<path
+   fill="url(#SVGID_11_)"
+   d="M207.766,200.33c-0.039,2.313-2.104,4.152-4.619,4.109c-2.512-0.041-4.518-1.951-4.479-4.27    c0.041-2.313,2.109-4.146,4.621-4.105C205.802,196.107,207.807,198.02,207.766,200.33z"
+   id="path200" />
+		
+			<radialGradient
+   id="SVGID_12_"
+   cx="196.1597"
+   cy="1123.4746"
+   r="3.0989"
+   gradientTransform="matrix(0.9999 0.017 -0.017 0.9999 26.0318 -927.0317)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#EEF8FB"
+   id="stop203" />
+			<stop
+   offset="0.4122"
+   style="stop-color:#EDF7F8;stop-opacity:0.8016"
+   id="stop205" />
+			<stop
+   offset="0.5215"
+   style="stop-color:#E9F5EE;stop-opacity:0.6525"
+   id="stop207" />
+			<stop
+   offset="0.619"
+   style="stop-color:#E2F1DE;stop-opacity:0.5196"
+   id="stop209" />
+			<stop
+   offset="0.7096"
+   style="stop-color:#D8ECC7;stop-opacity:0.396"
+   id="stop211" />
+			<stop
+   offset="0.7954"
+   style="stop-color:#CCE4AA;stop-opacity:0.2789"
+   id="stop213" />
+			<stop
+   offset="0.8777"
+   style="stop-color:#BCDC86;stop-opacity:0.1667"
+   id="stop215" />
+			<stop
+   offset="0.9557"
+   style="stop-color:#ABD25B;stop-opacity:0.0604"
+   id="stop217" />
+			<stop
+   offset="1"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop219" />
+		</radialGradient>
+		<circle
+   fill="url(#SVGID_12_)"
+   cx="203.053"
+   cy="199.665"
+   r="3.103"
+   id="circle221" />
+		<circle
+   opacity="0.62"
+   fill="#FFFFFF"
+   enable-background="new    "
+   cx="202.861"
+   cy="198.59"
+   r="1.219"
+   id="circle223" />
+		
+			<radialGradient
+   id="SVGID_13_"
+   cx="-899.3545"
+   cy="1250.8535"
+   r="4.0023"
+   gradientTransform="matrix(0.6377 -0.9894 0.791 0.5098 -216.9556 -1323.5928)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.5091"
+   style="stop-color:#C9DAF0;stop-opacity:0"
+   id="stop226" />
+			<stop
+   offset="0.5428"
+   style="stop-color:#CCDDF1;stop-opacity:0.3477"
+   id="stop228" />
+			<stop
+   offset="0.5702"
+   style="stop-color:#D6E4F4;stop-opacity:0.6307"
+   id="stop230" />
+			<stop
+   offset="0.5954"
+   style="stop-color:#E7F1FA;stop-opacity:0.8901"
+   id="stop232" />
+			<stop
+   offset="0.6061"
+   style="stop-color:#F1F9FD"
+   id="stop234" />
+			<stop
+   offset="0.6385"
+   style="stop-color:#D6EFF2;stop-opacity:0.9177"
+   id="stop236" />
+			<stop
+   offset="0.6939"
+   style="stop-color:#ADE1E2;stop-opacity:0.777"
+   id="stop238" />
+			<stop
+   offset="0.751"
+   style="stop-color:#8CD6D4;stop-opacity:0.6321"
+   id="stop240" />
+			<stop
+   offset="0.8092"
+   style="stop-color:#72CDC9;stop-opacity:0.4844"
+   id="stop242" />
+			<stop
+   offset="0.8689"
+   style="stop-color:#60C6C2;stop-opacity:0.3327"
+   id="stop244" />
+			<stop
+   offset="0.9312"
+   style="stop-color:#55C2BD;stop-opacity:0.1746"
+   id="stop246" />
+			<stop
+   offset="1"
+   style="stop-color:#51C1BC;stop-opacity:0"
+   id="stop248" />
+		</radialGradient>
+		<path
+   opacity="0.54"
+   fill="url(#SVGID_13_)"
+   enable-background="new    "
+   d="M202.284,199.682    c1.866,1.205,1.489,3.336-0.067,5.748c-1.554,2.412-2.707,2.275-5.565,2.99c-1.963,0.493-2.122-4.136-0.567-6.548    C197.642,199.457,200.416,198.477,202.284,199.682z"
+   id="path250" />
+		
+			<radialGradient
+   id="SVGID_14_"
+   cx="185.2437"
+   cy="1201.0166"
+   r="5.1918"
+   gradientTransform="matrix(0.9576 0.004 -0.004 0.952 26.6511 -939.7222)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop253" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop255" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop257" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop259" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop261" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop263" />
+		</radialGradient>
+		<path
+   opacity="0.5"
+   fill="url(#SVGID_14_)"
+   enable-background="new    "
+   d="M204.297,204.604c-0.01,2.082-1.287,3.861-3.102,4.619    c-0.608,0.256,1.101-7.013-1.96-6.453c-3.126,0.57-2.665,6.276-3.578,5.373c-0.921-0.918-1.489-2.184-1.483-3.582    c0.011-2.771,2.288-5.021,5.084-5.009C202.051,199.563,204.309,201.825,204.297,204.604z"
+   id="path265" />
+	</g>
+	<g
+   id="g267">
+		<g
+   id="g269">
+			
+				<radialGradient
+   id="SVGID_15_"
+   cx="326.1446"
+   cy="1002.1309"
+   r="12.7158"
+   gradientTransform="matrix(0.9687 0.2482 -0.2482 0.9687 47.035 -816.7146)"
+   gradientUnits="userSpaceOnUse">
+				<stop
+   offset="0.7758"
+   style="stop-color:#D5E2EE"
+   id="stop272" />
+				<stop
+   offset="0.8263"
+   style="stop-color:#D1DFED"
+   id="stop274" />
+				<stop
+   offset="0.8714"
+   style="stop-color:#C7D6E8"
+   id="stop276" />
+				<stop
+   offset="0.9144"
+   style="stop-color:#B4C6E1"
+   id="stop278" />
+				<stop
+   offset="0.9562"
+   style="stop-color:#9BB0D8"
+   id="stop280" />
+				<stop
+   offset="0.9968"
+   style="stop-color:#7A95CB"
+   id="stop282" />
+				<stop
+   offset="1"
+   style="stop-color:#7792CA"
+   id="stop284" />
+			</radialGradient>
+			<circle
+   fill="url(#SVGID_15_)"
+   cx="114.243"
+   cy="234.999"
+   r="12.712"
+   id="circle286" />
+			<path
+   fill="#39444F"
+   d="M127.31,238.368c-0.91,3.381-3.255,6.373-6.282,8.091c-3.025,1.743-6.685,2.302-10.111,1.455     c-3.374-0.805-6.43-3.046-8.272-6.05c-1.865-3.007-2.495-6.755-1.633-10.282c0.4-1.688,1.171-3.395,2.226-4.841     c1.064-1.455,2.428-2.688,3.974-3.622c3.096-1.881,6.935-2.488,10.498-1.523c3.471,0.864,6.578,3.313,8.323,6.424     c1.784,3.116,2.245,6.926,1.284,10.33l0,0L127.31,238.368z M125.799,237.957c0.724-3.047,0.169-6.326-1.467-8.932     c-0.814-1.303-1.874-2.443-3.109-3.334c-1.253-0.895-2.603-1.522-4.133-1.918c-2.888-0.727-6.139-0.313-8.766,1.227     c-2.639,1.537-4.644,4.08-5.476,7.104c-0.824,2.922-0.439,6.27,1.116,8.979c1.529,2.747,4.201,4.806,7.294,5.624     c3.023,0.84,6.455,0.385,9.152-1.292C123.129,243.764,125.081,241.035,125.799,237.957z"
+   id="path288" />
+		</g>
+		
+			<radialGradient
+   id="SVGID_16_"
+   cx="429.1719"
+   cy="463.3018"
+   r="14.2883"
+   gradientTransform="matrix(0.8471 0.5315 -0.5315 0.8471 -3.4861 -386.0533)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.4121"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop291" />
+			<stop
+   offset="0.5849"
+   style="stop-color:#0A1827;stop-opacity:0.5379"
+   id="stop293" />
+			<stop
+   offset="0.6472"
+   style="stop-color:#091420;stop-opacity:0.7317"
+   id="stop295" />
+			<stop
+   offset="0.6914"
+   style="stop-color:#060D15;stop-opacity:0.8694"
+   id="stop297" />
+			<stop
+   offset="0.727"
+   style="stop-color:#010204;stop-opacity:0.9803"
+   id="stop299" />
+			<stop
+   offset="0.7333"
+   style="stop-color:#000000"
+   id="stop301" />
+			<stop
+   offset="0.7876"
+   style="stop-color:#03080D;stop-opacity:0.6108"
+   id="stop303" />
+			<stop
+   offset="0.8727"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop305" />
+		</radialGradient>
+		<circle
+   opacity="0.36"
+   fill="url(#SVGID_16_)"
+   enable-background="new    "
+   cx="114.366"
+   cy="233.999"
+   r="13.728"
+   id="circle307" />
+		
+			<radialGradient
+   id="SVGID_17_"
+   cx="327.4825"
+   cy="994.3105"
+   r="19.6934"
+   gradientTransform="matrix(0.9687 0.2482 -0.2482 0.9687 47.035 -816.7146)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#B4CB80;stop-opacity:0"
+   id="stop310" />
+			<stop
+   offset="1"
+   style="stop-color:#60BD71"
+   id="stop312" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_17_)"
+   enable-background="new    "
+   cx="114.277"
+   cy="234.865"
+   r="12.712"
+   id="circle314" />
+		
+			<radialGradient
+   id="SVGID_18_"
+   cx="326.1436"
+   cy="1001.9922"
+   r="12.7153"
+   gradientTransform="matrix(0.9687 0.2482 -0.2482 0.9687 47.035 -816.7146)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#3FB1CB;stop-opacity:0"
+   id="stop317" />
+			<stop
+   offset="1"
+   style="stop-color:#456C90"
+   id="stop319" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_18_)"
+   enable-background="new    "
+   cx="114.276"
+   cy="234.864"
+   r="12.712"
+   id="circle321" />
+		<path
+   opacity="0.11"
+   fill="#EBF7FD"
+   enable-background="new    "
+   d="M101.718,233.407c1.086-6.927,7.374-12.093,14.303-11.007    c6.927,1.089,10.49,6.033,11.072,12.82c-1.466-7.693-10.208-10.091-12.922-10.132    C108.144,225.002,104.632,228.563,101.718,233.407z"
+   id="path323" />
+		<path
+   opacity="0.22"
+   fill="#EBF7FD"
+   enable-background="new    "
+   d="M101.752,236.422c0.206-9.501,7.219-14.711,13.972-13.652    c6.75,1.063,11.571,7.686,10.448,15.186c-0.147-11.454-9.297-13.441-11.943-13.479    C108.352,224.404,104.318,227.885,101.752,236.422z"
+   id="path325" />
+		
+			<radialGradient
+   id="SVGID_19_"
+   cx="91.043"
+   cy="1160.416"
+   r="13.8324"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop328" />
+			<stop
+   offset="0.5273"
+   style="stop-color:#0B1929;stop-opacity:0.52"
+   id="stop330" />
+			<stop
+   offset="0.7222"
+   style="stop-color:#132935;stop-opacity:0.3056"
+   id="stop332" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C;stop-opacity:0"
+   id="stop334" />
+		</radialGradient>
+		<path
+   opacity="0.7"
+   fill="url(#SVGID_19_)"
+   enable-background="new    "
+   d="M103.836,231.055    c0.305-5.298,5.391-9.387,11.394-9.029c6,0.32,10.626,4.908,10.33,10.23c-0.288,5.305-5.393,9.379-11.395,9.027    C108.178,240.948,103.544,236.369,103.836,231.055z"
+   id="path336" />
+		
+			<radialGradient
+   id="SVGID_20_"
+   cx="437.9317"
+   cy="677"
+   r="3.9558"
+   gradientTransform="matrix(0.996 0.6823 -0.5652 0.8249 55.119 -615.6229)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#B4DECF"
+   id="stop339" />
+			<stop
+   offset="0.4283"
+   style="stop-color:#B4DECC;stop-opacity:0.7796"
+   id="stop341" />
+			<stop
+   offset="0.5497"
+   style="stop-color:#B2DCC2;stop-opacity:0.6141"
+   id="stop343" />
+			<stop
+   offset="0.658"
+   style="stop-color:#B0DAB2;stop-opacity:0.4664"
+   id="stop345" />
+			<stop
+   offset="0.7585"
+   style="stop-color:#ACD79B;stop-opacity:0.3293"
+   id="stop347" />
+			<stop
+   offset="0.8538"
+   style="stop-color:#A8D37E;stop-opacity:0.1993"
+   id="stop349" />
+			<stop
+   offset="0.9439"
+   style="stop-color:#A3CE5A;stop-opacity:0.0764"
+   id="stop351" />
+			<stop
+   offset="1"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop353" />
+		</radialGradient>
+		<path
+   opacity="0.86"
+   fill="url(#SVGID_20_)"
+   enable-background="new    "
+   d="M112.619,244.35c-1.235,1.801-4,2.062-6.176,0.563    c-2.176-1.491-2.94-4.16-1.705-5.965c1.234-1.802,3.999-2.056,6.176-0.563C113.09,239.877,113.853,242.547,112.619,244.35z"
+   id="path355" />
+		<path
+   opacity="0.32"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M110.605,246.277c-0.082,0.218-0.221,0.404-0.399,0.549    c-1.101-0.053-2.812-0.956-3.535-1.674c0.011-0.106,0.035-0.213,0.074-0.313c0.305-0.821,1.417-1.167,2.484-0.771    C110.296,244.467,110.911,245.455,110.605,246.277z"
+   id="path357" />
+		
+			<radialGradient
+   id="SVGID_21_"
+   cx="-46.2158"
+   cy="1475.1348"
+   r="6.3043"
+   gradientTransform="matrix(1.1476 -0.0333 0.0226 0.7797 133.7359 -925.1971)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.5455"
+   style="stop-color:#1D3C6E;stop-opacity:0.36"
+   id="stop360" />
+			<stop
+   offset="0.569"
+   style="stop-color:#30486D;stop-opacity:0.433"
+   id="stop362" />
+			<stop
+   offset="0.6061"
+   style="stop-color:#46566B;stop-opacity:0.5484"
+   id="stop364" />
+			<stop
+   offset="0.6463"
+   style="stop-color:#56606A;stop-opacity:0.6733"
+   id="stop366" />
+			<stop
+   offset="0.6914"
+   style="stop-color:#606669;stop-opacity:0.8134"
+   id="stop368" />
+			<stop
+   offset="0.7515"
+   style="stop-color:#636869"
+   id="stop370" />
+			<stop
+   offset="1"
+   style="stop-color:#51C1BC;stop-opacity:0"
+   id="stop372" />
+		</radialGradient>
+		<path
+   opacity="0.19"
+   fill="url(#SVGID_21_)"
+   enable-background="new    "
+   d="M122.302,226.895c0.083,2.904-2.95,4.086-7.365,4.213    c-4.415,0.129-5.237-1.215-8.621-3.748c-2.325-1.74,3.427-5.358,7.84-5.487C118.571,221.736,122.218,223.99,122.302,226.895z"
+   id="path374" />
+		<path
+   opacity="0.49"
+   fill="#F2F6FA"
+   enable-background="new    "
+   d="M101.929,231.843c0.995-6.352,7.699-9.999,13.596-9.586    c5.842,0.408,11.568,6.604,11.485,11.063c-2.158-7.604-7.605-10.043-12.604-10.348    C108.126,222.587,103.981,227.402,101.929,231.843z"
+   id="path376" />
+		
+			<radialGradient
+   id="SVGID_22_"
+   cx="-29.956"
+   cy="1610.1816"
+   r="8.6612"
+   gradientTransform="matrix(0.9925 -0.1225 0.1225 0.9925 -52.6962 -1360.2935)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop379" />
+			<stop
+   offset="0.3195"
+   style="stop-color:#050709"
+   id="stop381" />
+			<stop
+   offset="0.5599"
+   style="stop-color:#070C13"
+   id="stop383" />
+			<stop
+   offset="0.7738"
+   style="stop-color:#0A1523"
+   id="stop385" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0B1929"
+   id="stop387" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C"
+   id="stop389" />
+		</radialGradient>
+		<path
+   opacity="0.12"
+   fill="url(#SVGID_22_)"
+   enable-background="new    "
+   d="M125.31,235.159    c0.111,5.558-3.949,10.502-9.712,11.214c-5.765,0.711-11.327-2.713-12.375-7.514c2.917,5.791,9.755,6.199,11.995,5.968    C120.896,244.24,123.978,239.641,125.31,235.159z"
+   id="path391" />
+		<path
+   opacity="0.75"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M125.986,235.954c0.082,5.562-4.221,10.536-10.292,11.285    c-6.071,0.75-11.903-2.644-12.975-7.438c2.076,6.657,10.787,7.129,13.139,6.84C120.941,246.022,125.786,241.889,125.986,235.954z"
+   id="path393" />
+		
+			<radialGradient
+   id="SVGID_23_"
+   cx="1378.8408"
+   cy="1000.8789"
+   r="1.634"
+   gradientTransform="matrix(0.9798 0.1996 -0.1234 0.6054 -1115.8159 -634.5699)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop396" />
+			<stop
+   offset="0.3195"
+   style="stop-color:#050709"
+   id="stop398" />
+			<stop
+   offset="0.5599"
+   style="stop-color:#070C13"
+   id="stop400" />
+			<stop
+   offset="0.7738"
+   style="stop-color:#0A1523"
+   id="stop402" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0B1929"
+   id="stop404" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C"
+   id="stop406" />
+		</radialGradient>
+		<path
+   opacity="0.23"
+   fill="url(#SVGID_23_)"
+   enable-background="new    "
+   d="M109.959,246.203    c0.115-0.469,0.981-0.654,1.937-0.419s1.636,0.803,1.521,1.271c-0.115,0.465-0.981,0.651-1.937,0.418    C110.524,247.236,109.843,246.667,109.959,246.203z"
+   id="path408" />
+		
+			<radialGradient
+   id="SVGID_24_"
+   cx="-3.7392"
+   cy="1224.8076"
+   r="5.185"
+   gradientTransform="matrix(1.2206 0.0051 -0.004 0.952 125.5627 -939.3163)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop411" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop413" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop415" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop417" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop419" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop421" />
+		</radialGradient>
+		<path
+   opacity="0.5"
+   fill="url(#SVGID_24_)"
+   enable-background="new    "
+   d="M122.551,226.919c-0.01,2.081-1.636,3.86-3.948,4.617    c-0.775,0.253,2.124-7.858-3.161-7.251c-4.009,0.461-2.737,7.068-3.9,6.162c-1.176-0.918-1.9-2.188-1.896-3.583    c0.012-2.775,2.911-5.019,6.474-5.005C119.683,221.875,122.562,224.143,122.551,226.919z"
+   id="path423" />
+		
+			<radialGradient
+   id="SVGID_25_"
+   cx="489.5684"
+   cy="655.8906"
+   r="2.9889"
+   gradientTransform="matrix(0.8906 0.6566 -0.5919 0.8029 69.4326 -623.5166)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop426" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop428" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop430" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop432" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop434" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop436" />
+		</radialGradient>
+		<path
+   opacity="0.52"
+   fill="url(#SVGID_25_)"
+   enable-background="new    "
+   d="M119.869,226.523    c-0.978,1.324-2.96,1.521-4.428,0.438c-1.468-1.083-1.867-3.034-0.89-4.357c0.975-1.317,2.956-1.521,4.426-0.437    C120.445,223.25,120.843,225.2,119.869,226.523z"
+   id="path438" />
+		<path
+   opacity="0.87"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M124.452,241.381c0.491-1.102,2.707-4.957,1.042-10.613    c-0.069-0.229,1.257,8.315-1.789,9.422c-0.772,0.279-1.831,0.498-1.846,1.317c-0.013,0.584,0.27,1.056,0.793,1.231    C123.431,243,124.117,242.136,124.452,241.381z"
+   id="path440" />
+		
+			<radialGradient
+   id="SVGID_26_"
+   cx="127.0777"
+   cy="1299.1113"
+   r="5.5641"
+   gradientTransform="matrix(1.1309 0.1977 -0.1343 0.7684 146.6669 -796.4049)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#C9DAF0;stop-opacity:0.17"
+   id="stop443" />
+			<stop
+   offset="0.2107"
+   style="stop-color:#CCDDF1;stop-opacity:0.4586"
+   id="stop445" />
+			<stop
+   offset="0.3822"
+   style="stop-color:#D6E4F4;stop-opacity:0.6934"
+   id="stop447" />
+			<stop
+   offset="0.5395"
+   style="stop-color:#E7F1FA;stop-opacity:0.9088"
+   id="stop449" />
+			<stop
+   offset="0.6061"
+   style="stop-color:#F1F9FD"
+   id="stop451" />
+			<stop
+   offset="0.6454"
+   style="stop-color:#CEEDEF;stop-opacity:0.9002"
+   id="stop453" />
+			<stop
+   offset="0.6966"
+   style="stop-color:#A8DFDF;stop-opacity:0.7701"
+   id="stop455" />
+			<stop
+   offset="0.75"
+   style="stop-color:#89D4D3;stop-opacity:0.6346"
+   id="stop457" />
+			<stop
+   offset="0.8053"
+   style="stop-color:#70CCC9;stop-opacity:0.4943"
+   id="stop459" />
+			<stop
+   offset="0.8632"
+   style="stop-color:#5FC6C2;stop-opacity:0.3472"
+   id="stop461" />
+			<stop
+   offset="0.9255"
+   style="stop-color:#54C2BD;stop-opacity:0.1891"
+   id="stop463" />
+			<stop
+   offset="1"
+   style="stop-color:#51C1BC;stop-opacity:0"
+   id="stop465" />
+		</radialGradient>
+		<path
+   opacity="0.54"
+   fill="url(#SVGID_26_)"
+   enable-background="new    "
+   d="M122.99,228.748    c-0.442,2.527-3.276,3.012-7.119,2.339c-3.84-0.671-4.315-1.978-6.792-4.771c-1.702-1.92,3.914-4.032,7.755-3.359    C120.677,223.627,123.432,226.221,122.99,228.748z"
+   id="path467" />
+	</g>
+	<g
+   id="g469">
+		<g
+   id="g471">
+			
+				<radialGradient
+   id="SVGID_27_"
+   cx="262.3155"
+   cy="893.6006"
+   r="12.7148"
+   gradientTransform="matrix(0.9687 0.2482 -0.2482 0.9687 47.035 -816.7146)"
+   gradientUnits="userSpaceOnUse">
+				<stop
+   offset="0.7758"
+   style="stop-color:#D5E2EE"
+   id="stop474" />
+				<stop
+   offset="0.8263"
+   style="stop-color:#D1DFED"
+   id="stop476" />
+				<stop
+   offset="0.8714"
+   style="stop-color:#C7D6E8"
+   id="stop478" />
+				<stop
+   offset="0.9144"
+   style="stop-color:#B4C6E1"
+   id="stop480" />
+				<stop
+   offset="0.9562"
+   style="stop-color:#9BB0D8"
+   id="stop482" />
+				<stop
+   offset="0.9968"
+   style="stop-color:#7A95CB"
+   id="stop484" />
+				<stop
+   offset="1"
+   style="stop-color:#7792CA"
+   id="stop486" />
+			</radialGradient>
+			<circle
+   fill="url(#SVGID_27_)"
+   cx="79.348"
+   cy="114.023"
+   r="12.712"
+   id="circle488" />
+			<path
+   fill="#39444F"
+   d="M92.415,117.392c-0.909,3.382-3.255,6.374-6.282,8.091c-3.025,1.743-6.684,2.303-10.111,1.456     c-3.374-0.804-6.429-3.046-8.272-6.05c-1.865-3.007-2.496-6.755-1.633-10.282c0.401-1.688,1.171-3.395,2.227-4.84     c1.064-1.455,2.428-2.689,3.974-3.623c3.083-1.884,6.962-2.48,10.469-1.531c3.527,0.879,6.595,3.313,8.352,6.432     c1.784,3.117,2.244,6.926,1.283,10.329L92.415,117.392z M90.904,116.984c0.725-3.048,0.17-6.328-1.466-8.935     c-1.615-2.632-4.275-4.499-7.214-5.245c-2.944-0.736-6.154-0.317-8.793,1.219c-2.64,1.537-4.644,4.08-5.477,7.103     c-0.825,2.923-0.439,6.265,1.116,8.98c1.529,2.747,4.201,4.805,7.294,5.626c3.023,0.839,6.455,0.383,9.152-1.293     c2.724-1.654,4.679-4.39,5.394-7.475L90.904,116.984z"
+   id="path490" />
+		</g>
+		
+			<radialGradient
+   id="SVGID_28_"
+   cx="335.3174"
+   cy="379.376"
+   r="14.2871"
+   gradientTransform="matrix(0.8471 0.5315 -0.5315 0.8471 -3.4861 -386.0533)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.4121"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop493" />
+			<stop
+   offset="0.5849"
+   style="stop-color:#0A1827;stop-opacity:0.5379"
+   id="stop495" />
+			<stop
+   offset="0.6472"
+   style="stop-color:#091420;stop-opacity:0.7317"
+   id="stop497" />
+			<stop
+   offset="0.6914"
+   style="stop-color:#060D15;stop-opacity:0.8694"
+   id="stop499" />
+			<stop
+   offset="0.727"
+   style="stop-color:#010204;stop-opacity:0.9803"
+   id="stop501" />
+			<stop
+   offset="0.7333"
+   style="stop-color:#000000"
+   id="stop503" />
+			<stop
+   offset="0.7876"
+   style="stop-color:#03080D;stop-opacity:0.6108"
+   id="stop505" />
+			<stop
+   offset="0.8727"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop507" />
+		</radialGradient>
+		<path
+   opacity="0.36"
+   fill="url(#SVGID_28_)"
+   enable-background="new    "
+   d="M91.099,120.319    c-4.03,6.423-12.502,8.363-18.925,4.333c-6.421-4.029-8.359-12.502-4.331-18.924c4.027-6.422,12.5-8.362,18.924-4.332    C93.188,105.425,95.127,113.897,91.099,120.319z"
+   id="path509" />
+		
+			<radialGradient
+   id="SVGID_29_"
+   cx="263.6504"
+   cy="885.7852"
+   r="19.6921"
+   gradientTransform="matrix(0.9687 0.2482 -0.2482 0.9687 47.035 -816.7146)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#B4CB80;stop-opacity:0"
+   id="stop512" />
+			<stop
+   offset="1"
+   style="stop-color:#60BD71"
+   id="stop514" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_29_)"
+   enable-background="new    "
+   cx="79.382"
+   cy="113.889"
+   r="12.712"
+   id="circle516" />
+		
+			<radialGradient
+   id="SVGID_30_"
+   cx="262.3164"
+   cy="893.4629"
+   r="12.7158"
+   gradientTransform="matrix(0.9687 0.2482 -0.2482 0.9687 47.035 -816.7146)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#3FB1CB;stop-opacity:0"
+   id="stop519" />
+			<stop
+   offset="1"
+   style="stop-color:#456C90"
+   id="stop521" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_30_)"
+   enable-background="new    "
+   cx="79.383"
+   cy="113.889"
+   r="12.713"
+   id="circle523" />
+		<path
+   opacity="0.11"
+   fill="#EBF7FD"
+   enable-background="new    "
+   d="M66.823,112.432c1.086-6.928,7.375-12.091,14.304-11.006    c6.927,1.089,10.49,6.032,11.073,12.82c-1.466-7.693-10.208-10.085-12.923-10.126C73.25,104.027,69.738,107.584,66.823,112.432z"
+   id="path525" />
+		<path
+   opacity="0.22"
+   fill="#EBF7FD"
+   enable-background="new    "
+   d="M66.858,115.446c0.205-9.501,7.22-14.712,13.973-13.655    c6.75,1.062,12.146,6.962,10.447,15.181c-0.147-11.453-9.259-11.628-11.904-11.659C73.497,105.244,69.423,106.91,66.858,115.446z"
+   id="path527" />
+		
+			<radialGradient
+   id="SVGID_31_"
+   cx="58.5659"
+   cy="1049.8984"
+   r="11.0627"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop530" />
+			<stop
+   offset="0.5273"
+   style="stop-color:#0B1929;stop-opacity:0.52"
+   id="stop532" />
+			<stop
+   offset="0.7222"
+   style="stop-color:#132935;stop-opacity:0.3056"
+   id="stop534" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C;stop-opacity:0"
+   id="stop536" />
+		</radialGradient>
+		<path
+   opacity="0.7"
+   fill="url(#SVGID_31_)"
+   enable-background="new    "
+   d="M74.863,124.994c-3.905-3.597-3.84-10.12,0.244-14.538    c4.052-4.435,10.534-5.103,14.461-1.498c3.918,3.586,3.831,10.117-0.245,14.537C85.267,127.911,78.785,128.588,74.863,124.994z"
+   id="path538" />
+		
+			<radialGradient
+   id="SVGID_32_"
+   cx="58.3701"
+   cy="1049.9414"
+   r="4.8829"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop541" />
+			<stop
+   offset="0.5273"
+   style="stop-color:#0B1929;stop-opacity:0.52"
+   id="stop543" />
+			<stop
+   offset="0.7222"
+   style="stop-color:#132935;stop-opacity:0.3056"
+   id="stop545" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C;stop-opacity:0"
+   id="stop547" />
+		</radialGradient>
+		<path
+   opacity="0.62"
+   fill="url(#SVGID_32_)"
+   enable-background="new    "
+   d="M78.97,120.515c-1.723-1.588-1.694-4.467,0.108-6.417    c1.79-1.958,4.649-2.252,6.384-0.661c1.729,1.583,1.69,4.465-0.109,6.416C83.562,121.803,80.702,122.101,78.97,120.515z"
+   id="path549" />
+		
+			<radialGradient
+   id="SVGID_33_"
+   cx="357.4551"
+   cy="596.916"
+   r="3.9574"
+   gradientTransform="matrix(0.996 0.6823 -0.5652 0.8249 55.119 -615.6229)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#26B481;stop-opacity:0.6"
+   id="stop552" />
+			<stop
+   offset="0.4392"
+   style="stop-color:#29B57F;stop-opacity:0.4588"
+   id="stop554" />
+			<stop
+   offset="0.5688"
+   style="stop-color:#33B67A;stop-opacity:0.3528"
+   id="stop556" />
+			<stop
+   offset="0.6843"
+   style="stop-color:#43B972;stop-opacity:0.2583"
+   id="stop558" />
+			<stop
+   offset="0.7917"
+   style="stop-color:#5ABE65;stop-opacity:0.1704"
+   id="stop560" />
+			<stop
+   offset="0.8934"
+   style="stop-color:#77C355;stop-opacity:0.0872"
+   id="stop562" />
+			<stop
+   offset="0.9896"
+   style="stop-color:#9BCA42;stop-opacity:0.0085"
+   id="stop564" />
+			<stop
+   offset="1"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop566" />
+		</radialGradient>
+		<path
+   opacity="0.52"
+   fill="url(#SVGID_33_)"
+   enable-background="new    "
+   d="M77.724,123.374c-1.235,1.802-4,2.056-6.176,0.565    c-2.177-1.493-2.94-4.163-1.706-5.965c1.234-1.802,4-2.056,6.177-0.564C78.196,118.901,78.959,121.57,77.724,123.374z"
+   id="path568" />
+		<path
+   opacity="0.32"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M75.711,125.303c-0.083,0.218-0.221,0.404-0.4,0.549    c-1.1-0.053-2.812-0.956-3.535-1.673c0.012-0.107,0.035-0.212,0.074-0.315c0.305-0.821,1.417-1.166,2.484-0.769    C75.401,123.49,76.017,124.48,75.711,125.303z"
+   id="path570" />
+		
+			<radialGradient
+   id="SVGID_34_"
+   cx="-73.3882"
+   cy="1333.8066"
+   r="6.3054"
+   gradientTransform="matrix(1.1476 -0.0333 0.0226 0.7797 133.3413 -938.8114)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.5455"
+   style="stop-color:#1D3C6E;stop-opacity:0.36"
+   id="stop573" />
+			<stop
+   offset="0.569"
+   style="stop-color:#30486D;stop-opacity:0.433"
+   id="stop575" />
+			<stop
+   offset="0.6061"
+   style="stop-color:#46566B;stop-opacity:0.5484"
+   id="stop577" />
+			<stop
+   offset="0.6463"
+   style="stop-color:#56606A;stop-opacity:0.6733"
+   id="stop579" />
+			<stop
+   offset="0.6914"
+   style="stop-color:#606669;stop-opacity:0.8134"
+   id="stop581" />
+			<stop
+   offset="0.7515"
+   style="stop-color:#636869"
+   id="stop583" />
+			<stop
+   offset="1"
+   style="stop-color:#51C1BC;stop-opacity:0"
+   id="stop585" />
+		</radialGradient>
+		<path
+   opacity="0.19"
+   fill="url(#SVGID_34_)"
+   enable-background="new    "
+   d="M87.53,103.994c0.084,2.906-2.951,4.085-7.365,4.212    c-4.414,0.128-5.237-1.214-8.621-3.749c-2.325-1.743,3.427-5.363,7.84-5.491C83.799,98.838,87.446,101.09,87.53,103.994z"
+   id="path587" />
+		<path
+   opacity="0.49"
+   fill="#F2F6FA"
+   enable-background="new    "
+   d="M67.035,110.868c0.995-6.352,7.699-10,13.596-9.587    c5.842,0.409,11.569,6.604,11.486,11.062c-2.159-7.602-7.783-8.538-12.783-8.844C73.055,103.114,69.086,106.428,67.035,110.868z"
+   id="path589" />
+		
+			<radialGradient
+   id="SVGID_35_"
+   cx="-605.8643"
+   cy="1553.4648"
+   r="8.6555"
+   gradientTransform="matrix(0.8182 -0.5749 0.5749 0.8182 -314.1375 -1499.7417)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop592" />
+			<stop
+   offset="0.3195"
+   style="stop-color:#050709"
+   id="stop594" />
+			<stop
+   offset="0.5599"
+   style="stop-color:#070C13"
+   id="stop596" />
+			<stop
+   offset="0.7738"
+   style="stop-color:#0A1523"
+   id="stop598" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0B1929"
+   id="stop600" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C"
+   id="stop602" />
+		</radialGradient>
+		<path
+   opacity="0.3"
+   fill="url(#SVGID_35_)"
+   enable-background="new    "
+   d="M89.526,109.116    c2.715,4.851,1.457,11.125-3.294,14.464c-4.753,3.338-11.271,2.935-14.455-0.809c5.299,3.738,11.525,0.881,13.392-0.376    C89.903,119.206,90.46,113.697,89.526,109.116z"
+   id="path604" />
+		<path
+   opacity="0.75"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M91.093,114.98c0.082,5.56-4.222,10.536-10.294,11.285    c-6.07,0.749-11.903-2.642-12.974-7.439c2.075,6.658,10.787,7.129,13.139,6.841C86.047,125.045,90.892,120.914,91.093,114.98z"
+   id="path606" />
+		
+			<radialGradient
+   id="SVGID_36_"
+   cx="-1129.0967"
+   cy="-2510.5957"
+   r="1.6341"
+   gradientTransform="matrix(-0.6927 0.7212 -0.4456 -0.428 -1831.28 -153.949)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop609" />
+			<stop
+   offset="0.3195"
+   style="stop-color:#050709"
+   id="stop611" />
+			<stop
+   offset="0.5599"
+   style="stop-color:#070C13"
+   id="stop613" />
+			<stop
+   offset="0.7738"
+   style="stop-color:#0A1523"
+   id="stop615" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0B1929"
+   id="stop617" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C"
+   id="stop619" />
+		</radialGradient>
+		<path
+   opacity="0.23"
+   fill="url(#SVGID_36_)"
+   enable-background="new    "
+   d="M70.85,105.04c0.333,0.347,0.027,1.178-0.682,1.861    c-0.709,0.682-1.554,0.952-1.887,0.606c-0.332-0.346-0.027-1.179,0.682-1.861C69.672,104.965,70.518,104.694,70.85,105.04z"
+   id="path621" />
+		
+			<radialGradient
+   id="SVGID_37_"
+   cx="260.0782"
+   cy="966.9385"
+   r="6.7709"
+   gradientTransform="matrix(0.9687 0.2482 -0.2286 0.8919 47.918 -820.168)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop624" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop626" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop628" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop630" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop632" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop634" />
+		</radialGradient>
+		<path
+   opacity="0.5"
+   fill="url(#SVGID_37_)"
+   enable-background="new    "
+   d="M85.382,108.478c-0.856,3.339-4.49,5.293-8.116,4.365    c-3.627-0.931-5.874-4.391-5.019-7.731c0.856-3.335,4.49-5.291,8.118-4.361C83.99,101.68,86.236,105.141,85.382,108.478z"
+   id="path636" />
+		
+			<radialGradient
+   id="SVGID_38_"
+   cx="260.1963"
+   cy="1098.9199"
+   r="6.0445"
+   gradientTransform="matrix(0.9687 0.2482 -0.1964 0.7666 43.0603 -801.2024)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop639" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop641" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop643" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop645" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop647" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop649" />
+		</radialGradient>
+		<path
+   opacity="0.65"
+   fill="url(#SVGID_38_)"
+   enable-background="new    "
+   d="M85.126,107.306c-0.655,2.56-3.809,3.963-7.042,3.135    c-3.234-0.83-5.323-3.577-4.667-6.135c0.654-2.558,3.808-3.961,7.043-3.132C83.692,102.002,85.78,104.749,85.126,107.306z"
+   id="path651" />
+		
+			<radialGradient
+   id="SVGID_39_"
+   cx="55.5752"
+   cy="1037.6338"
+   r="2.9778"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#EEF8FB"
+   id="stop654" />
+			<stop
+   offset="0.4122"
+   style="stop-color:#EDF7F8;stop-opacity:0.8016"
+   id="stop656" />
+			<stop
+   offset="0.5215"
+   style="stop-color:#E9F5EE;stop-opacity:0.6525"
+   id="stop658" />
+			<stop
+   offset="0.619"
+   style="stop-color:#E2F1DE;stop-opacity:0.5196"
+   id="stop660" />
+			<stop
+   offset="0.7096"
+   style="stop-color:#D8ECC7;stop-opacity:0.396"
+   id="stop662" />
+			<stop
+   offset="0.7954"
+   style="stop-color:#CCE4AA;stop-opacity:0.2789"
+   id="stop664" />
+			<stop
+   offset="0.8777"
+   style="stop-color:#BCDC86;stop-opacity:0.1667"
+   id="stop666" />
+			<stop
+   offset="0.9557"
+   style="stop-color:#ABD25B;stop-opacity:0.0604"
+   id="stop668" />
+			<stop
+   offset="1"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop670" />
+		</radialGradient>
+		<circle
+   fill="url(#SVGID_39_)"
+   cx="79.575"
+   cy="104.634"
+   r="2.978"
+   id="circle672" />
+		<circle
+   opacity="0.62"
+   fill="#FFFFFF"
+   enable-background="new    "
+   cx="79.984"
+   cy="103.588"
+   r="1.171"
+   id="circle674" />
+		<path
+   opacity="0.87"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M90.218,109.018c0.357,1.01,2.049,4.559,0.196,9.433    c-0.077,0.202,1.673-7.249-0.937-8.43c-0.662-0.301-1.579-0.562-1.538-1.289c0.029-0.515,0.31-0.911,0.782-1.029    C89.428,107.523,89.974,108.333,90.218,109.018z"
+   id="path676" />
+		<path
+   opacity="0.43"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M67.231,114.264c0.305,1.372,1.045,6.729,6.454,9.802    c0.248,0.139-6.89-5.417-4.832-10.025c0.389-0.873,1.363-1.727,0.813-2.506c-0.394-0.553-0.979-0.797-1.59-0.601    C67.168,111.229,67.023,113.333,67.231,114.264z"
+   id="path678" />
+		
+			<radialGradient
+   id="SVGID_40_"
+   cx="-661.5732"
+   cy="1094.1963"
+   r="4.9277"
+   gradientTransform="matrix(0.9395 -0.6599 0.6365 0.9061 6.9776 -1311.354)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#C9DAF0;stop-opacity:0.17"
+   id="stop681" />
+			<stop
+   offset="0.2107"
+   style="stop-color:#CCDDF1;stop-opacity:0.4586"
+   id="stop683" />
+			<stop
+   offset="0.3822"
+   style="stop-color:#D6E4F4;stop-opacity:0.6934"
+   id="stop685" />
+			<stop
+   offset="0.5395"
+   style="stop-color:#E7F1FA;stop-opacity:0.9088"
+   id="stop687" />
+			<stop
+   offset="0.6061"
+   style="stop-color:#F1F9FD"
+   id="stop689" />
+			<stop
+   offset="0.6454"
+   style="stop-color:#CEEDEF;stop-opacity:0.9002"
+   id="stop691" />
+			<stop
+   offset="0.6966"
+   style="stop-color:#A8DFDF;stop-opacity:0.7701"
+   id="stop693" />
+			<stop
+   offset="0.75"
+   style="stop-color:#89D4D3;stop-opacity:0.6346"
+   id="stop695" />
+			<stop
+   offset="0.8053"
+   style="stop-color:#70CCC9;stop-opacity:0.4943"
+   id="stop697" />
+			<stop
+   offset="0.8632"
+   style="stop-color:#5FC6C2;stop-opacity:0.3472"
+   id="stop699" />
+			<stop
+   offset="0.9255"
+   style="stop-color:#54C2BD;stop-opacity:0.1891"
+   id="stop701" />
+			<stop
+   offset="1"
+   style="stop-color:#51C1BC;stop-opacity:0"
+   id="stop703" />
+		</radialGradient>
+		<path
+   opacity="0.54"
+   fill="url(#SVGID_40_)"
+   enable-background="new    "
+   d="M87.562,113.538c1.851,2.638,0.586,5.007-2.238,6.989    c-2.822,1.984-4.193,1.096-7.986,0.193c-2.607-0.622-1.065-6.382,1.758-8.365C81.919,110.37,85.709,110.9,87.562,113.538z"
+   id="path705" />
+	</g>
+	<g
+   id="g707">
+		
+			<linearGradient
+   id="SVGID_41_"
+   gradientUnits="userSpaceOnUse"
+   x1="142.2154"
+   y1="1125.166"
+   x2="176.2896"
+   y2="1125.166"
+   gradientTransform="matrix(1 0 0 1 24 -933)">
+			<stop
+   offset="0"
+   style="stop-color:#517287"
+   id="stop710" />
+			<stop
+   offset="0.0118"
+   style="stop-color:#5C7B8F"
+   id="stop712" />
+			<stop
+   offset="0.057"
+   style="stop-color:#809BAB"
+   id="stop714" />
+			<stop
+   offset="0.1063"
+   style="stop-color:#9FB7C3"
+   id="stop716" />
+			<stop
+   offset="0.1597"
+   style="stop-color:#B8CDD6"
+   id="stop718" />
+			<stop
+   offset="0.219"
+   style="stop-color:#CCDEE5"
+   id="stop720" />
+			<stop
+   offset="0.2872"
+   style="stop-color:#DAEAEF"
+   id="stop722" />
+			<stop
+   offset="0.3724"
+   style="stop-color:#E2F1F5"
+   id="stop724" />
+			<stop
+   offset="0.5273"
+   style="stop-color:#E4F3F7"
+   id="stop726" />
+		</linearGradient>
+		<path
+   fill="url(#SVGID_41_)"
+   d="M173.005,179.977l26.599,21.987c0.805,0.664,0.917,1.854,0.25,2.659    c-0.608,0.741-1.667,0.896-2.458,0.398l-29.236-18.334c-1.941-1.225-2.526-3.778-1.312-5.724c1.218-1.938,3.776-2.522,5.717-1.31    C172.714,179.755,172.875,179.87,173.005,179.977z"
+   id="path728" />
+		<path
+   fill="#535A5F"
+   d="M173.542,179.35l16.771,14.328c2.793,2.396,5.611,4.76,8.441,7.108l1.059,0.884    c0.407,0.328,0.723,0.854,0.798,1.385c0.197,1.09-0.536,2.236-1.604,2.523c-0.524,0.152-1.104,0.104-1.598-0.137    c-0.467-0.26-0.803-0.489-1.211-0.735l-2.345-1.453c-6.242-3.894-12.56-7.666-18.84-11.498l-4.717-2.862l-2.358-1.433    c-0.882-0.483-1.727-1.356-2.144-2.36c-0.912-2.021-0.288-4.627,1.572-5.953c0.894-0.664,2.011-1.022,3.124-0.979    c1.11,0.032,2.206,0.477,3.033,1.168L173.542,179.35z M172.488,180.617c-1.173-0.963-2.913-0.954-4.081-0.072    c-0.289,0.211-0.55,0.49-0.743,0.773c-0.223,0.313-0.375,0.635-0.48,0.988c-0.205,0.693-0.169,1.476,0.108,2.157    c0.286,0.701,0.752,1.259,1.466,1.687l2.316,1.5l4.632,3c6.184,3.979,12.332,8.029,18.555,11.953l2.329,1.479    c0.376,0.232,0.804,0.521,1.138,0.711c0.332,0.167,0.728,0.204,1.088,0.104c0.734-0.182,1.252-0.979,1.1-1.729    c-0.069-0.378-0.251-0.693-0.56-0.945l-1.067-0.873c-2.84-2.338-5.693-4.66-8.569-6.953l-17.239-13.785L172.488,180.617z"
+   id="path730" />
+	</g>
+	
+		<radialGradient
+   id="SVGID_42_"
+   cx="176.3282"
+   cy="1137.2598"
+   r="11.5198"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+		<stop
+   offset="0"
+   style="stop-color:#46C3D6;stop-opacity:0.74"
+   id="stop733" />
+		<stop
+   offset="0.1036"
+   style="stop-color:#48C3D3;stop-opacity:0.5799"
+   id="stop735" />
+		<stop
+   offset="0.1813"
+   style="stop-color:#4DC4C9;stop-opacity:0.4597"
+   id="stop737" />
+		<stop
+   offset="0.2507"
+   style="stop-color:#57C5B9;stop-opacity:0.3525"
+   id="stop739" />
+		<stop
+   offset="0.3152"
+   style="stop-color:#65C6A2;stop-opacity:0.2529"
+   id="stop741" />
+		<stop
+   offset="0.3763"
+   style="stop-color:#76C785;stop-opacity:0.1584"
+   id="stop743" />
+		<stop
+   offset="0.434"
+   style="stop-color:#8BC961;stop-opacity:0.0692"
+   id="stop745" />
+		<stop
+   offset="0.4788"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop747" />
+	</radialGradient>
+	<path
+   opacity="0.52"
+   fill="url(#SVGID_42_)"
+   enable-background="new    "
+   d="M199.605,201.964l-3.69-3.051   c0.373,0.896,0.57,1.821,0.215,2.887c-0.399,0.603-0.898,1.097-1.443,1.521l2.71,1.701c0.792,0.498,1.85,0.348,2.458-0.396   C200.522,203.818,200.41,202.628,199.605,201.964z"
+   id="path749" />
+	<g
+   id="g751">
+		<path
+   fill="#E4F3F7"
+   d="M116.302,228.251c-0.247,0-0.493-0.03-0.744-0.096c-1.553-0.407-2.48-1.998-2.072-3.552l6.979-26.506    c0.409-1.557,1.999-2.479,3.553-2.07c1.553,0.408,2.482,2,2.072,3.554l-6.98,26.503    C118.767,227.389,117.589,228.251,116.302,228.251z"
+   id="path753" />
+		<path
+   fill="#535A5F"
+   d="M116.29,228.631c-0.383-0.001-0.88-0.107-1.229-0.256c-0.42-0.172-0.774-0.398-1.088-0.702    c-0.622-0.599-0.995-1.452-1.005-2.327c-0.015-0.434,0.099-0.891,0.187-1.234l0.271-1.104l0.543-2.219l2.17-8.875l2.189-8.87    l1.133-4.426l0.143-0.558l0.088-0.313c0.032-0.1,0.045-0.163,0.107-0.311c0.206-0.513,0.468-0.893,0.819-1.252    c0.691-0.701,1.666-1.11,2.657-1.111c0.247-0.008,0.495,0.021,0.736,0.064l0.181,0.038l0.045,0.011l0.078,0.021l0.068,0.021    c0.096,0.031,0.164,0.045,0.309,0.104c0.515,0.207,0.893,0.479,1.253,0.831c0.698,0.7,1.103,1.684,1.096,2.668    c0.008,0.484-0.136,1.021-0.227,1.338l-0.296,1.104l-0.593,2.205l-2.445,8.806l-2.485,8.792l-1.244,4.396    c-0.11,0.358-0.186,0.729-0.354,1.139c-0.179,0.422-0.426,0.774-0.743,1.08c-0.624,0.61-1.49,0.951-2.353,0.938L116.29,228.631    L116.29,228.631z M116.302,227.871c0.661-0.016,1.308-0.301,1.756-0.773c0.484-0.473,0.615-1.063,0.797-1.854l1.083-4.438    l2.168-8.877l2.208-8.861l0.57-2.211c0.161-0.715,0.46-1.566,0.443-2.016c-0.001-0.529-0.229-1.063-0.611-1.438    c-0.177-0.188-0.445-0.346-0.634-0.426c-0.027-0.021-0.144-0.059-0.229-0.084l-0.068-0.021c0.008,0.002-0.066-0.021,0.01,0.002    l-0.025-0.005l-0.099-0.021c-0.13-0.026-0.264-0.047-0.397-0.043c-0.532-0.009-1.069,0.213-1.452,0.592    c-0.187,0.178-0.355,0.438-0.438,0.637c-0.022,0.027-0.055,0.146-0.083,0.229l-0.022,0.067c0.002-0.011-0.02,0.063,0.001-0.011    l-0.009,0.035l-0.037,0.141l-0.148,0.552l-1.193,4.409l-2.463,8.798l-2.482,8.793l-0.621,2.198    c-0.177,0.725-0.493,1.504-0.508,2.104c-0.043,1.317,1.074,2.578,2.494,2.523h-0.011V227.871z"
+   id="path755" />
+	</g>
+	
+		<radialGradient
+   id="SVGID_43_"
+   cx="91.2823"
+   cy="1160.7344"
+   r="17.0993"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+		<stop
+   offset="0"
+   style="stop-color:#46C3D6;stop-opacity:0.74"
+   id="stop758" />
+		<stop
+   offset="0.1036"
+   style="stop-color:#48C3D3;stop-opacity:0.5799"
+   id="stop760" />
+		<stop
+   offset="0.1813"
+   style="stop-color:#4DC4C9;stop-opacity:0.4597"
+   id="stop762" />
+		<stop
+   offset="0.2507"
+   style="stop-color:#57C5B9;stop-opacity:0.3525"
+   id="stop764" />
+		<stop
+   offset="0.3152"
+   style="stop-color:#65C6A2;stop-opacity:0.2529"
+   id="stop766" />
+		<stop
+   offset="0.3763"
+   style="stop-color:#76C785;stop-opacity:0.1584"
+   id="stop768" />
+		<stop
+   offset="0.434"
+   style="stop-color:#8BC961;stop-opacity:0.0692"
+   id="stop770" />
+		<stop
+   offset="0.4788"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop772" />
+	</radialGradient>
+	<path
+   opacity="0.52"
+   fill="url(#SVGID_43_)"
+   enable-background="new    "
+   d="M115.016,218.796l-1.53,5.808   c-0.408,1.56,0.519,3.146,2.072,3.558c0.25,0.063,0.497,0.096,0.744,0.096c1.287,0,2.465-0.856,2.809-2.167l1.144-4.351   C118.081,221.824,116.304,220.574,115.016,218.796z"
+   id="path774" />
+	
+		<linearGradient
+   id="SVGID_44_"
+   gradientUnits="userSpaceOnUse"
+   x1="99.2281"
+   y1="1131.8906"
+   x2="96.1272"
+   y2="1143.5513"
+   gradientTransform="matrix(1 0 0 1 24 -933)">
+		<stop
+   offset="0.1879"
+   style="stop-color:#517287"
+   id="stop777" />
+		<stop
+   offset="0.2398"
+   style="stop-color:#7895A5;stop-opacity:0.847"
+   id="stop779" />
+		<stop
+   offset="0.3"
+   style="stop-color:#9FB6C2;stop-opacity:0.6695"
+   id="stop781" />
+		<stop
+   offset="0.3599"
+   style="stop-color:#BDD1D9;stop-opacity:0.4932"
+   id="stop783" />
+		<stop
+   offset="0.4184"
+   style="stop-color:#D3E4EA;stop-opacity:0.3209"
+   id="stop785" />
+		<stop
+   offset="0.4749"
+   style="stop-color:#E0EFF4;stop-opacity:0.1543"
+   id="stop787" />
+		<stop
+   offset="0.5273"
+   style="stop-color:#E4F3F7;stop-opacity:0"
+   id="stop789" />
+	</linearGradient>
+	<path
+   fill="url(#SVGID_44_)"
+   d="M124.019,196.027c-1.554-0.408-2.86,2.602-3.269,4.154l-1.349,4.656   c2.005,0.271,2.498,0.241,4.188,1.137l1.722-6.469C125.721,197.959,125.572,196.438,124.019,196.027z"
+   id="path791" />
+	<g
+   id="g793">
+		
+			<linearGradient
+   id="SVGID_45_"
+   gradientUnits="userSpaceOnUse"
+   x1="84.8589"
+   y1="1074.5898"
+   x2="55.6236"
+   y2="1044.1366"
+   gradientTransform="matrix(1 0 0 1 24 -933)">
+			<stop
+   offset="0"
+   style="stop-color:#517287"
+   id="stop796" />
+			<stop
+   offset="0.0517"
+   style="stop-color:#698799"
+   id="stop798" />
+			<stop
+   offset="0.1601"
+   style="stop-color:#95ADBA"
+   id="stop800" />
+			<stop
+   offset="0.2648"
+   style="stop-color:#B7CCD5"
+   id="stop802" />
+			<stop
+   offset="0.3634"
+   style="stop-color:#D0E1E8"
+   id="stop804" />
+			<stop
+   offset="0.4535"
+   style="stop-color:#DFEEF3"
+   id="stop806" />
+			<stop
+   offset="0.5273"
+   style="stop-color:#E4F3F7"
+   id="stop808" />
+			<stop
+   offset="0.6089"
+   style="stop-color:#E0EFF4"
+   id="stop810" />
+			<stop
+   offset="0.6925"
+   style="stop-color:#D4E4EA"
+   id="stop812" />
+			<stop
+   offset="0.7771"
+   style="stop-color:#BFD1DA"
+   id="stop814" />
+			<stop
+   offset="0.8624"
+   style="stop-color:#A2B7C4"
+   id="stop816" />
+			<stop
+   offset="0.9474"
+   style="stop-color:#7E96A7"
+   id="stop818" />
+			<stop
+   offset="1"
+   style="stop-color:#637E92"
+   id="stop820" />
+		</linearGradient>
+		<path
+   fill="url(#SVGID_45_)"
+   d="M101.716,140.504l-21.072-21.935c-0.877-0.912-0.845-2.36,0.066-3.237    c0.834-0.803,2.12-0.846,3.001-0.148l23.907,18.806c1.91,1.503,2.243,4.275,0.737,6.186c-1.503,1.913-4.274,2.246-6.188,0.742    C102.013,140.793,101.85,140.643,101.716,140.504z"
+   id="path822" />
+		<path
+   fill="#535A5F"
+   d="M101.13,141.067l-13.938-15.093l-3.5-3.758c-1.18-1.268-2.355-2.423-3.539-3.782    c-0.556-0.812-0.578-1.917-0.08-2.748c0.501-0.854,1.444-1.352,2.426-1.278c0.481,0.031,0.954,0.209,1.343,0.497l1.021,0.79    l2.028,1.574c5.403,4.205,10.886,8.31,16.347,12.441l4.091,3.104c0.333,0.261,0.687,0.506,1.048,0.819    c0.391,0.347,0.707,0.729,0.973,1.162c0.529,0.86,0.797,1.878,0.764,2.894c-0.038,2.044-1.413,4.008-3.365,4.703    C104.83,143.152,102.496,142.577,101.13,141.067z M102.303,139.94c0.983,1.017,2.548,1.308,3.836,0.819    c1.286-0.479,2.257-1.748,2.332-3.146c0.045-0.695-0.118-1.407-0.467-2.017c-0.17-0.302-0.4-0.593-0.643-0.821    c-0.277-0.258-0.62-0.513-0.952-0.79l-3.98-3.246c-5.301-4.335-10.582-8.696-15.941-12.958l-2.008-1.601l-1-0.793    c-0.294-0.224-0.655-0.366-1.027-0.395c-0.731-0.084-1.543,0.331-1.887,0.979c-0.383,0.646-0.346,1.514,0.078,2.117    c2.269,2.434,4.736,4.907,7.137,7.318L102.303,139.94z"
+   id="path824" />
+	</g>
+	
+		<radialGradient
+   id="SVGID_46_"
+   cx="57.0352"
+   cy="1049.2236"
+   r="11.4001"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+		<stop
+   offset="0"
+   style="stop-color:#46C3D6;stop-opacity:0.74"
+   id="stop827" />
+		<stop
+   offset="0.1036"
+   style="stop-color:#48C3D3;stop-opacity:0.5799"
+   id="stop829" />
+		<stop
+   offset="0.1813"
+   style="stop-color:#4DC4C9;stop-opacity:0.4597"
+   id="stop831" />
+		<stop
+   offset="0.2507"
+   style="stop-color:#57C5B9;stop-opacity:0.3525"
+   id="stop833" />
+		<stop
+   offset="0.3152"
+   style="stop-color:#65C6A2;stop-opacity:0.2529"
+   id="stop835" />
+		<stop
+   offset="0.3763"
+   style="stop-color:#76C785;stop-opacity:0.1584"
+   id="stop837" />
+		<stop
+   offset="0.434"
+   style="stop-color:#8BC961;stop-opacity:0.0692"
+   id="stop839" />
+		<stop
+   offset="0.4788"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop841" />
+	</radialGradient>
+	<path
+   opacity="0.52"
+   fill="url(#SVGID_46_)"
+   enable-background="new    "
+   d="M85.383,118.512c0.375-0.375,0.871-0.669,1.438-0.882   l-3.109-2.447c-0.882-0.697-2.167-0.654-3.001,0.148c-0.911,0.877-0.943,2.325-0.066,3.237l4.586,4.773   C83.995,121.683,83.402,120.098,85.383,118.512z"
+   id="path843" />
+	<g
+   id="blackball_2_">
+		
+			<radialGradient
+   id="SVGID_47_"
+   cx="107.7227"
+   cy="1101.1846"
+   r="47.014"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#000000"
+   id="stop847" />
+			<stop
+   offset="0.3003"
+   style="stop-color:#010203"
+   id="stop849" />
+			<stop
+   offset="0.5262"
+   style="stop-color:#03080D"
+   id="stop851" />
+			<stop
+   offset="0.7272"
+   style="stop-color:#08111D"
+   id="stop853" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0B1929"
+   id="stop855" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C"
+   id="stop857" />
+		</radialGradient>
+		<path
+   fill="url(#SVGID_47_)"
+   d="M176.311,162.557c0,22.381-18.141,40.521-40.519,40.521s-40.517-18.141-40.517-40.521    c0-22.375,18.139-40.517,40.517-40.517S176.311,140.181,176.311,162.557z"
+   id="path859" />
+		
+			<radialGradient
+   id="SVGID_48_"
+   cx="253.5371"
+   cy="619.9404"
+   r="42.1714"
+   gradientTransform="matrix(0.9525 0.3046 -0.3046 0.9525 81.9305 -503.3005)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop862" />
+			<stop
+   offset="0.2047"
+   style="stop-color:#0D1B2C;stop-opacity:0.2447"
+   id="stop864" />
+			<stop
+   offset="0.337"
+   style="stop-color:#132234;stop-opacity:0.4029"
+   id="stop866" />
+			<stop
+   offset="0.4487"
+   style="stop-color:#1D2D43;stop-opacity:0.5365"
+   id="stop868" />
+			<stop
+   offset="0.5491"
+   style="stop-color:#2B3D58;stop-opacity:0.6566"
+   id="stop870" />
+			<stop
+   offset="0.6418"
+   style="stop-color:#3D5173;stop-opacity:0.7674"
+   id="stop872" />
+			<stop
+   offset="0.7289"
+   style="stop-color:#536A95;stop-opacity:0.8715"
+   id="stop874" />
+			<stop
+   offset="0.8101"
+   style="stop-color:#6D87BC;stop-opacity:0.9686"
+   id="stop876" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#7792CA"
+   id="stop878" />
+		</radialGradient>
+		<path
+   opacity="0.36"
+   fill="url(#SVGID_48_)"
+   enable-background="new    "
+   d="M174.387,174.898    c-6.815,21.313-29.621,33.063-50.936,26.254c-21.315-6.815-33.065-29.623-26.25-50.938c6.813-21.314,29.615-33.068,50.931-26.252    C169.448,130.78,181.202,153.585,174.387,174.898z"
+   id="path880" />
+		
+			<radialGradient
+   id="SVGID_49_"
+   cx="102.2515"
+   cy="1105.4219"
+   r="33.1756"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop883" />
+			<stop
+   offset="0.2047"
+   style="stop-color:#0D1B2C;stop-opacity:0.2447"
+   id="stop885" />
+			<stop
+   offset="0.337"
+   style="stop-color:#132234;stop-opacity:0.4029"
+   id="stop887" />
+			<stop
+   offset="0.4487"
+   style="stop-color:#1D2D43;stop-opacity:0.5365"
+   id="stop889" />
+			<stop
+   offset="0.5491"
+   style="stop-color:#2B3D58;stop-opacity:0.6566"
+   id="stop891" />
+			<stop
+   offset="0.6418"
+   style="stop-color:#3D5173;stop-opacity:0.7674"
+   id="stop893" />
+			<stop
+   offset="0.7289"
+   style="stop-color:#536A95;stop-opacity:0.8715"
+   id="stop895" />
+			<stop
+   offset="0.8101"
+   style="stop-color:#6D87BC;stop-opacity:0.9686"
+   id="stop897" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#7792CA"
+   id="stop899" />
+		</radialGradient>
+		<path
+   opacity="0.36"
+   fill="url(#SVGID_49_)"
+   enable-background="new    "
+   d="M120.624,195.932    c-13.427-6.793-31.579-23.455-17.321-57.583c-2.607,3.5-4.699,7.478-6.102,11.869c-6.815,21.313,4.934,44.119,26.25,50.935    c12.161,3.895,24.802,1.729,34.687-4.801C145.616,199.322,129.343,200.34,120.624,195.932z"
+   id="path901" />
+		
+			<radialGradient
+   id="SVGID_50_"
+   cx="125.5313"
+   cy="1069.5029"
+   r="52.927"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#F5F9ED"
+   id="stop904" />
+			<stop
+   offset="0.3506"
+   style="stop-color:#F3F8EB;stop-opacity:0.5296"
+   id="stop906" />
+			<stop
+   offset="0.477"
+   style="stop-color:#ECF5E5;stop-opacity:0.3602"
+   id="stop908" />
+			<stop
+   offset="0.5669"
+   style="stop-color:#E1F0DA;stop-opacity:0.2395"
+   id="stop910" />
+			<stop
+   offset="0.6397"
+   style="stop-color:#D0E8CB;stop-opacity:0.1418"
+   id="stop912" />
+			<stop
+   offset="0.7014"
+   style="stop-color:#BADEB7;stop-opacity:0.0591"
+   id="stop914" />
+			<stop
+   offset="0.7455"
+   style="stop-color:#A5D4A4;stop-opacity:0"
+   id="stop916" />
+			<stop
+   offset="1"
+   style="stop-color:#000000;stop-opacity:0"
+   id="stop918" />
+		</radialGradient>
+		<path
+   opacity="0.23"
+   fill="url(#SVGID_50_)"
+   enable-background="new    "
+   d="M176.003,163.064    c-6.85,11.393-14.59,19.354-29.731,19.354c-22.2,0-40.194-16.566-40.194-37.013c0-6.141,2.97-10.512,5.848-15.61    c20.226-13.362,40.774-7.032,51.682,3.726C174.308,144.082,176.345,155.58,176.003,163.064z"
+   id="path920" />
+		
+			<radialGradient
+   id="SVGID_51_"
+   cx="123.9854"
+   cy="1169.793"
+   r="22.6494"
+   gradientTransform="matrix(1 0 0 0.9207 24 -936.5648)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#F5F9ED"
+   id="stop923" />
+			<stop
+   offset="0.3506"
+   style="stop-color:#F3F8EB;stop-opacity:0.5296"
+   id="stop925" />
+			<stop
+   offset="0.477"
+   style="stop-color:#ECF5E5;stop-opacity:0.3602"
+   id="stop927" />
+			<stop
+   offset="0.5669"
+   style="stop-color:#E1F0DA;stop-opacity:0.2395"
+   id="stop929" />
+			<stop
+   offset="0.6397"
+   style="stop-color:#D0E8CB;stop-opacity:0.1418"
+   id="stop931" />
+			<stop
+   offset="0.7014"
+   style="stop-color:#BADEB7;stop-opacity:0.0591"
+   id="stop933" />
+			<stop
+   offset="0.7455"
+   style="stop-color:#A5D4A4;stop-opacity:0"
+   id="stop935" />
+			<stop
+   offset="1"
+   style="stop-color:#000000;stop-opacity:0"
+   id="stop937" />
+		</radialGradient>
+		<path
+   opacity="0.1"
+   fill="url(#SVGID_51_)"
+   enable-background="new    "
+   d="M172.915,146.34    c-4.531,7.537-13.253,12.641-23.271,12.641c-14.685,0-26.589-10.959-26.589-24.481c0-4.063,1.076-7.895,2.979-11.267    C155.858,115.766,172.335,143.079,172.915,146.34z"
+   id="path939" />
+		
+			<radialGradient
+   id="SVGID_52_"
+   cx="125.9678"
+   cy="1163.1113"
+   r="2.9981"
+   gradientTransform="matrix(1 0 0 0.9207 24 -936.5648)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.4485"
+   style="stop-color:#DCECEF"
+   id="stop942" />
+			<stop
+   offset="0.6482"
+   style="stop-color:#D3E9ED;stop-opacity:0.6379"
+   id="stop944" />
+			<stop
+   offset="0.976"
+   style="stop-color:#BAE3E9;stop-opacity:0.0435"
+   id="stop946" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop948" />
+		</radialGradient>
+		<path
+   opacity="0.67"
+   fill="url(#SVGID_52_)"
+   enable-background="new    "
+   d="M153.086,134.421c0,1.455-1.658,2.536-2.911,2.536    c-1.835,0-3.325-1.371-3.325-3.062c0-0.509,0.637-1.922,2.121-2.195C151.852,131.384,153.086,133.29,153.086,134.421z"
+   id="path950" />
+		
+			<radialGradient
+   id="tublightreflection_1_"
+   cx="-300.0674"
+   cy="1151.0977"
+   r="7.9678"
+   gradientTransform="matrix(1.1755 -0.3579 0.3156 1.0363 129.1247 -1121.3802)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3939"
+   style="stop-color:#C9DAF0;stop-opacity:0.89"
+   id="stop953" />
+			<stop
+   offset="0.4493"
+   style="stop-color:#C6DAEE;stop-opacity:0.5772"
+   id="stop955" />
+			<stop
+   offset="0.4944"
+   style="stop-color:#BCDAE8;stop-opacity:0.3227"
+   id="stop957" />
+			<stop
+   offset="0.5357"
+   style="stop-color:#ABD9DD;stop-opacity:0.0893"
+   id="stop959" />
+			<stop
+   offset="0.5515"
+   style="stop-color:#A2D9D8;stop-opacity:0"
+   id="stop961" />
+			<stop
+   offset="0.6059"
+   style="stop-color:#A5DADA;stop-opacity:0.1564"
+   id="stop963" />
+			<stop
+   offset="0.6513"
+   style="stop-color:#B0DFDE;stop-opacity:0.287"
+   id="stop965" />
+			<stop
+   offset="0.6934"
+   style="stop-color:#C1E6E6;stop-opacity:0.4082"
+   id="stop967" />
+			<stop
+   offset="0.7334"
+   style="stop-color:#D9EFF2;stop-opacity:0.523"
+   id="stop969" />
+			<stop
+   offset="0.7636"
+   style="stop-color:#F1F9FD;stop-opacity:0.61"
+   id="stop971" />
+			<stop
+   offset="0.7872"
+   style="stop-color:#CEEDEF;stop-opacity:0.5491"
+   id="stop973" />
+			<stop
+   offset="0.818"
+   style="stop-color:#A8DFDF;stop-opacity:0.4698"
+   id="stop975" />
+			<stop
+   offset="0.85"
+   style="stop-color:#89D4D3;stop-opacity:0.3871"
+   id="stop977" />
+			<stop
+   offset="0.8832"
+   style="stop-color:#70CCC9;stop-opacity:0.3015"
+   id="stop979" />
+			<stop
+   offset="0.9179"
+   style="stop-color:#5FC6C2;stop-opacity:0.2118"
+   id="stop981" />
+			<stop
+   offset="0.9553"
+   style="stop-color:#54C2BD;stop-opacity:0.1153"
+   id="stop983" />
+			<stop
+   offset="1"
+   style="stop-color:#51C1BC;stop-opacity:0"
+   id="stop985" />
+		</radialGradient>
+		<path
+   id="tublightreflection_23_"
+   opacity="0.15"
+   fill="url(#tublightreflection_1_)"
+   enable-background="new    "
+   d="    M150.355,176.872c1.57,5.155-2.034,8.368-8.074,10.204c-6.035,1.84-9.8,0.506-12.545-4.268    c-2.329-4.055,0.809-10.104,6.845-11.939C142.62,169.027,148.785,171.716,150.355,176.872z" />
+		
+			<radialGradient
+   id="tublightreflection_2_"
+   cx="334.8067"
+   cy="-527.6826"
+   r="6.8185"
+   gradientTransform="matrix(-0.0457 1.2279 -1.0825 -0.0403 -452.0393 -273.2723)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3939"
+   style="stop-color:#C9DAF0;stop-opacity:0.89"
+   id="stop989" />
+			<stop
+   offset="0.4493"
+   style="stop-color:#C6DAEE;stop-opacity:0.5772"
+   id="stop991" />
+			<stop
+   offset="0.4944"
+   style="stop-color:#BCDAE8;stop-opacity:0.3227"
+   id="stop993" />
+			<stop
+   offset="0.5357"
+   style="stop-color:#ABD9DD;stop-opacity:0.0893"
+   id="stop995" />
+			<stop
+   offset="0.5515"
+   style="stop-color:#A2D9D8;stop-opacity:0"
+   id="stop997" />
+			<stop
+   offset="0.6059"
+   style="stop-color:#A5DADA;stop-opacity:0.1564"
+   id="stop999" />
+			<stop
+   offset="0.6513"
+   style="stop-color:#B0DFDE;stop-opacity:0.287"
+   id="stop1001" />
+			<stop
+   offset="0.6934"
+   style="stop-color:#C1E6E6;stop-opacity:0.4082"
+   id="stop1003" />
+			<stop
+   offset="0.7334"
+   style="stop-color:#D9EFF2;stop-opacity:0.523"
+   id="stop1005" />
+			<stop
+   offset="0.7636"
+   style="stop-color:#F1F9FD;stop-opacity:0.61"
+   id="stop1007" />
+			<stop
+   offset="0.7872"
+   style="stop-color:#CEEDEF;stop-opacity:0.5491"
+   id="stop1009" />
+			<stop
+   offset="0.818"
+   style="stop-color:#A8DFDF;stop-opacity:0.4698"
+   id="stop1011" />
+			<stop
+   offset="0.85"
+   style="stop-color:#89D4D3;stop-opacity:0.3871"
+   id="stop1013" />
+			<stop
+   offset="0.8832"
+   style="stop-color:#70CCC9;stop-opacity:0.3015"
+   id="stop1015" />
+			<stop
+   offset="0.9179"
+   style="stop-color:#5FC6C2;stop-opacity:0.2118"
+   id="stop1017" />
+			<stop
+   offset="0.9553"
+   style="stop-color:#54C2BD;stop-opacity:0.1153"
+   id="stop1019" />
+			<stop
+   offset="1"
+   style="stop-color:#51C1BC;stop-opacity:0"
+   id="stop1021" />
+		</radialGradient>
+		<path
+   id="tublightreflection_22_"
+   opacity="0.15"
+   fill="url(#tublightreflection_2_)"
+   enable-background="new    "
+   d="    M102.529,168.346c-4.607-0.172-6.198-3.979-5.993-9.378c0.198-5.393,2.328-8.063,6.954-8.951c3.922-0.75,7.94,3.478,7.74,8.87    C111.03,164.284,107.137,168.518,102.529,168.346z" />
+		
+			<radialGradient
+   id="tublightreflection_3_"
+   cx="-575.8125"
+   cy="-1028.6616"
+   r="6.9545"
+   gradientTransform="matrix(-1.1372 0.4656 -0.4104 -1.0025 -946.634 -614.2469)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3939"
+   style="stop-color:#C9DAF0;stop-opacity:0.89"
+   id="stop1025" />
+			<stop
+   offset="0.4493"
+   style="stop-color:#C6DAEE;stop-opacity:0.5772"
+   id="stop1027" />
+			<stop
+   offset="0.4944"
+   style="stop-color:#BCDAE8;stop-opacity:0.3227"
+   id="stop1029" />
+			<stop
+   offset="0.5357"
+   style="stop-color:#ABD9DD;stop-opacity:0.0893"
+   id="stop1031" />
+			<stop
+   offset="0.5515"
+   style="stop-color:#A2D9D8;stop-opacity:0"
+   id="stop1033" />
+			<stop
+   offset="0.6059"
+   style="stop-color:#A5DADA;stop-opacity:0.1564"
+   id="stop1035" />
+			<stop
+   offset="0.6513"
+   style="stop-color:#B0DFDE;stop-opacity:0.287"
+   id="stop1037" />
+			<stop
+   offset="0.6934"
+   style="stop-color:#C1E6E6;stop-opacity:0.4082"
+   id="stop1039" />
+			<stop
+   offset="0.7334"
+   style="stop-color:#D9EFF2;stop-opacity:0.523"
+   id="stop1041" />
+			<stop
+   offset="0.7636"
+   style="stop-color:#F1F9FD;stop-opacity:0.61"
+   id="stop1043" />
+			<stop
+   offset="0.7872"
+   style="stop-color:#CEEDEF;stop-opacity:0.5491"
+   id="stop1045" />
+			<stop
+   offset="0.818"
+   style="stop-color:#A8DFDF;stop-opacity:0.4698"
+   id="stop1047" />
+			<stop
+   offset="0.85"
+   style="stop-color:#89D4D3;stop-opacity:0.3871"
+   id="stop1049" />
+			<stop
+   offset="0.8832"
+   style="stop-color:#70CCC9;stop-opacity:0.3015"
+   id="stop1051" />
+			<stop
+   offset="0.9179"
+   style="stop-color:#5FC6C2;stop-opacity:0.2118"
+   id="stop1053" />
+			<stop
+   offset="0.9553"
+   style="stop-color:#54C2BD;stop-opacity:0.1153"
+   id="stop1055" />
+			<stop
+   offset="1"
+   style="stop-color:#51C1BC;stop-opacity:0"
+   id="stop1057" />
+		</radialGradient>
+		<path
+   id="tublightreflection_21_"
+   opacity="0.15"
+   fill="url(#tublightreflection_3_)"
+   enable-background="new    "
+   d="    M121.256,151.454c-1.783-4.353,1.09-7.438,6.189-9.522c5.096-2.088,8.476-1.234,11.249,2.69c2.352,3.331,0.116,8.849-4.981,10.935    C128.614,157.643,123.039,155.809,121.256,151.454z" />
+		
+			<radialGradient
+   id="tublightreflection_4_"
+   cx="-1493.042"
+   cy="13.3194"
+   r="6.535"
+   gradientTransform="matrix(-0.6244 -0.9876 0.9156 -0.5789 -787.8409 -1316.5985)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3939"
+   style="stop-color:#C9DAF0;stop-opacity:0.89"
+   id="stop1061" />
+			<stop
+   offset="0.4493"
+   style="stop-color:#C6DAEE;stop-opacity:0.5772"
+   id="stop1063" />
+			<stop
+   offset="0.4944"
+   style="stop-color:#BCDAE8;stop-opacity:0.3227"
+   id="stop1065" />
+			<stop
+   offset="0.5357"
+   style="stop-color:#ABD9DD;stop-opacity:0.0893"
+   id="stop1067" />
+			<stop
+   offset="0.5515"
+   style="stop-color:#A2D9D8;stop-opacity:0"
+   id="stop1069" />
+			<stop
+   offset="0.6059"
+   style="stop-color:#A5DADA;stop-opacity:0.1564"
+   id="stop1071" />
+			<stop
+   offset="0.6513"
+   style="stop-color:#B0DFDE;stop-opacity:0.287"
+   id="stop1073" />
+			<stop
+   offset="0.6934"
+   style="stop-color:#C1E6E6;stop-opacity:0.4082"
+   id="stop1075" />
+			<stop
+   offset="0.7334"
+   style="stop-color:#D9EFF2;stop-opacity:0.523"
+   id="stop1077" />
+			<stop
+   offset="0.7636"
+   style="stop-color:#F1F9FD;stop-opacity:0.61"
+   id="stop1079" />
+			<stop
+   offset="0.7872"
+   style="stop-color:#CEEDEF;stop-opacity:0.5491"
+   id="stop1081" />
+			<stop
+   offset="0.818"
+   style="stop-color:#A8DFDF;stop-opacity:0.4698"
+   id="stop1083" />
+			<stop
+   offset="0.85"
+   style="stop-color:#89D4D3;stop-opacity:0.3871"
+   id="stop1085" />
+			<stop
+   offset="0.8832"
+   style="stop-color:#70CCC9;stop-opacity:0.3015"
+   id="stop1087" />
+			<stop
+   offset="0.9179"
+   style="stop-color:#5FC6C2;stop-opacity:0.2118"
+   id="stop1089" />
+			<stop
+   offset="0.9553"
+   style="stop-color:#54C2BD;stop-opacity:0.1153"
+   id="stop1091" />
+			<stop
+   offset="1"
+   style="stop-color:#51C1BC;stop-opacity:0"
+   id="stop1093" />
+		</radialGradient>
+		<path
+   id="tublightreflection_20_"
+   opacity="0.15"
+   fill="url(#tublightreflection_4_)"
+   enable-background="new    "
+   d="    M152.919,142.645c3.736-2.362,6.967-0.359,9.595,3.804c2.631,4.158,2.327,7.316-0.878,10.482    c-2.719,2.686-8.086,1.683-10.715-2.479C148.289,150.294,149.182,145.008,152.919,142.645z" />
+		
+			<radialGradient
+   id="tublightreflection_5_"
+   cx="-1302.3652"
+   cy="-518.0547"
+   r="7.794"
+   gradientTransform="matrix(-1.0609 -0.7135 0.4489 -0.6946 -991.0353 -1157.8248)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3939"
+   style="stop-color:#C9DAF0;stop-opacity:0.89"
+   id="stop1097" />
+			<stop
+   offset="0.4493"
+   style="stop-color:#C6DAEE;stop-opacity:0.5772"
+   id="stop1099" />
+			<stop
+   offset="0.4944"
+   style="stop-color:#BCDAE8;stop-opacity:0.3227"
+   id="stop1101" />
+			<stop
+   offset="0.5357"
+   style="stop-color:#ABD9DD;stop-opacity:0.0893"
+   id="stop1103" />
+			<stop
+   offset="0.5515"
+   style="stop-color:#A2D9D8;stop-opacity:0"
+   id="stop1105" />
+			<stop
+   offset="0.6059"
+   style="stop-color:#A5DADA;stop-opacity:0.1564"
+   id="stop1107" />
+			<stop
+   offset="0.6513"
+   style="stop-color:#B0DFDE;stop-opacity:0.287"
+   id="stop1109" />
+			<stop
+   offset="0.6934"
+   style="stop-color:#C1E6E6;stop-opacity:0.4082"
+   id="stop1111" />
+			<stop
+   offset="0.7334"
+   style="stop-color:#D9EFF2;stop-opacity:0.523"
+   id="stop1113" />
+			<stop
+   offset="0.7636"
+   style="stop-color:#F1F9FD;stop-opacity:0.61"
+   id="stop1115" />
+			<stop
+   offset="0.7872"
+   style="stop-color:#CEEDEF;stop-opacity:0.5491"
+   id="stop1117" />
+			<stop
+   offset="0.818"
+   style="stop-color:#A8DFDF;stop-opacity:0.4698"
+   id="stop1119" />
+			<stop
+   offset="0.85"
+   style="stop-color:#89D4D3;stop-opacity:0.3871"
+   id="stop1121" />
+			<stop
+   offset="0.8832"
+   style="stop-color:#70CCC9;stop-opacity:0.3015"
+   id="stop1123" />
+			<stop
+   offset="0.9179"
+   style="stop-color:#5FC6C2;stop-opacity:0.2118"
+   id="stop1125" />
+			<stop
+   offset="0.9553"
+   style="stop-color:#54C2BD;stop-opacity:0.1153"
+   id="stop1127" />
+			<stop
+   offset="1"
+   style="stop-color:#51C1BC;stop-opacity:0"
+   id="stop1129" />
+		</radialGradient>
+		<path
+   id="tublightreflection_19_"
+   opacity="0.22"
+   fill="url(#tublightreflection_5_)"
+   enable-background="new    "
+   d="    M151.495,125.699c0.587-0.666,3.806,1.783,8.146,4.976c4.342,3.188,6.915,4.769,6.477,6.056    c-1.094,3.225-6.565,3.581-10.908,0.391C150.867,133.932,148.931,128.605,151.495,125.699z" />
+		
+			<radialGradient
+   id="tublightreflection_6_"
+   cx="-1306.2578"
+   cy="-399.9887"
+   r="6.0194"
+   gradientTransform="matrix(-1.0163 -0.7763 0.6764 -0.8708 -900.0159 -1232.0898)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3939"
+   style="stop-color:#C9DAF0;stop-opacity:0.89"
+   id="stop1133" />
+			<stop
+   offset="0.4493"
+   style="stop-color:#C6DAEE;stop-opacity:0.5772"
+   id="stop1135" />
+			<stop
+   offset="0.4944"
+   style="stop-color:#BCDAE8;stop-opacity:0.3227"
+   id="stop1137" />
+			<stop
+   offset="0.5357"
+   style="stop-color:#ABD9DD;stop-opacity:0.0893"
+   id="stop1139" />
+			<stop
+   offset="0.5515"
+   style="stop-color:#A2D9D8;stop-opacity:0"
+   id="stop1141" />
+			<stop
+   offset="0.6059"
+   style="stop-color:#A5DADA;stop-opacity:0.1564"
+   id="stop1143" />
+			<stop
+   offset="0.6513"
+   style="stop-color:#B0DFDE;stop-opacity:0.287"
+   id="stop1145" />
+			<stop
+   offset="0.6934"
+   style="stop-color:#C1E6E6;stop-opacity:0.4082"
+   id="stop1147" />
+			<stop
+   offset="0.7334"
+   style="stop-color:#D9EFF2;stop-opacity:0.523"
+   id="stop1149" />
+			<stop
+   offset="0.7636"
+   style="stop-color:#F1F9FD;stop-opacity:0.61"
+   id="stop1151" />
+			<stop
+   offset="0.7872"
+   style="stop-color:#CEEDEF;stop-opacity:0.5491"
+   id="stop1153" />
+			<stop
+   offset="0.818"
+   style="stop-color:#A8DFDF;stop-opacity:0.4698"
+   id="stop1155" />
+			<stop
+   offset="0.85"
+   style="stop-color:#89D4D3;stop-opacity:0.3871"
+   id="stop1157" />
+			<stop
+   offset="0.8832"
+   style="stop-color:#70CCC9;stop-opacity:0.3015"
+   id="stop1159" />
+			<stop
+   offset="0.9179"
+   style="stop-color:#5FC6C2;stop-opacity:0.2118"
+   id="stop1161" />
+			<stop
+   offset="0.9553"
+   style="stop-color:#54C2BD;stop-opacity:0.1153"
+   id="stop1163" />
+			<stop
+   offset="1"
+   style="stop-color:#51C1BC;stop-opacity:0"
+   id="stop1165" />
+		</radialGradient>
+		<path
+   id="tublightreflection_18_"
+   opacity="0.16"
+   fill="url(#tublightreflection_6_)"
+   enable-background="new    "
+   d="    M151.495,125.699c0.587-0.666,3.806,1.783,8.146,4.976c4.342,3.188-4.854-2.648-5.04-1.302c-0.286,2.066,4.622,4.18,0.609,7.749    C150.867,133.932,148.931,128.605,151.495,125.699z" />
+		
+			<radialGradient
+   id="tublightreflection_7_"
+   cx="-1340.5571"
+   cy="656.0801"
+   r="6.5285"
+   gradientTransform="matrix(0.0701 -1.2144 1.0815 0.0624 -444.2149 -1502.1295)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3939"
+   style="stop-color:#C9DAF0;stop-opacity:0.89"
+   id="stop1169" />
+			<stop
+   offset="0.4493"
+   style="stop-color:#C6DAEE;stop-opacity:0.5772"
+   id="stop1171" />
+			<stop
+   offset="0.4944"
+   style="stop-color:#BCDAE8;stop-opacity:0.3227"
+   id="stop1173" />
+			<stop
+   offset="0.5357"
+   style="stop-color:#ABD9DD;stop-opacity:0.0893"
+   id="stop1175" />
+			<stop
+   offset="0.5515"
+   style="stop-color:#A2D9D8;stop-opacity:0"
+   id="stop1177" />
+			<stop
+   offset="0.6059"
+   style="stop-color:#A5DADA;stop-opacity:0.1564"
+   id="stop1179" />
+			<stop
+   offset="0.6513"
+   style="stop-color:#B0DFDE;stop-opacity:0.287"
+   id="stop1181" />
+			<stop
+   offset="0.6934"
+   style="stop-color:#C1E6E6;stop-opacity:0.4082"
+   id="stop1183" />
+			<stop
+   offset="0.7334"
+   style="stop-color:#D9EFF2;stop-opacity:0.523"
+   id="stop1185" />
+			<stop
+   offset="0.7636"
+   style="stop-color:#F1F9FD;stop-opacity:0.61"
+   id="stop1187" />
+			<stop
+   offset="0.7872"
+   style="stop-color:#CEEDEF;stop-opacity:0.5491"
+   id="stop1189" />
+			<stop
+   offset="0.818"
+   style="stop-color:#A8DFDF;stop-opacity:0.4698"
+   id="stop1191" />
+			<stop
+   offset="0.85"
+   style="stop-color:#89D4D3;stop-opacity:0.3871"
+   id="stop1193" />
+			<stop
+   offset="0.8832"
+   style="stop-color:#70CCC9;stop-opacity:0.3015"
+   id="stop1195" />
+			<stop
+   offset="0.9179"
+   style="stop-color:#5FC6C2;stop-opacity:0.2118"
+   id="stop1197" />
+			<stop
+   offset="0.9553"
+   style="stop-color:#54C2BD;stop-opacity:0.1153"
+   id="stop1199" />
+			<stop
+   offset="1"
+   style="stop-color:#51C1BC;stop-opacity:0"
+   id="stop1201" />
+		</radialGradient>
+		<path
+   id="tublightreflection_17_"
+   opacity="0.15"
+   fill="url(#tublightreflection_7_)"
+   enable-background="new    "
+   d="    M172.824,158.135c4.413,0.256,5.866,3.903,5.568,9.02c-0.293,5.117-2.385,7.607-6.837,8.355c-3.775,0.635-7.547-3.457-7.253-8.57    C164.598,161.82,168.41,157.879,172.824,158.135z" />
+		
+			<radialGradient
+   id="tublightreflection_8_"
+   cx="341.4688"
+   cy="147.9659"
+   r="6.0193"
+   gradientTransform="matrix(0.8294 1.1696 -0.8836 0.6266 -46.2313 -305.4576)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3939"
+   style="stop-color:#C9DAF0;stop-opacity:0.89"
+   id="stop1205" />
+			<stop
+   offset="0.4493"
+   style="stop-color:#C6DAEE;stop-opacity:0.5772"
+   id="stop1207" />
+			<stop
+   offset="0.4944"
+   style="stop-color:#BCDAE8;stop-opacity:0.3227"
+   id="stop1209" />
+			<stop
+   offset="0.5357"
+   style="stop-color:#ABD9DD;stop-opacity:0.0893"
+   id="stop1211" />
+			<stop
+   offset="0.5515"
+   style="stop-color:#A2D9D8;stop-opacity:0"
+   id="stop1213" />
+			<stop
+   offset="0.6059"
+   style="stop-color:#A5DADA;stop-opacity:0.1564"
+   id="stop1215" />
+			<stop
+   offset="0.6513"
+   style="stop-color:#B0DFDE;stop-opacity:0.287"
+   id="stop1217" />
+			<stop
+   offset="0.6934"
+   style="stop-color:#C1E6E6;stop-opacity:0.4082"
+   id="stop1219" />
+			<stop
+   offset="0.7334"
+   style="stop-color:#D9EFF2;stop-opacity:0.523"
+   id="stop1221" />
+			<stop
+   offset="0.7636"
+   style="stop-color:#F1F9FD;stop-opacity:0.61"
+   id="stop1223" />
+			<stop
+   offset="0.7872"
+   style="stop-color:#CEEDEF;stop-opacity:0.5491"
+   id="stop1225" />
+			<stop
+   offset="0.818"
+   style="stop-color:#A8DFDF;stop-opacity:0.4698"
+   id="stop1227" />
+			<stop
+   offset="0.85"
+   style="stop-color:#89D4D3;stop-opacity:0.3871"
+   id="stop1229" />
+			<stop
+   offset="0.8832"
+   style="stop-color:#70CCC9;stop-opacity:0.3015"
+   id="stop1231" />
+			<stop
+   offset="0.9179"
+   style="stop-color:#5FC6C2;stop-opacity:0.2118"
+   id="stop1233" />
+			<stop
+   offset="0.9553"
+   style="stop-color:#54C2BD;stop-opacity:0.1153"
+   id="stop1235" />
+			<stop
+   offset="1"
+   style="stop-color:#51C1BC;stop-opacity:0"
+   id="stop1237" />
+		</radialGradient>
+		<path
+   id="tublightreflection_16_"
+   opacity="0.15"
+   fill="url(#tublightreflection_8_)"
+   enable-background="new    "
+   d="    M111.895,195.299c0,0-3.978-3.076-7.545-8.113c-3.57-5.024-4.786-7.537-4.364-9.156c1.043-4.014,8.545-1.604,12.114,3.432    C115.67,186.491,115.581,192.688,111.895,195.299z" />
+	</g>
+	<g
+   id="g1240">
+		
+			<linearGradient
+   id="SVGID_53_"
+   gradientUnits="userSpaceOnUse"
+   x1="130.314"
+   y1="1067.9688"
+   x2="184.4834"
+   y2="1067.9688"
+   gradientTransform="matrix(1 0 0 1 24 -933)">
+			<stop
+   offset="0"
+   style="stop-color:#517287"
+   id="stop1243" />
+			<stop
+   offset="0.0227"
+   style="stop-color:#6E8B9D"
+   id="stop1245" />
+			<stop
+   offset="0.0532"
+   style="stop-color:#8DA7B5"
+   id="stop1247" />
+			<stop
+   offset="0.0878"
+   style="stop-color:#A9BFCA"
+   id="stop1249" />
+			<stop
+   offset="0.1268"
+   style="stop-color:#BFD2DB"
+   id="stop1251" />
+			<stop
+   offset="0.1724"
+   style="stop-color:#D0E1E7"
+   id="stop1253" />
+			<stop
+   offset="0.2288"
+   style="stop-color:#DBEBF0"
+   id="stop1255" />
+			<stop
+   offset="0.3078"
+   style="stop-color:#E2F1F6"
+   id="stop1257" />
+			<stop
+   offset="0.5273"
+   style="stop-color:#E4F3F7"
+   id="stop1259" />
+		</linearGradient>
+		<path
+   fill="url(#SVGID_53_)"
+   d="M205.166,128.536l-46.103,24.173c-1.585,0.832-3.547,0.221-4.378-1.367    c-0.773-1.479-0.298-3.277,1.052-4.19l43.077-29.226c2.829-1.92,6.679-1.183,8.601,1.648c1.92,2.83,1.183,6.681-1.649,8.604    C205.572,128.309,205.368,128.429,205.166,128.536z"
+   id="path1261" />
+		<path
+   fill="#535A5F"
+   d="M205.547,129.259l-29.797,15.363l-14.874,7.728c-0.633,0.32-1.209,0.646-1.89,0.963    c-0.798,0.314-1.615,0.359-2.403,0.146c-0.78-0.207-1.485-0.684-1.977-1.318c-0.253-0.32-0.434-0.676-0.571-1.047    c-0.144-0.396-0.213-0.787-0.224-1.195c-0.015-0.808,0.239-1.615,0.713-2.271c0.236-0.329,0.526-0.62,0.858-0.853l0.871-0.601    l3.457-2.368l27.644-18.963l6.903-4.752l3.452-2.375c0.297-0.201,0.555-0.39,0.883-0.6c0.339-0.213,0.7-0.4,1.061-0.55    c0.73-0.304,1.514-0.478,2.304-0.522c1.582-0.085,3.188,0.381,4.48,1.313c1.291,0.93,2.262,2.302,2.668,3.849    c0.418,1.539,0.291,3.216-0.357,4.667C208.107,127.323,206.947,128.54,205.547,129.259z M204.785,127.814    c2.188-1.129,3.316-3.831,2.643-6.159c-0.316-1.154-1.029-2.207-1.996-2.922c-0.967-0.717-2.188-1.092-3.396-1.043    c-0.604,0.026-1.205,0.15-1.768,0.375c-0.286,0.116-0.549,0.248-0.803,0.401c-0.264,0.161-0.573,0.379-0.857,0.566l-3.483,2.33    l-6.967,4.658l-27.836,18.678l-3.478,2.337l-0.859,0.581c-0.243,0.166-0.454,0.375-0.627,0.612    c-0.348,0.473-0.541,1.062-0.535,1.652c0.002,0.29,0.061,0.599,0.15,0.856c0.099,0.283,0.242,0.563,0.426,0.785    c0.363,0.465,0.88,0.809,1.453,0.955c0.56,0.162,1.207,0.097,1.707-0.104c0.585-0.271,1.226-0.646,1.836-0.954l14.814-7.84    L204.785,127.814z"
+   id="path1263" />
+	</g>
+	
+		<radialGradient
+   id="SVGID_54_"
+   cx="177.8506"
+   cy="1057.0029"
+   r="20.2362"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+		<stop
+   offset="0"
+   style="stop-color:#46C3D6;stop-opacity:0.74"
+   id="stop1266" />
+		<stop
+   offset="0.1036"
+   style="stop-color:#48C3D3;stop-opacity:0.5799"
+   id="stop1268" />
+		<stop
+   offset="0.1813"
+   style="stop-color:#4DC4C9;stop-opacity:0.4597"
+   id="stop1270" />
+		<stop
+   offset="0.2507"
+   style="stop-color:#57C5B9;stop-opacity:0.3525"
+   id="stop1272" />
+		<stop
+   offset="0.3152"
+   style="stop-color:#65C6A2;stop-opacity:0.2529"
+   id="stop1274" />
+		<stop
+   offset="0.3763"
+   style="stop-color:#76C785;stop-opacity:0.1584"
+   id="stop1276" />
+		<stop
+   offset="0.434"
+   style="stop-color:#8BC961;stop-opacity:0.0692"
+   id="stop1278" />
+		<stop
+   offset="0.4788"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop1280" />
+	</radialGradient>
+	<path
+   opacity="0.52"
+   fill="url(#SVGID_54_)"
+   enable-background="new    "
+   d="M205.766,128.177c2.832-1.922,3.569-5.774,1.649-8.604   c-1.922-2.832-5.772-3.568-8.601-1.648l-5.358,3.636c-0.234,4.088,0.646,8.11,2.308,11.903l9.402-4.929   C205.368,128.429,205.572,128.309,205.766,128.177z"
+   id="path1282" />
+	<g
+   id="g1284">
+		
+			<linearGradient
+   id="SVGID_55_"
+   gradientUnits="userSpaceOnUse"
+   x1="164.0279"
+   y1="1079.2363"
+   x2="205.2583"
+   y2="1120.4667"
+   gradientTransform="matrix(1 0 0 1 24 -933)">
+			<stop
+   offset="0"
+   style="stop-color:#517287"
+   id="stop1287" />
+			<stop
+   offset="0.0227"
+   style="stop-color:#6E8B9D"
+   id="stop1289" />
+			<stop
+   offset="0.0532"
+   style="stop-color:#8DA7B5"
+   id="stop1291" />
+			<stop
+   offset="0.0878"
+   style="stop-color:#A9BFCA"
+   id="stop1293" />
+			<stop
+   offset="0.1268"
+   style="stop-color:#BFD2DB"
+   id="stop1295" />
+			<stop
+   offset="0.1724"
+   style="stop-color:#D0E1E7"
+   id="stop1297" />
+			<stop
+   offset="0.2288"
+   style="stop-color:#DBEBF0"
+   id="stop1299" />
+			<stop
+   offset="0.3078"
+   style="stop-color:#E2F1F6"
+   id="stop1301" />
+			<stop
+   offset="0.5273"
+   style="stop-color:#E4F3F7"
+   id="stop1303" />
+		</linearGradient>
+		<path
+   fill="url(#SVGID_55_)"
+   d="M241.759,172.475l-69.237-1.938c-2.038-0.057-3.642-1.756-3.583-3.791    c0.054-1.964,1.645-3.525,3.583-3.585l69.237-1.938c3.106-0.084,5.697,2.362,5.783,5.471c0.085,3.105-2.36,5.693-5.468,5.781    C241.977,172.477,241.855,172.477,241.759,172.475z"
+   id="path1305" />
+		<path
+   fill="#535A5F"
+   d="M241.734,173.298l-41.949-1.465l-20.977-0.666L173.564,171c-0.446-0.02-0.853-0.014-1.332-0.057    c-0.479-0.047-0.979-0.188-1.407-0.398c-0.879-0.425-1.588-1.179-1.966-2.076c-0.19-0.447-0.299-0.929-0.322-1.412    c0-0.129-0.009-0.229-0.001-0.38l0.024-0.327c0.036-0.257,0.085-0.504,0.157-0.729c0.29-0.934,0.923-1.745,1.75-2.264    c0.413-0.258,0.872-0.439,1.35-0.541c0.238-0.053,0.485-0.07,0.724-0.088l0.656-0.021l2.622-0.084l41.953-1.377l20.979-0.729    l2.622-0.094l0.677-0.016c0.271,0.007,0.521,0.021,0.771,0.058c0.496,0.067,0.982,0.191,1.455,0.371    c1.883,0.713,3.379,2.354,3.91,4.31c0.563,1.941,0.104,4.144-1.16,5.719c-1.236,1.599-3.281,2.52-5.272,2.438h-0.011V173.3    L241.734,173.298L241.734,173.298z M241.775,171.65c1.514,0.035,2.976-0.678,3.886-1.856c0.926-1.165,1.231-2.765,0.854-4.198    c-0.367-1.435-1.461-2.671-2.854-3.22c-0.349-0.138-0.708-0.235-1.078-0.29c-0.188-0.029-0.371-0.042-0.538-0.051l-0.635,0.006    l-2.623,0.057l-20.98,0.444l-41.967,0.974l-2.623,0.063l-0.655,0.017c-0.198,0.014-0.387,0.023-0.578,0.063    c-0.379,0.073-0.744,0.219-1.074,0.421c-0.662,0.4-1.173,1.05-1.41,1.788c-0.061,0.188-0.096,0.368-0.127,0.547l-0.027,0.327    l0.005,0.273c0.022,0.389,0.112,0.771,0.266,1.127c0.305,0.713,0.876,1.313,1.577,1.644c0.357,0.169,0.713,0.271,1.103,0.307    c0.393,0.034,0.862,0.027,1.289,0.044l5.245,0.129l20.981,0.508l41.965,0.886h-0.008v-0.007h0.004v-0.002H241.775L241.775,171.65z    "
+   id="path1307" />
+	</g>
+	
+		<radialGradient
+   id="SVGID_56_"
+   cx="215.1465"
+   cy="1101.0889"
+   r="18.8706"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+		<stop
+   offset="0"
+   style="stop-color:#46C3D6;stop-opacity:0.74"
+   id="stop1310" />
+		<stop
+   offset="0.1036"
+   style="stop-color:#48C3D3;stop-opacity:0.5799"
+   id="stop1312" />
+		<stop
+   offset="0.1813"
+   style="stop-color:#4DC4C9;stop-opacity:0.4597"
+   id="stop1314" />
+		<stop
+   offset="0.2507"
+   style="stop-color:#57C5B9;stop-opacity:0.3525"
+   id="stop1316" />
+		<stop
+   offset="0.3152"
+   style="stop-color:#65C6A2;stop-opacity:0.2529"
+   id="stop1318" />
+		<stop
+   offset="0.3763"
+   style="stop-color:#76C785;stop-opacity:0.1584"
+   id="stop1320" />
+		<stop
+   offset="0.434"
+   style="stop-color:#8BC961;stop-opacity:0.0692"
+   id="stop1322" />
+		<stop
+   offset="0.4788"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop1324" />
+	</radialGradient>
+	<path
+   opacity="0.52"
+   fill="url(#SVGID_56_)"
+   enable-background="new    "
+   d="M242.074,172.475c3.107-0.088,5.553-2.676,5.468-5.781   c-0.086-3.104-2.677-5.555-5.783-5.471l-11.776,0.332c-0.221,3.576,0.271,7.168,1.365,10.629l10.411,0.291   C241.855,172.477,241.977,172.477,242.074,172.475z"
+   id="path1326" />
+	<g
+   id="g1328">
+		
+			<linearGradient
+   id="SVGID_57_"
+   gradientUnits="userSpaceOnUse"
+   x1="116.8828"
+   y1="1108.6611"
+   x2="131.2825"
+   y2="1172.244"
+   gradientTransform="matrix(1 0 0 1 24 -933)">
+			<stop
+   offset="0"
+   style="stop-color:#202D36"
+   id="stop1331" />
+			<stop
+   offset="0.0732"
+   style="stop-color:#517287"
+   id="stop1333" />
+			<stop
+   offset="0.1426"
+   style="stop-color:#7895A5"
+   id="stop1335" />
+			<stop
+   offset="0.2232"
+   style="stop-color:#9FB6C2"
+   id="stop1337" />
+			<stop
+   offset="0.3033"
+   style="stop-color:#BDD1D9"
+   id="stop1339" />
+			<stop
+   offset="0.3816"
+   style="stop-color:#D3E4EA"
+   id="stop1341" />
+			<stop
+   offset="0.4572"
+   style="stop-color:#E0EFF4"
+   id="stop1343" />
+			<stop
+   offset="0.5273"
+   style="stop-color:#E4F3F7"
+   id="stop1345" />
+		</linearGradient>
+		<path
+   fill="url(#SVGID_57_)"
+   d="M144.025,178.781l17.471,54.305c1.259,3.918-0.896,8.114-4.812,9.374    c-3.917,1.263-8.111-0.894-9.371-4.81c-0.09-0.271-0.157-0.545-0.212-0.815l-11.224-55.931c-0.459-2.285,1.022-4.506,3.304-4.967    C141.308,175.512,143.38,176.766,144.025,178.781z"
+   id="path1347" />
+		<path
+   fill="#535A5F"
+   d="M144.484,178.634l11.826,35.88l5.854,17.957c0.583,1.563,0.707,3.449,0.227,5.122    c-0.46,1.69-1.478,3.224-2.856,4.314c-1.379,1.095-3.109,1.726-4.869,1.771c-1.76,0.057-3.522-0.476-4.96-1.476    c-1.446-0.99-2.552-2.466-3.114-4.117c-0.077-0.21-0.131-0.429-0.184-0.604l-0.142-0.646l-0.227-1.159l-0.455-2.316l-1.818-9.268    l-3.619-18.539l-3.586-18.546l-0.896-4.636l-0.224-1.159c-0.081-0.386-0.146-0.846-0.124-1.28c0.03-0.877,0.315-1.74,0.806-2.463    c0.978-1.468,2.796-2.262,4.535-2.015C142.391,175.682,143.95,176.945,144.484,178.634z M143.565,178.93    c-0.397-1.342-1.629-2.402-3.031-2.584c-1.388-0.221-2.889,0.447-3.641,1.639c-0.386,0.586-0.603,1.279-0.617,1.979    c-0.025,0.659,0.224,1.438,0.362,2.22l0.961,4.621l3.846,18.492l3.814,18.5l1.898,9.252l0.475,2.313l0.237,1.156l0.113,0.506    c0.062,0.203,0.102,0.367,0.164,0.523c0.463,1.323,1.353,2.487,2.514,3.268c1.154,0.789,2.56,1.197,3.949,1.145    c1.387-0.061,2.764-0.547,3.861-1.396c1.096-0.854,1.918-2.065,2.295-3.412c0.382-1.36,0.33-2.767-0.173-4.162l-5.715-18.002    L143.565,178.93z"
+   id="path1349" />
+	</g>
+	
+		<radialGradient
+   id="SVGID_58_"
+   cx="-2251.0732"
+   cy="1565.3145"
+   r="24.2975"
+   gradientTransform="matrix(-0.2616 -0.9652 0.6428 -0.1743 -1441.7035 -1668.0449)"
+   gradientUnits="userSpaceOnUse">
+		<stop
+   offset="0"
+   style="stop-color:#46C3D6;stop-opacity:0.74"
+   id="stop1352" />
+		<stop
+   offset="0.1404"
+   style="stop-color:#48C3D3;stop-opacity:0.5799"
+   id="stop1354" />
+		<stop
+   offset="0.2458"
+   style="stop-color:#4DC4C9;stop-opacity:0.4597"
+   id="stop1356" />
+		<stop
+   offset="0.3399"
+   style="stop-color:#57C5B9;stop-opacity:0.3525"
+   id="stop1358" />
+		<stop
+   offset="0.4273"
+   style="stop-color:#65C6A2;stop-opacity:0.2529"
+   id="stop1360" />
+		<stop
+   offset="0.5101"
+   style="stop-color:#76C785;stop-opacity:0.1584"
+   id="stop1362" />
+		<stop
+   offset="0.5883"
+   style="stop-color:#8BC961;stop-opacity:0.0692"
+   id="stop1364" />
+		<stop
+   offset="0.649"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop1366" />
+	</radialGradient>
+	<path
+   opacity="0.52"
+   fill="url(#SVGID_58_)"
+   enable-background="new    "
+   d="M149.451,215.529   c-1.866,1.066-3.963,2.132-5.955,3.336l3.605,17.97c0.055,0.271,0.122,0.545,0.212,0.815c1.26,3.916,5.454,6.07,9.371,4.81   c3.917-1.26,6.071-5.456,4.812-9.374l-5.972-18.561C153.225,214.504,151.016,214.902,149.451,215.529z"
+   id="path1368" />
+	<path
+   fill="#E4F3F7"
+   stroke="#535A5F"
+   stroke-width="1.7448"
+   stroke-miterlimit="10"
+   d="M107.278,190.825L73.16,225.299   c-2.395,2.419-6.296,2.44-8.715,0.045c-2.417-2.396-2.439-6.296-0.045-8.715c0.136-0.14,0.286-0.273,0.431-0.396l37.225-31.088   c1.639-1.369,4.074-1.146,5.442,0.487C108.779,187.171,108.652,189.425,107.278,190.825z"
+   id="path1370" />
+	
+		<radialGradient
+   id="SVGID_59_"
+   cx="47.6558"
+   cy="1150.9707"
+   r="24.7284"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+		<stop
+   offset="0"
+   style="stop-color:#46C3D6;stop-opacity:0.74"
+   id="stop1373" />
+		<stop
+   offset="0.1036"
+   style="stop-color:#48C3D3;stop-opacity:0.5799"
+   id="stop1375" />
+		<stop
+   offset="0.1813"
+   style="stop-color:#4DC4C9;stop-opacity:0.4597"
+   id="stop1377" />
+		<stop
+   offset="0.2507"
+   style="stop-color:#57C5B9;stop-opacity:0.3525"
+   id="stop1379" />
+		<stop
+   offset="0.3152"
+   style="stop-color:#65C6A2;stop-opacity:0.2529"
+   id="stop1381" />
+		<stop
+   offset="0.3763"
+   style="stop-color:#76C785;stop-opacity:0.1584"
+   id="stop1383" />
+		<stop
+   offset="0.434"
+   style="stop-color:#8BC961;stop-opacity:0.0692"
+   id="stop1385" />
+		<stop
+   offset="0.4788"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop1387" />
+	</radialGradient>
+	<path
+   opacity="0.52"
+   fill="url(#SVGID_59_)"
+   enable-background="new    "
+   d="M78.062,206.377c-0.293-0.176-0.586-0.327-0.878-0.459   l-12.353,10.314c-0.145,0.121-0.295,0.257-0.431,0.396c-2.395,2.419-2.372,6.319,0.045,8.715c2.419,2.396,6.321,2.374,8.715-0.045   l12.212-12.34C83.529,210.468,81.095,208.243,78.062,206.377z"
+   id="path1389" />
+	<g
+   id="g1391">
+		
+			<linearGradient
+   id="SVGID_60_"
+   gradientUnits="userSpaceOnUse"
+   x1="65.7774"
+   y1="1106.8008"
+   x2="37.484"
+   y2="1070.5869"
+   gradientTransform="matrix(1 0 0 1 24 -933)">
+			<stop
+   offset="0"
+   style="stop-color:#517287"
+   id="stop1394" />
+			<stop
+   offset="0.0118"
+   style="stop-color:#5C7B8F"
+   id="stop1396" />
+			<stop
+   offset="0.057"
+   style="stop-color:#809BAB"
+   id="stop1398" />
+			<stop
+   offset="0.1063"
+   style="stop-color:#9FB7C3"
+   id="stop1400" />
+			<stop
+   offset="0.1597"
+   style="stop-color:#B8CDD6"
+   id="stop1402" />
+			<stop
+   offset="0.219"
+   style="stop-color:#CCDEE5"
+   id="stop1404" />
+			<stop
+   offset="0.2872"
+   style="stop-color:#DAEAEF"
+   id="stop1406" />
+			<stop
+   offset="0.3724"
+   style="stop-color:#E2F1F5"
+   id="stop1408" />
+			<stop
+   offset="0.5273"
+   style="stop-color:#E4F3F7"
+   id="stop1410" />
+		</linearGradient>
+		<path
+   fill="url(#SVGID_60_)"
+   d="M54.304,146.159l48.887,8.844c2.137,0.39,3.557,2.437,3.171,4.574    c-0.359,1.976-2.136,3.339-4.094,3.228l-49.6-2.787c-3.853-0.219-6.803-3.518-6.589-7.373c0.218-3.852,3.517-6.802,7.372-6.583    C53.727,146.075,54.038,146.113,54.304,146.159z"
+   id="path1412" />
+		<path
+   fill="#535A5F"
+   d="M54.443,145.375l32.926,6.266l8.234,1.551l4.121,0.761l2.06,0.377c0.695,0.146,1.347,0.196,2.11,0.438    c1.472,0.489,2.607,1.823,2.866,3.354c0.282,1.521-0.326,3.16-1.533,4.131c-0.596,0.484-1.323,0.813-2.087,0.934    c-0.797,0.115-1.482-0.008-2.176-0.021l-4.184-0.223c-11.155-0.604-22.316-1.088-33.474-1.641l-8.369-0.396l-2.092-0.104    l-0.542-0.031c-0.18-0.021-0.405-0.043-0.589-0.076c-0.383-0.063-0.76-0.156-1.13-0.275c-1.48-0.479-2.804-1.424-3.753-2.66    c-1.947-2.459-2.183-6.154-0.464-8.825c0.827-1.333,2.057-2.414,3.496-3.035C51.296,145.257,52.925,145.088,54.443,145.375z     M54.164,146.944c-2.469-0.444-5.057,0.774-6.325,2.887c-0.317,0.523-0.557,1.091-0.707,1.683    c-0.076,0.301-0.129,0.596-0.165,0.885l-0.024,0.267l-0.01,0.214c-0.01,0.148-0.002,0.313-0.001,0.46    c0.043,1.229,0.471,2.438,1.209,3.423c0.734,0.991,1.772,1.764,2.943,2.162c0.293,0.104,0.592,0.188,0.898,0.233    c0.159,0.028,0.282,0.049,0.448,0.065l0.502,0.039l2.09,0.135l8.361,0.541c11.149,0.705,22.294,1.479,33.447,2.125l4.182,0.25    c0.698,0.021,1.414,0.14,2.004,0.041c0.617-0.09,1.209-0.352,1.697-0.744c0.988-0.771,1.49-2.111,1.251-3.354    c-0.216-1.236-1.146-2.318-2.338-2.711c-0.572-0.18-1.321-0.261-1.992-0.396l-2.062-0.369l-4.124-0.73l-8.255-1.438    L54.164,146.944z"
+   id="path1414" />
+	</g>
+	
+		<radialGradient
+   id="SVGID_61_"
+   cx="33.9258"
+   cy="1086.5967"
+   r="23.2725"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+		<stop
+   offset="0"
+   style="stop-color:#46C3D6;stop-opacity:0.74"
+   id="stop1417" />
+		<stop
+   offset="0.1036"
+   style="stop-color:#48C3D3;stop-opacity:0.5799"
+   id="stop1419" />
+		<stop
+   offset="0.1813"
+   style="stop-color:#4DC4C9;stop-opacity:0.4597"
+   id="stop1421" />
+		<stop
+   offset="0.2507"
+   style="stop-color:#57C5B9;stop-opacity:0.3525"
+   id="stop1423" />
+		<stop
+   offset="0.3152"
+   style="stop-color:#65C6A2;stop-opacity:0.2529"
+   id="stop1425" />
+		<stop
+   offset="0.3763"
+   style="stop-color:#76C785;stop-opacity:0.1584"
+   id="stop1427" />
+		<stop
+   offset="0.434"
+   style="stop-color:#8BC961;stop-opacity:0.0692"
+   id="stop1429" />
+		<stop
+   offset="0.4788"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop1431" />
+	</radialGradient>
+	<path
+   opacity="0.52"
+   fill="url(#SVGID_61_)"
+   enable-background="new    "
+   d="M66.826,148.424l-12.522-2.265   c-0.266-0.046-0.577-0.084-0.853-0.1c-3.855-0.216-7.154,2.733-7.372,6.585c-0.214,3.854,2.736,7.148,6.589,7.371l15.652,0.879   C69.202,157.001,68.837,152.781,66.826,148.424z"
+   id="path1433" />
+	<g
+   id="g1435">
+		<g
+   id="g1437">
+			
+				<radialGradient
+   id="SVGID_62_"
+   cx="42.4878"
+   cy="1133.252"
+   r="18.6436"
+   gradientTransform="matrix(0.9545 0 0 0.9545 -0.1888 -930.3677)"
+   gradientUnits="userSpaceOnUse">
+				<stop
+   offset="0.7758"
+   style="stop-color:#D5E2EE"
+   id="stop1440" />
+				<stop
+   offset="0.8263"
+   style="stop-color:#D1DFED"
+   id="stop1442" />
+				<stop
+   offset="0.8714"
+   style="stop-color:#C7D6E8"
+   id="stop1444" />
+				<stop
+   offset="0.9144"
+   style="stop-color:#B4C6E1"
+   id="stop1446" />
+				<stop
+   offset="0.9562"
+   style="stop-color:#9BB0D8"
+   id="stop1448" />
+				<stop
+   offset="0.9968"
+   style="stop-color:#7A95CB"
+   id="stop1450" />
+				<stop
+   offset="1"
+   style="stop-color:#7792CA"
+   id="stop1452" />
+			</radialGradient>
+			<circle
+   fill="url(#SVGID_62_)"
+   cx="40.366"
+   cy="151.321"
+   r="17.795"
+   id="circle1454" />
+			<path
+   fill="#39444F"
+   d="M58.944,151.331c-0.033,4.854-2.113,9.646-5.566,13.002c-3.432,3.387-8.172,5.387-13.02,5.409     c-4.817,0.066-9.645-1.897-13.117-5.297c-3.5-3.383-5.593-8.196-5.625-13.137c-0.032-2.434,0.421-4.917,1.34-7.205     c0.924-2.289,2.318-4.386,4.054-6.144c3.463-3.538,8.375-5.63,13.37-5.571c4.939-0.034,9.859,2.113,13.267,5.646     c3.449,3.513,5.392,8.413,5.296,13.275L58.944,151.331L58.944,151.331z M57.378,151.32c-0.045-4.464-1.948-8.828-5.127-11.884     c-1.582-1.531-3.455-2.751-5.487-3.562c-2.04-0.806-4.2-1.216-6.412-1.217c-4.339,0.009-8.689,1.763-11.795,4.853     c-3.123,3.076-4.984,7.378-5.031,11.822c-0.083,4.395,1.672,8.841,4.8,12.027c3.097,3.229,7.531,5.104,12.048,5.127     c4.486,0.072,9.009-1.771,12.146-5.014c3.175-3.211,4.941-7.688,4.858-12.162V151.32z"
+   id="path1456" />
+		</g>
+		
+			<radialGradient
+   id="SVGID_63_"
+   cx="198.6104"
+   cy="674.4346"
+   r="20.9529"
+   gradientTransform="matrix(0.9092 0.2908 -0.2908 0.9092 55.1576 -520.1451)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.4121"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop1459" />
+			<stop
+   offset="0.5849"
+   style="stop-color:#0A1827;stop-opacity:0.5379"
+   id="stop1461" />
+			<stop
+   offset="0.6472"
+   style="stop-color:#091420;stop-opacity:0.7317"
+   id="stop1463" />
+			<stop
+   offset="0.6914"
+   style="stop-color:#060D15;stop-opacity:0.8694"
+   id="stop1465" />
+			<stop
+   offset="0.727"
+   style="stop-color:#010204;stop-opacity:0.9803"
+   id="stop1467" />
+			<stop
+   offset="0.7333"
+   style="stop-color:#000000"
+   id="stop1469" />
+			<stop
+   offset="0.7876"
+   style="stop-color:#03080D;stop-opacity:0.6108"
+   id="stop1471" />
+			<stop
+   offset="0.8727"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop1473" />
+		</radialGradient>
+		<circle
+   opacity="0.36"
+   fill="url(#SVGID_63_)"
+   enable-background="new    "
+   cx="40.187"
+   cy="149.926"
+   r="19.216"
+   id="circle1475" />
+		
+			<radialGradient
+   id="SVGID_64_"
+   cx="44.4297"
+   cy="1121.793"
+   r="28.879"
+   gradientTransform="matrix(0.9545 0 0 0.9545 -0.1888 -930.3677)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#B4CB80;stop-opacity:0"
+   id="stop1478" />
+			<stop
+   offset="1"
+   style="stop-color:#60BD71"
+   id="stop1480" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_64_)"
+   enable-background="new    "
+   cx="40.368"
+   cy="151.127"
+   r="17.795"
+   id="circle1482" />
+		
+			<radialGradient
+   id="SVGID_65_"
+   cx="42.4912"
+   cy="1133.0498"
+   r="18.6443"
+   gradientTransform="matrix(0.9545 0 0 0.9545 -0.1888 -930.3677)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop1485" />
+			<stop
+   offset="1"
+   style="stop-color:#458691"
+   id="stop1487" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_65_)"
+   enable-background="new    "
+   cx="40.369"
+   cy="151.128"
+   r="17.796"
+   id="circle1489" />
+		<path
+   opacity="0.49"
+   fill="#F2F6FA"
+   enable-background="new    "
+   d="M25.006,152.037c-0.775-8.092,5.16-15.283,13.254-16.057    c8.092-0.772,15.991,3.641,17.272,10.397c-6.04-7.997-15.256-7.997-18.316-7.262C30.42,140.746,26.885,145.755,25.006,152.037z"
+   id="path1491" />
+		<path
+   opacity="0.11"
+   fill="#EBF7FD"
+   enable-background="new    "
+   d="M22.753,153.857c-0.934-9.772,5.798-18.961,15.57-19.896    c9.771-0.931,16.319,4.533,19.467,13.535c-4.66-9.921-17.346-10.127-21.041-9.239C28.546,140.226,25.021,146.272,22.753,153.857z"
+   id="path1493" />
+		<path
+   opacity="0.22"
+   fill="#EBF7FD"
+   enable-background="new    "
+   d="M24.147,158.452c-3.024-12.956,4.676-22.458,14.202-23.369    c9.522-0.908,18.36,6.393,19.442,16.954c-4.181-15.48-17.278-14.999-20.877-14.121C28.921,139.865,24.659,145.986,24.147,158.452z    "
+   id="path1495" />
+		
+			<radialGradient
+   id="SVGID_66_"
+   cx="42.1094"
+   cy="1224.0742"
+   r="9.9402"
+   gradientTransform="matrix(0.9545 0 0 0.8789 -0.1888 -933.7701)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop1498" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop1500" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop1502" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop1504" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop1506" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop1508" />
+		</radialGradient>
+		<path
+   opacity="0.5"
+   fill="url(#SVGID_66_)"
+   enable-background="new    "
+   d="M49.492,142.067c0,4.825-4.246,8.738-9.486,8.738    c-5.24,0-9.489-3.914-9.489-8.738c0-4.823,4.249-8.736,9.489-8.736C45.246,133.331,49.492,137.244,49.492,142.067z"
+   id="path1510" />
+		
+			<radialGradient
+   id="SVGID_67_"
+   cx="42.1109"
+   cy="1223.4004"
+   r="7.2747"
+   gradientTransform="matrix(0.9545 0 0 0.8789 -0.1888 -933.7701)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop1513" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop1515" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop1517" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop1519" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop1521" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop1523" />
+		</radialGradient>
+		<ellipse
+   fill="url(#SVGID_67_)"
+   cx="40.006"
+   cy="141.476"
+   rx="6.944"
+   ry="6.394"
+   id="ellipse1525" />
+		
+			<radialGradient
+   id="SVGID_68_"
+   cx="43.5"
+   cy="1121.7168"
+   r="4.9622"
+   gradientTransform="matrix(0.9545 0 0 0.9545 -0.1888 -930.3677)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#EEF8FB"
+   id="stop1528" />
+			<stop
+   offset="0.4122"
+   style="stop-color:#EDF7F8;stop-opacity:0.8016"
+   id="stop1530" />
+			<stop
+   offset="0.5215"
+   style="stop-color:#E9F5EE;stop-opacity:0.6525"
+   id="stop1532" />
+			<stop
+   offset="0.619"
+   style="stop-color:#E2F1DE;stop-opacity:0.5196"
+   id="stop1534" />
+			<stop
+   offset="0.7096"
+   style="stop-color:#D8ECC7;stop-opacity:0.396"
+   id="stop1536" />
+			<stop
+   offset="0.7954"
+   style="stop-color:#CCE4AA;stop-opacity:0.2789"
+   id="stop1538" />
+			<stop
+   offset="0.8777"
+   style="stop-color:#BCDC86;stop-opacity:0.1667"
+   id="stop1540" />
+			<stop
+   offset="0.9557"
+   style="stop-color:#ABD25B;stop-opacity:0.0604"
+   id="stop1542" />
+			<stop
+   offset="1"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop1544" />
+		</radialGradient>
+		<circle
+   fill="url(#SVGID_68_)"
+   cx="41.332"
+   cy="140.31"
+   r="4.737"
+   id="circle1546" />
+		<circle
+   opacity="0.62"
+   fill="#FFFFFF"
+   enable-background="new    "
+   cx="42.05"
+   cy="138.349"
+   r="1.862"
+   id="circle1548" />
+		
+			<radialGradient
+   id="SVGID_69_"
+   cx="251.9141"
+   cy="898.8926"
+   r="6.8579"
+   gradientTransform="matrix(1.0826 0.3949 -0.3271 0.8967 54.9292 -746.3787)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#46C3D6;stop-opacity:0.74"
+   id="stop1551" />
+			<stop
+   offset="0.4253"
+   style="stop-color:#48C3D3;stop-opacity:0.5799"
+   id="stop1553" />
+			<stop
+   offset="0.5444"
+   style="stop-color:#4DC4C9;stop-opacity:0.4597"
+   id="stop1555" />
+			<stop
+   offset="0.6507"
+   style="stop-color:#57C5B9;stop-opacity:0.3525"
+   id="stop1557" />
+			<stop
+   offset="0.7494"
+   style="stop-color:#65C6A2;stop-opacity:0.2529"
+   id="stop1559" />
+			<stop
+   offset="0.843"
+   style="stop-color:#76C785;stop-opacity:0.1584"
+   id="stop1561" />
+			<stop
+   offset="0.9314"
+   style="stop-color:#8BC961;stop-opacity:0.0692"
+   id="stop1563" />
+			<stop
+   offset="1"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop1565" />
+		</radialGradient>
+		<path
+   opacity="0.52"
+   fill="url(#SVGID_69_)"
+   enable-background="new    "
+   d="M41.05,161.848c-1.24,3.396-5.568,4.938-9.669,3.44    c-4.101-1.493-6.422-5.462-5.183-8.858c1.239-3.395,5.569-4.938,9.67-3.438C39.968,154.484,42.287,158.451,41.05,161.848z"
+   id="path1567" />
+		<path
+   opacity="0.32"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M36.418,166.998c-0.269,0.521-0.668,0.941-1.159,1.255    c-2.728-0.456-6.732-3.212-8.324-5.217c0.057-0.265,0.147-0.519,0.272-0.765c1.005-1.957,3.883-2.49,6.426-1.188    C36.177,162.389,37.423,165.037,36.418,166.998z"
+   id="path1569" />
+		
+			<radialGradient
+   id="SVGID_70_"
+   cx="-1457.8711"
+   cy="915.7305"
+   r="9.2501"
+   gradientTransform="matrix(0.0134 -1.0958 0.7445 0.0091 -608.7991 -1451.4426)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.5455"
+   style="stop-color:#1D3C6E;stop-opacity:0.36"
+   id="stop1572" />
+			<stop
+   offset="0.569"
+   style="stop-color:#30486D;stop-opacity:0.433"
+   id="stop1574" />
+			<stop
+   offset="0.6061"
+   style="stop-color:#46566B;stop-opacity:0.5484"
+   id="stop1576" />
+			<stop
+   offset="0.6463"
+   style="stop-color:#56606A;stop-opacity:0.6733"
+   id="stop1578" />
+			<stop
+   offset="0.6914"
+   style="stop-color:#606669;stop-opacity:0.8134"
+   id="stop1580" />
+			<stop
+   offset="0.7515"
+   style="stop-color:#636869"
+   id="stop1582" />
+			<stop
+   offset="1"
+   style="stop-color:#51C1BC;stop-opacity:0"
+   id="stop1584" />
+		</radialGradient>
+		<path
+   opacity="0.19"
+   fill="url(#SVGID_70_)"
+   enable-background="new    "
+   d="M54.453,142.89c4.068,0.05,5.542,4.363,5.467,10.545    c-0.075,6.182-1.999,7.254-5.742,11.84c-2.572,3.146-7.304-5.104-7.228-11.283C47.027,147.811,50.386,142.84,54.453,142.89z"
+   id="path1586" />
+		
+			<radialGradient
+   id="SVGID_71_"
+   cx="-1385.915"
+   cy="1234.9063"
+   r="12.6932"
+   gradientTransform="matrix(0.222 -0.9284 0.9284 0.222 -789.3549 -1407.3914)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop1589" />
+			<stop
+   offset="0.3195"
+   style="stop-color:#050709"
+   id="stop1591" />
+			<stop
+   offset="0.5599"
+   style="stop-color:#070C13"
+   id="stop1593" />
+			<stop
+   offset="0.7738"
+   style="stop-color:#0A1523"
+   id="stop1595" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0B1929"
+   id="stop1597" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C"
+   id="stop1599" />
+		</radialGradient>
+		<path
+   opacity="0.4"
+   fill="url(#SVGID_71_)"
+   enable-background="new    "
+   d="M46.334,136.593    c7.341,2.575,11.838,10.322,9.948,18.229c-1.893,7.906-9.105,13.523-15.913,12.547c9.025-0.988,12.906-9.758,13.699-12.807    C56.08,146.828,51.557,140.535,46.334,136.593z"
+   id="path1601" />
+		<path
+   opacity="0.75"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M56.626,148.539c2.043,7.511-2.063,15.754-10.037,18.879    c-7.972,3.124-17.057,0.555-20.178-5.58c5.126,8.309,17.104,5.918,20.194,4.711C53.282,163.941,58.416,156.654,56.626,148.539z"
+   id="path1603" />
+		
+			<radialGradient
+   id="SVGID_72_"
+   cx="-1698.0078"
+   cy="543.3105"
+   r="1.7839"
+   gradientTransform="matrix(-0.0307 -0.954 0.954 -0.0307 -546.501 -1450.8168)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop1606" />
+			<stop
+   offset="0.3195"
+   style="stop-color:#050709"
+   id="stop1608" />
+			<stop
+   offset="0.5599"
+   style="stop-color:#070C13"
+   id="stop1610" />
+			<stop
+   offset="0.7738"
+   style="stop-color:#0A1523"
+   id="stop1612" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0B1929"
+   id="stop1614" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C"
+   id="stop1616" />
+		</radialGradient>
+		<path
+   opacity="0.19"
+   fill="url(#SVGID_72_)"
+   enable-background="new    "
+   d="M23.857,150.251c0.583-0.018,1.09,0.935,1.127,2.132    c0.039,1.195-0.403,2.18-0.986,2.198c-0.584,0.021-1.09-0.937-1.128-2.132C22.832,151.256,23.274,150.271,23.857,150.251z"
+   id="path1618" />
+		<path
+   opacity="0.87"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M51.424,138.665c1.025,1.105,5.187,4.75,5.504,12.082    c0.014,0.302-1.872-10.3-5.902-10.375c-1.023-0.018-2.354,0.152-2.706-0.808c-0.25-0.683-0.107-1.351,0.438-1.768    C49.571,137.172,50.728,137.916,51.424,138.665z"
+   id="path1620" />
+		<path
+   opacity="0.43"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M24.636,158.24c1.158,1.602,5.1,8.113,13.799,9.072    c0.396,0.043-11.921-3.166-11.827-10.271c0.018-1.345,0.803-2.985-0.344-3.688c-0.814-0.498-1.709-0.485-2.388,0.105    C22.865,154.35,23.851,157.148,24.636,158.24z"
+   id="path1622" />
+	</g>
+	<g
+   id="g1624">
+		<g
+   id="g1626">
+			
+				<radialGradient
+   id="SVGID_73_"
+   cx="36.0469"
+   cy="1162.3555"
+   r="16.0999"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+				<stop
+   offset="0.7758"
+   style="stop-color:#D5E2EE"
+   id="stop1629" />
+				<stop
+   offset="0.8263"
+   style="stop-color:#D1DFED"
+   id="stop1631" />
+				<stop
+   offset="0.8714"
+   style="stop-color:#C7D6E8"
+   id="stop1633" />
+				<stop
+   offset="0.9144"
+   style="stop-color:#B4C6E1"
+   id="stop1635" />
+				<stop
+   offset="0.9562"
+   style="stop-color:#9BB0D8"
+   id="stop1637" />
+				<stop
+   offset="0.9968"
+   style="stop-color:#7A95CB"
+   id="stop1639" />
+				<stop
+   offset="1"
+   style="stop-color:#7792CA"
+   id="stop1641" />
+			</radialGradient>
+			<circle
+   fill="url(#SVGID_73_)"
+   cx="60.047"
+   cy="229.355"
+   r="16.1"
+   id="circle1643" />
+			<path
+   fill="#39444F"
+   d="M76.93,229.364c-0.035,4.409-1.932,8.759-5.069,11.803c-3.115,3.072-7.425,4.89-11.813,4.914     c-4.388,0.065-8.764-1.716-11.926-4.8c-3.185-3.063-5.094-7.454-5.129-11.926c-0.031-2.23,0.377-4.479,1.211-6.563     c0.839-2.084,2.106-3.993,3.686-5.595c3.144-3.223,7.635-5.131,12.157-5.074c4.523-0.032,8.981,1.932,12.083,5.148     c3.133,3.194,4.894,7.658,4.8,12.082V229.364z M75.364,229.355c-0.048-4.021-1.767-7.943-4.631-10.688     c-1.425-1.374-3.11-2.468-4.938-3.19c-1.829-0.724-3.787-1.088-5.749-1.088c-3.923,0.01-7.812,1.582-10.611,4.354     c-2.807,2.758-4.485,6.636-4.533,10.608c-0.08,3.976,1.491,7.961,4.303,10.842c2.781,2.912,6.785,4.607,10.842,4.633     c4.058,0.066,8.127-1.596,10.955-4.521c2.859-2.896,4.442-6.93,4.361-10.965L75.364,229.355L75.364,229.355z"
+   id="path1645" />
+		</g>
+		
+			<radialGradient
+   id="SVGID_74_"
+   cx="201.5274"
+   cy="704.2588"
+   r="18.0959"
+   gradientTransform="matrix(0.9525 0.3046 -0.3046 0.9525 81.9305 -503.3005)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.4121"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop1648" />
+			<stop
+   offset="0.5849"
+   style="stop-color:#0A1827;stop-opacity:0.5379"
+   id="stop1650" />
+			<stop
+   offset="0.6472"
+   style="stop-color:#091420;stop-opacity:0.7317"
+   id="stop1652" />
+			<stop
+   offset="0.6914"
+   style="stop-color:#060D15;stop-opacity:0.8694"
+   id="stop1654" />
+			<stop
+   offset="0.727"
+   style="stop-color:#010204;stop-opacity:0.9803"
+   id="stop1656" />
+			<stop
+   offset="0.7333"
+   style="stop-color:#000000"
+   id="stop1658" />
+			<stop
+   offset="0.7876"
+   style="stop-color:#03080D;stop-opacity:0.6108"
+   id="stop1660" />
+			<stop
+   offset="0.8727"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop1662" />
+		</radialGradient>
+		<path
+   opacity="0.36"
+   fill="url(#SVGID_74_)"
+   enable-background="new    "
+   d="M76.443,233.389    c-2.924,9.146-12.709,14.188-21.854,11.271c-9.146-2.931-14.187-12.718-11.264-21.857c2.924-9.146,12.708-14.188,21.855-11.263    C74.324,214.456,79.368,224.241,76.443,233.389z"
+   id="path1664" />
+		
+			<radialGradient
+   id="SVGID_75_"
+   cx="37.7256"
+   cy="1152.4668"
+   r="24.9388"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#B4CB80;stop-opacity:0"
+   id="stop1667" />
+			<stop
+   offset="1"
+   style="stop-color:#60BD71"
+   id="stop1669" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_75_)"
+   enable-background="new    "
+   cx="60.048"
+   cy="229.18"
+   r="16.1"
+   id="circle1671" />
+		
+			<radialGradient
+   id="SVGID_76_"
+   cx="36.0489"
+   cy="1162.1797"
+   r="16.0999"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#A0539F"
+   id="stop1674" />
+			<stop
+   offset="0.2909"
+   style="stop-color:#7452A1"
+   id="stop1676" />
+			<stop
+   offset="1"
+   style="stop-color:#2B2976"
+   id="stop1678" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_76_)"
+   enable-background="new    "
+   cx="60.049"
+   cy="229.18"
+   r="16.1"
+   id="circle1680" />
+		
+			<radialGradient
+   id="SVGID_77_"
+   cx="-1415.6758"
+   cy="-473.6089"
+   r="7.9875"
+   gradientTransform="matrix(-0.9618 -0.6268 0.4259 -0.6535 -1092.6766 -975.8175)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.5455"
+   style="stop-color:#1D3C6E;stop-opacity:0.36"
+   id="stop1683" />
+			<stop
+   offset="0.569"
+   style="stop-color:#30486D;stop-opacity:0.433"
+   id="stop1685" />
+			<stop
+   offset="0.6061"
+   style="stop-color:#46566B;stop-opacity:0.5484"
+   id="stop1687" />
+			<stop
+   offset="0.6463"
+   style="stop-color:#56606A;stop-opacity:0.6733"
+   id="stop1689" />
+			<stop
+   offset="0.6914"
+   style="stop-color:#606669;stop-opacity:0.8134"
+   id="stop1691" />
+			<stop
+   offset="0.7515"
+   style="stop-color:#636869"
+   id="stop1693" />
+			<stop
+   offset="1"
+   style="stop-color:#51C1BC;stop-opacity:0"
+   id="stop1695" />
+		</radialGradient>
+		<path
+   opacity="0.19"
+   fill="url(#SVGID_77_)"
+   enable-background="new    "
+   d="M58.87,214.62c2.008-3.085,6.019-2.119,10.706,0.935    c4.686,3.053,4.573,5.043,6.263,10.123c1.161,3.494-7.438,3.108-12.124,0.057C59.029,222.68,56.859,217.705,58.87,214.62z"
+   id="path1697" />
+		<path
+   opacity="0.49"
+   fill="#F2F6FA"
+   enable-background="new    "
+   d="M46.148,230.002c-0.7-7.322,4.668-13.827,11.992-14.527    c7.322-0.697,14.468,3.295,15.627,9.407c-5.464-7.233-13.803-7.233-16.572-6.569C51.048,219.788,47.848,224.318,46.148,230.002z"
+   id="path1699" />
+		<path
+   opacity="0.11"
+   fill="#EBF7FD"
+   enable-background="new    "
+   d="M44.11,231.648c-0.844-8.84,5.246-17.154,14.088-18    c8.84-0.842,14.765,4.104,17.613,12.244c-4.217-8.979-15.694-9.162-19.037-8.357C49.352,219.316,46.161,224.785,44.11,231.648z"
+   id="path1701" />
+		<path
+   opacity="0.22"
+   fill="#EBF7FD"
+   enable-background="new    "
+   d="M45.371,235.809c-2.735-11.724,4.231-20.322,12.85-21.146    c8.615-0.82,16.61,5.785,17.591,15.34c-3.783-14.007-15.633-13.569-18.89-12.774C49.691,218.99,45.835,224.527,45.371,235.809z"
+   id="path1703" />
+		
+			<radialGradient
+   id="SVGID_78_"
+   cx="-1569.333"
+   cy="121.5645"
+   r="10.9626"
+   gradientTransform="matrix(-0.7488 -0.6628 0.6628 -0.7488 -1190.2952 -726.3312)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#090609"
+   id="stop1706" />
+			<stop
+   offset="0.3309"
+   style="stop-color:#0B070C"
+   id="stop1708" />
+			<stop
+   offset="0.5799"
+   style="stop-color:#120916"
+   id="stop1710" />
+			<stop
+   offset="0.8014"
+   style="stop-color:#1E0D26"
+   id="stop1712" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#200E29"
+   id="stop1714" />
+			<stop
+   offset="1"
+   style="stop-color:#3F234C"
+   id="stop1716" />
+		</radialGradient>
+		<path
+   opacity="0.48"
+   fill="url(#SVGID_78_)"
+   enable-background="new    "
+   d="M50.613,218.118    c5.182-4.765,13.279-5.058,18.788-0.183c5.507,4.873,6.92,13.021,3.243,18.045c3.052-7.625-2.296-14.457-4.391-16.394    C62.934,214.693,55.983,215.626,50.613,218.118z"
+   id="path1718" />
+		
+			<radialGradient
+   id="SVGID_79_"
+   cx="35.7198"
+   cy="1257.248"
+   r="8.5857"
+   gradientTransform="matrix(1 0 0 0.9207 24 -936.5648)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop1721" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop1723" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop1725" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop1727" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop1729" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop1731" />
+		</radialGradient>
+		<path
+   opacity="0.5"
+   fill="url(#SVGID_79_)"
+   enable-background="new    "
+   d="M68.304,220.982c0,4.367-3.842,7.906-8.583,7.906    c-4.742,0-8.586-3.539-8.586-7.906c0-4.362,3.844-7.904,8.586-7.904C64.461,213.078,68.304,216.62,68.304,220.982z"
+   id="path1733" />
+		
+			<radialGradient
+   id="SVGID_80_"
+   cx="35.7198"
+   cy="1256.666"
+   r="6.2817"
+   gradientTransform="matrix(1 0 0 0.9207 24 -936.5648)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop1736" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop1738" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop1740" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop1742" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop1744" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop1746" />
+		</radialGradient>
+		<ellipse
+   fill="url(#SVGID_80_)"
+   cx="59.72"
+   cy="220.447"
+   rx="6.282"
+   ry="5.783"
+   id="ellipse1748" />
+		
+			<radialGradient
+   id="SVGID_81_"
+   cx="36.0479"
+   cy="1152.3936"
+   r="4.2861"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#EEF8FB"
+   id="stop1751" />
+			<stop
+   offset="0.4119"
+   style="stop-color:#EDF7F8;stop-opacity:0.802"
+   id="stop1753" />
+			<stop
+   offset="0.521"
+   style="stop-color:#ECF5EE;stop-opacity:0.6532"
+   id="stop1755" />
+			<stop
+   offset="0.6183"
+   style="stop-color:#E8F1DE;stop-opacity:0.5206"
+   id="stop1757" />
+			<stop
+   offset="0.7087"
+   style="stop-color:#E4ECC7;stop-opacity:0.3972"
+   id="stop1759" />
+			<stop
+   offset="0.7943"
+   style="stop-color:#DEE5AA;stop-opacity:0.2804"
+   id="stop1761" />
+			<stop
+   offset="0.8765"
+   style="stop-color:#D7DC86;stop-opacity:0.1684"
+   id="stop1763" />
+			<stop
+   offset="0.9543"
+   style="stop-color:#CFD25C;stop-opacity:0.0623"
+   id="stop1765" />
+			<stop
+   offset="1"
+   style="stop-color:#C9CB3F;stop-opacity:0"
+   id="stop1767" />
+		</radialGradient>
+		<circle
+   fill="url(#SVGID_81_)"
+   cx="60.048"
+   cy="219.394"
+   r="4.286"
+   id="circle1769" />
+		<circle
+   opacity="0.62"
+   fill="#FFFFFF"
+   enable-background="new    "
+   cx="60.966"
+   cy="217.741"
+   r="1.685"
+   id="circle1771" />
+		
+			<radialGradient
+   id="SVGID_82_"
+   cx="255.6211"
+   cy="927.1152"
+   r="5.9238"
+   gradientTransform="matrix(1.1342 0.4137 -0.3427 0.9394 81.7425 -740.2545)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#4CB4E1;stop-opacity:0.59"
+   id="stop1774" />
+			<stop
+   offset="0.463"
+   style="stop-color:#4EB1DF;stop-opacity:0.432"
+   id="stop1776" />
+			<stop
+   offset="0.6104"
+   style="stop-color:#55A7D8;stop-opacity:0.3134"
+   id="stop1778" />
+			<stop
+   offset="0.7419"
+   style="stop-color:#6097CE;stop-opacity:0.2077"
+   id="stop1780" />
+			<stop
+   offset="0.864"
+   style="stop-color:#7080BE;stop-opacity:0.1094"
+   id="stop1782" />
+			<stop
+   offset="0.9787"
+   style="stop-color:#8463AA;stop-opacity:0.0171"
+   id="stop1784" />
+			<stop
+   offset="1"
+   style="stop-color:#885DA6;stop-opacity:0"
+   id="stop1786" />
+		</radialGradient>
+		<path
+   opacity="0.52"
+   fill="url(#SVGID_82_)"
+   enable-background="new    "
+   d="M60.664,238.879    c-1.122,3.073-5.037,4.467-8.748,3.114c-3.711-1.354-5.811-4.944-4.689-8.019c1.122-3.07,5.038-4.473,8.749-3.111    C59.687,232.217,61.785,235.807,60.664,238.879z"
+   id="path1788" />
+		<path
+   opacity="0.32"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M56.474,243.536c-0.243,0.474-0.605,0.854-1.049,1.137    c-2.468-0.411-6.09-2.907-7.531-4.718c0.052-0.238,0.133-0.471,0.248-0.691c0.909-1.771,3.513-2.257,5.814-1.074    C56.255,239.368,57.383,241.764,56.474,243.536z"
+   id="path1790" />
+		<path
+   opacity="0.75"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M74.757,226.837c1.848,6.795-1.867,14.254-9.081,17.082    c-7.212,2.828-15.434,0.5-18.256-5.047c4.638,7.515,15.474,5.353,18.271,4.258C71.731,240.772,76.376,234.18,74.757,226.837z"
+   id="path1792" />
+		
+			<radialGradient
+   id="SVGID_83_"
+   cx="-654.7744"
+   cy="1235.373"
+   r="1.5423"
+   gradientTransform="matrix(0.864 -0.5034 0.5034 0.864 -3.3111 -1180.5216)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop1795" />
+			<stop
+   offset="0.3195"
+   style="stop-color:#050709"
+   id="stop1797" />
+			<stop
+   offset="0.5599"
+   style="stop-color:#070C13"
+   id="stop1799" />
+			<stop
+   offset="0.7738"
+   style="stop-color:#0A1523"
+   id="stop1801" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0B1929"
+   id="stop1803" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C"
+   id="stop1805" />
+		</radialGradient>
+		<path
+   opacity="0.19"
+   fill="url(#SVGID_83_)"
+   enable-background="new    "
+   d="M54.544,215.467c0.266,0.457-0.276,1.27-1.212,1.814    c-0.935,0.546-1.909,0.613-2.174,0.16c-0.266-0.457,0.276-1.271,1.211-1.815C53.304,215.083,54.277,215.012,54.544,215.467z"
+   id="path1807" />
+		<path
+   opacity="0.87"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M73.767,223.721c0.456,1.283,2.61,5.803,0.25,12.006    c-0.097,0.26,2.13-9.227-1.193-10.729c-0.844-0.383-2.01-0.719-1.958-1.643c0.038-0.655,0.394-1.16,0.997-1.313    C72.761,221.816,73.456,222.848,73.767,223.721z"
+   id="path1809" />
+		<path
+   opacity="0.43"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M44.502,230.398c0.388,1.746,1.333,8.563,8.217,12.478    c0.314,0.179-8.772-6.896-6.153-12.763c0.496-1.111,1.737-2.198,1.037-3.189c-0.5-0.705-1.248-1.017-2.024-0.765    C44.423,226.532,44.239,229.214,44.502,230.398z"
+   id="path1811" />
+	</g>
+	<g
+   id="g1813">
+		<g
+   id="g1815">
+			
+				<radialGradient
+   id="SVGID_84_"
+   cx="193.4532"
+   cy="1047.2227"
+   r="17.5698"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+				<stop
+   offset="0.7758"
+   style="stop-color:#D5E2EE"
+   id="stop1818" />
+				<stop
+   offset="0.8263"
+   style="stop-color:#D1DFED"
+   id="stop1820" />
+				<stop
+   offset="0.8714"
+   style="stop-color:#C7D6E8"
+   id="stop1822" />
+				<stop
+   offset="0.9144"
+   style="stop-color:#B4C6E1"
+   id="stop1824" />
+				<stop
+   offset="0.9562"
+   style="stop-color:#9BB0D8"
+   id="stop1826" />
+				<stop
+   offset="0.9968"
+   style="stop-color:#7A95CB"
+   id="stop1828" />
+				<stop
+   offset="1"
+   style="stop-color:#7792CA"
+   id="stop1830" />
+			</radialGradient>
+			<circle
+   fill="url(#SVGID_84_)"
+   cx="217.453"
+   cy="114.222"
+   r="17.57"
+   id="circle1832" />
+			<path
+   fill="#39444F"
+   d="M235.805,114.232c-0.033,4.795-2.089,9.526-5.5,12.841c-3.387,3.345-8.078,5.321-12.852,5.343     c-4.773,0.067-9.531-1.873-12.965-5.23c-3.457-3.34-5.525-8.096-5.557-12.976c-0.031-2.398,0.416-4.854,1.324-7.112     c0.913-2.261,2.289-4.333,4.005-6.07c3.422-3.495,8.273-5.562,13.208-5.503c4.88-0.033,9.74,2.089,13.104,5.579     c3.408,3.471,5.326,8.311,5.229,13.12v0.008H235.805z M234.243,114.222c-0.046-4.407-1.925-8.712-5.062-11.727     c-1.563-1.511-3.41-2.714-5.416-3.514c-2.019-0.794-4.146-1.199-6.326-1.2c-4.281,0.008-8.573,1.738-11.645,4.788     c-3.081,3.035-4.919,7.279-4.966,11.664c-0.082,4.335,1.646,8.725,4.729,11.871c3.059,3.187,7.439,5.044,11.887,5.062     c4.439,0.071,8.896-1.749,11.992-4.948c3.14-3.17,4.877-7.584,4.797-12.005L234.243,114.222L234.243,114.222z"
+   id="path1834" />
+		</g>
+		
+			<radialGradient
+   id="SVGID_85_"
+   cx="-1524.9443"
+   cy="266.9366"
+   r="20.0066"
+   gradientTransform="matrix(0.0099 -1 1 0.0099 -35.0023 -1413.4995)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.4121"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop1837" />
+			<stop
+   offset="0.5849"
+   style="stop-color:#0A1827;stop-opacity:0.5379"
+   id="stop1839" />
+			<stop
+   offset="0.6472"
+   style="stop-color:#091420;stop-opacity:0.7317"
+   id="stop1841" />
+			<stop
+   offset="0.6914"
+   style="stop-color:#060D15;stop-opacity:0.8694"
+   id="stop1843" />
+			<stop
+   offset="0.727"
+   style="stop-color:#010204;stop-opacity:0.9803"
+   id="stop1845" />
+			<stop
+   offset="0.7333"
+   style="stop-color:#000000"
+   id="stop1847" />
+			<stop
+   offset="0.7876"
+   style="stop-color:#03080D;stop-opacity:0.6108"
+   id="stop1849" />
+			<stop
+   offset="0.8727"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop1851" />
+		</radialGradient>
+		<path
+   opacity="0.28"
+   fill="url(#SVGID_85_)"
+   enable-background="new    "
+   d="M216.066,94.565    c10.613,0.106,19.134,8.795,19.029,19.412c-0.107,10.615-8.803,19.129-19.412,19.027c-10.613-0.103-19.137-8.793-19.027-19.412    C196.764,102.982,205.451,94.46,216.066,94.565z"
+   id="path1853" />
+		
+			<radialGradient
+   id="SVGID_86_"
+   cx="195.2852"
+   cy="1036.4297"
+   r="27.2182"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#B4CB80;stop-opacity:0"
+   id="stop1856" />
+			<stop
+   offset="1"
+   style="stop-color:#60BD71"
+   id="stop1858" />
+		</radialGradient>
+		<path
+   opacity="0.62"
+   fill="url(#SVGID_86_)"
+   enable-background="new    "
+   d="M235.023,114.031c0,9.702-7.866,17.567-17.57,17.567    c-9.701,0-17.57-7.865-17.57-17.567c0-9.705,7.869-17.571,17.57-17.571C227.157,96.46,235.023,104.326,235.023,114.031z"
+   id="path1860" />
+		
+			<radialGradient
+   id="SVGID_87_"
+   cx="193.4532"
+   cy="1047.0293"
+   r="17.5703"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop1863" />
+			<stop
+   offset="1"
+   style="stop-color:#458691"
+   id="stop1865" />
+		</radialGradient>
+		<path
+   opacity="0.62"
+   fill="url(#SVGID_87_)"
+   enable-background="new    "
+   d="M229.846,101.575    c6.881,6.843,6.908,17.966,0.063,24.845c-6.843,6.879-17.97,6.908-24.845,0.066c-6.881-6.844-6.917-17.968-0.064-24.846    C211.842,94.76,222.965,94.731,229.846,101.575z"
+   id="path1867" />
+		<path
+   opacity="0.36"
+   fill="#F2F6FA"
+   enable-background="new    "
+   d="M201.751,111.86c1.009-7.616,6.688-12.854,14.089-13.565    c7.4-0.702,14.176,4.516,16.659,10.333c-5.153-7.081-12.251-8.823-16.703-8.216C211.348,101.018,205.926,101.827,201.751,111.86z"
+   id="path1869" />
+		<path
+   opacity="0.11"
+   fill="#EBF7FD"
+   enable-background="new    "
+   d="M200.06,116.725c-0.92-9.646,5.726-18.719,15.375-19.643    c9.646-0.919,16.104,4.476,19.219,13.364c-4.604-9.796-17.125-9.999-20.774-9.124C205.779,103.267,202.3,109.236,200.06,116.725z"
+   id="path1871" />
+		<path
+   opacity="0.22"
+   fill="#EBF7FD"
+   enable-background="new    "
+   d="M202.139,118.951c-3.276-12.581,3.918-20.873,13.32-21.771    c9.398-0.896,18.127,6.313,19.195,16.738c-4.127-15.282-17.078-14.886-20.612-13.939    C207.397,101.755,201.041,103.712,202.139,118.951z"
+   id="path1873" />
+		
+			<radialGradient
+   id="SVGID_88_"
+   cx="193.6265"
+   cy="1131.9355"
+   r="9.3684"
+   gradientTransform="matrix(1 0 0 0.9207 24 -936.5648)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop1876" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop1878" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop1880" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop1882" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop1884" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop1886" />
+		</radialGradient>
+		<path
+   opacity="0.5"
+   fill="url(#SVGID_88_)"
+   enable-background="new    "
+   d="M226.994,105.605c0,4.766-4.193,8.629-9.366,8.629    c-5.176,0-9.369-3.863-9.369-8.629c0-4.759,4.193-8.624,9.369-8.624C222.801,96.981,226.994,100.846,226.994,105.605z"
+   id="path1888" />
+		
+			<radialGradient
+   id="SVGID_89_"
+   cx="193.3179"
+   cy="1130.7344"
+   r="6.8552"
+   gradientTransform="matrix(1 0 0 0.9207 24 -936.5648)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop1891" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop1893" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop1895" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop1897" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop1899" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop1901" />
+		</radialGradient>
+		<path
+   fill="url(#SVGID_89_)"
+   d="M224.173,104.5c0,3.486-3.071,6.314-6.854,6.314c-3.789,0-6.855-2.828-6.855-6.314    c0-3.485,3.066-6.311,6.855-6.311C221.102,98.189,224.173,101.015,224.173,104.5z"
+   id="path1903" />
+		
+			<radialGradient
+   id="SVGID_90_"
+   cx="192.6905"
+   cy="1035.5732"
+   r="4.6777"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#EEF8FB"
+   id="stop1906" />
+			<stop
+   offset="0.4122"
+   style="stop-color:#EDF7F8;stop-opacity:0.8016"
+   id="stop1908" />
+			<stop
+   offset="0.5215"
+   style="stop-color:#E9F5EE;stop-opacity:0.6525"
+   id="stop1910" />
+			<stop
+   offset="0.619"
+   style="stop-color:#E2F1DE;stop-opacity:0.5196"
+   id="stop1912" />
+			<stop
+   offset="0.7096"
+   style="stop-color:#D8ECC7;stop-opacity:0.396"
+   id="stop1914" />
+			<stop
+   offset="0.7954"
+   style="stop-color:#CCE4AA;stop-opacity:0.2789"
+   id="stop1916" />
+			<stop
+   offset="0.8777"
+   style="stop-color:#BCDC86;stop-opacity:0.1667"
+   id="stop1918" />
+			<stop
+   offset="0.9557"
+   style="stop-color:#ABD25B;stop-opacity:0.0604"
+   id="stop1920" />
+			<stop
+   offset="1"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop1922" />
+		</radialGradient>
+		<path
+   fill="url(#SVGID_90_)"
+   d="M221.369,102.571c0,2.584-2.094,4.679-4.68,4.679c-2.582,0-4.678-2.095-4.678-4.679    c0-2.581,2.096-4.675,4.678-4.675C219.275,97.896,221.369,99.991,221.369,102.571z"
+   id="path1924" />
+		<circle
+   opacity="0.62"
+   fill="#FFFFFF"
+   enable-background="new    "
+   cx="216.441"
+   cy="100.983"
+   r="1.837"
+   id="circle1926" />
+		
+			<radialGradient
+   id="SVGID_91_"
+   cx="-255.8769"
+   cy="1154.1875"
+   r="8.5684"
+   gradientTransform="matrix(1.1333 -0.416 0.3445 0.9387 114.2 -1067.6246)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#46C3D6;stop-opacity:0.58"
+   id="stop1929" />
+			<stop
+   offset="0.4253"
+   style="stop-color:#48C3D3;stop-opacity:0.4545"
+   id="stop1931" />
+			<stop
+   offset="0.5444"
+   style="stop-color:#4DC4C9;stop-opacity:0.3603"
+   id="stop1933" />
+			<stop
+   offset="0.6507"
+   style="stop-color:#57C5B9;stop-opacity:0.2763"
+   id="stop1935" />
+			<stop
+   offset="0.7494"
+   style="stop-color:#65C6A2;stop-opacity:0.1982"
+   id="stop1937" />
+			<stop
+   offset="0.843"
+   style="stop-color:#76C785;stop-opacity:0.1242"
+   id="stop1939" />
+			<stop
+   offset="0.9314"
+   style="stop-color:#8BC961;stop-opacity:0.0542"
+   id="stop1941" />
+			<stop
+   offset="1"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop1943" />
+		</radialGradient>
+		<path
+   opacity="0.52"
+   fill="url(#SVGID_91_)"
+   enable-background="new    "
+   d="M231.559,118.682    c1.635,4.453-1.396,9.659-6.767,11.63c-5.376,1.972-11.056-0.036-12.687-4.487c-1.643-4.447,1.396-9.653,6.77-11.627    C224.246,112.227,229.927,114.236,231.559,118.682z"
+   id="path1945" />
+		<path
+   opacity="0.32"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M230.295,123.416c0.377,0.442,0.609,0.967,0.708,1.532    c-1.446,2.313-5.479,4.922-7.909,5.615c-0.215-0.153-0.414-0.333-0.588-0.54c-1.41-1.659-0.807-4.482,1.348-6.307    C226.002,121.89,228.891,121.758,230.295,123.416z"
+   id="path1947" />
+		
+			<radialGradient
+   id="SVGID_92_"
+   cx="656.4619"
+   cy="107.9346"
+   r="8.1566"
+   gradientTransform="matrix(0.6253 0.9628 -0.6615 0.4297 -133.8877 -557.1061)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.4424"
+   style="stop-color:#1D3C6E;stop-opacity:0.36"
+   id="stop1950" />
+			<stop
+   offset="0.444"
+   style="stop-color:#1E3C6E;stop-opacity:0.3638"
+   id="stop1952" />
+			<stop
+   offset="0.5121"
+   style="stop-color:#3C4F6C;stop-opacity:0.5311"
+   id="stop1954" />
+			<stop
+   offset="0.579"
+   style="stop-color:#525D6A;stop-opacity:0.6954"
+   id="stop1956" />
+			<stop
+   offset="0.6435"
+   style="stop-color:#5F6569;stop-opacity:0.8539"
+   id="stop1958" />
+			<stop
+   offset="0.703"
+   style="stop-color:#636869"
+   id="stop1960" />
+			<stop
+   offset="0.7987"
+   style="stop-color:#5C8B8A;stop-opacity:0.5734"
+   id="stop1962" />
+			<stop
+   offset="0.9273"
+   style="stop-color:#51C1BC;stop-opacity:0"
+   id="stop1964" />
+		</radialGradient>
+		<path
+   opacity="0.19"
+   fill="url(#SVGID_92_)"
+   enable-background="new    "
+   d="M210.302,130.714    c-3.186,2.071-6.544-0.481-9.649-5.267c-3.109-4.786-2.167-6.606-1.605-12.067c0.386-3.754,8.29,0.134,11.396,4.923    C213.549,123.086,213.491,128.647,210.302,130.714z"
+   id="path1966" />
+		
+			<radialGradient
+   id="SVGID_93_"
+   cx="838.9912"
+   cy="786.2725"
+   r="11.8551"
+   gradientTransform="matrix(0.701 0.7131 -0.7131 0.701 184.1534 -1027.8478)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop1969" />
+			<stop
+   offset="0.3195"
+   style="stop-color:#050709"
+   id="stop1971" />
+			<stop
+   offset="0.5599"
+   style="stop-color:#070C13"
+   id="stop1973" />
+			<stop
+   offset="0.7738"
+   style="stop-color:#0A1523"
+   id="stop1975" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0B1929"
+   id="stop1977" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C"
+   id="stop1979" />
+		</radialGradient>
+		<path
+   opacity="0.41"
+   fill="url(#SVGID_93_)"
+   enable-background="new    "
+   d="M227.326,127.526c-6,4.796-16.163,3.975-21.694-1.84    c-4.104-4.315-5.717-12.938-1.335-18.125c-3.899,8.073,0.729,14.473,2.995,16.604C213.727,130.211,221.29,129.835,227.326,127.526    z"
+   id="path1981" />
+		<path
+   opacity="0.54"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M213.34,130.282c-3.176-0.825-7.734-3.693-10.152-8.272    c0.334,1.313,1.354,2.457,1.852,3.703c1.941,2.479,4.607,4.397,7.906,5.3c8.152,2.231,16.313-2.202,19.123-9.354    C228.699,129.139,220.189,132.062,213.34,130.282z"
+   id="path1983" />
+		
+			<radialGradient
+   id="SVGID_94_"
+   cx="819.7813"
+   cy="-53.2729"
+   r="2.1992"
+   gradientTransform="matrix(0.3888 0.9213 -0.9213 0.3888 -136.7975 -625.9019)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop1986" />
+			<stop
+   offset="0.3195"
+   style="stop-color:#050709"
+   id="stop1988" />
+			<stop
+   offset="0.5599"
+   style="stop-color:#070C13"
+   id="stop1990" />
+			<stop
+   offset="0.7738"
+   style="stop-color:#0A1523"
+   id="stop1992" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0B1929"
+   id="stop1994" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C"
+   id="stop1996" />
+		</radialGradient>
+		<path
+   opacity="0.19"
+   fill="url(#SVGID_94_)"
+   enable-background="new    "
+   d="M232.091,111.199    c-0.694,0.291-1.745-0.621-2.346-2.045c-0.601-1.423-0.522-2.815,0.172-3.108s1.747,0.622,2.345,2.049    C232.861,109.513,232.786,110.907,232.091,111.199z"
+   id="path1998" />
+		<path
+   opacity="0.87"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M233.783,113.712c-0.021,1.437,0.451,6.698-4.158,11.969    c-0.191,0.219,5.494-8.346,2.758-11.052c-0.693-0.688-1.725-1.446-1.336-2.342c0.278-0.636,0.818-1.002,1.469-0.933    C233.488,111.46,233.798,112.735,233.783,113.712z"
+   id="path2000" />
+	</g>
+	<g
+   id="g2002">
+		<g
+   id="g2004">
+			
+				<radialGradient
+   id="SVGID_95_"
+   cx="233.9688"
+   cy="1098.083"
+   r="16.7324"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+				<stop
+   offset="0.7758"
+   style="stop-color:#D5E2EE"
+   id="stop2007" />
+				<stop
+   offset="0.8263"
+   style="stop-color:#D1DFED"
+   id="stop2009" />
+				<stop
+   offset="0.8714"
+   style="stop-color:#C7D6E8"
+   id="stop2011" />
+				<stop
+   offset="0.9144"
+   style="stop-color:#B4C6E1"
+   id="stop2013" />
+				<stop
+   offset="0.9562"
+   style="stop-color:#9BB0D8"
+   id="stop2015" />
+				<stop
+   offset="0.9968"
+   style="stop-color:#7A95CB"
+   id="stop2017" />
+				<stop
+   offset="1"
+   style="stop-color:#7792CA"
+   id="stop2019" />
+			</radialGradient>
+			<path
+   fill="url(#SVGID_95_)"
+   d="M274.702,165.085c0,9.24-7.491,16.729-16.733,16.729c-9.238,0-16.732-7.489-16.732-16.729     c0-9.244,7.494-16.734,16.732-16.734C267.211,148.351,274.702,155.841,274.702,165.085z"
+   id="path2021" />
+			<path
+   fill="#39444F"
+   d="M275.482,165.096c-0.033,4.574-2,9.088-5.256,12.248c-3.234,3.188-7.699,5.072-12.271,5.096     c-4.538,0.065-9.09-1.778-12.363-4.98c-3.304-3.188-5.275-7.729-5.313-12.389c-0.029-2.284,0.396-4.637,1.263-6.793     c0.871-2.153,2.188-4.139,3.821-5.797c3.27-3.334,7.902-5.313,12.617-5.252c4.66-0.032,9.305,2,12.516,5.333     c3.25,3.314,5.076,7.938,4.98,12.526v0.013h0.004v-0.002h0.002V165.096z M273.922,165.085c-0.047-4.188-1.834-8.274-4.814-11.136     c-1.479-1.434-3.234-2.575-5.145-3.333c-1.911-0.752-3.934-1.136-6.006-1.136c-4.063,0.009-8.137,1.648-11.047,4.542     c-2.926,2.881-4.674,6.906-4.723,11.072c-0.082,4.115,1.559,8.287,4.483,11.278c2.901,3.03,7.063,4.798,11.304,4.817     c4.209,0.064,8.455-1.658,11.396-4.701c2.979-3.016,4.63-7.213,4.549-11.413L273.922,165.085L273.922,165.085z"
+   id="path2023" />
+		</g>
+		
+			<radialGradient
+   id="SVGID_96_"
+   cx="-1575.4067"
+   cy="307.9854"
+   r="19.0524"
+   gradientTransform="matrix(0.0099 -1 1 0.0099 -35.0023 -1413.4995)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.4121"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop2026" />
+			<stop
+   offset="0.5849"
+   style="stop-color:#0A1827;stop-opacity:0.5379"
+   id="stop2028" />
+			<stop
+   offset="0.6472"
+   style="stop-color:#091420;stop-opacity:0.7317"
+   id="stop2030" />
+			<stop
+   offset="0.6914"
+   style="stop-color:#060D15;stop-opacity:0.8694"
+   id="stop2032" />
+			<stop
+   offset="0.727"
+   style="stop-color:#010204;stop-opacity:0.9803"
+   id="stop2034" />
+			<stop
+   offset="0.7333"
+   style="stop-color:#000000"
+   id="stop2036" />
+			<stop
+   offset="0.7876"
+   style="stop-color:#03080D;stop-opacity:0.6108"
+   id="stop2038" />
+			<stop
+   offset="0.8727"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop2040" />
+		</radialGradient>
+		<path
+   opacity="0.28"
+   fill="url(#SVGID_96_)"
+   enable-background="new    "
+   d="M256.647,146.363    c10.109,0.102,18.229,8.377,18.125,18.485c-0.104,10.109-8.379,18.221-18.48,18.123c-10.104-0.098-18.227-8.375-18.123-18.486    C238.266,154.379,246.539,146.261,256.647,146.363z"
+   id="path2042" />
+		
+			<radialGradient
+   id="SVGID_97_"
+   cx="235.7149"
+   cy="1087.8047"
+   r="25.9212"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#B4CB80;stop-opacity:0"
+   id="stop2045" />
+			<stop
+   offset="1"
+   style="stop-color:#60BD71"
+   id="stop2047" />
+		</radialGradient>
+		<path
+   opacity="0.62"
+   fill="url(#SVGID_97_)"
+   enable-background="new    "
+   d="M274.705,164.902c0,9.238-7.494,16.729-16.735,16.729    c-9.237,0-16.733-7.49-16.733-16.729c0-9.243,7.496-16.735,16.733-16.735C267.211,148.167,274.705,155.659,274.705,164.902z"
+   id="path2049" />
+		
+			<radialGradient
+   id="SVGID_98_"
+   cx="233.9727"
+   cy="1097.9004"
+   r="16.7324"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop2052" />
+			<stop
+   offset="1"
+   style="stop-color:#458691"
+   id="stop2054" />
+		</radialGradient>
+		<path
+   opacity="0.62"
+   fill="url(#SVGID_98_)"
+   enable-background="new    "
+   d="M269.772,153.038    c6.558,6.519,6.578,17.11,0.063,23.662s-17.108,6.581-23.66,0.063c-6.554-6.521-6.581-17.113-0.063-23.664    C252.625,146.549,263.219,146.521,269.772,153.038z"
+   id="path2056" />
+		<path
+   opacity="0.36"
+   fill="#F2F6FA"
+   enable-background="new    "
+   d="M250.096,152.15c5.975-4.229,13.313-3.646,18.596,1.063    c5.283,4.717,6.021,12.823,3.564,18.325c1.611-8.185-1.766-14.271-5.07-16.987C263.88,151.837,259.809,148.572,250.096,152.15z"
+   id="path2058" />
+		<path
+   opacity="0.11"
+   fill="#EBF7FD"
+   enable-background="new    "
+   d="M241.404,167.468c-0.879-9.188,5.453-17.829,14.644-18.708    c9.187-0.874,15.345,4.264,18.306,12.729c-4.385-9.33-16.313-9.522-19.787-8.689C246.852,154.65,243.537,160.336,241.404,167.468z    "
+   id="path2060" />
+		<path
+   opacity="0.22"
+   fill="#EBF7FD"
+   enable-background="new    "
+   d="M243.383,169.587c-3.119-11.979,3.73-19.879,12.688-20.735    c8.951-0.853,17.271,6.013,18.283,15.941c-3.932-14.555-16.268-14.176-19.633-13.275    C248.393,153.21,242.339,155.074,243.383,169.587z"
+   id="path2062" />
+		
+			<radialGradient
+   id="SVGID_99_"
+   cx="234.4854"
+   cy="1187.084"
+   r="8.9224"
+   gradientTransform="matrix(1 0 0 0.9207 24 -936.5648)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop2065" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop2067" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop2069" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop2071" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop2073" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop2075" />
+		</radialGradient>
+		<path
+   opacity="0.5"
+   fill="url(#SVGID_99_)"
+   enable-background="new    "
+   d="M267.406,156.382c0,4.537-3.992,8.218-8.92,8.218    c-4.93,0-8.922-3.681-8.922-8.218c0-4.534,3.992-8.215,8.922-8.215C263.414,148.167,267.406,151.848,267.406,156.382z"
+   id="path2077" />
+		
+			<radialGradient
+   id="SVGID_100_"
+   cx="233.6289"
+   cy="1186.4785"
+   r="6.5303"
+   gradientTransform="matrix(1 0 0 0.9207 24 -936.5648)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop2080" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop2082" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop2084" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop2086" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop2088" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop2090" />
+		</radialGradient>
+		<ellipse
+   fill="url(#SVGID_100_)"
+   cx="257.628"
+   cy="155.825"
+   rx="6.531"
+   ry="6.013"
+   id="ellipse2092" />
+		
+			<radialGradient
+   id="SVGID_101_"
+   cx="232.9092"
+   cy="1086.9883"
+   r="4.4551"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#EEF8FB"
+   id="stop2095" />
+			<stop
+   offset="0.4122"
+   style="stop-color:#EDF7F8;stop-opacity:0.8016"
+   id="stop2097" />
+			<stop
+   offset="0.5215"
+   style="stop-color:#E9F5EE;stop-opacity:0.6525"
+   id="stop2099" />
+			<stop
+   offset="0.619"
+   style="stop-color:#E2F1DE;stop-opacity:0.5196"
+   id="stop2101" />
+			<stop
+   offset="0.7096"
+   style="stop-color:#D8ECC7;stop-opacity:0.396"
+   id="stop2103" />
+			<stop
+   offset="0.7954"
+   style="stop-color:#CCE4AA;stop-opacity:0.2789"
+   id="stop2105" />
+			<stop
+   offset="0.8777"
+   style="stop-color:#BCDC86;stop-opacity:0.1667"
+   id="stop2107" />
+			<stop
+   offset="0.9557"
+   style="stop-color:#ABD25B;stop-opacity:0.0604"
+   id="stop2109" />
+			<stop
+   offset="1"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop2111" />
+		</radialGradient>
+		<path
+   fill="url(#SVGID_101_)"
+   d="M261.364,153.988c0,2.46-1.991,4.455-4.456,4.455c-2.46,0-4.454-1.995-4.454-4.455    c0-2.459,1.994-4.454,4.454-4.454C259.373,149.534,261.364,151.529,261.364,153.988z"
+   id="path2113" />
+		<circle
+   opacity="0.62"
+   fill="#FFFFFF"
+   enable-background="new    "
+   cx="256.734"
+   cy="152.475"
+   r="1.75"
+   id="circle2115" />
+		
+			<radialGradient
+   id="SVGID_102_"
+   cx="-406.8857"
+   cy="1224.5635"
+   r="6.3198"
+   gradientTransform="matrix(1.042 -0.6097 0.505 0.8631 69.3665 -1130.8982)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#46C3D6;stop-opacity:0.58"
+   id="stop2118" />
+			<stop
+   offset="0.4253"
+   style="stop-color:#48C3D3;stop-opacity:0.4545"
+   id="stop2120" />
+			<stop
+   offset="0.5444"
+   style="stop-color:#4DC4C9;stop-opacity:0.3603"
+   id="stop2122" />
+			<stop
+   offset="0.6507"
+   style="stop-color:#57C5B9;stop-opacity:0.2763"
+   id="stop2124" />
+			<stop
+   offset="0.7494"
+   style="stop-color:#65C6A2;stop-opacity:0.1982"
+   id="stop2126" />
+			<stop
+   offset="0.843"
+   style="stop-color:#76C785;stop-opacity:0.1242"
+   id="stop2128" />
+			<stop
+   offset="0.9314"
+   style="stop-color:#8BC961;stop-opacity:0.0542"
+   id="stop2130" />
+			<stop
+   offset="1"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop2132" />
+		</radialGradient>
+		<path
+   opacity="0.52"
+   fill="url(#SVGID_102_)"
+   enable-background="new    "
+   d="M270.391,170.242    c1.771,3.018,0.243,7.189-3.396,9.32c-3.646,2.131-8.028,1.414-9.792-1.604c-1.768-3.015-0.244-7.188,3.396-9.319    C264.243,166.51,268.625,167.227,270.391,170.242z"
+   id="path2134" />
+		<path
+   opacity="0.32"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M268.417,176.277c0.255,0.425,0.373,0.895,0.377,1.384    c-1.536,1.731-5.278,3.346-7.409,3.585c-0.16-0.159-0.299-0.335-0.416-0.536c-0.947-1.587-0.044-3.864,2.014-5.088    C265.04,174.397,267.477,174.689,268.417,176.277z"
+   id="path2136" />
+		
+			<radialGradient
+   id="SVGID_103_"
+   cx="369.5157"
+   cy="-675.3394"
+   r="7.7597"
+   gradientTransform="matrix(0.1013 1.1436 -0.7858 0.0696 -321.7245 -209.3378)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.4424"
+   style="stop-color:#1D3C6E;stop-opacity:0.36"
+   id="stop2139" />
+			<stop
+   offset="0.444"
+   style="stop-color:#1E3C6E;stop-opacity:0.3638"
+   id="stop2141" />
+			<stop
+   offset="0.5121"
+   style="stop-color:#3C4F6C;stop-opacity:0.5311"
+   id="stop2143" />
+			<stop
+   offset="0.579"
+   style="stop-color:#525D6A;stop-opacity:0.6954"
+   id="stop2145" />
+			<stop
+   offset="0.6435"
+   style="stop-color:#5F6569;stop-opacity:0.8539"
+   id="stop2147" />
+			<stop
+   offset="0.703"
+   style="stop-color:#636869"
+   id="stop2149" />
+			<stop
+   offset="0.7987"
+   style="stop-color:#5C8B8A;stop-opacity:0.5734"
+   id="stop2151" />
+			<stop
+   offset="0.9273"
+   style="stop-color:#51C1BC;stop-opacity:0"
+   id="stop2153" />
+		</radialGradient>
+		<path
+   opacity="0.19"
+   fill="url(#SVGID_103_)"
+   enable-background="new    "
+   d="M246.522,176.419    c-3.604,0.32-5.291-3.323-5.769-8.735c-0.483-5.418,1.125-6.522,4.031-10.873c1.999-2.982,6.913,3.813,7.394,9.229    C252.657,171.449,250.126,176.104,246.522,176.419z"
+   id="path2155" />
+		
+			<radialGradient
+   id="SVGID_104_"
+   cx="875.7461"
+   cy="41.2539"
+   r="11.2916"
+   gradientTransform="matrix(0.108 0.9941 -0.9941 0.108 194.9519 -708.9521)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop2158" />
+			<stop
+   offset="0.3195"
+   style="stop-color:#050709"
+   id="stop2160" />
+			<stop
+   offset="0.5599"
+   style="stop-color:#070C13"
+   id="stop2162" />
+			<stop
+   offset="0.7738"
+   style="stop-color:#0A1523"
+   id="stop2164" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0B1929"
+   id="stop2166" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C"
+   id="stop2168" />
+		</radialGradient>
+		<path
+   opacity="0.42"
+   fill="url(#SVGID_104_)"
+   enable-background="new    "
+   d="M256.807,179.816    c-7.313,0.045-14.425-6.569-15.125-14.188c-0.521-5.646,3.364-13.042,9.703-14.331c-7.68,3.729-8,11.247-7.563,14.182    C245.059,173.796,250.934,177.98,256.807,179.816z"
+   id="path2170" />
+		<path
+   opacity="0.54"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M245.775,175.023c-1.887-2.491-4.405-7.34-3.51-12.189    c-0.525,1.18-0.476,1.766-0.479,3.688c0.271,3.271,1.322,6.192,3.255,8.813c4.774,6.481,13.489,7.983,19.813,4.3    C257.926,183.236,249.844,180.397,245.775,175.023z"
+   id="path2172" />
+		
+			<radialGradient
+   id="SVGID_105_"
+   cx="786.2891"
+   cy="-464.4311"
+   r="2.0952"
+   gradientTransform="matrix(0.0425 0.999 -0.999 0.0425 -225.4858 -600.7423)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop2175" />
+			<stop
+   offset="0.3195"
+   style="stop-color:#050709"
+   id="stop2177" />
+			<stop
+   offset="0.5599"
+   style="stop-color:#070C13"
+   id="stop2179" />
+			<stop
+   offset="0.7738"
+   style="stop-color:#0A1523"
+   id="stop2181" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0B1929"
+   id="stop2183" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C"
+   id="stop2185" />
+		</radialGradient>
+		<path
+   opacity="0.19"
+   fill="url(#SVGID_105_)"
+   enable-background="new    "
+   d="M272.002,167.745    c-0.718,0.026-1.352-1.136-1.412-2.606c-0.063-1.47,0.469-2.688,1.188-2.716c0.723-0.032,1.354,1.136,1.41,2.606    C273.252,166.497,272.719,167.714,272.002,167.745z"
+   id="path2187" />
+		<path
+   opacity="0.87"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M273.139,162.708c0.172,1.356,1.317,6.256-2.328,11.841    c-0.148,0.23,4.07-8.604,1.129-10.789c-0.744-0.557-1.813-1.133-1.564-2.031c0.177-0.636,0.637-1.053,1.26-1.067    C272.561,160.623,273.022,161.787,273.139,162.708z"
+   id="path2189" />
+		<path
+   opacity="0.43"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M242.686,162.416c0.006,2.029-0.906,6.975,3.754,11.68    c0.242,0.247-5.053-6.938-1.76-11.478c0.688-0.946,2.123-1.659,1.693-2.746c-0.309-0.771-0.936-1.231-1.719-1.175    C243.488,158.783,242.684,161.246,242.686,162.416z"
+   id="path2191" />
+	</g>
+	<g
+   id="g2193">
+		<g
+   id="g2195">
+			
+				<linearGradient
+   id="SVGID_106_"
+   gradientUnits="userSpaceOnUse"
+   x1="106.7686"
+   y1="1084.6729"
+   x2="82.3512"
+   y2="1004.8064"
+   gradientTransform="matrix(1 0 0 1 24 -933)">
+				<stop
+   offset="0"
+   style="stop-color:#202D36"
+   id="stop2198" />
+				<stop
+   offset="0.0848"
+   style="stop-color:#517287"
+   id="stop2200" />
+				<stop
+   offset="0.1039"
+   style="stop-color:#6E8B9D"
+   id="stop2202" />
+				<stop
+   offset="0.1295"
+   style="stop-color:#8DA7B5"
+   id="stop2204" />
+				<stop
+   offset="0.1585"
+   style="stop-color:#A9BFCA"
+   id="stop2206" />
+				<stop
+   offset="0.1913"
+   style="stop-color:#BFD2DB"
+   id="stop2208" />
+				<stop
+   offset="0.2295"
+   style="stop-color:#D0E1E7"
+   id="stop2210" />
+				<stop
+   offset="0.2768"
+   style="stop-color:#DBEBF0"
+   id="stop2212" />
+				<stop
+   offset="0.3431"
+   style="stop-color:#E2F1F6"
+   id="stop2214" />
+				<stop
+   offset="0.5273"
+   style="stop-color:#E4F3F7"
+   id="stop2216" />
+			</linearGradient>
+			<path
+   fill="url(#SVGID_106_)"
+   d="M121.731,81.898l13.116,64.383c0.453,2.422-1.145,4.751-3.566,5.205     c-2.021,0.377-3.985-0.68-4.834-2.45L99.612,89.728c-3.154-6.548-0.402-14.414,6.145-17.564     c6.547-3.153,11.739-0.113,14.893,6.434C121.159,79.651,121.522,80.802,121.731,81.898z"
+   id="path2218" />
+			<path
+   fill="#535A5F"
+   d="M122.495,81.757l8.905,45.684l2.264,11.417l1.148,5.705l0.288,1.426c0.108,0.481,0.158,1.021,0.106,1.533     c-0.09,1.034-0.536,2.027-1.236,2.789c-0.703,0.764-1.643,1.287-2.681,1.466c-0.996,0.188-2.09,0.027-3.005-0.446     c-0.923-0.474-1.682-1.246-2.131-2.194l-1.208-2.647l-4.831-10.589l-19.491-42.282l-1.219-2.642l-0.609-1.322     c-0.203-0.434-0.404-0.96-0.559-1.432c-0.646-1.944-0.828-4.038-0.569-6.073c0.503-4.082,2.925-7.891,6.456-10.065     c0.446-0.271,0.881-0.515,1.368-0.749c0.42-0.199,0.918-0.423,1.411-0.591c0.976-0.34,2-0.592,3.057-0.666     c2.111-0.194,4.311,0.392,6.069,1.55c1.78,1.148,3.128,2.773,4.189,4.487c0.53,0.866,0.996,1.749,1.397,2.682     c0.408,0.97,0.686,1.943,0.878,2.955L122.495,81.757z M120.967,82.041c-0.182-0.889-0.456-1.786-0.813-2.598     c-0.377-0.844-0.833-1.674-1.328-2.454c-0.993-1.563-2.237-2.955-3.73-3.914c-1.487-0.965-3.241-1.427-5.003-1.266     c-0.88,0.063-1.757,0.28-2.61,0.579c-0.424,0.15-0.817,0.31-1.277,0.52c-0.39,0.181-0.805,0.403-1.192,0.631     c-3.124,1.86-5.324,5.188-5.827,8.817c-0.256,1.808-0.124,3.677,0.43,5.426c0.144,0.451,0.28,0.836,0.479,1.285l0.589,1.329     l1.18,2.66l18.893,42.552l4.765,10.619l1.191,2.655c0.377,0.809,1.041,1.501,1.844,1.917c0.807,0.418,1.734,0.569,2.648,0.403     c0.875-0.152,1.721-0.621,2.326-1.291c0.61-0.67,0.996-1.541,1.07-2.442c0.041-0.457,0.001-0.893-0.103-1.357l-0.294-1.425     l-1.174-5.7l-2.383-11.393l-9.679-45.542L120.967,82.041z"
+   id="path2220" />
+		</g>
+		
+			<radialGradient
+   id="SVGID_107_"
+   cx="87.3858"
+   cy="1019.8359"
+   r="38.4591"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#46C3D6;stop-opacity:0.74"
+   id="stop2223" />
+			<stop
+   offset="0.1036"
+   style="stop-color:#48C3D3;stop-opacity:0.5799"
+   id="stop2225" />
+			<stop
+   offset="0.1813"
+   style="stop-color:#4DC4C9;stop-opacity:0.4597"
+   id="stop2227" />
+			<stop
+   offset="0.2507"
+   style="stop-color:#57C5B9;stop-opacity:0.3525"
+   id="stop2229" />
+			<stop
+   offset="0.3152"
+   style="stop-color:#65C6A2;stop-opacity:0.2529"
+   id="stop2231" />
+			<stop
+   offset="0.3763"
+   style="stop-color:#76C785;stop-opacity:0.1584"
+   id="stop2233" />
+			<stop
+   offset="0.434"
+   style="stop-color:#8BC961;stop-opacity:0.0692"
+   id="stop2235" />
+			<stop
+   offset="0.4788"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop2237" />
+		</radialGradient>
+		<path
+   opacity="0.52"
+   fill="url(#SVGID_107_)"
+   enable-background="new    "
+   d="M127.139,104.906l-5.408-23.008    c-0.209-1.096-0.572-2.247-1.082-3.3c-3.154-6.547-8.346-9.587-14.893-6.434c-6.547,3.15-9.298,11.016-6.145,17.564l6.387,16.851    C112.795,110.001,120.46,108.731,127.139,104.906z"
+   id="path2239" />
+		
+			<linearGradient
+   id="SVGID_108_"
+   gradientUnits="userSpaceOnUse"
+   x1="105.2149"
+   y1="1075.0869"
+   x2="88.5873"
+   y2="1023.8326"
+   gradientTransform="matrix(1 0 0 1 24 -933)">
+			<stop
+   offset="0.1636"
+   style="stop-color:#141A2B"
+   id="stop2242" />
+			<stop
+   offset="0.3161"
+   style="stop-color:#142F3A;stop-opacity:0.825"
+   id="stop2244" />
+			<stop
+   offset="0.486"
+   style="stop-color:#143E45;stop-opacity:0.63"
+   id="stop2246" />
+			<stop
+   offset="0.6877"
+   style="stop-color:#14464B;stop-opacity:0.3984"
+   id="stop2248" />
+			<stop
+   offset="1"
+   style="stop-color:#14494D;stop-opacity:0.04"
+   id="stop2250" />
+		</linearGradient>
+		<path
+   opacity="0.36"
+   fill="url(#SVGID_108_)"
+   enable-background="new    "
+   d="M131.948,145.632    c0.491,1.591,0.03,2.719-0.697,2.944c-0.726,0.225-1.859-0.365-2.354-1.958l-18.716-54.317L109.3,80.778l5.699,8.602    L131.948,145.632z"
+   id="path2252" />
+		
+			<linearGradient
+   id="SVGID_109_"
+   gradientUnits="userSpaceOnUse"
+   x1="321.3457"
+   y1="2027.7021"
+   x2="321.3457"
+   y2="1934.0166"
+   gradientTransform="matrix(0.4376 -0.092 0.139 0.6612 -292.0062 -1162.1183)">
+			<stop
+   offset="0"
+   style="stop-color:#D5EBDE;stop-opacity:0.87"
+   id="stop2255" />
+			<stop
+   offset="0.5636"
+   style="stop-color:#F1F6E3;stop-opacity:0.91"
+   id="stop2257" />
+			<stop
+   offset="1"
+   style="stop-color:#7AC587;stop-opacity:0.09"
+   id="stop2259" />
+		</linearGradient>
+		<path
+   fill="url(#SVGID_109_)"
+   d="M132.294,144.863c0.271,1.296,0.768,2.823-0.501,3.741c-0.346,0.25-1.019,0.568-1.705-0.075    c0.67,0.365,1.19,0.22,1.5-0.014c0.772-0.586,0.843-1.4,0.327-3.438L114.999,89.38l2.515-1.206l2.731-1.673L132.294,144.863z"
+   id="path2261" />
+		
+			<linearGradient
+   id="SVGID_110_"
+   gradientUnits="userSpaceOnUse"
+   x1="-583.2954"
+   y1="2096.6973"
+   x2="-583.2954"
+   y2="1999.1387"
+   gradientTransform="matrix(-0.4079 0.1832 0.2768 0.6163 -686.8612 -1034.1141)">
+			<stop
+   offset="0"
+   style="stop-color:#D5EBDE;stop-opacity:0.08"
+   id="stop2264" />
+			<stop
+   offset="1"
+   style="stop-color:#7AC587;stop-opacity:0.32"
+   id="stop2266" />
+		</linearGradient>
+		<path
+   fill="url(#SVGID_110_)"
+   d="M127.71,148.516c0.5,1.192,2.331,4.509,5.686,1.496c-3.222,2.593-4.728-0.419-5.252-1.546    l-21.131-57.034l-0.048,2.917l-2.781-3.146L127.71,148.516z"
+   id="path2268" />
+		<polygon
+   fill="#FFFFFF"
+   points="125.054,145.483 100.865,90.625 102.925,90.933   "
+   id="polygon2270" />
+		<path
+   opacity="0.56"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M133.396,150.012c0,0-19.263-59.018-19.664-60.221    c2.153-0.743,4.354-1.674,6.513-3.29c0.096,0.551,11.162,44.224,14.047,58.982C134.899,148.585,133.396,150.012,133.396,150.012z"
+   id="path2272" />
+		<polygon
+   fill="#FFFFFF"
+   points="132.625,143.371 119.554,86.985 121.361,85.671   "
+   id="polygon2274" />
+		<path
+   opacity="0.44"
+   fill="#131415"
+   enable-background="new    "
+   d="M133.839,146.265c0.665,1.82-0.271,3.834-2.092,4.499    c-1.82,0.666-3.834-0.271-4.5-2.091c0.471,1.291,2.471,2.183,4.291,1.518C133.358,149.528,134.248,147.382,133.839,146.265z"
+   id="path2276" />
+	</g>
+	<g
+   id="g2278">
+		
+			<linearGradient
+   id="SVGID_111_"
+   gradientUnits="userSpaceOnUse"
+   x1="-169.5659"
+   y1="-1046.3184"
+   x2="-184.4361"
+   y2="-1092.1558"
+   gradientTransform="matrix(0.8184 -0.5747 -0.5747 -0.8184 -322.341 -768.7596)">
+			<stop
+   offset="0.1636"
+   style="stop-color:#141A2B"
+   id="stop2281" />
+			<stop
+   offset="0.3161"
+   style="stop-color:#142F3A;stop-opacity:0.825"
+   id="stop2283" />
+			<stop
+   offset="0.486"
+   style="stop-color:#143E45;stop-opacity:0.63"
+   id="stop2285" />
+			<stop
+   offset="0.6877"
+   style="stop-color:#14464B;stop-opacity:0.3984"
+   id="stop2287" />
+			<stop
+   offset="1"
+   style="stop-color:#14494D;stop-opacity:0.04"
+   id="stop2289" />
+		</linearGradient>
+		<path
+   opacity="0.36"
+   fill="url(#SVGID_111_)"
+   enable-background="new    "
+   d="M142.173,180.471    c-0.461-1.431-1.388-2.021-2.042-1.813c-0.651,0.21-1.182,1.23-0.721,2.665l11.701,50.034l5.323,8.961l0.523-9.998    L142.173,180.471z"
+   id="path2291" />
+		
+			<linearGradient
+   id="SVGID_112_"
+   gradientUnits="userSpaceOnUse"
+   x1="697.9121"
+   y1="-1130.0562"
+   x2="697.9121"
+   y2="-1214.3638"
+   gradientTransform="matrix(0.411 -0.1762 -0.2662 -0.621 -449.3053 -399.6598)">
+			<stop
+   offset="0"
+   style="stop-color:#D5EBDE;stop-opacity:0.87"
+   id="stop2294" />
+			<stop
+   offset="0.5636"
+   style="stop-color:#F1F6E3;stop-opacity:0.91"
+   id="stop2296" />
+			<stop
+   offset="1"
+   style="stop-color:#7AC587;stop-opacity:0.09"
+   id="stop2298" />
+		</linearGradient>
+		<path
+   fill="url(#SVGID_112_)"
+   d="M142.827,180.855c-0.472-1.102-0.895-2.481-2.309-2.5c-0.386-0.008-1.049,0.104-1.22,0.938    c0.306-0.617,0.763-0.777,1.116-0.77c0.871,0.035,1.347,0.598,2.021,2.369l14.91,51.252l2.187-0.113L142.827,180.855z"
+   id="path2300" />
+		
+			<linearGradient
+   id="SVGID_113_"
+   gradientUnits="userSpaceOnUse"
+   x1="-1970.999"
+   y1="-935.4204"
+   x2="-1970.999"
+   y2="-1023.7095"
+   gradientTransform="matrix(-0.4391 0.0845 -0.1277 -0.6635 -846.0248 -277.4889)">
+			<stop
+   offset="0"
+   style="stop-color:#D5EBDE;stop-opacity:0.08"
+   id="stop2303" />
+			<stop
+   offset="1"
+   style="stop-color:#7AC587;stop-opacity:0.32"
+   id="stop2305" />
+		</linearGradient>
+		<path
+   fill="url(#SVGID_113_)"
+   d="M137.55,180.537c-0.248-1.139-0.617-4.537,3.421-4.051c-3.723-0.246-3.273,2.761-3.075,3.861    l12.623,53.521l-1.548-2.127l-0.422,3.763L137.55,180.537z"
+   id="path2307" />
+		<polygon
+   fill="#FFFFFF"
+   points="137.163,184.152 147.377,236.037 148.393,235.436   "
+   id="polygon2309" />
+		<path
+   opacity="0.56"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M139.655,176.302c0,0,13.718,55.409,14.046,56.505    c1.976-0.563,4.082-1.021,6.513-0.947c-0.215-0.457-14.996-42.101-18.186-54.885C141.128,176.145,139.655,176.302,139.655,176.302    z"
+   id="path2311" />
+		<polygon
+   fill="#FFFFFF"
+   points="142.123,177.343 157.518,232.314 159.532,232.346   "
+   id="polygon2313" />
+		<path
+   opacity="0.44"
+   fill="#131415"
+   enable-background="new    "
+   d="M143.242,179.022c-0.454-1.688-2.188-2.688-3.876-2.231    c-1.688,0.453-2.691,2.188-2.237,3.876c-0.321-1.195,0.693-2.896,2.379-3.348C141.196,176.863,142.963,177.986,143.242,179.022z"
+   id="path2315" />
+	</g>
+	<g
+   id="g2317">
+		<g
+   id="g2319">
+			
+				<radialGradient
+   id="SVGID_114_"
+   cx="81.4873"
+   cy="997.1055"
+   r="26.9465"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+				<stop
+   offset="0.7758"
+   style="stop-color:#D5E2EE"
+   id="stop2322" />
+				<stop
+   offset="0.8263"
+   style="stop-color:#D1DFED"
+   id="stop2324" />
+				<stop
+   offset="0.8714"
+   style="stop-color:#C7D6E8"
+   id="stop2326" />
+				<stop
+   offset="0.9144"
+   style="stop-color:#B4C6E1"
+   id="stop2328" />
+				<stop
+   offset="0.9562"
+   style="stop-color:#9BB0D8"
+   id="stop2330" />
+				<stop
+   offset="0.9968"
+   style="stop-color:#7A95CB"
+   id="stop2332" />
+				<stop
+   offset="1"
+   style="stop-color:#7792CA"
+   id="stop2334" />
+			</radialGradient>
+			<circle
+   fill="url(#SVGID_114_)"
+   cx="105.487"
+   cy="64.105"
+   r="26.947"
+   id="circle2336" />
+			<path
+   fill="#39444F"
+   d="M133.217,64.115c-0.03,3.608-0.774,7.243-2.192,10.568c-1.415,3.332-3.493,6.366-6.045,8.914     c-5.113,5.117-12.261,8.052-19.501,8.093c-7.216,0.09-14.456-2.843-19.606-7.973c-5.2-5.087-8.262-12.288-8.286-19.626     c-0.032-3.626,0.656-7.311,2.036-10.702c1.383-3.396,3.456-6.507,6.04-9.112c2.584-2.606,5.685-4.703,9.078-6.124     c3.396-1.433,7.065-2.129,10.764-2.127c7.34-0.047,14.641,3.09,19.737,8.327c5.153,5.203,8.085,12.484,7.977,19.752v0.01H133.217     z M131.651,64.105c-0.033-6.866-2.923-13.611-7.807-18.356c-2.429-2.379-5.316-4.279-8.456-5.548     c-3.146-1.266-6.504-1.912-9.914-1.912c-6.74-0.004-13.472,2.738-18.267,7.533c-4.827,4.765-7.678,11.449-7.712,18.292     c-0.102,6.796,2.659,13.622,7.497,18.482c4.797,4.908,11.583,7.797,18.502,7.813c3.425,0.016,6.903-0.603,10.081-1.949     c3.184-1.33,6.098-3.295,8.527-5.741c4.9-4.881,7.641-11.75,7.549-18.625V64.105z"
+   id="path2338" />
+		</g>
+		
+			<radialGradient
+   id="SVGID_115_"
+   cx="193.9414"
+   cy="532.8594"
+   r="30.2852"
+   gradientTransform="matrix(0.9525 0.3046 -0.3046 0.9525 81.9305 -503.3005)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.4121"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop2341" />
+			<stop
+   offset="0.5849"
+   style="stop-color:#0A1827;stop-opacity:0.5379"
+   id="stop2343" />
+			<stop
+   offset="0.6472"
+   style="stop-color:#091420;stop-opacity:0.7317"
+   id="stop2345" />
+			<stop
+   offset="0.6914"
+   style="stop-color:#060D15;stop-opacity:0.8694"
+   id="stop2347" />
+			<stop
+   offset="0.727"
+   style="stop-color:#010204;stop-opacity:0.9803"
+   id="stop2349" />
+			<stop
+   offset="0.7333"
+   style="stop-color:#000000"
+   id="stop2351" />
+			<stop
+   offset="0.7876"
+   style="stop-color:#03080D;stop-opacity:0.6108"
+   id="stop2353" />
+			<stop
+   offset="0.8727"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop2355" />
+		</radialGradient>
+		<circle
+   opacity="0.36"
+   fill="url(#SVGID_115_)"
+   enable-background="new    "
+   cx="105.214"
+   cy="61.99"
+   r="29.098"
+   id="circle2357" />
+		
+			<radialGradient
+   id="SVGID_116_"
+   cx="84.2964"
+   cy="980.5527"
+   r="41.7421"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#B4CB80;stop-opacity:0"
+   id="stop2360" />
+			<stop
+   offset="1"
+   style="stop-color:#60BD71"
+   id="stop2362" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_116_)"
+   enable-background="new    "
+   cx="105.488"
+   cy="63.811"
+   r="26.947"
+   id="circle2364" />
+		
+			<radialGradient
+   id="SVGID_117_"
+   cx="81.4893"
+   cy="996.8105"
+   r="26.9465"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.0242"
+   style="stop-color:#79CCCB"
+   id="stop2367" />
+			<stop
+   offset="0.4667"
+   style="stop-color:#35AED5"
+   id="stop2369" />
+			<stop
+   offset="1"
+   style="stop-color:#25346F"
+   id="stop2371" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_117_)"
+   enable-background="new    "
+   cx="105.489"
+   cy="63.81"
+   r="26.947"
+   id="circle2373" />
+		<path
+   opacity="0.49"
+   fill="#F2F6FA"
+   enable-background="new    "
+   d="M82.225,65.187c-1.171-12.255,7.813-23.142,20.071-24.313    c12.254-1.168,24.214,5.513,26.153,15.744c-9.143-12.108-23.101-12.108-27.735-10.996C90.424,48.091,85.069,55.673,82.225,65.187z    "
+   id="path2375" />
+		<path
+   opacity="0.11"
+   fill="#EBF7FD"
+   enable-background="new    "
+   d="M78.813,67.942c-1.415-14.795,8.78-28.709,23.58-30.125    c14.795-1.411,24.712,6.865,29.479,20.496c-7.058-15.023-26.267-15.335-31.863-13.993C87.585,47.301,82.246,56.458,78.813,67.942z    "
+   id="path2377" />
+		<path
+   opacity="0.22"
+   fill="#EBF7FD"
+   enable-background="new    "
+   d="M80.923,74.902c-4.578-19.618,7.083-34.009,21.507-35.389    c14.418-1.375,27.801,9.682,29.441,25.673c-6.331-23.442-26.164-22.711-31.615-21.382C88.153,46.755,81.7,56.022,80.923,74.902z"
+   id="path2379" />
+		
+			<radialGradient
+   id="SVGID_118_"
+   cx="80.9385"
+   cy="1071.6387"
+   r="14.3689"
+   gradientTransform="matrix(1 0 0 0.9207 24 -936.5648)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop2382" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop2384" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop2386" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop2388" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop2390" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop2392" />
+		</radialGradient>
+		<path
+   opacity="0.5"
+   fill="url(#SVGID_118_)"
+   enable-background="new    "
+   d="M119.307,50.09c0,7.307-6.432,13.232-14.366,13.232    c-7.936,0-14.371-5.926-14.371-13.232c0-7.302,6.435-13.227,14.371-13.227C112.875,36.863,119.307,42.788,119.307,50.09z"
+   id="path2394" />
+		
+			<radialGradient
+   id="SVGID_119_"
+   cx="80.939"
+   cy="1070.6641"
+   r="10.5154"
+   gradientTransform="matrix(1 0 0 0.9207 24 -936.5648)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop2397" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop2399" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop2401" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop2403" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop2405" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop2407" />
+		</radialGradient>
+		<path
+   fill="url(#SVGID_119_)"
+   d="M115.454,49.193c0,5.348-4.707,9.684-10.514,9.684c-5.808,0-10.516-4.335-10.516-9.684    c0-5.344,4.708-9.68,10.516-9.68C110.748,39.514,115.454,43.85,115.454,49.193z"
+   id="path2409" />
+		
+			<radialGradient
+   id="SVGID_120_"
+   cx="90.3418"
+   cy="668.6094"
+   r="8.2778"
+   gradientTransform="matrix(1 0 0 1 16 -622)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.4758"
+   style="stop-color:#EEF8FB;stop-opacity:0.75"
+   id="stop2412" />
+			<stop
+   offset="0.7615"
+   style="stop-color:#79C88D;stop-opacity:0.0912"
+   id="stop2414" />
+			<stop
+   offset="1"
+   style="stop-color:#59BB6E;stop-opacity:0"
+   id="stop2416" />
+		</radialGradient>
+		<path
+   fill="url(#SVGID_120_)"
+   d="M112.663,47.429c0,3.962-3.212,7.174-7.173,7.174c-3.962,0-7.174-3.212-7.174-7.174    c0-3.959,3.212-7.172,7.174-7.172C109.451,40.257,112.663,43.47,112.663,47.429z"
+   id="path2418" />
+		<circle
+   opacity="0.62"
+   fill="#FFFFFF"
+   enable-background="new    "
+   cx="107.024"
+   cy="44.665"
+   r="2.82"
+   id="circle2420" />
+		
+			<radialGradient
+   id="SVGID_121_"
+   cx="242.2227"
+   cy="762.1758"
+   r="9.9145"
+   gradientTransform="matrix(1.1342 0.4137 -0.3427 0.9394 81.7425 -740.2545)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#5FC099;stop-opacity:0.74"
+   id="stop2423" />
+			<stop
+   offset="0.4027"
+   style="stop-color:#5FC094;stop-opacity:0.5917"
+   id="stop2425" />
+			<stop
+   offset="0.5654"
+   style="stop-color:#5EBE85;stop-opacity:0.4143"
+   id="stop2427" />
+			<stop
+   offset="0.7418"
+   style="stop-color:#5CBC6D;stop-opacity:0.222"
+   id="stop2429" />
+			<stop
+   offset="0.9267"
+   style="stop-color:#5AB94C;stop-opacity:0.0204"
+   id="stop2431" />
+			<stop
+   offset="0.9455"
+   style="stop-color:#5AB948;stop-opacity:0"
+   id="stop2433" />
+		</radialGradient>
+		<path
+   opacity="0.66"
+   fill="url(#SVGID_121_)"
+   enable-background="new    "
+   d="M106.52,80.042    c-1.877,5.144-8.432,7.478-14.642,5.213c-6.211-2.265-9.725-8.272-7.849-13.416c1.876-5.143,8.432-7.477,14.644-5.211    C104.883,68.893,108.395,74.9,106.52,80.042z"
+   id="path2435" />
+		<path
+   opacity="0.32"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M99.506,87.84c-0.406,0.792-1.012,1.428-1.756,1.9    c-4.129-0.688-10.193-4.863-12.605-7.896c0.086-0.398,0.224-0.785,0.414-1.156c1.522-2.968,5.88-3.774,9.732-1.799    C99.141,80.863,101.028,84.873,99.506,87.84z"
+   id="path2437" />
+		
+			<radialGradient
+   id="SVGID_122_"
+   cx="-250.6884"
+   cy="1458.0879"
+   r="13.3664"
+   gradientTransform="matrix(1.1034 -0.3171 0.2155 0.7497 71.9107 -1091.3529)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.5455"
+   style="stop-color:#1D3C6E;stop-opacity:0.36"
+   id="stop2440" />
+			<stop
+   offset="0.569"
+   style="stop-color:#30486D;stop-opacity:0.433"
+   id="stop2442" />
+			<stop
+   offset="0.6061"
+   style="stop-color:#46566B;stop-opacity:0.5484"
+   id="stop2444" />
+			<stop
+   offset="0.6463"
+   style="stop-color:#56606A;stop-opacity:0.6733"
+   id="stop2446" />
+			<stop
+   offset="0.6914"
+   style="stop-color:#606669;stop-opacity:0.8134"
+   id="stop2448" />
+			<stop
+   offset="0.7515"
+   style="stop-color:#636869"
+   id="stop2450" />
+			<stop
+   offset="1"
+   style="stop-color:#51C1BC;stop-opacity:0"
+   id="stop2452" />
+		</radialGradient>
+		<path
+   opacity="0.19"
+   fill="url(#SVGID_122_)"
+   enable-background="new    "
+   d="M126.697,77.728    c1.703,5.92-3.911,9.939-12.907,12.525c-8.998,2.586-11.393,0.264-19.674-3.163c-5.692-2.355,4.213-12.815,13.21-15.403    C116.323,69.102,124.996,71.805,126.697,77.728z"
+   id="path2454" />
+		
+			<radialGradient
+   id="SVGID_123_"
+   cx="-256.1054"
+   cy="1523.5244"
+   r="18.3488"
+   gradientTransform="matrix(0.931 -0.365 0.365 0.931 -207.5863 -1434.8041)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop2457" />
+			<stop
+   offset="0.3232"
+   style="stop-color:#050709"
+   id="stop2459" />
+			<stop
+   offset="0.5663"
+   style="stop-color:#070E13"
+   id="stop2461" />
+			<stop
+   offset="0.7826"
+   style="stop-color:#0C1A23"
+   id="stop2463" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0D1E28"
+   id="stop2465" />
+			<stop
+   offset="1"
+   style="stop-color:#234A4C"
+   id="stop2467" />
+		</radialGradient>
+		<path
+   opacity="0.38"
+   fill="url(#SVGID_123_)"
+   enable-background="new    "
+   d="M128.298,58.611    c3.154,11.353-2.58,23.644-14.042,28.138c-11.463,4.492-24.686,0.388-29.364-8.917c9.039,10.36,23.293,7.595,27.77,5.942    C124.016,79.581,127.921,68.514,128.298,58.611z"
+   id="path2469" />
+		<path
+   opacity="0.75"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M130.106,59.889c3.094,11.375-3.126,23.857-15.198,28.592    c-12.072,4.729-25.831,0.835-30.557-8.451c7.765,12.579,25.901,8.961,30.581,7.132C125.043,83.212,132.818,72.179,130.106,59.889z    "
+   id="path2471" />
+		
+			<radialGradient
+   id="SVGID_124_"
+   cx="-532.1299"
+   cy="1105.5078"
+   r="2.5809"
+   gradientTransform="matrix(0.864 -0.5034 0.5034 0.864 -3.3111 -1180.5216)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop2474" />
+			<stop
+   offset="0.3195"
+   style="stop-color:#050709"
+   id="stop2476" />
+			<stop
+   offset="0.5599"
+   style="stop-color:#070C13"
+   id="stop2478" />
+			<stop
+   offset="0.7738"
+   style="stop-color:#0A1523"
+   id="stop2480" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0B1929"
+   id="stop2482" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C"
+   id="stop2484" />
+		</radialGradient>
+		<path
+   opacity="0.19"
+   fill="url(#SVGID_124_)"
+   enable-background="new    "
+   d="M96.275,40.86c0.445,0.764-0.462,2.124-2.027,3.035    c-1.566,0.912-3.195,1.031-3.641,0.267c-0.445-0.764,0.463-2.123,2.029-3.036C94.2,40.215,95.83,40.096,96.275,40.86z"
+   id="path2486" />
+		<path
+   opacity="0.87"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M128.449,54.672c0.764,2.149,4.37,9.712,0.421,20.098    c-0.164,0.429,3.565-15.445-1.996-17.961c-1.412-0.639-3.365-1.198-3.279-2.746c0.062-1.099,0.66-1.941,1.668-2.197    C126.766,51.487,127.93,53.212,128.449,54.672z"
+   id="path2488" />
+		<path
+   opacity="0.43"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M79.47,65.851c0.648,2.922,2.23,14.34,13.754,20.884    c0.525,0.298-14.684-11.542-10.298-21.362c0.829-1.857,2.906-3.677,1.732-5.337c-0.836-1.18-2.087-1.7-3.387-1.28    C79.337,59.38,79.029,63.866,79.47,65.851z"
+   id="path2490" />
+	</g>
+	<g
+   id="g2492">
+		<g
+   id="g2494">
+			
+				<radialGradient
+   id="SVGID_125_"
+   cx="135.5938"
+   cy="1187.5576"
+   r="21.0791"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+				<stop
+   offset="0.7758"
+   style="stop-color:#D5E2EE"
+   id="stop2497" />
+				<stop
+   offset="0.8263"
+   style="stop-color:#D1DFED"
+   id="stop2499" />
+				<stop
+   offset="0.8714"
+   style="stop-color:#C7D6E8"
+   id="stop2501" />
+				<stop
+   offset="0.9144"
+   style="stop-color:#B4C6E1"
+   id="stop2503" />
+				<stop
+   offset="0.9562"
+   style="stop-color:#9BB0D8"
+   id="stop2505" />
+				<stop
+   offset="0.9968"
+   style="stop-color:#7A95CB"
+   id="stop2507" />
+				<stop
+   offset="1"
+   style="stop-color:#7792CA"
+   id="stop2509" />
+			</radialGradient>
+			<circle
+   fill="url(#SVGID_125_)"
+   cx="159.594"
+   cy="254.558"
+   r="21.079"
+   id="circle2511" />
+			<path
+   fill="#39444F"
+   d="M181.456,254.566c-0.028,5.716-2.463,11.354-6.528,15.322c-4.038,3.993-9.633,6.354-15.342,6.366     c-5.678,0.072-11.361-2.241-15.439-6.258c-4.112-3.983-6.559-9.658-6.586-15.459c-0.032-2.854,0.505-5.771,1.59-8.456     c1.088-2.688,2.726-5.146,4.766-7.21c2.041-2.063,4.492-3.729,7.175-4.854c2.687-1.139,5.587-1.685,8.518-1.682     c5.801-0.039,11.575,2.463,15.588,6.605c4.061,4.119,6.359,9.873,6.259,15.604L181.456,254.566L181.456,254.566z M179.89,254.557     c-0.041-5.326-2.298-10.545-6.089-14.205c-1.886-1.836-4.123-3.3-6.553-4.271c-2.437-0.976-5.026-1.47-7.668-1.47     c-5.2,0.008-10.405,2.111-14.118,5.813c-3.734,3.684-5.95,8.84-5.992,14.145c-0.087,5.26,2.021,10.562,5.761,14.354     c3.704,3.846,8.992,6.076,14.371,6.089c5.348,0.077,10.725-2.118,14.468-5.975c3.788-3.816,5.908-9.146,5.821-14.485     L179.89,254.557L179.89,254.557z"
+   id="path2513" />
+		</g>
+		
+			<radialGradient
+   id="SVGID_126_"
+   cx="303.7735"
+   cy="697.8633"
+   r="23.6904"
+   gradientTransform="matrix(0.9525 0.3046 -0.3046 0.9525 81.9305 -503.3005)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.4121"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop2516" />
+			<stop
+   offset="0.5849"
+   style="stop-color:#0A1827;stop-opacity:0.5379"
+   id="stop2518" />
+			<stop
+   offset="0.6472"
+   style="stop-color:#091420;stop-opacity:0.7317"
+   id="stop2520" />
+			<stop
+   offset="0.6914"
+   style="stop-color:#060D15;stop-opacity:0.8694"
+   id="stop2522" />
+			<stop
+   offset="0.727"
+   style="stop-color:#010204;stop-opacity:0.9803"
+   id="stop2524" />
+			<stop
+   offset="0.7333"
+   style="stop-color:#000000"
+   id="stop2526" />
+			<stop
+   offset="0.7876"
+   style="stop-color:#03080D;stop-opacity:0.6108"
+   id="stop2528" />
+			<stop
+   offset="0.8727"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop2530" />
+		</radialGradient>
+		<circle
+   opacity="0.36"
+   fill="url(#SVGID_126_)"
+   enable-background="new    "
+   cx="159.38"
+   cy="252.903"
+   r="22.763"
+   id="circle2532" />
+		
+			<radialGradient
+   id="SVGID_127_"
+   cx="137.791"
+   cy="1174.6094"
+   r="32.6524"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#B4CB80;stop-opacity:0"
+   id="stop2535" />
+			<stop
+   offset="1"
+   style="stop-color:#60BD71"
+   id="stop2537" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_127_)"
+   enable-background="new    "
+   cx="159.594"
+   cy="254.328"
+   r="21.08"
+   id="circle2539" />
+		
+			<radialGradient
+   id="SVGID_128_"
+   cx="135.5948"
+   cy="1187.3271"
+   r="21.0791"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#3FB1CB;stop-opacity:0"
+   id="stop2542" />
+			<stop
+   offset="1"
+   style="stop-color:#458691"
+   id="stop2544" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_128_)"
+   enable-background="new    "
+   cx="159.595"
+   cy="254.327"
+   r="21.079"
+   id="circle2546" />
+		
+			<radialGradient
+   id="SVGID_129_"
+   cx="129.9517"
+   cy="1169.5059"
+   r="12.0611"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#181338"
+   id="stop2549" />
+			<stop
+   offset="0.4454"
+   style="stop-color:#151435"
+   id="stop2551" />
+			<stop
+   offset="0.7801"
+   style="stop-color:#0D182B"
+   id="stop2553" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0B1929"
+   id="stop2555" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C"
+   id="stop2557" />
+		</radialGradient>
+		<path
+   opacity="0.16"
+   fill="url(#SVGID_129_)"
+   enable-background="new    "
+   d="M167.638,235.452    c1.139,3.319-3.452,7.899-10.247,10.239c-6.802,2.332-13.235,1.533-14.372-1.783c-1.144-3.325,3.444-7.903,10.241-10.245    C160.062,231.33,166.505,232.141,167.638,235.452z"
+   id="path2559" />
+		<path
+   opacity="0.49"
+   fill="#F2F6FA"
+   enable-background="new    "
+   d="M141.397,255.404c-0.917-9.586,6.112-18.104,15.7-19.021    c9.585-0.916,18.941,4.313,20.459,12.314c-7.151-9.473-18.071-9.473-21.697-8.604C147.81,242.031,143.62,247.962,141.397,255.404z    "
+   id="path2561" />
+		<path
+   opacity="0.11"
+   fill="#EBF7FD"
+   enable-background="new    "
+   d="M138.727,257.559c-1.107-11.572,6.869-22.457,18.446-23.563    c11.573-1.104,19.331,5.367,23.06,16.029c-5.52-11.75-20.547-11.993-24.925-10.942    C145.589,241.412,141.413,248.574,138.727,257.559z"
+   id="path2563" />
+		<path
+   opacity="0.22"
+   fill="#EBF7FD"
+   enable-background="new    "
+   d="M140.377,263.003c-3.581-15.346,5.542-26.603,16.824-27.681    c11.28-1.076,21.748,7.57,23.031,20.082c-4.952-18.34-20.468-17.766-24.73-16.729    C146.034,240.984,140.985,248.234,140.377,263.003z"
+   id="path2565" />
+		
+			<radialGradient
+   id="SVGID_130_"
+   cx="339.3867"
+   cy="919.3789"
+   r="7.7568"
+   gradientTransform="matrix(1.1342 0.4137 -0.3427 0.9394 81.7425 -740.2545)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#28B467;stop-opacity:0.6"
+   id="stop2568" />
+			<stop
+   offset="0.4403"
+   style="stop-color:#2BB566;stop-opacity:0.4579"
+   id="stop2570" />
+			<stop
+   offset="0.5708"
+   style="stop-color:#35B663;stop-opacity:0.3512"
+   id="stop2572" />
+			<stop
+   offset="0.6871"
+   style="stop-color:#45BA5E;stop-opacity:0.256"
+   id="stop2574" />
+			<stop
+   offset="0.7952"
+   style="stop-color:#5CBE56;stop-opacity:0.1676"
+   id="stop2576" />
+			<stop
+   offset="0.8975"
+   style="stop-color:#79C44C;stop-opacity:0.0838"
+   id="stop2578" />
+			<stop
+   offset="0.9944"
+   style="stop-color:#9DCB41;stop-opacity:0.0046"
+   id="stop2580" />
+			<stop
+   offset="1"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop2582" />
+		</radialGradient>
+		<path
+   opacity="0.52"
+   fill="url(#SVGID_130_)"
+   enable-background="new    "
+   d="M160.401,267.023    c-1.468,4.021-6.597,5.851-11.454,4.078c-4.858-1.772-7.606-6.478-6.14-10.496c1.468-4.022,6.596-5.854,11.455-4.076    C159.12,258.305,161.868,263.001,160.401,267.023z"
+   id="path2584" />
+		<path
+   opacity="0.32"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M154.915,273.124c-0.318,0.619-0.792,1.119-1.374,1.487    c-3.231-0.539-7.973-3.807-9.86-6.176c0.069-0.313,0.175-0.615,0.324-0.906c1.189-2.322,4.599-2.951,7.612-1.407    C154.629,267.666,156.105,270.802,154.915,273.124z"
+   id="path2586" />
+		
+			<radialGradient
+   id="SVGID_131_"
+   cx="-250.1513"
+   cy="1644.1836"
+   r="10.4552"
+   gradientTransform="matrix(1.1034 -0.3171 0.2155 0.7497 76.8658 -1074.1146)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.5455"
+   style="stop-color:#1D3C6E;stop-opacity:0.36"
+   id="stop2589" />
+			<stop
+   offset="0.569"
+   style="stop-color:#30486D;stop-opacity:0.433"
+   id="stop2591" />
+			<stop
+   offset="0.6061"
+   style="stop-color:#46566B;stop-opacity:0.5484"
+   id="stop2593" />
+			<stop
+   offset="0.6463"
+   style="stop-color:#56606A;stop-opacity:0.6733"
+   id="stop2595" />
+			<stop
+   offset="0.6914"
+   style="stop-color:#606669;stop-opacity:0.8134"
+   id="stop2597" />
+			<stop
+   offset="0.7515"
+   style="stop-color:#636869"
+   id="stop2599" />
+			<stop
+   offset="1"
+   style="stop-color:#51C1BC;stop-opacity:0"
+   id="stop2601" />
+		</radialGradient>
+		<path
+   opacity="0.19"
+   fill="url(#SVGID_131_)"
+   enable-background="new    "
+   d="M168.608,235.081    c1.331,4.632-3.059,7.776-10.097,9.799c-7.039,2.022-8.911,0.206-15.39-2.474c-4.454-1.844,3.296-10.025,10.333-12.049    C160.493,228.334,167.277,230.449,168.608,235.081z"
+   id="path2603" />
+		
+			<radialGradient
+   id="SVGID_132_"
+   cx="-529.9268"
+   cy="-539.4927"
+   r="14.3531"
+   gradientTransform="matrix(-0.9545 0.3742 -0.365 -0.931 -547.4075 -60.8402)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop2606" />
+			<stop
+   offset="0.3195"
+   style="stop-color:#050709"
+   id="stop2608" />
+			<stop
+   offset="0.5599"
+   style="stop-color:#070C13"
+   id="stop2610" />
+			<stop
+   offset="0.7738"
+   style="stop-color:#0A1523"
+   id="stop2612" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0B1929"
+   id="stop2614" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C"
+   id="stop2616" />
+		</radialGradient>
+		<path
+   opacity="0.4"
+   fill="url(#SVGID_132_)"
+   enable-background="new    "
+   d="M140.625,257.743    c-2.446-8.888,2.219-18.575,11.413-22.179c9.194-3.604,19.735-0.477,23.414,6.803c-7.156-8.071-18.57-5.807-22.159-4.477    C144.189,241.259,140.993,249.968,140.625,257.743z"
+   id="path2618" />
+		<path
+   opacity="0.75"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M178.852,251.259c2.42,8.898-2.445,18.664-11.888,22.366    c-9.444,3.701-20.208,0.654-23.904-6.609c6.075,9.838,20.262,7.008,23.923,5.578C174.891,269.503,180.973,260.873,178.852,251.259    z"
+   id="path2620" />
+		
+			<radialGradient
+   id="SVGID_133_"
+   cx="-1913.8877"
+   cy="-2069.2295"
+   r="4.7557"
+   gradientTransform="matrix(-0.9319 0.3625 -0.224 -0.5758 -2093.0261 -261.7899)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop2623" />
+			<stop
+   offset="0.3195"
+   style="stop-color:#050709"
+   id="stop2625" />
+			<stop
+   offset="0.5599"
+   style="stop-color:#070C13"
+   id="stop2627" />
+			<stop
+   offset="0.7738"
+   style="stop-color:#0A1523"
+   id="stop2629" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0B1929"
+   id="stop2631" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C"
+   id="stop2633" />
+		</radialGradient>
+		<path
+   opacity="0.31"
+   fill="url(#SVGID_133_)"
+   enable-background="new    "
+   d="M158.936,234.206    c0.454,1.321-1.374,3.146-4.081,4.078c-2.708,0.928-5.269,0.608-5.722-0.711c-0.456-1.324,1.372-3.146,4.078-4.08    C155.919,232.564,158.484,232.889,158.936,234.206z"
+   id="path2635" />
+		<path
+   opacity="0.87"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M177.556,247.182c0.598,1.68,3.417,7.596,0.33,15.721    c-0.129,0.341,2.789-12.082-1.562-14.051c-1.104-0.502-2.633-0.938-2.565-2.146c0.048-0.858,0.517-1.521,1.306-1.722    C176.238,244.688,177.149,246.037,177.556,247.182z"
+   id="path2637" />
+		<path
+   opacity="0.43"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M139.241,255.925c0.507,2.284,1.744,11.214,10.76,16.334    c0.41,0.232-11.486-9.026-8.056-16.71c0.649-1.451,2.273-2.875,1.355-4.173c-0.654-0.925-1.633-1.332-2.651-1.002    C139.137,250.859,138.896,254.37,139.241,255.925z"
+   id="path2639" />
+		
+			<radialGradient
+   id="SVGID_134_"
+   cx="134.5264"
+   cy="1281.8086"
+   r="11.2395"
+   gradientTransform="matrix(1 0 0 0.9207 24 -936.5648)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop2642" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop2644" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop2646" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop2648" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop2650" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop2652" />
+		</radialGradient>
+		<path
+   opacity="0.5"
+   fill="url(#SVGID_134_)"
+   enable-background="new    "
+   d="M169.767,243.596c0,5.717-5.032,10.348-11.239,10.348    c-6.208,0-11.242-4.631-11.242-10.348c0-5.712,5.034-10.348,11.242-10.348C164.734,233.248,169.767,237.884,169.767,243.596z"
+   id="path2654" />
+		
+			<radialGradient
+   id="SVGID_135_"
+   cx="134.8775"
+   cy="1281.0508"
+   r="8.2236"
+   gradientTransform="matrix(1 0 0 0.9207 24 -936.5648)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop2657" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop2659" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop2661" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop2663" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop2665" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop2667" />
+		</radialGradient>
+		<path
+   fill="url(#SVGID_135_)"
+   d="M167.103,242.893c0,4.188-3.681,7.575-8.224,7.575c-4.544,0-8.227-3.392-8.227-7.575    c0-4.18,3.683-7.564,8.227-7.564C163.422,235.322,167.103,238.713,167.103,242.893z"
+   id="path2669" />
+		
+			<radialGradient
+   id="SVGID_136_"
+   cx="134.5264"
+   cy="1173.8418"
+   r="5.6121"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#EEF8FB"
+   id="stop2672" />
+			<stop
+   offset="0.4122"
+   style="stop-color:#EDF7F8;stop-opacity:0.8016"
+   id="stop2674" />
+			<stop
+   offset="0.5215"
+   style="stop-color:#E9F5EE;stop-opacity:0.6525"
+   id="stop2676" />
+			<stop
+   offset="0.619"
+   style="stop-color:#E2F1DE;stop-opacity:0.5196"
+   id="stop2678" />
+			<stop
+   offset="0.7096"
+   style="stop-color:#D8ECC7;stop-opacity:0.396"
+   id="stop2680" />
+			<stop
+   offset="0.7954"
+   style="stop-color:#CCE4AA;stop-opacity:0.2789"
+   id="stop2682" />
+			<stop
+   offset="0.8777"
+   style="stop-color:#BCDC86;stop-opacity:0.1667"
+   id="stop2684" />
+			<stop
+   offset="0.9557"
+   style="stop-color:#ABD25B;stop-opacity:0.0604"
+   id="stop2686" />
+			<stop
+   offset="1"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop2688" />
+		</radialGradient>
+		<circle
+   fill="url(#SVGID_136_)"
+   cx="158.526"
+   cy="240.842"
+   r="5.612"
+   id="circle2690" />
+		<circle
+   opacity="0.62"
+   fill="#FFFFFF"
+   enable-background="new    "
+   cx="158.524"
+   cy="238.425"
+   r="2.207"
+   id="circle2692" />
+	</g>
+	<g
+   id="g2694">
+		
+			<linearGradient
+   id="SVGID_137_"
+   gradientUnits="userSpaceOnUse"
+   x1="132.9654"
+   y1="1066.0518"
+   x2="169.7413"
+   y2="1020.4093"
+   gradientTransform="matrix(1 0 0 1 24 -933)">
+			<stop
+   offset="0"
+   style="stop-color:#202D36"
+   id="stop2697" />
+			<stop
+   offset="0.0821"
+   style="stop-color:#517287"
+   id="stop2699" />
+			<stop
+   offset="0.1266"
+   style="stop-color:#7793A4"
+   id="stop2701" />
+			<stop
+   offset="0.175"
+   style="stop-color:#98B1BD"
+   id="stop2703" />
+			<stop
+   offset="0.2272"
+   style="stop-color:#B4C9D2"
+   id="stop2705" />
+			<stop
+   offset="0.2833"
+   style="stop-color:#C9DCE3"
+   id="stop2707" />
+			<stop
+   offset="0.3454"
+   style="stop-color:#D8E9EE"
+   id="stop2709" />
+			<stop
+   offset="0.4181"
+   style="stop-color:#E1F1F5"
+   id="stop2711" />
+			<stop
+   offset="0.5273"
+   style="stop-color:#E4F3F7"
+   id="stop2713" />
+		</linearGradient>
+		<path
+   fill="url(#SVGID_137_)"
+   d="M193.984,87.626l-30.212,44.652c-1.49,2.203-3.807,2.051-6.312,0.306    c-2.384-1.659-3.157-3.505-1.665-5.709c0.071-0.105,0.154-0.216,0.234-0.313l33.801-42.004c0.896-1.11,2.521-1.287,3.63-0.395    C194.516,85.011,194.725,86.524,193.984,87.626z"
+   id="path2715" />
+		<path
+   fill="#535A5F"
+   d="M194.415,87.916l-17.968,27.117l-9.095,13.483c-0.771,1.115-1.576,2.207-2.394,3.29l-0.61,0.814    c-0.205,0.277-0.489,0.612-0.78,0.854c-0.59,0.521-1.376,0.874-2.164,0.926c-1.596,0.093-2.932-0.64-4.073-1.418    c-0.568-0.399-1.133-0.846-1.61-1.388c-0.477-0.539-0.882-1.205-1.02-1.967c-0.142-0.762,0.026-1.55,0.346-2.205    c0.302-0.669,0.794-1.219,1.21-1.734l2.561-3.158l5.096-6.337l10.161-12.699l10.153-12.706l5.08-6.35l0.176-0.217l0.171-0.191    c0.157-0.158,0.318-0.289,0.48-0.401c0.334-0.225,0.713-0.382,1.108-0.461c0.788-0.162,1.642,0.003,2.312,0.456    c0.087,0.064,0.152,0.104,0.256,0.191c0.066,0.061,0.122,0.103,0.196,0.177c0.16,0.159,0.288,0.315,0.4,0.482    c0.226,0.336,0.382,0.717,0.461,1.114C195.032,86.379,194.869,87.238,194.415,87.916z M193.553,87.335    c0.643-0.894,0.396-2.289-0.546-2.894c-0.922-0.637-2.278-0.41-2.948,0.6l-5.116,6.321l-10.24,12.636l-10.231,12.642l-5.1,6.333    l-2.538,3.177c-0.882,0.996-1.605,2.151-1.376,3.338c0.228,1.172,1.257,2.11,2.327,2.828c1.071,0.713,2.348,1.259,3.495,1.054    c0.563-0.1,1.051-0.384,1.439-0.799c0.207-0.22,0.347-0.418,0.521-0.703l0.529-0.869c0.701-1.162,1.416-2.315,2.164-3.446    l9.133-13.457L193.553,87.335z"
+   id="path2717" />
+	</g>
+	<g
+   id="g2719">
+		
+			<linearGradient
+   id="SVGID_138_"
+   gradientUnits="userSpaceOnUse"
+   x1="-1192.0801"
+   y1="866.0107"
+   x2="-1205.1014"
+   y2="825.8729"
+   gradientTransform="matrix(-0.93 -0.3675 -0.3675 0.93 -628.9186 -1117.981)">
+			<stop
+   offset="0.1636"
+   style="stop-color:#141A2B"
+   id="stop2722" />
+			<stop
+   offset="0.3161"
+   style="stop-color:#142F3A;stop-opacity:0.825"
+   id="stop2724" />
+			<stop
+   offset="0.486"
+   style="stop-color:#143E45;stop-opacity:0.63"
+   id="stop2726" />
+			<stop
+   offset="0.6877"
+   style="stop-color:#14464B;stop-opacity:0.3984"
+   id="stop2728" />
+			<stop
+   offset="1"
+   style="stop-color:#14494D;stop-opacity:0.04"
+   id="stop2730" />
+		</linearGradient>
+		<path
+   opacity="0.21"
+   fill="url(#SVGID_138_)"
+   enable-background="new    "
+   d="M159.016,126.885    c-1.042,1.299-1.735,2.059-0.569,3.096c1.286,1.144,1.998,0.243,3.044-1.057L192.263,87.6l0.493-1.657l-2.416,1.089    L159.016,126.885z"
+   id="path2732" />
+		
+			<linearGradient
+   id="SVGID_139_"
+   gradientUnits="userSpaceOnUse"
+   x1="-2422.1553"
+   y1="1328.002"
+   x2="-2422.1553"
+   y2="1248.3154"
+   gradientTransform="matrix(-0.3732 -0.2464 -0.3723 0.5639 -250.8944 -1214.951)">
+			<stop
+   offset="0"
+   style="stop-color:#D5EBDE;stop-opacity:0.87"
+   id="stop2735" />
+			<stop
+   offset="0.5636"
+   style="stop-color:#F1F6E3;stop-opacity:0.91"
+   id="stop2737" />
+			<stop
+   offset="1"
+   style="stop-color:#7AC587;stop-opacity:0.09"
+   id="stop2739" />
+		</linearGradient>
+		<path
+   fill="url(#SVGID_139_)"
+   d="M158.976,126.114c-0.729,1.106-2.243,2.18-1.451,3.532c0.264,0.45,1.205,1.382,2.08,1.036    c-0.757,0.092-1.653-0.711-1.855-1.044c-0.502-0.829,0.272-1.479,1.501-3.184l31.09-39.351l-0.378-0.227l-0.37-0.299    L158.976,126.114z"
+   id="path2741" />
+		
+			<linearGradient
+   id="SVGID_140_"
+   gradientUnits="userSpaceOnUse"
+   x1="1867.6152"
+   y1="1024.6885"
+   x2="1867.6152"
+   y2="941.2666"
+   gradientTransform="matrix(0.312 0.3203 -0.484 0.4715 69.2846 -950.7426)">
+			<stop
+   offset="0"
+   style="stop-color:#D5EBDE;stop-opacity:0.08"
+   id="stop2744" />
+			<stop
+   offset="1"
+   style="stop-color:#7AC587;stop-opacity:0.32"
+   id="stop2746" />
+		</linearGradient>
+		<path
+   fill="url(#SVGID_140_)"
+   d="M163.423,130.817c-0.882,1.18-2.503,3.826-6.039,1.166c3.736,2.002,4.738-0.317,5.652-1.373    l29.226-43.01l-0.325,0.417l0.935-0.385L163.423,130.817z"
+   id="path2748" />
+		<path
+   fill="#FFFFFF"
+   d="M160.48,132.158c0,0-0.103,0.101-1.404,0.33c1.459,0.343,2.045-0.215,2.045-0.215l31.573-43.697    l-1.446-1.015L160.48,132.158z"
+   id="path2750" />
+		<path
+   opacity="0.56"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M159.318,132.373c0,0,0.973,0.057,2.167-1.562    c6.883-9.328,29.9-41.906,29.984-42.123c0.241,0.306,0.504,0.592,0.84,0.771c-0.053,0.099-21.814,30.101-30.488,42.787    C160.808,133.728,159.318,132.373,159.318,132.373z"
+   id="path2752" />
+		<polygon
+   fill="#FFFFFF"
+   points="157.84,127.558 189.68,86.591 189.251,86.063   "
+   id="polygon2754" />
+		<path
+   opacity="0.44"
+   fill="#131415"
+   enable-background="new    "
+   d="M157.202,126.602c-1.459,1.403-1.518,3.425,0.268,4.798    c0.151,0.117,0.972,0.648,1.135,0.745c1.751,1.038,2.301-0.479,3.315-1.953c-0.99,0.95-1.314,2.562-3.082,1.367    c-0.084-0.055-0.829-0.54-0.91-0.602C156.145,129.586,156.305,127.464,157.202,126.602z"
+   id="path2756" />
+		
+			<linearGradient
+   id="SVGID_141_"
+   gradientUnits="userSpaceOnUse"
+   x1="3512.9297"
+   y1="-172.4526"
+   x2="3499.9082"
+   y2="-212.5916"
+   gradientTransform="matrix(0.1764 0.2008 0.5417 -0.8371 -337.1025 -758.0223)">
+			<stop
+   offset="0.1636"
+   style="stop-color:#141A2B"
+   id="stop2759" />
+			<stop
+   offset="0.3161"
+   style="stop-color:#142F3A;stop-opacity:0.825"
+   id="stop2761" />
+			<stop
+   offset="0.486"
+   style="stop-color:#143E45;stop-opacity:0.63"
+   id="stop2763" />
+			<stop
+   offset="0.6877"
+   style="stop-color:#14464B;stop-opacity:0.3984"
+   id="stop2765" />
+			<stop
+   offset="1"
+   style="stop-color:#14494D;stop-opacity:0.04"
+   id="stop2767" />
+		</linearGradient>
+		<path
+   opacity="0.21"
+   fill="url(#SVGID_141_)"
+   enable-background="new    "
+   d="M190.652,90.26c0.948-1.235,1.534-1.964,1.566-2.709    c0.034-0.819-0.619,0.036-1.57,1.271l-29.316,38.942l-0.906,1.473l1.357-1.222L190.652,90.26z"
+   id="path2769" />
+		<path
+   opacity="0.36"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M159.408,129.259c0,0.236-0.144,0.426-0.322,0.426    c-0.178,0-0.322-0.189-0.322-0.426c0-0.234,5.733-7.765,5.912-7.765C164.855,121.494,159.408,129.025,159.408,129.259z"
+   id="path2771" />
+	</g>
+	
+		<radialGradient
+   id="SVGID_142_"
+   cx="-760.7588"
+   cy="-1519.2607"
+   r="9.4656"
+   fx="-764.102"
+   fy="-1518.6959"
+   gradientTransform="matrix(-0.4849 0.8746 -0.8033 -0.4453 -1400.3799 79.0864)"
+   gradientUnits="userSpaceOnUse">
+		<stop
+   offset="0"
+   style="stop-color:#46C3D6;stop-opacity:0.74"
+   id="stop2774" />
+		<stop
+   offset="0.1121"
+   style="stop-color:#48C3D3;stop-opacity:0.5799"
+   id="stop2776" />
+		<stop
+   offset="0.1963"
+   style="stop-color:#4DC4C9;stop-opacity:0.4597"
+   id="stop2778" />
+		<stop
+   offset="0.2713"
+   style="stop-color:#57C5B9;stop-opacity:0.3525"
+   id="stop2780" />
+		<stop
+   offset="0.3411"
+   style="stop-color:#65C6A2;stop-opacity:0.2529"
+   id="stop2782" />
+		<stop
+   offset="0.4072"
+   style="stop-color:#76C785;stop-opacity:0.1584"
+   id="stop2784" />
+		<stop
+   offset="0.4697"
+   style="stop-color:#8BC961;stop-opacity:0.0692"
+   id="stop2786" />
+		<stop
+   offset="0.5182"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop2788" />
+	</radialGradient>
+	<path
+   opacity="0.52"
+   fill="url(#SVGID_142_)"
+   enable-background="new    "
+   d="M193.461,84.163c-1.109-0.892-2.734-0.715-3.63,0.395   l-4.544,5.647c0.824,1.958,2.123,3.543,3.872,4.553l4.825-7.132C194.725,86.524,194.516,85.011,193.461,84.163z"
+   id="path2790" />
+	<g
+   id="g2792">
+		<g
+   id="g2794">
+			
+				<radialGradient
+   id="SVGID_143_"
+   cx="176.4571"
+   cy="1010.1426"
+   r="13.5566"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+				<stop
+   offset="0.7758"
+   style="stop-color:#D5E2EE"
+   id="stop2797" />
+				<stop
+   offset="0.8263"
+   style="stop-color:#D1DFED"
+   id="stop2799" />
+				<stop
+   offset="0.8714"
+   style="stop-color:#C7D6E8"
+   id="stop2801" />
+				<stop
+   offset="0.9144"
+   style="stop-color:#B4C6E1"
+   id="stop2803" />
+				<stop
+   offset="0.9562"
+   style="stop-color:#9BB0D8"
+   id="stop2805" />
+				<stop
+   offset="0.9968"
+   style="stop-color:#7A95CB"
+   id="stop2807" />
+				<stop
+   offset="1"
+   style="stop-color:#7792CA"
+   id="stop2809" />
+			</radialGradient>
+			<circle
+   fill="url(#SVGID_143_)"
+   cx="200.457"
+   cy="77.142"
+   r="13.557"
+   id="circle2811" />
+			<path
+   fill="#39444F"
+   d="M214.794,77.162c-0.04,3.722-1.66,7.422-4.323,9.994c-2.652,2.597-6.277,4.138-10.03,4.167     c-3.689,0.059-7.425-1.446-10.111-4.056c-2.71-2.605-4.342-6.299-4.381-10.151c-0.031-1.844,0.314-3.799,1.02-5.563     c0.712-1.775,1.79-3.403,3.133-4.769c2.688-2.747,6.475-4.379,10.386-4.328c3.799-0.026,7.635,1.662,10.254,4.404     c2.658,2.731,4.141,6.526,4.054,10.283v0.019H214.794z M213.232,77.142c-0.053-3.354-1.496-6.615-3.885-8.891     c-1.189-1.139-2.6-2.044-4.113-2.642c-1.539-0.594-3.113-0.894-4.805-0.897c-3.2,0.018-6.468,1.312-8.787,3.613     c-2.333,2.3-3.735,5.482-3.791,8.839c-0.074,3.259,1.221,6.621,3.56,9.021c2.32,2.439,5.639,3.861,9.061,3.887     c3.36,0.063,6.792-1.321,9.143-3.772c2.387-2.435,3.691-5.79,3.617-9.179V77.142L213.232,77.142z"
+   id="path2813" />
+		</g>
+		
+			<radialGradient
+   id="SVGID_144_"
+   cx="289.0264"
+   cy="516.5518"
+   r="15.2356"
+   gradientTransform="matrix(0.9525 0.3046 -0.3046 0.9525 81.9305 -503.3005)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.4121"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop2816" />
+			<stop
+   offset="0.5849"
+   style="stop-color:#0A1827;stop-opacity:0.5379"
+   id="stop2818" />
+			<stop
+   offset="0.6472"
+   style="stop-color:#091420;stop-opacity:0.7317"
+   id="stop2820" />
+			<stop
+   offset="0.6914"
+   style="stop-color:#060D15;stop-opacity:0.8694"
+   id="stop2822" />
+			<stop
+   offset="0.727"
+   style="stop-color:#010204;stop-opacity:0.9803"
+   id="stop2824" />
+			<stop
+   offset="0.7333"
+   style="stop-color:#000000"
+   id="stop2826" />
+			<stop
+   offset="0.7876"
+   style="stop-color:#03080D;stop-opacity:0.6108"
+   id="stop2828" />
+			<stop
+   offset="0.8727"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop2830" />
+		</radialGradient>
+		<circle
+   opacity="0.36"
+   fill="url(#SVGID_144_)"
+   enable-background="new    "
+   cx="200.32"
+   cy="76.078"
+   r="14.641"
+   id="circle2832" />
+		
+			<radialGradient
+   id="SVGID_145_"
+   cx="177.8701"
+   cy="1001.8135"
+   r="20.9982"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#B4CB80;stop-opacity:0"
+   id="stop2835" />
+			<stop
+   offset="1"
+   style="stop-color:#60BD71"
+   id="stop2837" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_145_)"
+   enable-background="new    "
+   cx="200.457"
+   cy="76.994"
+   r="13.557"
+   id="circle2839" />
+		
+			<radialGradient
+   id="SVGID_146_"
+   cx="176.458"
+   cy="1009.9941"
+   r="13.5571"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop2842" />
+			<stop
+   offset="1"
+   style="stop-color:#458691"
+   id="stop2844" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_146_)"
+   enable-background="new    "
+   cx="200.458"
+   cy="76.994"
+   r="13.557"
+   id="circle2846" />
+		<path
+   opacity="0.36"
+   fill="#F2F6FA"
+   enable-background="new    "
+   d="M188.342,75.319c0.777-5.876,5.159-9.919,10.869-10.466    c5.71-0.543,10.938,3.484,12.855,7.971c-3.979-5.463-9.455-6.808-12.888-6.339C195.746,66.954,191.564,67.577,188.342,75.319z"
+   id="path2848" />
+		<path
+   opacity="0.11"
+   fill="#EBF7FD"
+   enable-background="new    "
+   d="M187.036,79.072c-0.711-7.443,4.418-14.444,11.865-15.156    c7.445-0.709,12.431,3.454,14.832,10.312c-3.551-7.558-13.217-7.715-16.026-7.04C191.448,68.688,188.765,73.294,187.036,79.072z"
+   id="path2850" />
+		<path
+   opacity="0.22"
+   fill="#EBF7FD"
+   enable-background="new    "
+   d="M188.639,80.79c-2.527-9.707,3.025-16.105,10.28-16.799    c7.253-0.691,13.987,4.871,14.812,12.916c-3.186-11.793-13.18-11.487-15.9-10.757C192.695,67.52,187.794,69.032,188.639,80.79z"
+   id="path2852" />
+		
+			<radialGradient
+   id="SVGID_147_"
+   cx="174.4092"
+   cy="1093.7969"
+   r="7.2285"
+   gradientTransform="matrix(1 0 0 0.9207 24 -936.5648)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop2855" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop2857" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop2859" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop2861" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop2863" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop2865" />
+		</radialGradient>
+		<path
+   opacity="0.5"
+   fill="url(#SVGID_147_)"
+   enable-background="new    "
+   d="M205.637,70.492c0,3.678-3.236,6.658-7.227,6.658    c-3.995,0-7.229-2.98-7.229-6.658c0-3.672,3.235-6.654,7.229-6.654C202.4,63.838,205.637,66.82,205.637,70.492z"
+   id="path2867" />
+		
+			<radialGradient
+   id="SVGID_148_"
+   cx="174.4082"
+   cy="1092.8691"
+   r="5.291"
+   gradientTransform="matrix(1 0 0 0.9207 24 -936.5648)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop2870" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop2872" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop2874" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop2876" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop2878" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop2880" />
+		</radialGradient>
+		<ellipse
+   fill="url(#SVGID_148_)"
+   cx="198.408"
+   cy="69.639"
+   rx="5.29"
+   ry="4.873"
+   id="ellipse2882" />
+		
+			<radialGradient
+   id="SVGID_149_"
+   cx="174.0713"
+   cy="1001.5869"
+   r="3.6104"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#EEF8FB"
+   id="stop2885" />
+			<stop
+   offset="0.4122"
+   style="stop-color:#EDF7F8;stop-opacity:0.8016"
+   id="stop2887" />
+			<stop
+   offset="0.5215"
+   style="stop-color:#E9F5EE;stop-opacity:0.6525"
+   id="stop2889" />
+			<stop
+   offset="0.619"
+   style="stop-color:#E2F1DE;stop-opacity:0.5196"
+   id="stop2891" />
+			<stop
+   offset="0.7096"
+   style="stop-color:#D8ECC7;stop-opacity:0.396"
+   id="stop2893" />
+			<stop
+   offset="0.7954"
+   style="stop-color:#CCE4AA;stop-opacity:0.2789"
+   id="stop2895" />
+			<stop
+   offset="0.8777"
+   style="stop-color:#BCDC86;stop-opacity:0.1667"
+   id="stop2897" />
+			<stop
+   offset="0.9557"
+   style="stop-color:#ABD25B;stop-opacity:0.0604"
+   id="stop2899" />
+			<stop
+   offset="1"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop2901" />
+		</radialGradient>
+		<circle
+   fill="url(#SVGID_149_)"
+   cx="198.071"
+   cy="68.587"
+   r="3.61"
+   id="circle2903" />
+		<circle
+   opacity="0.62"
+   fill="#FFFFFF"
+   enable-background="new    "
+   cx="197.879"
+   cy="67.361"
+   r="1.419"
+   id="circle2905" />
+		
+			<radialGradient
+   id="SVGID_150_"
+   cx="-257.7392"
+   cy="1112.8301"
+   r="4.9822"
+   gradientTransform="matrix(1.1333 -0.416 0.3445 0.9387 114.2 -1067.6246)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#46C3D6;stop-opacity:0.74"
+   id="stop2908" />
+			<stop
+   offset="0.4253"
+   style="stop-color:#48C3D3;stop-opacity:0.5799"
+   id="stop2910" />
+			<stop
+   offset="0.5444"
+   style="stop-color:#4DC4C9;stop-opacity:0.4597"
+   id="stop2912" />
+			<stop
+   offset="0.6507"
+   style="stop-color:#57C5B9;stop-opacity:0.3525"
+   id="stop2914" />
+			<stop
+   offset="0.7494"
+   style="stop-color:#65C6A2;stop-opacity:0.2529"
+   id="stop2916" />
+			<stop
+   offset="0.843"
+   style="stop-color:#76C785;stop-opacity:0.1584"
+   id="stop2918" />
+			<stop
+   offset="0.9314"
+   style="stop-color:#8BC961;stop-opacity:0.0692"
+   id="stop2920" />
+			<stop
+   offset="1"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop2922" />
+		</radialGradient>
+		<path
+   opacity="0.52"
+   fill="url(#SVGID_150_)"
+   enable-background="new    "
+   d="M211.123,82.118    c0.952,2.588-0.811,5.612-3.932,6.759c-3.123,1.146-6.426-0.022-7.375-2.608c-0.952-2.583,0.81-5.61,3.934-6.757    C206.874,78.367,210.177,79.535,211.123,82.118z"
+   id="path2924" />
+		<path
+   opacity="0.32"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M208.698,86.228c0.21,0.395,0.296,0.83,0.278,1.272    c-1.479,1.504-4.945,2.8-6.896,2.921c-0.141-0.151-0.257-0.319-0.354-0.505c-0.785-1.483,0.14-3.511,2.063-4.53    C205.716,84.366,207.914,84.744,208.698,86.228z"
+   id="path2926" />
+		
+			<radialGradient
+   id="SVGID_151_"
+   cx="525.1318"
+   cy="616.583"
+   r="4.8049"
+   gradientTransform="matrix(0.9318 0.6706 -0.4608 0.6403 -12.1767 -661.0315)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.4424"
+   style="stop-color:#1D3C6E;stop-opacity:0.36"
+   id="stop2929" />
+			<stop
+   offset="0.444"
+   style="stop-color:#1E3C6E;stop-opacity:0.3638"
+   id="stop2931" />
+			<stop
+   offset="0.5121"
+   style="stop-color:#3C4F6C;stop-opacity:0.5311"
+   id="stop2933" />
+			<stop
+   offset="0.579"
+   style="stop-color:#525D6A;stop-opacity:0.6954"
+   id="stop2935" />
+			<stop
+   offset="0.6435"
+   style="stop-color:#5F6569;stop-opacity:0.8539"
+   id="stop2937" />
+			<stop
+   offset="0.703"
+   style="stop-color:#636869"
+   id="stop2939" />
+			<stop
+   offset="0.7987"
+   style="stop-color:#5C8B8A;stop-opacity:0.5734"
+   id="stop2941" />
+			<stop
+   offset="0.9273"
+   style="stop-color:#51C1BC;stop-opacity:0"
+   id="stop2943" />
+		</radialGradient>
+		<path
+   opacity="0.19"
+   fill="url(#SVGID_151_)"
+   enable-background="new    "
+   d="M197.868,89.985    c-1.307,1.818-3.696,1.133-6.427-0.832c-2.732-1.965-2.6-3.167-3.461-6.286c-0.592-2.144,4.582-1.697,7.313,0.269    C198.022,85.101,199.177,88.168,197.868,89.985z"
+   id="path2945" />
+		
+			<radialGradient
+   id="SVGID_152_"
+   cx="604.1953"
+   cy="1143.8135"
+   r="9.2593"
+   gradientTransform="matrix(0.9164 0.4002 -0.4002 0.9164 101.5593 -1206.0709)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop2948" />
+			<stop
+   offset="0.3195"
+   style="stop-color:#050709"
+   id="stop2950" />
+			<stop
+   offset="0.5599"
+   style="stop-color:#070C13"
+   id="stop2952" />
+			<stop
+   offset="0.7738"
+   style="stop-color:#0A1523"
+   id="stop2954" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0B1929"
+   id="stop2956" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C"
+   id="stop2958" />
+		</radialGradient>
+		<path
+   opacity="0.42"
+   fill="url(#SVGID_152_)"
+   enable-background="new    "
+   d="M210.564,83.87    c-2.916,5.161-9.326,7.495-15.003,5.017c-5.676-2.48-8.992-8.646-7.346-13.621c-0.468,6.902,5.656,10.99,7.837,11.994    C201.583,89.806,206.908,87.26,210.564,83.87z"
+   id="path2960" />
+		<path
+   opacity="0.54"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M211.736,82.878c-2.176,5.519-8.438,8.683-14.729,6.962    c-6.293-1.722-10.673-7.431-9.785-12.598c-0.652,7.408,7.752,11.403,10.19,12.073C202.682,90.764,209.135,88.651,211.736,82.878z"
+   id="path2962" />
+		
+			<radialGradient
+   id="SVGID_153_"
+   cx="670.3818"
+   cy="507.4414"
+   r="1.2996"
+   gradientTransform="matrix(0.7921 0.6103 -0.6103 0.7921 -12.4576 -743.2179)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop2965" />
+			<stop
+   offset="0.3195"
+   style="stop-color:#050709"
+   id="stop2967" />
+			<stop
+   offset="0.5599"
+   style="stop-color:#070C13"
+   id="stop2969" />
+			<stop
+   offset="0.7738"
+   style="stop-color:#0A1523"
+   id="stop2971" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0B1929"
+   id="stop2973" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C"
+   id="stop2975" />
+		</radialGradient>
+		<path
+   opacity="0.19"
+   fill="url(#SVGID_153_)"
+   enable-background="new    "
+   d="M210.177,68.873    c-0.272,0.351-1.077,0.189-1.801-0.37c-0.722-0.555-1.087-1.293-0.815-1.644c0.271-0.353,1.08-0.189,1.801,0.37    C210.081,67.783,210.445,68.521,210.177,68.873z"
+   id="path2977" />
+		
+			<radialGradient
+   id="SVGID_154_"
+   cx="495.4756"
+   cy="88.253"
+   r="8.9664"
+   gradientTransform="matrix(0.7838 0.621 -0.5116 0.6457 -149.5511 -279.8802)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506;stop-opacity:0.85"
+   id="stop2980" />
+			<stop
+   offset="0.5273"
+   style="stop-color:#0B1929;stop-opacity:0.52"
+   id="stop2982" />
+			<stop
+   offset="0.7222"
+   style="stop-color:#132935;stop-opacity:0.3056"
+   id="stop2984" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C;stop-opacity:0"
+   id="stop2986" />
+		</radialGradient>
+		<path
+   opacity="0.23"
+   fill="url(#SVGID_154_)"
+   enable-background="new    "
+   d="M204.773,89.556    c-1.479,2.081-9.792,0.143-12.792-1.992c-3.009-2.116-6.564-8.478-5.084-10.57c1.469-2.087,8.507-0.302,11.509,1.827    C201.407,80.94,206.247,87.466,204.773,89.556z"
+   id="path2988" />
+	</g>
+	
+		<radialGradient
+   id="SVGID_155_"
+   cx="-1247.3779"
+   cy="1117.417"
+   r="2.1424"
+   gradientTransform="matrix(0.2687 -0.9632 0.7107 0.1982 -302.0964 -1294.5463)"
+   gradientUnits="userSpaceOnUse">
+		<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop2991" />
+		<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop2993" />
+		<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop2995" />
+		<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop2997" />
+		<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop2999" />
+		<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop3001" />
+	</radialGradient>
+	<path
+   opacity="0.63"
+   fill="url(#SVGID_155_)"
+   enable-background="new    "
+   d="M157.539,126.247c0.804,0.223,1.081,1.53,0.841,2.393   c-0.354,1.264-1.394,2.078-2.327,1.817c-0.28-0.078-0.938-0.733-0.803-1.796C155.627,126.629,156.916,126.073,157.539,126.247z"
+   id="path3003" />
+	<polygon
+   fill="#FFFFFF"
+   points="156.318,148.664 200.022,122.255 200.022,120.674  "
+   id="polygon3005" />
+	<path
+   fill="#FFFFFF"
+   d="M155.934,150.469c1.24,1.764,3.683,0.311,3.683,0.311l45.129-23.217l-1.529-1.342l-43.683,24.33   C159.534,150.546,157.445,151.876,155.934,150.469z"
+   id="path3007" />
+	
+		<linearGradient
+   id="SVGID_156_"
+   gradientUnits="userSpaceOnUse"
+   x1="4384.4502"
+   y1="-1276.5322"
+   x2="4367.8047"
+   y2="-1327.8422"
+   gradientTransform="matrix(-0.0843 0.3112 -0.6769 0.3248 -333.9066 -802.8984)">
+		<stop
+   offset="0.1636"
+   style="stop-color:#141A2B;stop-opacity:0.54"
+   id="stop3010" />
+		<stop
+   offset="0.3161"
+   style="stop-color:#142F3A;stop-opacity:0.4488"
+   id="stop3012" />
+		<stop
+   offset="0.486"
+   style="stop-color:#143E45;stop-opacity:0.3473"
+   id="stop3014" />
+		<stop
+   offset="0.6877"
+   style="stop-color:#14464B;stop-opacity:0.2267"
+   id="stop3016" />
+		<stop
+   offset="1"
+   style="stop-color:#14494D;stop-opacity:0.04"
+   id="stop3018" />
+	</linearGradient>
+	<path
+   opacity="0.36"
+   fill="url(#SVGID_156_)"
+   enable-background="new    "
+   d="M157.385,149.931c-1.117,0.668-1.348-0.407-1.44-0.56   c-0.09-0.153,0.404-0.697,1.524-1.369l38.343-23.465l7.874-4.017l-6.49,4.968L157.385,149.931z"
+   id="path3020" />
+	<path
+   fill="#FFFFFF"
+   d="M238.721,164.564c0,0.506-65.954,1.689-66.456,1.689c-0.501,0-0.907-0.406-0.907-0.916   c0-0.506,0.406-0.915,0.907-0.915c0.039,0,0.588,0.708,1.341,0.704C182.647,165.089,238.721,164.1,238.721,164.564z"
+   id="path3022" />
+	<path
+   fill="#FFFFFF"
+   d="M198.876,203.088c-0.311,0.398-27.932-19.713-28.145-19.878c0.156-0.382,0.409-0.614,0.72-1.397   C175.31,184.77,199.163,202.721,198.876,203.088z"
+   id="path3024" />
+	<path
+   fill="#FFFFFF"
+   d="M82.215,115.233c0.342-0.372,23.256,19.933,23.455,20.116c-0.187,0.366-0.454,0.499-0.967,1.21   C101.095,133.303,81.899,115.575,82.215,115.233z"
+   id="path3026" />
+	
+		<linearGradient
+   id="SVGID_157_"
+   gradientUnits="userSpaceOnUse"
+   x1="-4795.7344"
+   y1="391.6641"
+   x2="-4804.9072"
+   y2="363.3881"
+   gradientTransform="matrix(-0.1142 -0.2637 0.2148 -0.7179 -509.0133 -779.4001)">
+		<stop
+   offset="0.1636"
+   style="stop-color:#141A2B;stop-opacity:0.54"
+   id="stop3029" />
+		<stop
+   offset="0.3161"
+   style="stop-color:#142F3A;stop-opacity:0.4488"
+   id="stop3031" />
+		<stop
+   offset="0.486"
+   style="stop-color:#143E45;stop-opacity:0.3473"
+   id="stop3033" />
+		<stop
+   offset="0.6877"
+   style="stop-color:#14464B;stop-opacity:0.2267"
+   id="stop3035" />
+		<stop
+   offset="1"
+   style="stop-color:#14494D;stop-opacity:0.04"
+   id="stop3037" />
+	</linearGradient>
+	<path
+   opacity="0.36"
+   fill="url(#SVGID_157_)"
+   enable-background="new    "
+   d="M122.551,202.01c0.285-1.271,0.977-0.751,1.108-0.723   c0.13,0.029,0.134,0.752-0.151,2.027l-6.469,23.547l1.563,4.675l-2.844-4.246L122.551,202.01z"
+   id="path3039" />
+	<path
+   fill="#FFFFFF"
+   d="M70.754,215.016c0.335,0.379,33.987-27.742,34.237-27.965c0.25-0.22,0.181-0.705-0.153-1.085   c-0.334-0.379-0.809-0.508-1.058-0.286c-0.02,0.021,0.176,0.791-0.202,1.119C99.043,190.74,70.446,214.666,70.754,215.016z"
+   id="path3041" />
+	<polygon
+   fill="#FFFFFF"
+   points="103.867,156.626 58.932,149.071 58.783,147.87  "
+   id="polygon3043" />
+	<path
+   fill="#FFFFFF"
+   d="M105.23,158.889c-0.04,3.258-2.94,2.819-2.94,2.819l-44.499-3.063l0.263-1.646l44.172,4.333   C102.225,161.329,104.755,161.825,105.23,158.889z"
+   id="path3045" />
+	
+		<linearGradient
+   id="SVGID_158_"
+   gradientUnits="userSpaceOnUse"
+   x1="3956.2988"
+   y1="-393.3481"
+   x2="3941.5193"
+   y2="-438.9062"
+   gradientTransform="matrix(0.2232 0.2328 0.7497 -0.0394 -488.028 -781.4999)">
+		<stop
+   offset="0.1636"
+   style="stop-color:#141A2B;stop-opacity:0.54"
+   id="stop3048" />
+		<stop
+   offset="0.3161"
+   style="stop-color:#142F3A;stop-opacity:0.4488"
+   id="stop3050" />
+		<stop
+   offset="0.486"
+   style="stop-color:#143E45;stop-opacity:0.3473"
+   id="stop3052" />
+		<stop
+   offset="0.6877"
+   style="stop-color:#14464B;stop-opacity:0.2267"
+   id="stop3054" />
+		<stop
+   offset="1"
+   style="stop-color:#14494D;stop-opacity:0.04"
+   id="stop3056" />
+	</linearGradient>
+	<path
+   opacity="0.36"
+   fill="url(#SVGID_158_)"
+   enable-background="new    "
+   d="M103.135,158.611c1.33,0.205,1.454-0.521,1.454-1.047   c0-0.588-0.741-0.904-2.075-1.114l-45.86-6.809l-1.122,0.047l0.496,2.175L103.135,158.611z"
+   id="path3058" />
+</g>
+<g
+   id="g3060">
+	<g
+   id="g3062">
+		<g
+   id="g3064">
+			
+				<radialGradient
+   id="SVGID_159_"
+   cx="321.6426"
+   cy="1007.4033"
+   r="2.181"
+   gradientTransform="matrix(0.9999 0.017 -0.017 0.9999 26.0318 -927.0317)"
+   gradientUnits="userSpaceOnUse">
+				<stop
+   offset="0.7758"
+   style="stop-color:#D5E2EE"
+   id="stop3067" />
+				<stop
+   offset="0.8263"
+   style="stop-color:#D1DFED"
+   id="stop3069" />
+				<stop
+   offset="0.8714"
+   style="stop-color:#C7D6E8"
+   id="stop3071" />
+				<stop
+   offset="0.9144"
+   style="stop-color:#B4C6E1"
+   id="stop3073" />
+				<stop
+   offset="0.9562"
+   style="stop-color:#9BB0D8"
+   id="stop3075" />
+				<stop
+   offset="0.9968"
+   style="stop-color:#7A95CB"
+   id="stop3077" />
+				<stop
+   offset="1"
+   style="stop-color:#7792CA"
+   id="stop3079" />
+			</radialGradient>
+			<circle
+   fill="url(#SVGID_159_)"
+   cx="330.494"
+   cy="85.746"
+   r="2.184"
+   id="circle3081" />
+			<path
+   fill="#39444F"
+   d="M332.824,85.784l-0.001,0.01c-0.022,1.234-1.142,2.285-2.375,2.255c-1.218,0.029-2.351-1.072-2.313-2.352     c-0.025-1.234,1.104-2.416,2.409-2.34c0.604,0.015,1.235,0.287,1.649,0.744C332.62,84.554,332.848,85.175,332.824,85.784z      M332.531,85.78c0.01-1.09-0.942-2.028-2.014-2.01c-1.024-0.025-2.029,0.85-2.033,1.95c-0.063,1.052,0.861,2.083,1.979,2.09     C331.563,87.88,332.57,86.878,332.531,85.78z"
+   id="path3083" />
+		</g>
+		
+			<radialGradient
+   id="SVGID_160_"
+   cx="427.0703"
+   cy="469.8311"
+   r="2.4543"
+   gradientTransform="matrix(0.9472 0.3208 -0.3208 0.9472 76.6095 -496.3437)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.4121"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop3086" />
+			<stop
+   offset="0.5849"
+   style="stop-color:#0A1827;stop-opacity:0.5379"
+   id="stop3088" />
+			<stop
+   offset="0.6472"
+   style="stop-color:#091420;stop-opacity:0.7317"
+   id="stop3090" />
+			<stop
+   offset="0.6914"
+   style="stop-color:#060D15;stop-opacity:0.8694"
+   id="stop3092" />
+			<stop
+   offset="0.727"
+   style="stop-color:#010204;stop-opacity:0.9803"
+   id="stop3094" />
+			<stop
+   offset="0.7333"
+   style="stop-color:#000000"
+   id="stop3096" />
+			<stop
+   offset="0.7876"
+   style="stop-color:#03080D;stop-opacity:0.6108"
+   id="stop3098" />
+			<stop
+   offset="0.8727"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop3100" />
+		</radialGradient>
+		<circle
+   opacity="0.36"
+   fill="url(#SVGID_160_)"
+   enable-background="new    "
+   cx="330.475"
+   cy="85.574"
+   r="2.358"
+   id="circle3102" />
+		
+			<radialGradient
+   id="SVGID_161_"
+   cx="321.8692"
+   cy="1006.0635"
+   r="3.3748"
+   gradientTransform="matrix(0.9999 0.017 -0.017 0.9999 26.0318 -927.0317)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#B4CB80;stop-opacity:0"
+   id="stop3105" />
+			<stop
+   offset="1"
+   style="stop-color:#60BD71"
+   id="stop3107" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_161_)"
+   enable-background="new    "
+   cx="330.495"
+   cy="85.723"
+   r="2.183"
+   id="circle3109" />
+		
+			<radialGradient
+   id="SVGID_162_"
+   cx="321.6387"
+   cy="1007.3789"
+   r="2.1812"
+   gradientTransform="matrix(0.9999 0.017 -0.017 0.9999 26.0318 -927.0317)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#3FB1CB;stop-opacity:0"
+   id="stop3112" />
+			<stop
+   offset="1"
+   style="stop-color:#456C90"
+   id="stop3114" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_162_)"
+   enable-background="new    "
+   cx="330.495"
+   cy="85.722"
+   r="2.183"
+   id="circle3116" />
+		
+			<radialGradient
+   id="SVGID_163_"
+   cx="298.0899"
+   cy="-435.0634"
+   r="1.4906"
+   gradientTransform="matrix(-0.4207 0.9072 -0.9072 -0.4207 60.0593 -368.1773)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop3119" />
+			<stop
+   offset="0.3195"
+   style="stop-color:#050709"
+   id="stop3121" />
+			<stop
+   offset="0.5599"
+   style="stop-color:#070C13"
+   id="stop3123" />
+			<stop
+   offset="0.7738"
+   style="stop-color:#0A1523"
+   id="stop3125" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0B1929"
+   id="stop3127" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C"
+   id="stop3129" />
+		</radialGradient>
+		<path
+   opacity="0.39"
+   fill="url(#SVGID_163_)"
+   enable-background="new    "
+   d="M329.301,87.346    c-0.82-0.488-1.172-1.529-0.753-2.433c0.421-0.905,1.425-1.417,2.22-1.133c-1.104-0.101-1.789,0.871-1.959,1.218    C328.378,85.879,328.77,86.745,329.301,87.346z"
+   id="path3131" />
+		<path
+   opacity="0.54"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M332.355,85.186c0.365,0.882,0.021,1.93-0.864,2.409    c-0.886,0.479-1.995,0.282-2.464-0.42c0.74,0.94,2.104,0.5,2.451,0.314C332.219,87.089,332.702,86.144,332.355,85.186z"
+   id="path3133" />
+		
+			<radialGradient
+   id="SVGID_164_"
+   cx="-655.6924"
+   cy="1196.3076"
+   r="2.0524"
+   gradientTransform="matrix(0.6235 -0.7818 0.7818 0.6235 -197.1253 -1173.7216)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop3136" />
+			<stop
+   offset="0.5273"
+   style="stop-color:#0B1929;stop-opacity:0.52"
+   id="stop3138" />
+			<stop
+   offset="0.7222"
+   style="stop-color:#132935;stop-opacity:0.3056"
+   id="stop3140" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C;stop-opacity:0"
+   id="stop3142" />
+		</radialGradient>
+		<path
+   opacity="0.7"
+   fill="url(#SVGID_164_)"
+   enable-background="new    "
+   d="M328.707,86.423c-0.586-0.526-0.59-1.495,0.008-2.159    c0.592-0.666,1.553-0.779,2.145-0.252c0.594,0.525,0.595,1.494-0.008,2.159C330.258,86.835,329.298,86.949,328.707,86.423z"
+   id="path3144" />
+		
+			<radialGradient
+   id="SVGID_165_"
+   cx="321.4776"
+   cy="1005.9941"
+   r="0.5787"
+   gradientTransform="matrix(0.9999 0.017 -0.017 0.9999 26.0318 -927.0317)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#EEF8FB"
+   id="stop3147" />
+			<stop
+   offset="0.4122"
+   style="stop-color:#EDF7F8;stop-opacity:0.8016"
+   id="stop3149" />
+			<stop
+   offset="0.5215"
+   style="stop-color:#E9F5EE;stop-opacity:0.6525"
+   id="stop3151" />
+			<stop
+   offset="0.619"
+   style="stop-color:#E2F1DE;stop-opacity:0.5196"
+   id="stop3153" />
+			<stop
+   offset="0.7096"
+   style="stop-color:#D8ECC7;stop-opacity:0.396"
+   id="stop3155" />
+			<stop
+   offset="0.7954"
+   style="stop-color:#CCE4AA;stop-opacity:0.2789"
+   id="stop3157" />
+			<stop
+   offset="0.8777"
+   style="stop-color:#BCDC86;stop-opacity:0.1667"
+   id="stop3159" />
+			<stop
+   offset="0.9557"
+   style="stop-color:#ABD25B;stop-opacity:0.0604"
+   id="stop3161" />
+			<stop
+   offset="1"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop3163" />
+		</radialGradient>
+		<circle
+   fill="url(#SVGID_165_)"
+   cx="330.352"
+   cy="84.333"
+   r="0.581"
+   id="circle3165" />
+		<circle
+   opacity="0.62"
+   fill="#FFFFFF"
+   enable-background="new    "
+   cx="330.316"
+   cy="84.131"
+   r="0.228"
+   id="circle3167" />
+	</g>
+	<g
+   id="g3169">
+		<g
+   id="g3171">
+			
+				<radialGradient
+   id="SVGID_166_"
+   cx="483.6289"
+   cy="813.0605"
+   r="2.3818"
+   gradientTransform="matrix(0.9687 0.2482 -0.2482 0.9687 47.035 -816.7146)"
+   gradientUnits="userSpaceOnUse">
+				<stop
+   offset="0.7758"
+   style="stop-color:#D5E2EE"
+   id="stop3174" />
+				<stop
+   offset="0.8263"
+   style="stop-color:#D1DFED"
+   id="stop3176" />
+				<stop
+   offset="0.8714"
+   style="stop-color:#C7D6E8"
+   id="stop3178" />
+				<stop
+   offset="0.9144"
+   style="stop-color:#B4C6E1"
+   id="stop3180" />
+				<stop
+   offset="0.9562"
+   style="stop-color:#9BB0D8"
+   id="stop3182" />
+				<stop
+   offset="0.9968"
+   style="stop-color:#7A95CB"
+   id="stop3184" />
+				<stop
+   offset="1"
+   style="stop-color:#7792CA"
+   id="stop3186" />
+			</radialGradient>
+			<circle
+   fill="url(#SVGID_166_)"
+   cx="313.721"
+   cy="90.949"
+   r="2.381"
+   id="circle3188" />
+			<path
+   fill="#39444F"
+   d="M316.169,91.574l-0.003,0.01c-0.332,1.297-1.779,2.13-3.073,1.785c-0.625-0.147-1.209-0.566-1.55-1.132     c-0.348-0.563-0.461-1.272-0.3-1.922c0.284-1.328,1.78-2.27,3.118-1.873c0.654,0.172,1.238,0.613,1.563,1.2     C316.261,90.226,316.348,90.938,316.169,91.574z M315.885,91.502c0.295-1.158-0.496-2.41-1.626-2.658     c-0.554-0.131-1.151-0.058-1.649,0.229c-0.498,0.284-0.875,0.769-1.021,1.329c-0.337,1.128,0.396,2.446,1.581,2.739     C314.316,93.493,315.645,92.682,315.885,91.502z"
+   id="path3190" />
+		</g>
+		
+			<radialGradient
+   id="SVGID_167_"
+   cx="522.084"
+   cy="235.417"
+   r="2.6739"
+   gradientTransform="matrix(0.8471 0.5315 -0.5315 0.8471 -3.4861 -386.0533)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.4121"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop3193" />
+			<stop
+   offset="0.5849"
+   style="stop-color:#0A1827;stop-opacity:0.5379"
+   id="stop3195" />
+			<stop
+   offset="0.6472"
+   style="stop-color:#091420;stop-opacity:0.7317"
+   id="stop3197" />
+			<stop
+   offset="0.6914"
+   style="stop-color:#060D15;stop-opacity:0.8694"
+   id="stop3199" />
+			<stop
+   offset="0.727"
+   style="stop-color:#010204;stop-opacity:0.9803"
+   id="stop3201" />
+			<stop
+   offset="0.7333"
+   style="stop-color:#000000"
+   id="stop3203" />
+			<stop
+   offset="0.7876"
+   style="stop-color:#03080D;stop-opacity:0.6108"
+   id="stop3205" />
+			<stop
+   offset="0.8727"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop3207" />
+		</radialGradient>
+		<circle
+   opacity="0.36"
+   fill="url(#SVGID_167_)"
+   enable-background="new    "
+   cx="313.742"
+   cy="90.762"
+   r="2.571"
+   id="circle3209" />
+		
+			<radialGradient
+   id="SVGID_168_"
+   cx="483.8809"
+   cy="811.5986"
+   r="3.6872"
+   gradientTransform="matrix(0.9687 0.2482 -0.2482 0.9687 47.035 -816.7146)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#B4CB80;stop-opacity:0"
+   id="stop3212" />
+			<stop
+   offset="1"
+   style="stop-color:#60BD71"
+   id="stop3214" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_168_)"
+   enable-background="new    "
+   cx="313.727"
+   cy="90.925"
+   r="2.381"
+   id="circle3216" />
+		
+			<radialGradient
+   id="SVGID_169_"
+   cx="483.6367"
+   cy="813.0381"
+   r="2.3792"
+   gradientTransform="matrix(0.9687 0.2482 -0.2482 0.9687 47.035 -816.7146)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#3FB1CB;stop-opacity:0"
+   id="stop3219" />
+			<stop
+   offset="1"
+   style="stop-color:#456C90"
+   id="stop3221" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_169_)"
+   enable-background="new    "
+   cx="313.725"
+   cy="90.924"
+   r="2.38"
+   id="circle3223" />
+		
+			<radialGradient
+   id="SVGID_170_"
+   cx="289.8662"
+   cy="1022.5303"
+   r="2.5921"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop3226" />
+			<stop
+   offset="0.5273"
+   style="stop-color:#0B1929;stop-opacity:0.52"
+   id="stop3228" />
+			<stop
+   offset="0.7222"
+   style="stop-color:#132935;stop-opacity:0.3056"
+   id="stop3230" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C;stop-opacity:0"
+   id="stop3232" />
+		</radialGradient>
+		<path
+   opacity="0.7"
+   fill="url(#SVGID_170_)"
+   enable-background="new    "
+   d="M311.772,90.211c0.063-0.993,1.008-1.758,2.133-1.691    c1.123,0.061,1.99,0.919,1.938,1.917c-0.053,0.993-1.009,1.756-2.134,1.69C312.584,92.064,311.715,91.206,311.772,90.211z"
+   id="path3234" />
+		<path
+   opacity="0.75"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M315.918,91.128c0.018,1.042-0.79,1.974-1.927,2.114    c-1.138,0.14-2.229-0.496-2.431-1.394c0.39,1.248,2.021,1.335,2.461,1.282C314.975,93.014,315.881,92.24,315.918,91.128z"
+   id="path3236" />
+		<path
+   opacity="0.87"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M315.631,92.145c0.094-0.207,0.506-0.929,0.194-1.988    c-0.013-0.043,0.235,1.558-0.334,1.765c-0.144,0.052-0.343,0.093-0.347,0.247c-0.002,0.109,0.051,0.197,0.146,0.23    C315.439,92.448,315.568,92.286,315.631,92.145z"
+   id="path3238" />
+	</g>
+	<g
+   id="g3240">
+		<g
+   id="g3242">
+			
+				<radialGradient
+   id="SVGID_171_"
+   cx="471.6739"
+   cy="792.7363"
+   r="2.3824"
+   gradientTransform="matrix(0.9687 0.2482 -0.2482 0.9687 47.035 -816.7146)"
+   gradientUnits="userSpaceOnUse">
+				<stop
+   offset="0.7758"
+   style="stop-color:#D5E2EE"
+   id="stop3245" />
+				<stop
+   offset="0.8263"
+   style="stop-color:#D1DFED"
+   id="stop3247" />
+				<stop
+   offset="0.8714"
+   style="stop-color:#C7D6E8"
+   id="stop3249" />
+				<stop
+   offset="0.9144"
+   style="stop-color:#B4C6E1"
+   id="stop3251" />
+				<stop
+   offset="0.9562"
+   style="stop-color:#9BB0D8"
+   id="stop3253" />
+				<stop
+   offset="0.9968"
+   style="stop-color:#7A95CB"
+   id="stop3255" />
+				<stop
+   offset="1"
+   style="stop-color:#7792CA"
+   id="stop3257" />
+			</radialGradient>
+			<circle
+   fill="url(#SVGID_171_)"
+   cx="307.184"
+   cy="68.294"
+   r="2.381"
+   id="circle3259" />
+			<path
+   fill="#39444F"
+   d="M309.63,68.928c-0.33,1.299-1.778,2.131-3.071,1.786c-1.293-0.278-2.213-1.726-1.848-3.063     c0.284-1.309,1.77-2.269,3.126-1.861c0.634,0.166,1.231,0.611,1.556,1.197c0.334,0.584,0.42,1.297,0.239,1.935L309.63,68.928z      M309.35,68.848c0.293-1.16-0.48-2.408-1.636-2.662c-0.532-0.126-1.147-0.056-1.641,0.23c-0.499,0.288-0.872,0.761-1.028,1.338     c-0.332,1.111,0.396,2.441,1.584,2.73c1.154,0.353,2.486-0.46,2.723-1.644L309.35,68.848z"
+   id="path3261" />
+		</g>
+		
+			<radialGradient
+   id="SVGID_172_"
+   cx="504.5078"
+   cy="219.7041"
+   r="2.672"
+   gradientTransform="matrix(0.8471 0.5315 -0.5315 0.8471 -3.4861 -386.0533)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.4121"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop3264" />
+			<stop
+   offset="0.5849"
+   style="stop-color:#0A1827;stop-opacity:0.5379"
+   id="stop3266" />
+			<stop
+   offset="0.6472"
+   style="stop-color:#091420;stop-opacity:0.7317"
+   id="stop3268" />
+			<stop
+   offset="0.6914"
+   style="stop-color:#060D15;stop-opacity:0.8694"
+   id="stop3270" />
+			<stop
+   offset="0.727"
+   style="stop-color:#010204;stop-opacity:0.9803"
+   id="stop3272" />
+			<stop
+   offset="0.7333"
+   style="stop-color:#000000"
+   id="stop3274" />
+			<stop
+   offset="0.7876"
+   style="stop-color:#03080D;stop-opacity:0.6108"
+   id="stop3276" />
+			<stop
+   offset="0.8727"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop3278" />
+		</radialGradient>
+		<circle
+   opacity="0.36"
+   fill="url(#SVGID_172_)"
+   enable-background="new    "
+   cx="307.208"
+   cy="68.106"
+   r="2.57"
+   id="circle3280" />
+		
+			<radialGradient
+   id="SVGID_173_"
+   cx="471.9278"
+   cy="791.2754"
+   r="3.6879"
+   gradientTransform="matrix(0.9687 0.2482 -0.2482 0.9687 47.035 -816.7146)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#B4CB80;stop-opacity:0"
+   id="stop3283" />
+			<stop
+   offset="1"
+   style="stop-color:#60BD71"
+   id="stop3285" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_173_)"
+   enable-background="new    "
+   cx="307.189"
+   cy="68.268"
+   r="2.381"
+   id="circle3287" />
+		
+			<radialGradient
+   id="SVGID_174_"
+   cx="471.6748"
+   cy="792.7109"
+   r="2.383"
+   gradientTransform="matrix(0.9687 0.2482 -0.2482 0.9687 47.035 -816.7146)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#3FB1CB;stop-opacity:0"
+   id="stop3290" />
+			<stop
+   offset="1"
+   style="stop-color:#456C90"
+   id="stop3292" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_174_)"
+   enable-background="new    "
+   cx="307.191"
+   cy="68.269"
+   r="2.381"
+   id="circle3294" />
+		
+			<radialGradient
+   id="SVGID_175_"
+   cx="283.7803"
+   cy="1001.832"
+   r="2.0738"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop3297" />
+			<stop
+   offset="0.5273"
+   style="stop-color:#0B1929;stop-opacity:0.52"
+   id="stop3299" />
+			<stop
+   offset="0.7222"
+   style="stop-color:#132935;stop-opacity:0.3056"
+   id="stop3301" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C;stop-opacity:0"
+   id="stop3303" />
+		</radialGradient>
+		<path
+   opacity="0.7"
+   fill="url(#SVGID_175_)"
+   enable-background="new    "
+   d="M306.344,70.348c-0.73-0.673-0.719-1.895,0.047-2.722    c0.758-0.831,1.973-0.955,2.709-0.281c0.731,0.672,0.717,1.896-0.047,2.723C308.293,70.895,307.079,71.021,306.344,70.348z"
+   id="path3305" />
+		<path
+   opacity="0.75"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M309.384,68.473c0.015,1.041-0.792,1.973-1.928,2.113    c-1.138,0.14-2.229-0.495-2.431-1.394c0.39,1.247,2.021,1.335,2.463,1.281C308.439,70.358,309.346,69.585,309.384,68.473z"
+   id="path3307" />
+		
+			<radialGradient
+   id="SVGID_176_"
+   cx="471.2676"
+   cy="979.625"
+   r="1.1292"
+   gradientTransform="matrix(0.9687 0.2482 -0.1964 0.7666 43.0603 -801.2024)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop3310" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop3312" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop3314" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop3316" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop3318" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop3320" />
+		</radialGradient>
+		<path
+   opacity="0.65"
+   fill="url(#SVGID_176_)"
+   enable-background="new    "
+   d="M308.266,67.036    c-0.123,0.479-0.713,0.742-1.313,0.586c-0.604-0.155-0.996-0.669-0.873-1.148c0.115-0.479,0.712-0.742,1.313-0.586    C307.998,66.042,308.391,66.557,308.266,67.036z"
+   id="path3322" />
+		
+			<radialGradient
+   id="SVGID_177_"
+   cx="283.2266"
+   cy="999.5352"
+   r="0.5581"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#EEF8FB"
+   id="stop3325" />
+			<stop
+   offset="0.4122"
+   style="stop-color:#EDF7F8;stop-opacity:0.8016"
+   id="stop3327" />
+			<stop
+   offset="0.5215"
+   style="stop-color:#E9F5EE;stop-opacity:0.6525"
+   id="stop3329" />
+			<stop
+   offset="0.619"
+   style="stop-color:#E2F1DE;stop-opacity:0.5196"
+   id="stop3331" />
+			<stop
+   offset="0.7096"
+   style="stop-color:#D8ECC7;stop-opacity:0.396"
+   id="stop3333" />
+			<stop
+   offset="0.7954"
+   style="stop-color:#CCE4AA;stop-opacity:0.2789"
+   id="stop3335" />
+			<stop
+   offset="0.8777"
+   style="stop-color:#BCDC86;stop-opacity:0.1667"
+   id="stop3337" />
+			<stop
+   offset="0.9557"
+   style="stop-color:#ABD25B;stop-opacity:0.0604"
+   id="stop3339" />
+			<stop
+   offset="1"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop3341" />
+		</radialGradient>
+		<circle
+   fill="url(#SVGID_177_)"
+   cx="307.227"
+   cy="66.535"
+   r="0.558"
+   id="circle3343" />
+		<circle
+   opacity="0.62"
+   fill="#FFFFFF"
+   enable-background="new    "
+   cx="307.303"
+   cy="66.339"
+   r="0.219"
+   id="circle3345" />
+		<path
+   opacity="0.87"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M309.221,67.356c0.067,0.189,0.385,0.854,0.036,1.767    c-0.015,0.038,0.313-1.358-0.176-1.579c-0.124-0.056-0.295-0.106-0.287-0.241c0.005-0.097,0.058-0.171,0.146-0.193    C309.072,67.077,309.174,67.229,309.221,67.356z"
+   id="path3347" />
+	</g>
+	<g
+   id="g3349">
+		
+			<linearGradient
+   id="SVGID_178_"
+   gradientUnits="userSpaceOnUse"
+   x1="299.4502"
+   y1="1015.9287"
+   x2="305.833"
+   y2="1015.9287"
+   gradientTransform="matrix(1 0 0 1 24 -933)">
+			<stop
+   offset="0"
+   style="stop-color:#517287"
+   id="stop3352" />
+			<stop
+   offset="0.0118"
+   style="stop-color:#5C7B8F"
+   id="stop3354" />
+			<stop
+   offset="0.057"
+   style="stop-color:#809BAB"
+   id="stop3356" />
+			<stop
+   offset="0.1063"
+   style="stop-color:#9FB7C3"
+   id="stop3358" />
+			<stop
+   offset="0.1597"
+   style="stop-color:#B8CDD6"
+   id="stop3360" />
+			<stop
+   offset="0.219"
+   style="stop-color:#CCDEE5"
+   id="stop3362" />
+			<stop
+   offset="0.2872"
+   style="stop-color:#DAEAEF"
+   id="stop3364" />
+			<stop
+   offset="0.3724"
+   style="stop-color:#E2F1F5"
+   id="stop3366" />
+			<stop
+   offset="0.5273"
+   style="stop-color:#E4F3F7"
+   id="stop3368" />
+		</linearGradient>
+		<path
+   fill="url(#SVGID_178_)"
+   d="M324.725,80.645l4.98,4.118c0.15,0.125,0.172,0.347,0.047,0.498    c-0.113,0.139-0.313,0.168-0.46,0.075l-5.476-3.434c-0.363-0.229-0.478-0.708-0.246-1.07c0.229-0.364,0.707-0.474,1.07-0.246    C324.669,80.604,324.7,80.625,324.725,80.645z"
+   id="path3370" />
+		<path
+   fill="#535A5F"
+   d="M324.823,80.527l3.143,2.681l1.58,1.331c0.113,0.111,0.308,0.198,0.349,0.426    c0.029,0.208-0.09,0.412-0.299,0.475c-0.215,0.071-0.398-0.083-0.527-0.16l-0.438-0.271l-3.521-2.157l-0.883-0.536    c-0.271-0.195-0.641-0.284-0.847-0.709c-0.179-0.364-0.037-0.89,0.291-1.112C324.006,80.243,324.502,80.249,324.823,80.527z     M324.624,80.763c-0.21-0.179-0.548-0.175-0.761-0.013c-0.232,0.188-0.307,0.465-0.207,0.738c0.072,0.241,0.431,0.402,0.709,0.596    l0.867,0.562l3.477,2.233l0.436,0.279c0.152,0.096,0.273,0.202,0.414,0.152c0.129-0.027,0.236-0.189,0.203-0.323    c-0.012-0.136-0.176-0.223-0.307-0.338l-1.604-1.302L324.624,80.763z"
+   id="path3372" />
+	</g>
+	<g
+   id="g3374">
+		<path
+   fill="#E4F3F7"
+   d="M314.105,89.686c-0.047,0-0.092-0.006-0.146-0.018c-0.29-0.077-0.463-0.374-0.388-0.666l1.309-4.964    c0.075-0.29,0.373-0.464,0.664-0.388c0.29,0.077,0.471,0.375,0.395,0.666l-1.313,4.963    C314.566,89.524,314.346,89.686,314.105,89.686z"
+   id="path3376" />
+		<path
+   fill="#535A5F"
+   d="M314.096,89.757c-0.304,0.001-0.623-0.282-0.613-0.616c0.033-0.324,0.125-0.567,0.188-0.854l0.406-1.662    l0.418-1.658l0.21-0.829c0.025-0.123,0.068-0.313,0.215-0.453c0.128-0.131,0.313-0.209,0.494-0.21    c0.365-0.019,0.72,0.334,0.697,0.705c-0.045,0.362-0.146,0.574-0.211,0.868l-0.449,1.649l-0.467,1.646l-0.23,0.823    c-0.023,0.28-0.313,0.618-0.646,0.592L314.096,89.757z M314.105,89.615c0.265-0.017,0.438-0.202,0.479-0.493l0.203-0.831    l0.406-1.662l0.42-1.658c0.059-0.26,0.164-0.59,0.185-0.792c-0.005-0.21-0.173-0.378-0.386-0.383    c-0.1-0.002-0.201,0.039-0.271,0.109c-0.063,0.06-0.104,0.158-0.143,0.31l-0.227,0.825l-0.455,1.649l-0.465,1.646    c-0.066,0.267-0.183,0.565-0.209,0.806c-0.006,0.249,0.188,0.48,0.472,0.475L314.105,89.615z"
+   id="path3378" />
+	</g>
+	<g
+   id="g3380">
+		
+			<linearGradient
+   id="SVGID_179_"
+   gradientUnits="userSpaceOnUse"
+   x1="288.71"
+   y1="1006.4541"
+   x2="283.234"
+   y2="1000.7501"
+   gradientTransform="matrix(1 0 0 1 24 -933)">
+			<stop
+   offset="0"
+   style="stop-color:#517287"
+   id="stop3383" />
+			<stop
+   offset="0.0517"
+   style="stop-color:#698799"
+   id="stop3385" />
+			<stop
+   offset="0.1601"
+   style="stop-color:#95ADBA"
+   id="stop3387" />
+			<stop
+   offset="0.2648"
+   style="stop-color:#B7CCD5"
+   id="stop3389" />
+			<stop
+   offset="0.3634"
+   style="stop-color:#D0E1E8"
+   id="stop3391" />
+			<stop
+   offset="0.4535"
+   style="stop-color:#DFEEF3"
+   id="stop3393" />
+			<stop
+   offset="0.5273"
+   style="stop-color:#E4F3F7"
+   id="stop3395" />
+			<stop
+   offset="0.6089"
+   style="stop-color:#E0EFF4"
+   id="stop3397" />
+			<stop
+   offset="0.6925"
+   style="stop-color:#D4E4EA"
+   id="stop3399" />
+			<stop
+   offset="0.7771"
+   style="stop-color:#BFD1DA"
+   id="stop3401" />
+			<stop
+   offset="0.8624"
+   style="stop-color:#A2B7C4"
+   id="stop3403" />
+			<stop
+   offset="0.9474"
+   style="stop-color:#7E96A7"
+   id="stop3405" />
+			<stop
+   offset="1"
+   style="stop-color:#637E92"
+   id="stop3407" />
+		</linearGradient>
+		<path
+   fill="url(#SVGID_179_)"
+   d="M311.374,73.253l-3.946-4.108c-0.164-0.171-0.158-0.442,0.012-0.606    c0.156-0.15,0.396-0.158,0.563-0.028l4.476,3.522c0.359,0.282,0.422,0.801,0.145,1.158c-0.281,0.358-0.805,0.421-1.157,0.139    C311.428,73.307,311.398,73.279,311.374,73.253z"
+   id="path3409" />
+		<path
+   fill="#535A5F"
+   d="M311.227,73.317l-2.574-2.781l-1.313-1.411c-0.23-0.323,0.049-0.799,0.438-0.76    c0.193,0.008,0.326,0.151,0.447,0.237l0.381,0.293l3.056,2.337l0.767,0.581c0.271,0.165,0.555,0.519,0.524,0.909    c-0.021,0.392-0.239,0.733-0.63,0.878c-0.354,0.144-0.799,0.026-1.045-0.233L311.227,73.317z M311.473,73.136l0.004,0.003    c0.398,0.438,1.146,0.122,1.162-0.43c0.021-0.273-0.127-0.497-0.388-0.682l-0.745-0.607l-2.988-2.418l-0.375-0.301    c-0.132-0.101-0.231-0.218-0.377-0.222c-0.298-0.049-0.518,0.349-0.334,0.574l1.338,1.372L311.473,73.136z"
+   id="path3411" />
+	</g>
+	<g
+   id="blackball_1_">
+		
+			<radialGradient
+   id="SVGID_180_"
+   cx="292.9912"
+   cy="1011.4365"
+   r="8.8053"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#000000"
+   id="stop3415" />
+			<stop
+   offset="0.3003"
+   style="stop-color:#010203"
+   id="stop3417" />
+			<stop
+   offset="0.5262"
+   style="stop-color:#03080D"
+   id="stop3419" />
+			<stop
+   offset="0.7272"
+   style="stop-color:#08111D"
+   id="stop3421" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0B1929"
+   id="stop3423" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C"
+   id="stop3425" />
+		</radialGradient>
+		<circle
+   fill="url(#SVGID_180_)"
+   cx="317.754"
+   cy="77.382"
+   r="7.588"
+   id="circle3427" />
+		
+			<radialGradient
+   id="SVGID_181_"
+   cx="401.378"
+   cy="481.6504"
+   r="7.8969"
+   gradientTransform="matrix(0.9525 0.3046 -0.3046 0.9525 81.9305 -503.3005)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop3430" />
+			<stop
+   offset="0.2047"
+   style="stop-color:#0D1B2C;stop-opacity:0.2447"
+   id="stop3432" />
+			<stop
+   offset="0.337"
+   style="stop-color:#132234;stop-opacity:0.4029"
+   id="stop3434" />
+			<stop
+   offset="0.4487"
+   style="stop-color:#1D2D43;stop-opacity:0.5365"
+   id="stop3436" />
+			<stop
+   offset="0.5491"
+   style="stop-color:#2B3D58;stop-opacity:0.6566"
+   id="stop3438" />
+			<stop
+   offset="0.6418"
+   style="stop-color:#3D5173;stop-opacity:0.7674"
+   id="stop3440" />
+			<stop
+   offset="0.7289"
+   style="stop-color:#536A95;stop-opacity:0.8715"
+   id="stop3442" />
+			<stop
+   offset="0.8101"
+   style="stop-color:#6D87BC;stop-opacity:0.9686"
+   id="stop3444" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#7792CA"
+   id="stop3446" />
+		</radialGradient>
+		<circle
+   opacity="0.36"
+   fill="url(#SVGID_181_)"
+   enable-background="new    "
+   cx="317.755"
+   cy="77.383"
+   r="7.589"
+   id="circle3448" />
+		
+			<radialGradient
+   id="SVGID_182_"
+   cx="296.3291"
+   cy="1005.5029"
+   r="9.9113"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#F5F9ED"
+   id="stop3451" />
+			<stop
+   offset="0.3506"
+   style="stop-color:#F3F8EB;stop-opacity:0.5296"
+   id="stop3453" />
+			<stop
+   offset="0.477"
+   style="stop-color:#ECF5E5;stop-opacity:0.3602"
+   id="stop3455" />
+			<stop
+   offset="0.5669"
+   style="stop-color:#E1F0DA;stop-opacity:0.2395"
+   id="stop3457" />
+			<stop
+   offset="0.6397"
+   style="stop-color:#D0E8CB;stop-opacity:0.1418"
+   id="stop3459" />
+			<stop
+   offset="0.7014"
+   style="stop-color:#BADEB7;stop-opacity:0.0591"
+   id="stop3461" />
+			<stop
+   offset="0.7455"
+   style="stop-color:#A5D4A4;stop-opacity:0"
+   id="stop3463" />
+			<stop
+   offset="1"
+   style="stop-color:#000000;stop-opacity:0"
+   id="stop3465" />
+		</radialGradient>
+		<path
+   opacity="0.23"
+   fill="url(#SVGID_182_)"
+   enable-background="new    "
+   d="M325.285,77.478    c-1.283,2.134-2.732,3.625-5.568,3.625c-4.156,0-7.525-3.103-7.525-6.931c0-1.15,0.56-1.969,1.1-2.924    c3.788-2.501,7.637-1.317,9.682,0.698C324.968,73.923,325.35,76.077,325.285,77.478z"
+   id="path3467" />
+		
+			<radialGradient
+   id="SVGID_183_"
+   cx="296.0391"
+   cy="1096.7852"
+   r="4.2417"
+   gradientTransform="matrix(1 0 0 0.9207 24 -936.5648)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#F5F9ED"
+   id="stop3470" />
+			<stop
+   offset="0.3506"
+   style="stop-color:#F3F8EB;stop-opacity:0.5296"
+   id="stop3472" />
+			<stop
+   offset="0.477"
+   style="stop-color:#ECF5E5;stop-opacity:0.3602"
+   id="stop3474" />
+			<stop
+   offset="0.5669"
+   style="stop-color:#E1F0DA;stop-opacity:0.2395"
+   id="stop3476" />
+			<stop
+   offset="0.6397"
+   style="stop-color:#D0E8CB;stop-opacity:0.1418"
+   id="stop3478" />
+			<stop
+   offset="0.7014"
+   style="stop-color:#BADEB7;stop-opacity:0.0591"
+   id="stop3480" />
+			<stop
+   offset="0.7455"
+   style="stop-color:#A5D4A4;stop-opacity:0"
+   id="stop3482" />
+			<stop
+   offset="1"
+   style="stop-color:#000000;stop-opacity:0"
+   id="stop3484" />
+		</radialGradient>
+		<path
+   opacity="0.1"
+   fill="url(#SVGID_183_)"
+   enable-background="new    "
+   d="M324.707,74.346c-0.85,1.412-2.48,2.368-4.357,2.368    c-2.75,0-4.979-2.054-4.979-4.586c0-0.761,0.202-1.479,0.561-2.11C321.514,68.62,324.6,73.735,324.707,74.346z"
+   id="path3486" />
+		
+			<radialGradient
+   id="SVGID_184_"
+   cx="296.4102"
+   cy="1095.5352"
+   r="1.4997"
+   gradientTransform="matrix(1 0 0 0.9207 24 -936.5648)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop3489" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop3491" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop3493" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop3495" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop3497" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop3499" />
+		</radialGradient>
+		<path
+   opacity="0.65"
+   fill="url(#SVGID_184_)"
+   enable-background="new    "
+   d="M321.968,72.146c0,0.73-0.827,1.273-1.456,1.273    c-0.921,0-1.658-0.687-1.658-1.531c0-0.257,0.314-0.961,1.061-1.101C321.355,70.625,321.968,71.582,321.968,72.146z"
+   id="path3501" />
+	</g>
+	<g
+   id="g3503">
+		
+			<linearGradient
+   id="SVGID_185_"
+   gradientUnits="userSpaceOnUse"
+   x1="297.2237"
+   y1="1005.2148"
+   x2="307.3614"
+   y2="1005.2148"
+   gradientTransform="matrix(1 0 0 1 24 -933)">
+			<stop
+   offset="0"
+   style="stop-color:#517287"
+   id="stop3506" />
+			<stop
+   offset="0.0227"
+   style="stop-color:#6E8B9D"
+   id="stop3508" />
+			<stop
+   offset="0.0532"
+   style="stop-color:#8DA7B5"
+   id="stop3510" />
+			<stop
+   offset="0.0878"
+   style="stop-color:#A9BFCA"
+   id="stop3512" />
+			<stop
+   offset="0.1268"
+   style="stop-color:#BFD2DB"
+   id="stop3514" />
+			<stop
+   offset="0.1724"
+   style="stop-color:#D0E1E7"
+   id="stop3516" />
+			<stop
+   offset="0.2288"
+   style="stop-color:#DBEBF0"
+   id="stop3518" />
+			<stop
+   offset="0.3078"
+   style="stop-color:#E2F1F6"
+   id="stop3520" />
+			<stop
+   offset="0.5273"
+   style="stop-color:#E4F3F7"
+   id="stop3522" />
+		</linearGradient>
+		<path
+   fill="url(#SVGID_185_)"
+   d="M330.747,71.012l-8.634,4.526c-0.299,0.156-0.665,0.042-0.82-0.256    c-0.145-0.276-0.055-0.614,0.198-0.784l8.065-5.474c0.525-0.36,1.252-0.222,1.605,0.309c0.355,0.53,0.227,1.251-0.313,1.611    C330.823,70.969,330.785,70.991,330.747,71.012z"
+   id="path3524" />
+		<path
+   fill="#535A5F"
+   d="M330.818,71.147l-5.576,2.884l-2.787,1.441c-0.212,0.104-0.492,0.305-0.807,0.206    c-0.297-0.083-0.519-0.353-0.521-0.667c-0.025-0.31,0.242-0.589,0.456-0.698l0.646-0.444l5.179-3.554l1.293-0.888l0.646-0.444    c0.202-0.158,0.502-0.307,0.797-0.312c0.601-0.044,1.19,0.382,1.338,0.967c0.17,0.578-0.142,1.248-0.653,1.504L330.818,71.147z     M330.641,70.895l0.026-0.014c0.427-0.221,0.63-0.72,0.504-1.159c-0.114-0.438-0.552-0.77-1.011-0.74    c-0.234,0.007-0.43,0.097-0.641,0.251l-0.651,0.437l-1.304,0.874l-5.215,3.496l-0.65,0.437c-0.241,0.135-0.378,0.292-0.378,0.532    c-0.009,0.214,0.165,0.437,0.378,0.484c0.22,0.073,0.422-0.074,0.662-0.198l2.771-1.473L330.641,70.895z"
+   id="path3526" />
+	</g>
+	<g
+   id="g3528">
+		
+			<linearGradient
+   id="SVGID_186_"
+   gradientUnits="userSpaceOnUse"
+   x1="303.5381"
+   y1="1007.3262"
+   x2="311.2625"
+   y2="1015.0504"
+   gradientTransform="matrix(1 0 0 1 24 -933)">
+			<stop
+   offset="0"
+   style="stop-color:#517287"
+   id="stop3531" />
+			<stop
+   offset="0.0227"
+   style="stop-color:#6E8B9D"
+   id="stop3533" />
+			<stop
+   offset="0.0532"
+   style="stop-color:#8DA7B5"
+   id="stop3535" />
+			<stop
+   offset="0.0878"
+   style="stop-color:#A9BFCA"
+   id="stop3537" />
+			<stop
+   offset="0.1268"
+   style="stop-color:#BFD2DB"
+   id="stop3539" />
+			<stop
+   offset="0.1724"
+   style="stop-color:#D0E1E7"
+   id="stop3541" />
+			<stop
+   offset="0.2288"
+   style="stop-color:#DBEBF0"
+   id="stop3543" />
+			<stop
+   offset="0.3078"
+   style="stop-color:#E2F1F6"
+   id="stop3545" />
+			<stop
+   offset="0.5273"
+   style="stop-color:#E4F3F7"
+   id="stop3547" />
+		</linearGradient>
+		<path
+   fill="url(#SVGID_186_)"
+   d="M337.6,79.24l-12.966-0.363c-0.382-0.01-0.682-0.329-0.671-0.71    c0.01-0.367,0.309-0.66,0.671-0.671l12.966-0.363c0.584-0.016,1.067,0.442,1.084,1.024c0.021,0.583-0.438,1.066-1.021,1.083    C337.643,79.24,337.618,79.24,337.6,79.24z"
+   id="path3549" />
+		<path
+   fill="#535A5F"
+   d="M337.598,79.395l-7.854-0.275l-3.932-0.125l-0.979-0.031c-0.315,0.031-0.753-0.112-0.881-0.475    c-0.148-0.334-0.021-0.764,0.302-0.956c0.146-0.102,0.354-0.127,0.516-0.123l0.486-0.016l7.854-0.257L337.037,77    c0.32,0.008,0.652-0.079,1.033,0.061c0.352,0.135,0.634,0.44,0.729,0.807C339.043,78.619,338.366,79.451,337.598,79.395z     M337.602,79.086c0.592,0.034,1.063-0.585,0.895-1.133c-0.066-0.27-0.271-0.499-0.533-0.604c-0.236-0.106-0.585-0.047-0.912-0.053    l-3.93,0.083l-7.854,0.182c-0.32,0.032-0.686-0.045-0.928,0.107c-0.253,0.146-0.357,0.488-0.238,0.76    c0.112,0.289,0.42,0.397,0.738,0.373l0.979,0.024l3.934,0.095L337.602,79.086z"
+   id="path3551" />
+	</g>
+	<g
+   id="g3553">
+		
+			<linearGradient
+   id="SVGID_187_"
+   gradientUnits="userSpaceOnUse"
+   x1="294.708"
+   y1="1012.8379"
+   x2="297.4047"
+   y2="1024.7451"
+   gradientTransform="matrix(1 0 0 1 24 -933)">
+			<stop
+   offset="0"
+   style="stop-color:#202D36"
+   id="stop3556" />
+			<stop
+   offset="0.0732"
+   style="stop-color:#517287"
+   id="stop3558" />
+			<stop
+   offset="0.1426"
+   style="stop-color:#7895A5"
+   id="stop3560" />
+			<stop
+   offset="0.2232"
+   style="stop-color:#9FB6C2"
+   id="stop3562" />
+			<stop
+   offset="0.3033"
+   style="stop-color:#BDD1D9"
+   id="stop3564" />
+			<stop
+   offset="0.3816"
+   style="stop-color:#D3E4EA"
+   id="stop3566" />
+			<stop
+   offset="0.4572"
+   style="stop-color:#E0EFF4"
+   id="stop3568" />
+			<stop
+   offset="0.5273"
+   style="stop-color:#E4F3F7"
+   id="stop3570" />
+		</linearGradient>
+		<path
+   fill="url(#SVGID_187_)"
+   d="M319.297,80.421l3.271,10.17c0.229,0.733-0.168,1.519-0.9,1.755    c-0.734,0.236-1.52-0.167-1.756-0.9c-0.016-0.051-0.029-0.102-0.039-0.153l-2.102-10.475c-0.086-0.428,0.188-0.844,0.617-0.93    C318.788,79.809,319.176,80.044,319.297,80.421z"
+   id="path3572" />
+		<path
+   fill="#535A5F"
+   d="M319.494,80.358l2.275,6.698l1.108,3.357c0.267,0.658,0.054,1.54-0.553,1.992    c-0.58,0.483-1.479,0.501-2.084,0.062c-0.312-0.209-0.539-0.525-0.657-0.873c-0.104-0.376-0.124-0.603-0.188-0.912l-0.33-1.737    l-0.653-3.476l-0.642-3.479l-0.16-0.87c-0.021-0.129-0.063-0.308-0.063-0.465c0.009-0.216,0.073-0.381,0.175-0.54    c0.197-0.303,0.607-0.476,0.95-0.424C319.051,79.739,319.371,80.002,319.494,80.358z M319.1,80.485    c-0.062-0.207-0.252-0.383-0.469-0.41c-0.246-0.037-0.445,0.074-0.576,0.261c-0.056,0.093-0.088,0.213-0.092,0.293    c0.004,0.139,0.036,0.248,0.069,0.408l0.188,0.864l0.75,3.457l0.733,3.459l0.362,1.73c0.063,0.266,0.119,0.627,0.186,0.815    c0.076,0.207,0.221,0.389,0.396,0.508c0.363,0.255,0.873,0.216,1.22-0.046c0.354-0.268,0.501-0.742,0.335-1.193l-1.057-3.376    L319.1,80.485z"
+   id="path3574" />
+	</g>
+	<path
+   fill="#E4F3F7"
+   stroke="#535A5F"
+   stroke-width="0.5"
+   stroke-miterlimit="10"
+   d="M312.415,82.677l-6.39,6.457   c-0.448,0.453-1.18,0.457-1.633,0.008c-0.453-0.449-0.457-1.18-0.015-1.632c0.024-0.026,0.06-0.051,0.082-0.074l6.976-5.822   c0.309-0.257,0.765-0.216,1.021,0.091C312.695,81.993,312.673,82.414,312.415,82.677z"
+   id="path3576" />
+	<g
+   id="g3578">
+		
+			<linearGradient
+   id="SVGID_188_"
+   gradientUnits="userSpaceOnUse"
+   x1="285.1358"
+   y1="1012.4893"
+   x2="279.8378"
+   y2="1005.708"
+   gradientTransform="matrix(1 0 0 1 24 -933)">
+			<stop
+   offset="0"
+   style="stop-color:#517287"
+   id="stop3581" />
+			<stop
+   offset="0.0118"
+   style="stop-color:#5C7B8F"
+   id="stop3583" />
+			<stop
+   offset="0.057"
+   style="stop-color:#809BAB"
+   id="stop3585" />
+			<stop
+   offset="0.1063"
+   style="stop-color:#9FB7C3"
+   id="stop3587" />
+			<stop
+   offset="0.1597"
+   style="stop-color:#B8CDD6"
+   id="stop3589" />
+			<stop
+   offset="0.219"
+   style="stop-color:#CCDEE5"
+   id="stop3591" />
+			<stop
+   offset="0.2872"
+   style="stop-color:#DAEAEF"
+   id="stop3593" />
+			<stop
+   offset="0.3724"
+   style="stop-color:#E2F1F5"
+   id="stop3595" />
+			<stop
+   offset="0.5273"
+   style="stop-color:#E4F3F7"
+   id="stop3597" />
+		</linearGradient>
+		<path
+   fill="url(#SVGID_188_)"
+   d="M302.494,74.312l9.154,1.656c0.396,0.073,0.668,0.457,0.595,0.856    c-0.067,0.37-0.4,0.625-0.767,0.604l-9.289-0.521c-0.728-0.04-1.273-0.659-1.233-1.38c0.041-0.721,0.657-1.273,1.381-1.233    C302.386,74.296,302.443,74.303,302.494,74.312z"
+   id="path3599" />
+		<path
+   fill="#535A5F"
+   d="M302.522,74.165l6.164,1.17c1.031,0.197,2.058,0.37,3.092,0.585c0.6,0.183,0.75,1.023,0.26,1.403    c-0.227,0.2-0.563,0.202-0.805,0.174l-0.778-0.04l-6.271-0.312l-1.563-0.075c-0.269-0.023-0.519,0.006-0.813-0.092    c-0.273-0.088-0.521-0.266-0.699-0.497c-0.365-0.46-0.41-1.152-0.088-1.651C301.316,74.325,301.943,74.052,302.522,74.165z     M302.467,74.459c-0.458-0.083-0.949,0.141-1.185,0.54c-0.238,0.391-0.228,0.928,0.059,1.298c0.14,0.185,0.332,0.33,0.552,0.403    c0.195,0.077,0.481,0.067,0.737,0.09l1.565,0.102l6.263,0.394l0.783,0.048c0.27,0.029,0.501,0.028,0.692-0.13    c0.185-0.142,0.271-0.391,0.229-0.627c-0.04-0.229-0.223-0.436-0.438-0.501c-1.012-0.199-2.057-0.368-3.08-0.553L302.467,74.459z"
+   id="path3601" />
+	</g>
+	<g
+   id="g3603">
+		<g
+   id="g3605">
+			
+				<radialGradient
+   id="SVGID_189_"
+   cx="314.3614"
+   cy="1053.585"
+   r="3.4949"
+   gradientTransform="matrix(0.9545 0 0 0.9545 -0.1888 -930.3677)"
+   gradientUnits="userSpaceOnUse">
+				<stop
+   offset="0.7758"
+   style="stop-color:#D5E2EE"
+   id="stop3608" />
+				<stop
+   offset="0.8263"
+   style="stop-color:#D1DFED"
+   id="stop3610" />
+				<stop
+   offset="0.8714"
+   style="stop-color:#C7D6E8"
+   id="stop3612" />
+				<stop
+   offset="0.9144"
+   style="stop-color:#B4C6E1"
+   id="stop3614" />
+				<stop
+   offset="0.9562"
+   style="stop-color:#9BB0D8"
+   id="stop3616" />
+				<stop
+   offset="0.9968"
+   style="stop-color:#7A95CB"
+   id="stop3618" />
+				<stop
+   offset="1"
+   style="stop-color:#7792CA"
+   id="stop3620" />
+			</radialGradient>
+			<circle
+   fill="url(#SVGID_189_)"
+   cx="299.885"
+   cy="75.279"
+   r="3.333"
+   id="circle3622" />
+			<path
+   fill="#39444F"
+   d="M303.364,75.286c-0.007,0.898-0.398,1.801-1.041,2.431c-0.642,0.638-1.536,1.001-2.439,1.014     s-1.813-0.351-2.461-0.992c-0.653-0.639-1.042-1.533-1.046-2.47c-0.013-0.9,0.357-1.835,1.01-2.489     c0.649-0.663,1.563-1.059,2.51-1.042c0.904,0.003,1.847,0.388,2.479,1.053c0.646,0.659,1.011,1.576,0.992,2.487L303.364,75.286     L303.364,75.286z M303.07,75.279c0.01-1.705-1.512-3.178-3.196-3.125c-0.797,0.01-1.622,0.332-2.204,0.91     c-0.59,0.578-0.938,1.376-0.943,2.224c-0.01,0.811,0.319,1.651,0.906,2.243c0.582,0.6,1.407,0.954,2.251,0.961     c0.845,0.018,1.685-0.336,2.275-0.938c0.598-0.601,0.925-1.431,0.911-2.281V75.279z"
+   id="path3624" />
+		</g>
+		
+			<radialGradient
+   id="SVGID_190_"
+   cx="434.041"
+   cy="515.9688"
+   r="3.9218"
+   gradientTransform="matrix(0.9092 0.2908 -0.2908 0.9092 55.1576 -520.1451)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.4121"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop3627" />
+			<stop
+   offset="0.5849"
+   style="stop-color:#0A1827;stop-opacity:0.5379"
+   id="stop3629" />
+			<stop
+   offset="0.6472"
+   style="stop-color:#091420;stop-opacity:0.7317"
+   id="stop3631" />
+			<stop
+   offset="0.6914"
+   style="stop-color:#060D15;stop-opacity:0.8694"
+   id="stop3633" />
+			<stop
+   offset="0.727"
+   style="stop-color:#010204;stop-opacity:0.9803"
+   id="stop3635" />
+			<stop
+   offset="0.7333"
+   style="stop-color:#000000"
+   id="stop3637" />
+			<stop
+   offset="0.7876"
+   style="stop-color:#03080D;stop-opacity:0.6108"
+   id="stop3639" />
+			<stop
+   offset="0.8727"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop3641" />
+		</radialGradient>
+		<circle
+   opacity="0.36"
+   fill="url(#SVGID_190_)"
+   enable-background="new    "
+   cx="299.852"
+   cy="75.018"
+   r="3.598"
+   id="circle3643" />
+		
+			<radialGradient
+   id="SVGID_191_"
+   cx="314.7256"
+   cy="1051.4346"
+   r="5.4084"
+   gradientTransform="matrix(0.9545 0 0 0.9545 -0.1888 -930.3677)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#B4CB80;stop-opacity:0"
+   id="stop3646" />
+			<stop
+   offset="1"
+   style="stop-color:#60BD71"
+   id="stop3648" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_191_)"
+   enable-background="new    "
+   cx="299.885"
+   cy="75.242"
+   r="3.333"
+   id="circle3650" />
+		
+			<radialGradient
+   id="SVGID_192_"
+   cx="314.3623"
+   cy="1053.5469"
+   r="3.4929"
+   gradientTransform="matrix(0.9545 0 0 0.9545 -0.1888 -930.3677)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop3653" />
+			<stop
+   offset="1"
+   style="stop-color:#458691"
+   id="stop3655" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_192_)"
+   enable-background="new    "
+   cx="299.885"
+   cy="75.242"
+   r="3.333"
+   id="circle3657" />
+		<path
+   opacity="0.49"
+   fill="#F2F6FA"
+   enable-background="new    "
+   d="M297.008,75.413c-0.145-1.516,0.967-2.862,2.48-3.007    c1.518-0.146,2.996,0.682,3.236,1.947c-1.138-1.498-2.858-1.498-3.437-1.36C298.022,73.298,297.357,74.236,297.008,75.413z"
+   id="path3659" />
+		
+			<radialGradient
+   id="SVGID_193_"
+   cx="314.5498"
+   cy="1051.4199"
+   r="0.929"
+   gradientTransform="matrix(0.9545 0 0 0.9545 -0.1888 -930.3677)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#EEF8FB"
+   id="stop3662" />
+			<stop
+   offset="0.4122"
+   style="stop-color:#EDF7F8;stop-opacity:0.8016"
+   id="stop3664" />
+			<stop
+   offset="0.5215"
+   style="stop-color:#E9F5EE;stop-opacity:0.6525"
+   id="stop3666" />
+			<stop
+   offset="0.619"
+   style="stop-color:#E2F1DE;stop-opacity:0.5196"
+   id="stop3668" />
+			<stop
+   offset="0.7096"
+   style="stop-color:#D8ECC7;stop-opacity:0.396"
+   id="stop3670" />
+			<stop
+   offset="0.7954"
+   style="stop-color:#CCE4AA;stop-opacity:0.2789"
+   id="stop3672" />
+			<stop
+   offset="0.8777"
+   style="stop-color:#BCDC86;stop-opacity:0.1667"
+   id="stop3674" />
+			<stop
+   offset="0.9557"
+   style="stop-color:#ABD25B;stop-opacity:0.0604"
+   id="stop3676" />
+			<stop
+   offset="1"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop3678" />
+		</radialGradient>
+		<circle
+   fill="url(#SVGID_193_)"
+   cx="300.064"
+   cy="73.216"
+   r="0.887"
+   id="circle3680" />
+		<circle
+   opacity="0.62"
+   fill="#FFFFFF"
+   enable-background="new    "
+   cx="300.199"
+   cy="72.849"
+   r="0.349"
+   id="circle3682" />
+		
+			<radialGradient
+   id="SVGID_194_"
+   cx="-1245.2334"
+   cy="1472.8672"
+   r="2.376"
+   gradientTransform="matrix(0.222 -0.9284 0.9284 0.222 -789.3549 -1407.3914)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop3685" />
+			<stop
+   offset="0.3195"
+   style="stop-color:#050709"
+   id="stop3687" />
+			<stop
+   offset="0.5599"
+   style="stop-color:#070C13"
+   id="stop3689" />
+			<stop
+   offset="0.7738"
+   style="stop-color:#0A1523"
+   id="stop3691" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0B1929"
+   id="stop3693" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C"
+   id="stop3695" />
+		</radialGradient>
+		<path
+   opacity="0.4"
+   fill="url(#SVGID_194_)"
+   enable-background="new    "
+   d="M301.002,72.521c1.375,0.482,2.219,1.933,1.863,3.414    c-0.355,1.48-1.707,2.533-2.98,2.35c1.69-0.185,2.416-1.827,2.565-2.399C302.826,74.438,301.98,73.259,301.002,72.521z"
+   id="path3697" />
+		<path
+   opacity="0.87"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M301.955,72.909c0.189,0.207,0.972,0.89,1.029,2.262    c0.002,0.057-0.354-1.929-1.104-1.943c-0.19-0.003-0.44,0.028-0.507-0.151c-0.047-0.127-0.021-0.253,0.082-0.331    C301.607,72.628,301.824,72.769,301.955,72.909z"
+   id="path3699" />
+	</g>
+	<g
+   id="g3701">
+		<g
+   id="g3703">
+			
+				<radialGradient
+   id="SVGID_195_"
+   cx="279.5703"
+   cy="1022.8926"
+   r="3.0156"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+				<stop
+   offset="0.7758"
+   style="stop-color:#D5E2EE"
+   id="stop3706" />
+				<stop
+   offset="0.8263"
+   style="stop-color:#D1DFED"
+   id="stop3708" />
+				<stop
+   offset="0.8714"
+   style="stop-color:#C7D6E8"
+   id="stop3710" />
+				<stop
+   offset="0.9144"
+   style="stop-color:#B4C6E1"
+   id="stop3712" />
+				<stop
+   offset="0.9562"
+   style="stop-color:#9BB0D8"
+   id="stop3714" />
+				<stop
+   offset="0.9968"
+   style="stop-color:#7A95CB"
+   id="stop3716" />
+				<stop
+   offset="1"
+   style="stop-color:#7792CA"
+   id="stop3718" />
+			</radialGradient>
+			<circle
+   fill="url(#SVGID_195_)"
+   cx="303.57"
+   cy="89.892"
+   r="3.016"
+   id="circle3720" />
+			<path
+   fill="#39444F"
+   d="M306.927,89.909c-0.021,0.845-0.415,1.72-1.038,2.302c-0.619,0.593-1.455,0.951-2.318,0.969     c-0.854,0.022-1.729-0.321-2.363-0.919c-0.646-0.597-1.04-1.469-1.063-2.368c-0.104-1.833,1.521-3.575,3.457-3.508     c0.865-0.008,1.813,0.416,2.407,1.071c0.62,0.656,0.955,1.557,0.925,2.436L306.927,89.909L306.927,89.909z M306.245,89.892     c-0.028-0.703-0.345-1.37-0.849-1.827c-0.519-0.467-1.145-0.691-1.854-0.695c-0.608,0.013-1.3,0.263-1.771,0.727     c-0.479,0.466-0.773,1.109-0.809,1.795c-0.023,0.682,0.229,1.379,0.703,1.896c0.479,0.524,1.179,0.83,1.896,0.846     c0.721,0.023,1.448-0.268,1.943-0.797c0.5-0.532,0.758-1.225,0.729-1.962v0.017H306.245z"
+   id="path3722" />
+		</g>
+		
+			<radialGradient
+   id="SVGID_196_"
+   cx="391.6367"
+   cy="497.4405"
+   r="3.3871"
+   gradientTransform="matrix(0.9525 0.3046 -0.3046 0.9525 81.9305 -503.3005)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.4121"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop3725" />
+			<stop
+   offset="0.5849"
+   style="stop-color:#0A1827;stop-opacity:0.5379"
+   id="stop3727" />
+			<stop
+   offset="0.6472"
+   style="stop-color:#091420;stop-opacity:0.7317"
+   id="stop3729" />
+			<stop
+   offset="0.6914"
+   style="stop-color:#060D15;stop-opacity:0.8694"
+   id="stop3731" />
+			<stop
+   offset="0.727"
+   style="stop-color:#010204;stop-opacity:0.9803"
+   id="stop3733" />
+			<stop
+   offset="0.7333"
+   style="stop-color:#000000"
+   id="stop3735" />
+			<stop
+   offset="0.7876"
+   style="stop-color:#03080D;stop-opacity:0.6108"
+   id="stop3737" />
+			<stop
+   offset="0.8727"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop3739" />
+		</radialGradient>
+		<circle
+   opacity="0.36"
+   fill="url(#SVGID_196_)"
+   enable-background="new    "
+   cx="303.539"
+   cy="89.656"
+   r="3.256"
+   id="circle3741" />
+		
+			<radialGradient
+   id="SVGID_197_"
+   cx="279.8848"
+   cy="1021.041"
+   r="4.6703"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#B4CB80;stop-opacity:0"
+   id="stop3744" />
+			<stop
+   offset="1"
+   style="stop-color:#60BD71"
+   id="stop3746" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_197_)"
+   enable-background="new    "
+   cx="303.57"
+   cy="89.86"
+   r="3.016"
+   id="circle3748" />
+		
+			<radialGradient
+   id="SVGID_198_"
+   cx="279.5703"
+   cy="1022.8594"
+   r="3.0151"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#A0539F"
+   id="stop3751" />
+			<stop
+   offset="0.2909"
+   style="stop-color:#7452A1"
+   id="stop3753" />
+			<stop
+   offset="1"
+   style="stop-color:#2B2976"
+   id="stop3755" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_198_)"
+   enable-background="new    "
+   cx="303.57"
+   cy="89.86"
+   r="3.015"
+   id="circle3757" />
+		<path
+   opacity="0.49"
+   fill="#F2F6FA"
+   enable-background="new    "
+   d="M300.967,90.013c-0.131-1.371,0.874-2.589,2.245-2.72    c1.373-0.131,2.71,0.616,2.929,1.762c-1.021-1.355-2.586-1.355-3.104-1.231C301.884,88.101,301.285,88.95,300.967,90.013z"
+   id="path3759" />
+		
+			<radialGradient
+   id="SVGID_199_"
+   cx="279.5078"
+   cy="1113.1631"
+   r="1.6079"
+   gradientTransform="matrix(1 0 0 0.9207 24 -936.5648)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop3762" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop3764" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop3766" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop3768" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop3770" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop3772" />
+		</radialGradient>
+		<ellipse
+   opacity="0.5"
+   fill="url(#SVGID_199_)"
+   enable-background="new    "
+   cx="303.508"
+   cy="88.324"
+   rx="1.607"
+   ry="1.481"
+   id="ellipse3774" />
+		
+			<radialGradient
+   id="SVGID_200_"
+   cx="279.5078"
+   cy="1113.0547"
+   r="1.1735"
+   gradientTransform="matrix(1 0 0 0.9207 24 -936.5648)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop3777" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop3779" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop3781" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop3783" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop3785" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop3787" />
+		</radialGradient>
+		<ellipse
+   fill="url(#SVGID_200_)"
+   cx="303.508"
+   cy="88.224"
+   rx="1.176"
+   ry="1.083"
+   id="ellipse3789" />
+		
+			<radialGradient
+   id="SVGID_201_"
+   cx="279.5703"
+   cy="1021.0273"
+   r="0.8018"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#EEF8FB"
+   id="stop3792" />
+			<stop
+   offset="0.4119"
+   style="stop-color:#EDF7F8;stop-opacity:0.802"
+   id="stop3794" />
+			<stop
+   offset="0.521"
+   style="stop-color:#ECF5EE;stop-opacity:0.6532"
+   id="stop3796" />
+			<stop
+   offset="0.6183"
+   style="stop-color:#E8F1DE;stop-opacity:0.5206"
+   id="stop3798" />
+			<stop
+   offset="0.7087"
+   style="stop-color:#E4ECC7;stop-opacity:0.3972"
+   id="stop3800" />
+			<stop
+   offset="0.7943"
+   style="stop-color:#DEE5AA;stop-opacity:0.2804"
+   id="stop3802" />
+			<stop
+   offset="0.8765"
+   style="stop-color:#D7DC86;stop-opacity:0.1684"
+   id="stop3804" />
+			<stop
+   offset="0.9543"
+   style="stop-color:#CFD25C;stop-opacity:0.0623"
+   id="stop3806" />
+			<stop
+   offset="1"
+   style="stop-color:#C9CB3F;stop-opacity:0"
+   id="stop3808" />
+		</radialGradient>
+		<circle
+   fill="url(#SVGID_201_)"
+   cx="303.57"
+   cy="88.027"
+   r="0.802"
+   id="circle3810" />
+		<path
+   opacity="0.75"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M306.324,89.421c0.347,1.272-0.35,2.669-1.701,3.199    c-1.352,0.529-2.889,0.093-3.418-0.945c0.868,1.407,2.898,1.002,3.421,0.797C305.758,92.031,306.629,90.796,306.324,89.421z"
+   id="path3812" />
+	</g>
+	<g
+   id="g3814">
+		<g
+   id="g3816">
+			
+				<radialGradient
+   id="SVGID_202_"
+   cx="309.0469"
+   cy="1001.3311"
+   r="3.291"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+				<stop
+   offset="0.7758"
+   style="stop-color:#D5E2EE"
+   id="stop3819" />
+				<stop
+   offset="0.8263"
+   style="stop-color:#D1DFED"
+   id="stop3821" />
+				<stop
+   offset="0.8714"
+   style="stop-color:#C7D6E8"
+   id="stop3823" />
+				<stop
+   offset="0.9144"
+   style="stop-color:#B4C6E1"
+   id="stop3825" />
+				<stop
+   offset="0.9562"
+   style="stop-color:#9BB0D8"
+   id="stop3827" />
+				<stop
+   offset="0.9968"
+   style="stop-color:#7A95CB"
+   id="stop3829" />
+				<stop
+   offset="1"
+   style="stop-color:#7792CA"
+   id="stop3831" />
+			</radialGradient>
+			<circle
+   fill="url(#SVGID_202_)"
+   cx="333.047"
+   cy="68.331"
+   r="3.291"
+   id="circle3833" />
+			<path
+   fill="#39444F"
+   d="M336.484,68.338c-0.008,0.887-0.396,1.779-1.027,2.401c-0.634,0.631-1.518,0.989-2.409,1.001     c-0.894,0.013-1.79-0.346-2.431-0.979c-0.646-0.628-1.03-1.521-1.035-2.431c-0.012-0.907,0.354-1.818,0.998-2.467     c0.637-0.655,1.549-1.046,2.468-1.03c0.913,0.004,1.825,0.383,2.457,1.04c0.638,0.65,0.995,1.557,0.979,2.457V68.338     L336.484,68.338z M336.191,68.331c-0.01-0.825-0.36-1.631-0.947-2.196c-0.585-0.568-1.385-0.896-2.196-0.887     c-0.808,0.01-1.606,0.329-2.187,0.898c-0.582,0.566-0.924,1.367-0.93,2.186c-0.017,0.817,0.313,1.634,0.895,2.222     c0.574,0.592,1.389,0.942,2.222,0.949c0.834,0.018,1.662-0.332,2.245-0.926c0.59-0.594,0.911-1.414,0.898-2.252V68.331     L336.191,68.331z"
+   id="path3835" />
+		</g>
+		
+			<radialGradient
+   id="SVGID_203_"
+   cx="-1478.0259"
+   cy="382.5293"
+   r="3.7481"
+   gradientTransform="matrix(0.0099 -1 1 0.0099 -35.0023 -1413.4995)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.4121"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop3838" />
+			<stop
+   offset="0.5849"
+   style="stop-color:#0A1827;stop-opacity:0.5379"
+   id="stop3840" />
+			<stop
+   offset="0.6472"
+   style="stop-color:#091420;stop-opacity:0.7317"
+   id="stop3842" />
+			<stop
+   offset="0.6914"
+   style="stop-color:#060D15;stop-opacity:0.8694"
+   id="stop3844" />
+			<stop
+   offset="0.727"
+   style="stop-color:#010204;stop-opacity:0.9803"
+   id="stop3846" />
+			<stop
+   offset="0.7333"
+   style="stop-color:#000000"
+   id="stop3848" />
+			<stop
+   offset="0.7876"
+   style="stop-color:#03080D;stop-opacity:0.6108"
+   id="stop3850" />
+			<stop
+   offset="0.8727"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop3852" />
+		</radialGradient>
+		<circle
+   opacity="0.28"
+   fill="url(#SVGID_203_)"
+   enable-background="new    "
+   cx="332.752"
+   cy="68.249"
+   r="3.599"
+   id="circle3854" />
+		
+			<radialGradient
+   id="SVGID_204_"
+   cx="309.3907"
+   cy="999.3096"
+   r="5.0973"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#B4CB80;stop-opacity:0"
+   id="stop3857" />
+			<stop
+   offset="1"
+   style="stop-color:#60BD71"
+   id="stop3859" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_204_)"
+   enable-background="new    "
+   cx="333.048"
+   cy="68.295"
+   r="3.291"
+   id="circle3861" />
+		
+			<radialGradient
+   id="SVGID_205_"
+   cx="309.0479"
+   cy="1001.2949"
+   r="3.29"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop3864" />
+			<stop
+   offset="1"
+   style="stop-color:#458691"
+   id="stop3866" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_205_)"
+   enable-background="new    "
+   cx="333.048"
+   cy="68.295"
+   r="3.29"
+   id="circle3868" />
+		<path
+   opacity="0.36"
+   fill="#F2F6FA"
+   enable-background="new    "
+   d="M330.107,67.889c0.188-1.426,1.252-2.408,2.639-2.54    c1.386-0.132,2.654,0.845,3.12,1.934c-0.966-1.325-2.296-1.652-3.128-1.538C331.904,65.858,330.891,66.009,330.107,67.889z"
+   id="path3870" />
+		
+			<radialGradient
+   id="SVGID_206_"
+   cx="309.0811"
+   cy="1089.6953"
+   r="1.7544"
+   gradientTransform="matrix(1 0 0 0.9207 24 -936.5648)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop3873" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop3875" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop3877" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop3879" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop3881" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop3883" />
+		</radialGradient>
+		<ellipse
+   opacity="0.5"
+   fill="url(#SVGID_206_)"
+   enable-background="new    "
+   cx="333.081"
+   cy="66.717"
+   rx="1.754"
+   ry="1.616"
+   id="ellipse3885" />
+		
+			<radialGradient
+   id="SVGID_207_"
+   cx="309.0215"
+   cy="1089.4707"
+   r="1.2842"
+   gradientTransform="matrix(1 0 0 0.9207 24 -936.5648)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop3888" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop3890" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop3892" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop3894" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop3896" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop3898" />
+		</radialGradient>
+		<ellipse
+   fill="url(#SVGID_207_)"
+   cx="333.022"
+   cy="66.51"
+   rx="1.285"
+   ry="1.182"
+   id="ellipse3900" />
+		
+			<radialGradient
+   id="SVGID_208_"
+   cx="308.9043"
+   cy="999.1484"
+   r="0.875"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#EEF8FB"
+   id="stop3903" />
+			<stop
+   offset="0.4122"
+   style="stop-color:#EDF7F8;stop-opacity:0.8016"
+   id="stop3905" />
+			<stop
+   offset="0.5215"
+   style="stop-color:#E9F5EE;stop-opacity:0.6525"
+   id="stop3907" />
+			<stop
+   offset="0.619"
+   style="stop-color:#E2F1DE;stop-opacity:0.5196"
+   id="stop3909" />
+			<stop
+   offset="0.7096"
+   style="stop-color:#D8ECC7;stop-opacity:0.396"
+   id="stop3911" />
+			<stop
+   offset="0.7954"
+   style="stop-color:#CCE4AA;stop-opacity:0.2789"
+   id="stop3913" />
+			<stop
+   offset="0.8777"
+   style="stop-color:#BCDC86;stop-opacity:0.1667"
+   id="stop3915" />
+			<stop
+   offset="0.9557"
+   style="stop-color:#ABD25B;stop-opacity:0.0604"
+   id="stop3917" />
+			<stop
+   offset="1"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop3919" />
+		</radialGradient>
+		<circle
+   fill="url(#SVGID_208_)"
+   cx="332.904"
+   cy="66.149"
+   r="0.875"
+   id="circle3921" />
+		<circle
+   opacity="0.62"
+   fill="#FFFFFF"
+   enable-background="new    "
+   cx="332.859"
+   cy="65.852"
+   r="0.344"
+   id="circle3923" />
+		
+			<radialGradient
+   id="SVGID_209_"
+   cx="886.3174"
+   cy="664.0469"
+   r="2.219"
+   gradientTransform="matrix(0.701 0.7131 -0.7131 0.701 184.1534 -1027.8478)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop3926" />
+			<stop
+   offset="0.3195"
+   style="stop-color:#050709"
+   id="stop3928" />
+			<stop
+   offset="0.5599"
+   style="stop-color:#070C13"
+   id="stop3930" />
+			<stop
+   offset="0.7738"
+   style="stop-color:#0A1523"
+   id="stop3932" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0B1929"
+   id="stop3934" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C"
+   id="stop3936" />
+		</radialGradient>
+		<path
+   opacity="0.41"
+   fill="url(#SVGID_209_)"
+   enable-background="new    "
+   d="M334.897,70.823    c-1.123,0.898-3.021,0.744-4.062-0.345c-0.771-0.808-1.071-2.423-0.251-3.395c-0.729,1.512,0.136,2.71,0.563,3.109    C332.35,71.326,333.768,71.255,334.897,70.823z"
+   id="path3938" />
+		<path
+   opacity="0.87"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M336.105,68.235c-0.004,0.269,0.084,1.254-0.778,2.242    c-0.035,0.041,1.028-1.563,0.519-2.07c-0.131-0.129-0.324-0.271-0.252-0.438c0.053-0.12,0.152-0.188,0.274-0.175    C336.052,67.814,336.109,68.052,336.105,68.235z"
+   id="path3940" />
+	</g>
+	<g
+   id="g3942">
+		<g
+   id="g3944">
+			
+				<radialGradient
+   id="SVGID_210_"
+   cx="316.6358"
+   cy="1010.8564"
+   r="3.1338"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+				<stop
+   offset="0.7758"
+   style="stop-color:#D5E2EE"
+   id="stop3947" />
+				<stop
+   offset="0.8263"
+   style="stop-color:#D1DFED"
+   id="stop3949" />
+				<stop
+   offset="0.8714"
+   style="stop-color:#C7D6E8"
+   id="stop3951" />
+				<stop
+   offset="0.9144"
+   style="stop-color:#B4C6E1"
+   id="stop3953" />
+				<stop
+   offset="0.9562"
+   style="stop-color:#9BB0D8"
+   id="stop3955" />
+				<stop
+   offset="0.9968"
+   style="stop-color:#7A95CB"
+   id="stop3957" />
+				<stop
+   offset="1"
+   style="stop-color:#7792CA"
+   id="stop3959" />
+			</radialGradient>
+			<circle
+   fill="url(#SVGID_210_)"
+   cx="340.636"
+   cy="77.856"
+   r="3.134"
+   id="circle3961" />
+			<path
+   fill="#39444F"
+   d="M343.916,77.863c-0.006,0.846-0.376,1.697-0.98,2.291c-0.604,0.601-1.447,0.943-2.3,0.955     c-0.852,0.013-1.708-0.329-2.319-0.933c-0.612-0.599-0.979-1.453-0.983-2.32c-0.063-1.76,1.503-3.404,3.313-3.34     c0.854,0.003,1.738,0.366,2.336,0.994c0.609,0.622,0.951,1.487,0.938,2.346L343.916,77.863z M343.624,77.856     c0.007-1.599-1.419-2.976-2.998-2.927c-0.746,0.011-1.521,0.312-2.065,0.852c-0.552,0.537-0.877,1.297-0.884,2.075     c-0.01,0.776,0.298,1.552,0.849,2.111c0.545,0.563,1.318,0.896,2.11,0.902c0.794,0.018,1.581-0.315,2.136-0.88     c0.563-0.564,0.865-1.343,0.854-2.141L343.624,77.856z"
+   id="path3963" />
+		</g>
+		
+			<radialGradient
+   id="SVGID_211_"
+   cx="-1487.4751"
+   cy="390.2198"
+   r="3.5686"
+   gradientTransform="matrix(0.0099 -1 1 0.0099 -35.0023 -1413.4995)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.4121"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop3966" />
+			<stop
+   offset="0.5849"
+   style="stop-color:#0A1827;stop-opacity:0.5379"
+   id="stop3968" />
+			<stop
+   offset="0.6472"
+   style="stop-color:#091420;stop-opacity:0.7317"
+   id="stop3970" />
+			<stop
+   offset="0.6914"
+   style="stop-color:#060D15;stop-opacity:0.8694"
+   id="stop3972" />
+			<stop
+   offset="0.727"
+   style="stop-color:#010204;stop-opacity:0.9803"
+   id="stop3974" />
+			<stop
+   offset="0.7333"
+   style="stop-color:#000000"
+   id="stop3976" />
+			<stop
+   offset="0.7876"
+   style="stop-color:#03080D;stop-opacity:0.6108"
+   id="stop3978" />
+			<stop
+   offset="0.8727"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop3980" />
+		</radialGradient>
+		<circle
+   opacity="0.28"
+   fill="url(#SVGID_211_)"
+   enable-background="new    "
+   cx="340.355"
+   cy="77.778"
+   r="3.428"
+   id="circle3982" />
+		
+			<radialGradient
+   id="SVGID_212_"
+   cx="316.9629"
+   cy="1008.9307"
+   r="4.8519"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#B4CB80;stop-opacity:0"
+   id="stop3985" />
+			<stop
+   offset="1"
+   style="stop-color:#60BD71"
+   id="stop3987" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_212_)"
+   enable-background="new    "
+   cx="340.636"
+   cy="77.822"
+   r="3.134"
+   id="circle3989" />
+		
+			<radialGradient
+   id="SVGID_213_"
+   cx="316.6358"
+   cy="1010.8223"
+   r="3.1338"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop3992" />
+			<stop
+   offset="1"
+   style="stop-color:#458691"
+   id="stop3994" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_213_)"
+   enable-background="new    "
+   cx="340.636"
+   cy="77.822"
+   r="3.134"
+   id="circle3996" />
+		<path
+   opacity="0.36"
+   fill="#F2F6FA"
+   enable-background="new    "
+   d="M339.16,75.434c1.119-0.791,2.494-0.683,3.482,0.199    c0.985,0.884,1.129,2.402,0.668,3.432c0.303-1.532-0.33-2.672-0.949-3.182C341.743,75.376,340.98,74.763,339.16,75.434z"
+   id="path3998" />
+		
+			<radialGradient
+   id="SVGID_214_"
+   cx="316.7325"
+   cy="1100.0234"
+   r="1.6719"
+   gradientTransform="matrix(1 0 0 0.9207 24 -936.5648)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop4001" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop4003" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop4005" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop4007" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop4009" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop4011" />
+		</radialGradient>
+		<ellipse
+   opacity="0.5"
+   fill="url(#SVGID_214_)"
+   enable-background="new    "
+   cx="340.732"
+   cy="76.227"
+   rx="1.672"
+   ry="1.539"
+   id="ellipse4013" />
+		
+			<radialGradient
+   id="SVGID_215_"
+   cx="316.5703"
+   cy="1099.9102"
+   r="1.2231"
+   gradientTransform="matrix(1 0 0 0.9207 24 -936.5648)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop4016" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop4018" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop4020" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop4022" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop4024" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop4026" />
+		</radialGradient>
+		<ellipse
+   fill="url(#SVGID_215_)"
+   cx="340.57"
+   cy="76.122"
+   rx="1.224"
+   ry="1.126"
+   id="ellipse4028" />
+		
+			<radialGradient
+   id="SVGID_216_"
+   cx="316.4375"
+   cy="1008.7773"
+   r="0.834"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#EEF8FB"
+   id="stop4031" />
+			<stop
+   offset="0.4122"
+   style="stop-color:#EDF7F8;stop-opacity:0.8016"
+   id="stop4033" />
+			<stop
+   offset="0.5215"
+   style="stop-color:#E9F5EE;stop-opacity:0.6525"
+   id="stop4035" />
+			<stop
+   offset="0.619"
+   style="stop-color:#E2F1DE;stop-opacity:0.5196"
+   id="stop4037" />
+			<stop
+   offset="0.7096"
+   style="stop-color:#D8ECC7;stop-opacity:0.396"
+   id="stop4039" />
+			<stop
+   offset="0.7954"
+   style="stop-color:#CCE4AA;stop-opacity:0.2789"
+   id="stop4041" />
+			<stop
+   offset="0.8777"
+   style="stop-color:#BCDC86;stop-opacity:0.1667"
+   id="stop4043" />
+			<stop
+   offset="0.9557"
+   style="stop-color:#ABD25B;stop-opacity:0.0604"
+   id="stop4045" />
+			<stop
+   offset="1"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop4047" />
+		</radialGradient>
+		<circle
+   fill="url(#SVGID_216_)"
+   cx="340.438"
+   cy="75.778"
+   r="0.834"
+   id="circle4049" />
+		<circle
+   opacity="0.62"
+   fill="#FFFFFF"
+   enable-background="new    "
+   cx="340.404"
+   cy="75.495"
+   r="0.328"
+   id="circle4051" />
+		
+			<radialGradient
+   id="SVGID_217_"
+   cx="797.9131"
+   cy="-58.0888"
+   r="2.1143"
+   gradientTransform="matrix(0.108 0.9941 -0.9941 0.108 194.9519 -708.9521)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop4054" />
+			<stop
+   offset="0.3195"
+   style="stop-color:#050709"
+   id="stop4056" />
+			<stop
+   offset="0.5599"
+   style="stop-color:#070C13"
+   id="stop4058" />
+			<stop
+   offset="0.7738"
+   style="stop-color:#0A1523"
+   id="stop4060" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0B1929"
+   id="stop4062" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C"
+   id="stop4064" />
+		</radialGradient>
+		<path
+   opacity="0.42"
+   fill="url(#SVGID_217_)"
+   enable-background="new    "
+   d="M340.418,80.615c-1.37,0.008-2.701-1.23-2.832-2.656    c-0.098-1.058,0.629-2.443,1.816-2.684c-1.438,0.698-1.5,2.106-1.418,2.654C338.219,79.488,339.318,80.272,340.418,80.615z"
+   id="path4066" />
+		<path
+   opacity="0.87"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M343.479,77.411c0.03,0.254,0.244,1.172-0.438,2.218    c-0.027,0.043,0.764-1.612,0.212-2.021c-0.142-0.104-0.341-0.212-0.293-0.38c0.031-0.119,0.119-0.197,0.233-0.201    C343.367,77.021,343.455,77.239,343.479,77.411z"
+   id="path4068" />
+		<path
+   opacity="0.43"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M337.773,77.356c0.002,0.38-0.17,1.306,0.703,2.188    c0.045,0.046-0.947-1.299-0.33-2.149c0.129-0.178,0.396-0.311,0.313-0.515c-0.063-0.144-0.176-0.23-0.316-0.22    C337.924,76.676,337.773,77.138,337.773,77.356z"
+   id="path4070" />
+	</g>
+	<g
+   id="g4072">
+		<g
+   id="g4074">
+			
+				<linearGradient
+   id="SVGID_218_"
+   gradientUnits="userSpaceOnUse"
+   x1="292.8135"
+   y1="1008.3447"
+   x2="288.2412"
+   y2="993.3894"
+   gradientTransform="matrix(1 0 0 1 24 -933)">
+				<stop
+   offset="0"
+   style="stop-color:#202D36"
+   id="stop4077" />
+				<stop
+   offset="0.0848"
+   style="stop-color:#517287"
+   id="stop4079" />
+				<stop
+   offset="0.1039"
+   style="stop-color:#6E8B9D"
+   id="stop4081" />
+				<stop
+   offset="0.1295"
+   style="stop-color:#8DA7B5"
+   id="stop4083" />
+				<stop
+   offset="0.1585"
+   style="stop-color:#A9BFCA"
+   id="stop4085" />
+				<stop
+   offset="0.1913"
+   style="stop-color:#BFD2DB"
+   id="stop4087" />
+				<stop
+   offset="0.2295"
+   style="stop-color:#D0E1E7"
+   id="stop4089" />
+				<stop
+   offset="0.2768"
+   style="stop-color:#DBEBF0"
+   id="stop4091" />
+				<stop
+   offset="0.3431"
+   style="stop-color:#E2F1F6"
+   id="stop4093" />
+				<stop
+   offset="0.5273"
+   style="stop-color:#E4F3F7"
+   id="stop4095" />
+			</linearGradient>
+			<path
+   fill="url(#SVGID_218_)"
+   d="M315.122,62.278l2.456,12.057c0.085,0.454-0.215,0.89-0.667,0.975     c-0.379,0.071-0.747-0.127-0.907-0.458l-5.025-11.107c-0.59-1.227-0.074-2.699,1.152-3.289c1.225-0.591,2.197-0.021,2.788,1.205     C315.014,61.856,315.082,62.072,315.122,62.278z"
+   id="path4097" />
+			<path
+   fill="#535A5F"
+   d="M315.559,62.191l1.521,8.585c0.127,0.715,0.257,1.431,0.398,2.143l0.211,1.069     c0.026,0.167,0.088,0.362,0.066,0.577c-0.02,0.241-0.107,0.437-0.263,0.6c-0.154,0.161-0.337,0.266-0.576,0.311     c-0.08,0.014-0.188,0.02-0.313,0.006c-0.106-0.019-0.213-0.051-0.313-0.099c-0.191-0.1-0.354-0.26-0.455-0.464l-0.229-0.494     l-0.918-1.978l-3.776-7.858c-0.149-0.33-0.322-0.64-0.466-1.024c-0.146-0.43-0.188-0.848-0.141-1.28     c0.103-0.854,0.604-1.658,1.34-2.125c0.104-0.058,0.172-0.102,0.305-0.167c0.089-0.038,0.148-0.075,0.263-0.112     c0.229-0.079,0.44-0.134,0.681-0.147c0.461-0.046,0.959,0.093,1.34,0.344c0.389,0.253,0.664,0.599,0.873,0.951     C315.309,61.366,315.486,61.767,315.559,62.191z M314.686,62.365c-0.121-0.551-0.547-1.188-0.98-1.459     c-0.469-0.291-0.969-0.222-1.535,0.089c-0.503,0.292-0.869,0.821-0.961,1.411c-0.048,0.288-0.021,0.61,0.055,0.872     c0.1,0.302,0.268,0.64,0.397,0.975l3.403,8.027l0.879,1.994l0.225,0.499c0.063,0.124,0.163,0.239,0.291,0.305     c0.063,0.032,0.133,0.055,0.204,0.069c0.055,0.008,0.13,0.013,0.229-0.002c0.115-0.026,0.27-0.103,0.356-0.208     c0.214-0.229,0.19-0.491,0.095-0.876l-0.225-1.066c-0.146-0.712-0.309-1.42-0.473-2.129L314.686,62.365z"
+   id="path4099" />
+		</g>
+		
+			<linearGradient
+   id="SVGID_219_"
+   gradientUnits="userSpaceOnUse"
+   x1="292.5225"
+   y1="1006.5488"
+   x2="289.4085"
+   y2="996.9501"
+   gradientTransform="matrix(1 0 0 1 24 -933)">
+			<stop
+   offset="0.1636"
+   style="stop-color:#141A2B"
+   id="stop4102" />
+			<stop
+   offset="0.3161"
+   style="stop-color:#142F3A;stop-opacity:0.825"
+   id="stop4104" />
+			<stop
+   offset="0.486"
+   style="stop-color:#143E45;stop-opacity:0.63"
+   id="stop4106" />
+			<stop
+   offset="0.6877"
+   style="stop-color:#14464B;stop-opacity:0.3984"
+   id="stop4108" />
+			<stop
+   offset="1"
+   style="stop-color:#14494D;stop-opacity:0.04"
+   id="stop4110" />
+		</linearGradient>
+		<path
+   opacity="0.36"
+   fill="url(#SVGID_219_)"
+   enable-background="new    "
+   d="M317.034,74.213c0.093,0.298,0.006,0.509-0.13,0.551    c-0.137,0.042-0.348-0.068-0.439-0.366l-3.506-10.172l-0.165-2.158l1.067,1.611L317.034,74.213z"
+   id="path4112" />
+		<polygon
+   fill="#FFFFFF"
+   points="315.943,74.274 311.214,63.911 311.6,63.969   "
+   id="polygon4114" />
+		<path
+   opacity="0.56"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M317.307,75.034c0,0-3.604-11.053-3.682-11.278    c0.4-0.139,0.814-0.313,1.218-0.616c0.019,0.103,2.091,8.282,2.632,11.045C317.589,74.766,317.307,75.034,317.307,75.034z"
+   id="path4116" />
+		<polygon
+   fill="#FFFFFF"
+   points="317.161,73.79 314.714,63.23 315.053,62.984   "
+   id="polygon4118" />
+	</g>
+	<g
+   id="g4120">
+		
+			<linearGradient
+   id="SVGID_220_"
+   gradientUnits="userSpaceOnUse"
+   x1="35.8316"
+   y1="-1064.2036"
+   x2="33.0473"
+   y2="-1072.7859"
+   gradientTransform="matrix(0.8184 -0.5747 -0.5747 -0.8184 -322.341 -768.7596)">
+			<stop
+   offset="0.1636"
+   style="stop-color:#141A2B"
+   id="stop4123" />
+			<stop
+   offset="0.3161"
+   style="stop-color:#142F3A;stop-opacity:0.825"
+   id="stop4125" />
+			<stop
+   offset="0.486"
+   style="stop-color:#143E45;stop-opacity:0.63"
+   id="stop4127" />
+			<stop
+   offset="0.6877"
+   style="stop-color:#14464B;stop-opacity:0.3984"
+   id="stop4129" />
+			<stop
+   offset="1"
+   style="stop-color:#14494D;stop-opacity:0.04"
+   id="stop4131" />
+		</linearGradient>
+		<path
+   opacity="0.36"
+   fill="url(#SVGID_220_)"
+   enable-background="new    "
+   d="M318.95,80.737    c-0.087-0.268-0.261-0.378-0.382-0.339c-0.123,0.04-0.223,0.231-0.137,0.499l2.188,9.371l0.997,1.678l0.097-1.872L318.95,80.737z"
+   id="path4133" />
+		
+			<linearGradient
+   id="SVGID_221_"
+   gradientUnits="userSpaceOnUse"
+   x1="1154.5391"
+   y1="-1100.77"
+   x2="1154.5391"
+   y2="-1116.5586"
+   gradientTransform="matrix(0.411 -0.1762 -0.2662 -0.621 -449.3053 -399.6598)">
+			<stop
+   offset="0"
+   style="stop-color:#D5EBDE;stop-opacity:0.87"
+   id="stop4136" />
+			<stop
+   offset="0.5636"
+   style="stop-color:#F1F6E3;stop-opacity:0.91"
+   id="stop4138" />
+			<stop
+   offset="1"
+   style="stop-color:#7AC587;stop-opacity:0.09"
+   id="stop4140" />
+		</linearGradient>
+		<path
+   fill="url(#SVGID_221_)"
+   d="M319.073,80.81c-0.091-0.205-0.169-0.465-0.433-0.468c-0.072-0.001-0.197,0.021-0.229,0.176    c0.057-0.116,0.144-0.146,0.208-0.144c0.164,0.007,0.253,0.111,0.381,0.444l2.791,9.598l0.409-0.021L319.073,80.81z"
+   id="path4142" />
+		<polygon
+   fill="#FFFFFF"
+   points="318.012,81.427 319.925,91.144 320.115,91.032   "
+   id="polygon4144" />
+		<path
+   opacity="0.56"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M318.479,79.957c0,0,2.569,10.377,2.631,10.582    c0.371-0.106,0.77-0.191,1.225-0.177c-0.039-0.086-2.813-7.884-3.4-10.278C318.754,79.927,318.479,79.957,318.479,79.957z"
+   id="path4146" />
+		<polygon
+   fill="#FFFFFF"
+   points="318.941,80.152 321.823,90.447 322.2,90.453   "
+   id="polygon4148" />
+	</g>
+	<g
+   id="g4150">
+		<g
+   id="g4152">
+			
+				<radialGradient
+   id="SVGID_222_"
+   cx="288.0791"
+   cy="991.9453"
+   r="5.0459"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+				<stop
+   offset="0.7758"
+   style="stop-color:#D5E2EE"
+   id="stop4155" />
+				<stop
+   offset="0.8263"
+   style="stop-color:#D1DFED"
+   id="stop4157" />
+				<stop
+   offset="0.8714"
+   style="stop-color:#C7D6E8"
+   id="stop4159" />
+				<stop
+   offset="0.9144"
+   style="stop-color:#B4C6E1"
+   id="stop4161" />
+				<stop
+   offset="0.9562"
+   style="stop-color:#9BB0D8"
+   id="stop4163" />
+				<stop
+   offset="0.9968"
+   style="stop-color:#7A95CB"
+   id="stop4165" />
+				<stop
+   offset="1"
+   style="stop-color:#7792CA"
+   id="stop4167" />
+			</radialGradient>
+			<circle
+   fill="url(#SVGID_222_)"
+   cx="312.079"
+   cy="58.945"
+   r="5.046"
+   id="circle4169" />
+			<path
+   fill="#39444F"
+   d="M317.466,58.954c-0.017,1.398-0.636,2.78-1.628,3.75c-0.992,0.983-2.361,1.539-3.766,1.56     c-1.383,0.025-2.786-0.538-3.799-1.515c-1.021-0.977-1.644-2.362-1.656-3.815c-0.037-1.41,0.533-2.875,1.558-3.895     c1.007-1.037,2.451-1.655,3.905-1.634c1.454-0.01,2.884,0.632,3.872,1.667c0.998,1.032,1.551,2.461,1.514,3.873V58.954     L317.466,58.954z M316.784,58.945c-0.024-1.236-0.56-2.432-1.44-3.265c-0.875-0.845-2.07-1.292-3.264-1.289     c-1.193,0.009-2.375,0.479-3.23,1.322c-0.854,0.843-1.375,2.005-1.396,3.242c-0.031,1.194,0.438,2.435,1.298,3.321     c0.854,0.902,2.074,1.429,3.339,1.442c1.242,0.034,2.5-0.499,3.37-1.396c0.893-0.896,1.354-2.138,1.328-3.386L316.784,58.945     L316.784,58.945z"
+   id="path4171" />
+		</g>
+		
+			<radialGradient
+   id="SVGID_223_"
+   cx="390.2139"
+   cy="465.3448"
+   r="5.6711"
+   gradientTransform="matrix(0.9525 0.3046 -0.3046 0.9525 81.9305 -503.3005)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.4121"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop4174" />
+			<stop
+   offset="0.5849"
+   style="stop-color:#0A1827;stop-opacity:0.5379"
+   id="stop4176" />
+			<stop
+   offset="0.6472"
+   style="stop-color:#091420;stop-opacity:0.7317"
+   id="stop4178" />
+			<stop
+   offset="0.6914"
+   style="stop-color:#060D15;stop-opacity:0.8694"
+   id="stop4180" />
+			<stop
+   offset="0.727"
+   style="stop-color:#010204;stop-opacity:0.9803"
+   id="stop4182" />
+			<stop
+   offset="0.7333"
+   style="stop-color:#000000"
+   id="stop4184" />
+			<stop
+   offset="0.7876"
+   style="stop-color:#03080D;stop-opacity:0.6108"
+   id="stop4186" />
+			<stop
+   offset="0.8727"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop4188" />
+		</radialGradient>
+		<circle
+   opacity="0.36"
+   fill="url(#SVGID_223_)"
+   enable-background="new    "
+   cx="312.029"
+   cy="58.549"
+   r="5.45"
+   id="circle4190" />
+		
+			<radialGradient
+   id="SVGID_224_"
+   cx="288.6045"
+   cy="988.8447"
+   r="7.8172"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#B4CB80;stop-opacity:0"
+   id="stop4193" />
+			<stop
+   offset="1"
+   style="stop-color:#60BD71"
+   id="stop4195" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_224_)"
+   enable-background="new    "
+   cx="312.079"
+   cy="58.89"
+   r="5.046"
+   id="circle4197" />
+		
+			<radialGradient
+   id="SVGID_225_"
+   cx="288.0791"
+   cy="991.8906"
+   r="5.0469"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.0242"
+   style="stop-color:#79CCCB"
+   id="stop4200" />
+			<stop
+   offset="0.4667"
+   style="stop-color:#35AED5"
+   id="stop4202" />
+			<stop
+   offset="1"
+   style="stop-color:#25346F"
+   id="stop4204" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_225_)"
+   enable-background="new    "
+   cx="312.079"
+   cy="58.89"
+   r="5.047"
+   id="circle4206" />
+		<path
+   opacity="0.49"
+   fill="#F2F6FA"
+   enable-background="new    "
+   d="M307.723,58.932c-0.219-2.296,1.463-4.334,3.76-4.554    c2.295-0.219,4.535,1.033,4.898,2.949c-1.713-2.268-4.326-2.268-5.195-2.059C309.258,55.73,308.256,57.15,307.723,58.932z"
+   id="path4208" />
+		
+			<radialGradient
+   id="SVGID_226_"
+   cx="287.9785"
+   cy="1078.4023"
+   r="2.6909"
+   gradientTransform="matrix(1 0 0 0.9207 24 -936.5648)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop4211" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop4213" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop4215" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop4217" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop4219" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop4221" />
+		</radialGradient>
+		<ellipse
+   opacity="0.5"
+   fill="url(#SVGID_226_)"
+   enable-background="new    "
+   cx="311.979"
+   cy="56.32"
+   rx="2.689"
+   ry="2.479"
+   id="ellipse4223" />
+		
+			<radialGradient
+   id="SVGID_227_"
+   cx="287.9766"
+   cy="1078.2207"
+   r="1.9727"
+   gradientTransform="matrix(1 0 0 0.9207 24 -936.5648)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop4226" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop4228" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop4230" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop4232" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop4234" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop4236" />
+		</radialGradient>
+		<ellipse
+   fill="url(#SVGID_227_)"
+   cx="311.977"
+   cy="56.153"
+   rx="1.976"
+   ry="1.813"
+   id="ellipse4238" />
+		
+			<radialGradient
+   id="SVGID_228_"
+   cx="288.0801"
+   cy="988.8223"
+   r="1.3428"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#EEF8FB"
+   id="stop4241" />
+			<stop
+   offset="0.4257"
+   style="stop-color:#EBF7F8;stop-opacity:0.7831"
+   id="stop4243" />
+			<stop
+   offset="0.5452"
+   style="stop-color:#E1F3EF;stop-opacity:0.6202"
+   id="stop4245" />
+			<stop
+   offset="0.6517"
+   style="stop-color:#D1ECE0;stop-opacity:0.475"
+   id="stop4247" />
+			<stop
+   offset="0.7507"
+   style="stop-color:#BAE3CA;stop-opacity:0.34"
+   id="stop4249" />
+			<stop
+   offset="0.8445"
+   style="stop-color:#9DD7AE;stop-opacity:0.2121"
+   id="stop4251" />
+			<stop
+   offset="0.9332"
+   style="stop-color:#79C88D;stop-opacity:0.0912"
+   id="stop4253" />
+			<stop
+   offset="1"
+   style="stop-color:#59BB6E;stop-opacity:0"
+   id="stop4255" />
+		</radialGradient>
+		<circle
+   fill="url(#SVGID_228_)"
+   cx="312.08"
+   cy="55.822"
+   r="1.343"
+   id="circle4257" />
+		
+			<radialGradient
+   id="SVGID_229_"
+   cx="-61.499"
+   cy="1582.957"
+   r="3.4364"
+   gradientTransform="matrix(0.931 -0.365 0.365 0.931 -207.5863 -1434.8041)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop4260" />
+			<stop
+   offset="0.3232"
+   style="stop-color:#050709"
+   id="stop4262" />
+			<stop
+   offset="0.5663"
+   style="stop-color:#070E13"
+   id="stop4264" />
+			<stop
+   offset="0.7826"
+   style="stop-color:#0C1A23"
+   id="stop4266" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0D1E28"
+   id="stop4268" />
+			<stop
+   offset="1"
+   style="stop-color:#234A4C"
+   id="stop4270" />
+		</radialGradient>
+		<path
+   opacity="0.38"
+   fill="url(#SVGID_229_)"
+   enable-background="new    "
+   d="M316.352,57.917c0.59,2.126-0.479,4.428-2.631,5.27    c-2.146,0.841-4.621,0.072-5.498-1.67c1.693,1.94,4.363,1.422,5.2,1.113C315.55,61.843,316.281,59.771,316.352,57.917z"
+   id="path4272" />
+		<path
+   opacity="0.87"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M316.381,57.179c0.143,0.402,0.816,1.819,0.079,3.764    c-0.032,0.08,0.665-2.893-0.375-3.364c-0.267-0.12-0.631-0.225-0.614-0.515c0.014-0.206,0.125-0.363,0.313-0.411    C316.064,56.583,316.283,56.905,316.381,57.179z"
+   id="path4274" />
+		<path
+   opacity="0.43"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M307.208,59.272c0.12,0.547-0.019,2.103,1.92,3.763    c0.086,0.074-2.095-2.013-1.272-3.852c0.154-0.349,0.543-0.689,0.324-1c-0.156-0.221-0.392-0.318-0.636-0.239    C307.184,58.06,307.125,58.9,307.208,59.272z"
+   id="path4276" />
+	</g>
+	<g
+   id="g4278">
+		<g
+   id="g4280">
+			
+				<radialGradient
+   id="SVGID_230_"
+   cx="298.2129"
+   cy="1027.6113"
+   r="3.9468"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+				<stop
+   offset="0.7758"
+   style="stop-color:#D5E2EE"
+   id="stop4283" />
+				<stop
+   offset="0.8263"
+   style="stop-color:#D1DFED"
+   id="stop4285" />
+				<stop
+   offset="0.8714"
+   style="stop-color:#C7D6E8"
+   id="stop4287" />
+				<stop
+   offset="0.9144"
+   style="stop-color:#B4C6E1"
+   id="stop4289" />
+				<stop
+   offset="0.9562"
+   style="stop-color:#9BB0D8"
+   id="stop4291" />
+				<stop
+   offset="0.9968"
+   style="stop-color:#7A95CB"
+   id="stop4293" />
+				<stop
+   offset="1"
+   style="stop-color:#7792CA"
+   id="stop4295" />
+			</radialGradient>
+			<path
+   fill="url(#SVGID_230_)"
+   d="M326.159,94.612c0,2.18-1.767,3.947-3.948,3.947c-2.179,0-3.945-1.767-3.945-3.947     c0-2.181,1.771-3.947,3.945-3.947C324.395,90.665,326.159,92.432,326.159,94.612z"
+   id="path4297" />
+			<path
+   fill="#39444F"
+   d="M326.5,94.621c-0.02,1.108-0.514,2.21-1.311,2.969c-0.791,0.767-1.871,1.227-2.979,1.242     c-1.104,0.024-2.216-0.42-3.026-1.193c-0.813-0.773-1.313-1.873-1.334-3.038c-0.037-1.122,0.416-2.3,1.231-3.118     c0.812-0.833,1.95-1.332,3.144-1.312c1.145-0.009,2.303,0.515,3.082,1.345c0.795,0.829,1.229,1.973,1.19,3.096L326.5,94.621     L326.5,94.621z M325.818,94.612c-0.026-0.947-0.442-1.858-1.119-2.487c-0.678-0.64-1.57-0.967-2.499-0.967     c-0.882,0.01-1.794,0.362-2.442,1c-0.65,0.641-1.05,1.517-1.076,2.465c-0.029,0.906,0.322,1.86,0.979,2.544     c0.646,0.698,1.592,1.106,2.555,1.12c0.968,0.025,1.938-0.367,2.604-1.07c0.677-0.699,1.031-1.651,1.003-2.613v0.008H325.818z"
+   id="path4299" />
+		</g>
+		
+			<radialGradient
+   id="SVGID_231_"
+   cx="410.7862"
+   cy="496.2461"
+   r="4.4365"
+   gradientTransform="matrix(0.9525 0.3046 -0.3046 0.9525 81.9305 -503.3005)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.4121"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop4302" />
+			<stop
+   offset="0.5849"
+   style="stop-color:#0A1827;stop-opacity:0.5379"
+   id="stop4304" />
+			<stop
+   offset="0.6472"
+   style="stop-color:#091420;stop-opacity:0.7317"
+   id="stop4306" />
+			<stop
+   offset="0.6914"
+   style="stop-color:#060D15;stop-opacity:0.8694"
+   id="stop4308" />
+			<stop
+   offset="0.727"
+   style="stop-color:#010204;stop-opacity:0.9803"
+   id="stop4310" />
+			<stop
+   offset="0.7333"
+   style="stop-color:#000000"
+   id="stop4312" />
+			<stop
+   offset="0.7876"
+   style="stop-color:#03080D;stop-opacity:0.6108"
+   id="stop4314" />
+			<stop
+   offset="0.8727"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop4316" />
+		</radialGradient>
+		<circle
+   opacity="0.36"
+   fill="url(#SVGID_231_)"
+   enable-background="new    "
+   cx="322.172"
+   cy="94.303"
+   r="4.263"
+   id="circle4318" />
+		
+			<radialGradient
+   id="SVGID_232_"
+   cx="298.6241"
+   cy="1025.1885"
+   r="6.1147"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#B4CB80;stop-opacity:0"
+   id="stop4321" />
+			<stop
+   offset="1"
+   style="stop-color:#60BD71"
+   id="stop4323" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_232_)"
+   enable-background="new    "
+   cx="322.213"
+   cy="94.569"
+   r="3.947"
+   id="circle4325" />
+		
+			<radialGradient
+   id="SVGID_233_"
+   cx="298.2119"
+   cy="1027.5693"
+   r="3.9482"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#3FB1CB;stop-opacity:0"
+   id="stop4328" />
+			<stop
+   offset="1"
+   style="stop-color:#458691"
+   id="stop4330" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_233_)"
+   enable-background="new    "
+   cx="322.212"
+   cy="94.569"
+   r="3.948"
+   id="circle4332" />
+		<path
+   opacity="0.49"
+   fill="#F2F6FA"
+   enable-background="new    "
+   d="M318.805,94.771c-0.172-1.795,1.146-3.391,2.939-3.562    c1.796-0.171,3.548,0.808,3.832,2.306c-1.34-1.773-3.385-1.773-4.063-1.611C320.006,92.267,319.223,93.377,318.805,94.771z"
+   id="path4334" />
+		<path
+   opacity="0.11"
+   fill="#EBF7FD"
+   enable-background="new    "
+   d="M318.305,95.174c-0.207-2.167,1.285-4.206,3.455-4.413    c2.166-0.207,3.62,1.006,4.317,3.003c-1.034-2.201-3.847-2.247-4.668-2.05C319.589,92.15,318.809,93.492,318.305,95.174z"
+   id="path4336" />
+		<path
+   opacity="0.22"
+   fill="#EBF7FD"
+   enable-background="new    "
+   d="M318.611,96.194c-0.67-2.874,1.039-4.982,3.152-5.184    c2.106-0.201,4.067,1.418,4.313,3.761c-0.928-3.434-3.833-3.327-4.633-3.133C319.673,92.07,318.729,93.429,318.611,96.194z"
+   id="path4338" />
+		
+			<radialGradient
+   id="SVGID_234_"
+   cx="-734.3887"
+   cy="-459.8393"
+   r="2.6844"
+   gradientTransform="matrix(-0.9545 0.3742 -0.365 -0.931 -547.4075 -60.8402)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop4341" />
+			<stop
+   offset="0.3195"
+   style="stop-color:#050709"
+   id="stop4343" />
+			<stop
+   offset="0.5599"
+   style="stop-color:#070C13"
+   id="stop4345" />
+			<stop
+   offset="0.7738"
+   style="stop-color:#0A1523"
+   id="stop4347" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0B1929"
+   id="stop4349" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C"
+   id="stop4351" />
+		</radialGradient>
+		<path
+   opacity="0.4"
+   fill="url(#SVGID_234_)"
+   enable-background="new    "
+   d="M318.66,95.209c-0.458-1.664,0.416-3.479,2.138-4.153    c1.722-0.675,3.695-0.088,4.384,1.274c-1.34-1.512-3.477-1.087-4.146-0.838C319.327,92.122,318.729,93.752,318.66,95.209z"
+   id="path4353" />
+		<path
+   opacity="0.87"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M325.576,93.231c0.111,0.314,0.64,1.422,0.063,2.944    c-0.021,0.063,0.521-2.262-0.293-2.631c-0.207-0.094-0.492-0.176-0.479-0.402c0.01-0.161,0.097-0.285,0.242-0.322    C325.329,92.764,325.5,93.017,325.576,93.231z"
+   id="path4355" />
+		
+			<radialGradient
+   id="SVGID_235_"
+   cx="298.0782"
+   cy="1117.6211"
+   r="1.5405"
+   gradientTransform="matrix(1 0 0 0.9207 24 -936.5648)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop4358" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop4360" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop4362" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop4364" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop4366" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop4368" />
+		</radialGradient>
+		<ellipse
+   fill="url(#SVGID_235_)"
+   cx="322.078"
+   cy="92.428"
+   rx="1.541"
+   ry="1.418"
+   id="ellipse4370" />
+		<circle
+   opacity="0.62"
+   fill="#FFFFFF"
+   enable-background="new    "
+   cx="322.012"
+   cy="91.591"
+   r="0.413"
+   id="circle4372" />
+	</g>
+	<g
+   id="g4374">
+		
+			<linearGradient
+   id="SVGID_236_"
+   gradientUnits="userSpaceOnUse"
+   x1="297.7227"
+   y1="1004.8545"
+   x2="304.6088"
+   y2="996.308"
+   gradientTransform="matrix(1 0 0 1 24 -933)">
+			<stop
+   offset="0"
+   style="stop-color:#202D36"
+   id="stop4377" />
+			<stop
+   offset="0.0821"
+   style="stop-color:#517287"
+   id="stop4379" />
+			<stop
+   offset="0.1266"
+   style="stop-color:#7793A4"
+   id="stop4381" />
+			<stop
+   offset="0.175"
+   style="stop-color:#98B1BD"
+   id="stop4383" />
+			<stop
+   offset="0.2272"
+   style="stop-color:#B4C9D2"
+   id="stop4385" />
+			<stop
+   offset="0.2833"
+   style="stop-color:#C9DCE3"
+   id="stop4387" />
+			<stop
+   offset="0.3454"
+   style="stop-color:#D8E9EE"
+   id="stop4389" />
+			<stop
+   offset="0.4181"
+   style="stop-color:#E1F1F5"
+   id="stop4391" />
+			<stop
+   offset="0.5273"
+   style="stop-color:#E4F3F7"
+   id="stop4393" />
+		</linearGradient>
+		<path
+   fill="url(#SVGID_236_)"
+   d="M328.652,63.35l-5.657,8.363c-0.279,0.413-0.712,0.384-1.183,0.057    c-0.446-0.311-0.598-0.656-0.313-1.068c0.015-0.021,0.026-0.041,0.045-0.059l6.329-7.866c0.168-0.208,0.475-0.242,0.682-0.075    C328.752,62.86,328.793,63.144,328.652,63.35z"
+   id="path4395" />
+		<path
+   fill="#535A5F"
+   d="M328.732,63.404l-3.369,5.074l-1.698,2.527c-0.146,0.208-0.292,0.416-0.447,0.617    c-0.124,0.187-0.353,0.478-0.665,0.486c-0.298,0.017-0.551-0.114-0.763-0.264c-0.202-0.146-0.438-0.338-0.491-0.629    c-0.063-0.293,0.131-0.562,0.287-0.74l0.479-0.593l0.955-1.185l1.905-2.376l1.9-2.379l0.95-1.189    c0.146-0.235,0.549-0.339,0.795-0.153C328.826,62.758,328.916,63.152,328.732,63.404z M328.572,63.295    c0.117-0.17,0.076-0.421-0.104-0.54c-0.178-0.116-0.413-0.08-0.551,0.112l-0.958,1.184l-1.917,2.366l-1.914,2.369l-0.952,1.188    l-0.477,0.594c-0.168,0.193-0.301,0.397-0.256,0.622c0.104,0.416,0.67,0.765,1.086,0.728c0.224-0.041,0.332-0.21,0.466-0.445    c0.13-0.219,0.269-0.432,0.407-0.644l1.713-2.518L328.572,63.295z"
+   id="path4397" />
+	</g>
+	<g
+   id="g4399">
+		<path
+   fill="#FFFFFF"
+   d="M322.378,71.689c0,0-0.019,0.019-0.263,0.062c0.271,0.064,0.383-0.04,0.383-0.04l5.913-8.184l-0.271-0.19    L322.378,71.689z"
+   id="path4401" />
+		<polygon
+   fill="#FFFFFF"
+   points="321.884,70.828 327.848,63.156 327.768,63.057   "
+   id="polygon4403" />
+	</g>
+	
+		<radialGradient
+   id="SVGID_237_"
+   cx="-621.9941"
+   cy="-1545.666"
+   r="1.7694"
+   fx="-622.6192"
+   fy="-1545.5605"
+   gradientTransform="matrix(-0.4849 0.8746 -0.8033 -0.4453 -1215.5381 -80.437)"
+   gradientUnits="userSpaceOnUse">
+		<stop
+   offset="0"
+   style="stop-color:#46C3D6;stop-opacity:0.74"
+   id="stop4406" />
+		<stop
+   offset="0.1121"
+   style="stop-color:#48C3D3;stop-opacity:0.5799"
+   id="stop4408" />
+		<stop
+   offset="0.1963"
+   style="stop-color:#4DC4C9;stop-opacity:0.4597"
+   id="stop4410" />
+		<stop
+   offset="0.2713"
+   style="stop-color:#57C5B9;stop-opacity:0.3525"
+   id="stop4412" />
+		<stop
+   offset="0.3411"
+   style="stop-color:#65C6A2;stop-opacity:0.2529"
+   id="stop4414" />
+		<stop
+   offset="0.4072"
+   style="stop-color:#76C785;stop-opacity:0.1584"
+   id="stop4416" />
+		<stop
+   offset="0.4697"
+   style="stop-color:#8BC961;stop-opacity:0.0692"
+   id="stop4418" />
+		<stop
+   offset="0.5182"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop4420" />
+	</radialGradient>
+	<path
+   opacity="0.52"
+   fill="url(#SVGID_237_)"
+   enable-background="new    "
+   d="M328.555,62.701c-0.207-0.167-0.512-0.134-0.68,0.075   l-0.852,1.057c0.149,0.367,0.396,0.664,0.726,0.853l0.903-1.336C328.793,63.144,328.752,62.86,328.555,62.701z"
+   id="path4422" />
+	<g
+   id="g4424">
+		<g
+   id="g4426">
+			
+				<radialGradient
+   id="SVGID_238_"
+   cx="305.8653"
+   cy="994.3867"
+   r="2.5391"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+				<stop
+   offset="0.7758"
+   style="stop-color:#D5E2EE"
+   id="stop4429" />
+				<stop
+   offset="0.8263"
+   style="stop-color:#D1DFED"
+   id="stop4431" />
+				<stop
+   offset="0.8714"
+   style="stop-color:#C7D6E8"
+   id="stop4433" />
+				<stop
+   offset="0.9144"
+   style="stop-color:#B4C6E1"
+   id="stop4435" />
+				<stop
+   offset="0.9562"
+   style="stop-color:#9BB0D8"
+   id="stop4437" />
+				<stop
+   offset="0.9968"
+   style="stop-color:#7A95CB"
+   id="stop4439" />
+				<stop
+   offset="1"
+   style="stop-color:#7792CA"
+   id="stop4441" />
+			</radialGradient>
+			<circle
+   fill="url(#SVGID_238_)"
+   cx="329.865"
+   cy="61.387"
+   r="2.539"
+   id="circle4443" />
+			<path
+   fill="#39444F"
+   d="M332.549,61.394c-0.007,0.689-0.313,1.387-0.807,1.87c-0.497,0.491-1.178,0.769-1.885,0.781     c-1.405,0.055-2.729-1.197-2.707-2.667c-0.062-1.424,1.23-2.796,2.715-2.737c0.717,0.004,1.434,0.303,1.926,0.82     c0.497,0.512,0.773,1.223,0.759,1.926L332.549,61.394z M332.257,61.387c0.004-1.281-1.151-2.375-2.392-2.332     c-0.61,0.011-1.215,0.248-1.654,0.677c-0.441,0.432-0.703,1.024-0.71,1.664c-0.049,1.243,1.063,2.428,2.37,2.411     c0.624,0.017,1.268-0.251,1.707-0.706c0.449-0.455,0.689-1.079,0.68-1.721L332.257,61.387z"
+   id="path4445" />
+		</g>
+		
+			<radialGradient
+   id="SVGID_239_"
+   cx="408.0235"
+   cy="462.293"
+   r="2.8521"
+   gradientTransform="matrix(0.9525 0.3046 -0.3046 0.9525 81.9305 -503.3005)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.4121"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop4448" />
+			<stop
+   offset="0.5849"
+   style="stop-color:#0A1827;stop-opacity:0.5379"
+   id="stop4450" />
+			<stop
+   offset="0.6472"
+   style="stop-color:#091420;stop-opacity:0.7317"
+   id="stop4452" />
+			<stop
+   offset="0.6914"
+   style="stop-color:#060D15;stop-opacity:0.8694"
+   id="stop4454" />
+			<stop
+   offset="0.727"
+   style="stop-color:#010204;stop-opacity:0.9803"
+   id="stop4456" />
+			<stop
+   offset="0.7333"
+   style="stop-color:#000000"
+   id="stop4458" />
+			<stop
+   offset="0.7876"
+   style="stop-color:#03080D;stop-opacity:0.6108"
+   id="stop4460" />
+			<stop
+   offset="0.8727"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop4462" />
+		</radialGradient>
+		<circle
+   opacity="0.36"
+   fill="url(#SVGID_239_)"
+   enable-background="new    "
+   cx="329.839"
+   cy="61.187"
+   r="2.742"
+   id="circle4464" />
+		
+			<radialGradient
+   id="SVGID_240_"
+   cx="306.1299"
+   cy="992.8271"
+   r="3.9358"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#B4CB80;stop-opacity:0"
+   id="stop4467" />
+			<stop
+   offset="1"
+   style="stop-color:#60BD71"
+   id="stop4469" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_240_)"
+   enable-background="new    "
+   cx="329.865"
+   cy="61.359"
+   r="2.539"
+   id="circle4471" />
+		
+			<radialGradient
+   id="SVGID_241_"
+   cx="305.8653"
+   cy="994.3594"
+   r="2.5391"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop4474" />
+			<stop
+   offset="1"
+   style="stop-color:#458691"
+   id="stop4476" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_241_)"
+   enable-background="new    "
+   cx="329.865"
+   cy="61.359"
+   r="2.539"
+   id="circle4478" />
+		<path
+   opacity="0.36"
+   fill="#F2F6FA"
+   enable-background="new    "
+   d="M327.596,61.045c0.146-1.101,0.967-1.858,2.036-1.96    c1.069-0.103,2.048,0.653,2.407,1.493c-0.745-1.023-1.771-1.275-2.413-1.188C328.982,59.479,328.2,59.595,327.596,61.045z"
+   id="path4480" />
+		
+			<radialGradient
+   id="SVGID_242_"
+   cx="305.42"
+   cy="992.7832"
+   r="0.6777"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#EEF8FB"
+   id="stop4483" />
+			<stop
+   offset="0.4122"
+   style="stop-color:#EDF7F8;stop-opacity:0.8016"
+   id="stop4485" />
+			<stop
+   offset="0.5215"
+   style="stop-color:#E9F5EE;stop-opacity:0.6525"
+   id="stop4487" />
+			<stop
+   offset="0.619"
+   style="stop-color:#E2F1DE;stop-opacity:0.5196"
+   id="stop4489" />
+			<stop
+   offset="0.7096"
+   style="stop-color:#D8ECC7;stop-opacity:0.396"
+   id="stop4491" />
+			<stop
+   offset="0.7954"
+   style="stop-color:#CCE4AA;stop-opacity:0.2789"
+   id="stop4493" />
+			<stop
+   offset="0.8777"
+   style="stop-color:#BCDC86;stop-opacity:0.1667"
+   id="stop4495" />
+			<stop
+   offset="0.9557"
+   style="stop-color:#ABD25B;stop-opacity:0.0604"
+   id="stop4497" />
+			<stop
+   offset="1"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop4499" />
+		</radialGradient>
+		<circle
+   fill="url(#SVGID_242_)"
+   cx="329.419"
+   cy="59.784"
+   r="0.676"
+   id="circle4501" />
+		<circle
+   opacity="0.62"
+   fill="#FFFFFF"
+   enable-background="new    "
+   cx="329.382"
+   cy="59.555"
+   r="0.266"
+   id="circle4503" />
+		
+			<radialGradient
+   id="SVGID_243_"
+   cx="716.4902"
+   cy="1071.5557"
+   r="1.7344"
+   gradientTransform="matrix(0.9164 0.4002 -0.4002 0.9164 101.5593 -1206.0709)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop4506" />
+			<stop
+   offset="0.3195"
+   style="stop-color:#050709"
+   id="stop4508" />
+			<stop
+   offset="0.5599"
+   style="stop-color:#070C13"
+   id="stop4510" />
+			<stop
+   offset="0.7738"
+   style="stop-color:#0A1523"
+   id="stop4512" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0B1929"
+   id="stop4514" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C"
+   id="stop4516" />
+		</radialGradient>
+		<path
+   opacity="0.42"
+   fill="url(#SVGID_243_)"
+   enable-background="new    "
+   d="M331.758,62.647c-0.545,0.967-1.747,1.404-2.81,0.94    c-1.063-0.465-1.685-1.619-1.376-2.552c-0.088,1.293,1.06,2.059,1.469,2.247C330.077,63.758,331.073,63.281,331.758,62.647z"
+   id="path4518" />
+	</g>
+	<polygon
+   fill="#FFFFFF"
+   points="321.6,74.781 329.784,69.835 329.784,69.539  "
+   id="polygon4520" />
+	<path
+   fill="#FFFFFF"
+   d="M321.525,75.12c0.229,0.33,0.688,0.058,0.688,0.058l8.451-4.349l-0.287-0.251l-8.184,4.557   C322.2,75.133,321.811,75.382,321.525,75.12z"
+   id="path4522" />
+	<path
+   fill="#FFFFFF"
+   d="M337.031,77.758c0,0.095-12.352,0.318-12.446,0.318c-0.094,0-0.17-0.077-0.17-0.172   c0-0.094,0.076-0.171,0.17-0.171c0.008,0,0.11,0.132,0.252,0.131C326.529,77.857,337.031,77.671,337.031,77.758z"
+   id="path4524" />
+	<path
+   fill="#FFFFFF"
+   d="M329.568,84.973c-0.063,0.074-5.23-3.691-5.271-3.722c0.031-0.072,0.077-0.115,0.137-0.262   C325.156,81.543,329.623,84.905,329.568,84.973z"
+   id="path4526" />
+	<path
+   fill="#FFFFFF"
+   d="M307.721,68.52c0.064-0.069,4.356,3.733,4.396,3.767c-0.034,0.069-0.085,0.094-0.184,0.227   C311.257,71.904,307.662,68.584,307.721,68.52z"
+   id="path4528" />
+	
+		<linearGradient
+   id="SVGID_244_"
+   gradientUnits="userSpaceOnUse"
+   x1="-5608.5522"
+   y1="855.8457"
+   x2="-5610.27"
+   y2="850.5513"
+   gradientTransform="matrix(-0.1142 -0.2637 0.2148 -0.7179 -509.0133 -779.4001)">
+		<stop
+   offset="0.1636"
+   style="stop-color:#141A2B;stop-opacity:0.54"
+   id="stop4531" />
+		<stop
+   offset="0.3161"
+   style="stop-color:#142F3A;stop-opacity:0.4488"
+   id="stop4533" />
+		<stop
+   offset="0.486"
+   style="stop-color:#143E45;stop-opacity:0.3473"
+   id="stop4535" />
+		<stop
+   offset="0.6877"
+   style="stop-color:#14464B;stop-opacity:0.2267"
+   id="stop4537" />
+		<stop
+   offset="1"
+   style="stop-color:#14494D;stop-opacity:0.04"
+   id="stop4539" />
+	</linearGradient>
+	<path
+   opacity="0.36"
+   fill="url(#SVGID_244_)"
+   enable-background="new    "
+   d="M315.275,84.772c0.053-0.238,0.183-0.141,0.207-0.136   c0.021,0.006,0.021,0.141-0.028,0.38l-1.211,4.41l0.293,0.875l-0.532-0.794L315.275,84.772z"
+   id="path4541" />
+	<polygon
+   fill="#FFFFFF"
+   points="311.775,76.272 303.359,74.857 303.333,74.632  "
+   id="polygon4543" />
+	<path
+   fill="#FFFFFF"
+   d="M312.031,76.696c-0.008,0.609-0.551,0.528-0.551,0.528l-8.334-0.574l0.049-0.309l8.271,0.812   C311.469,77.153,311.941,77.246,312.031,76.696z"
+   id="path4545" />
+</g>
+<g
+   id="g4547">
+	<g
+   id="g4549">
+		<g
+   id="g4551">
+			<circle
+   fill="#FFFFFF"
+   cx="318.875"
+   cy="150.277"
+   r="1.442"
+   id="circle4553" />
+			<path
+   fill="#39444F"
+   d="M320.413,150.309c-0.017,0.814-0.755,1.507-1.567,1.49c-0.805,0.02-1.553-0.715-1.527-1.548     c-0.018-0.827,0.729-1.598,1.597-1.55c0.834-0.003,1.563,0.784,1.504,1.604v0.002L320.413,150.309L320.413,150.309z      M320.221,150.3c0.006-0.72-0.623-1.339-1.33-1.327c-0.676-0.019-1.34,0.567-1.342,1.282c-0.04,0.707,0.569,1.376,1.307,1.386     C319.579,151.686,320.246,151.025,320.221,150.3z"
+   id="path4555" />
+		</g>
+		
+			<radialGradient
+   id="SVGID_245_"
+   cx="311.2725"
+   cy="1071.2354"
+   r="2.2324"
+   gradientTransform="matrix(0.9999 0.017 -0.017 0.9999 26.0318 -927.0317)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#B4CB80;stop-opacity:0"
+   id="stop4558" />
+			<stop
+   offset="1"
+   style="stop-color:#60BD71"
+   id="stop4560" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_245_)"
+   enable-background="new    "
+   cx="318.875"
+   cy="150.261"
+   r="1.442"
+   id="circle4562" />
+		
+			<radialGradient
+   id="SVGID_246_"
+   cx="311.1221"
+   cy="1072.1064"
+   r="1.4396"
+   gradientTransform="matrix(0.9999 0.017 -0.017 0.9999 26.0318 -927.0317)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#3FB1CB;stop-opacity:0"
+   id="stop4565" />
+			<stop
+   offset="1"
+   style="stop-color:#456C90"
+   id="stop4567" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_246_)"
+   enable-background="new    "
+   cx="318.876"
+   cy="150.262"
+   r="1.441"
+   id="circle4569" />
+		
+			<radialGradient
+   id="SVGID_247_"
+   cx="361.5108"
+   cy="-452.1015"
+   r="0.9829"
+   gradientTransform="matrix(-0.4207 0.9072 -0.9072 -0.4207 60.0593 -368.1773)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop4572" />
+			<stop
+   offset="0.3195"
+   style="stop-color:#050709"
+   id="stop4574" />
+			<stop
+   offset="0.5599"
+   style="stop-color:#070C13"
+   id="stop4576" />
+			<stop
+   offset="0.7738"
+   style="stop-color:#0A1523"
+   id="stop4578" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0B1929"
+   id="stop4580" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C"
+   id="stop4582" />
+		</radialGradient>
+		<path
+   opacity="0.39"
+   fill="url(#SVGID_247_)"
+   enable-background="new    "
+   d="M318.087,151.334    c-0.541-0.322-0.772-1.01-0.497-1.607c0.277-0.597,0.941-0.936,1.467-0.748c-0.729-0.067-1.183,0.575-1.295,0.805    C317.479,150.364,317.736,150.936,318.087,151.334z"
+   id="path4584" />
+		
+			<radialGradient
+   id="SVGID_248_"
+   cx="-713.3936"
+   cy="1227.9746"
+   r="1.3548"
+   gradientTransform="matrix(0.6235 -0.7818 0.7818 0.6235 -197.1253 -1173.7216)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop4587" />
+			<stop
+   offset="0.5273"
+   style="stop-color:#0B1929;stop-opacity:0.52"
+   id="stop4589" />
+			<stop
+   offset="0.7222"
+   style="stop-color:#132935;stop-opacity:0.3056"
+   id="stop4591" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C;stop-opacity:0"
+   id="stop4593" />
+		</radialGradient>
+		<path
+   opacity="0.5"
+   fill="url(#SVGID_248_)"
+   enable-background="new    "
+   d="M317.695,150.723    c-0.387-0.347-0.391-0.986,0.005-1.425c0.391-0.439,1.024-0.513,1.415-0.166c0.389,0.347,0.39,0.986-0.004,1.427    C318.719,150.996,318.085,151.072,317.695,150.723z"
+   id="path4595" />
+		
+			<radialGradient
+   id="SVGID_249_"
+   cx="311.0137"
+   cy="1071.1895"
+   r="0.3839"
+   gradientTransform="matrix(0.9999 0.017 -0.017 0.9999 26.0318 -927.0317)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#EEF8FB"
+   id="stop4598" />
+			<stop
+   offset="0.4122"
+   style="stop-color:#EDF7F8;stop-opacity:0.8016"
+   id="stop4600" />
+			<stop
+   offset="0.5215"
+   style="stop-color:#E9F5EE;stop-opacity:0.6525"
+   id="stop4602" />
+			<stop
+   offset="0.619"
+   style="stop-color:#E2F1DE;stop-opacity:0.5196"
+   id="stop4604" />
+			<stop
+   offset="0.7096"
+   style="stop-color:#D8ECC7;stop-opacity:0.396"
+   id="stop4606" />
+			<stop
+   offset="0.7954"
+   style="stop-color:#CCE4AA;stop-opacity:0.2789"
+   id="stop4608" />
+			<stop
+   offset="0.8777"
+   style="stop-color:#BCDC86;stop-opacity:0.1667"
+   id="stop4610" />
+			<stop
+   offset="0.9557"
+   style="stop-color:#ABD25B;stop-opacity:0.0604"
+   id="stop4612" />
+			<stop
+   offset="1"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop4614" />
+		</radialGradient>
+		<circle
+   fill="url(#SVGID_249_)"
+   cx="318.781"
+   cy="149.343"
+   r="0.383"
+   id="circle4616" />
+		<circle
+   opacity="0.62"
+   fill="#FFFFFF"
+   enable-background="new    "
+   cx="318.757"
+   cy="149.21"
+   r="0.151"
+   id="circle4618" />
+	</g>
+	<g
+   id="g4620">
+		<g
+   id="g4622">
+			<circle
+   fill="#FFFFFF"
+   cx="307.8"
+   cy="153.713"
+   r="1.572"
+   id="circle4624" />
+			<path
+   fill="#39444F"
+   d="M309.415,154.133c-0.22,0.857-1.176,1.406-2.03,1.178c-0.854-0.184-1.459-1.141-1.218-2.021     c0.188-0.865,1.17-1.498,2.063-1.229c0.881,0.207,1.451,1.219,1.186,2.067L309.415,154.133L309.415,154.133z M309.229,154.078     c0.192-0.764-0.313-1.59-1.078-1.758c-0.721-0.193-1.57,0.262-1.762,1.035c-0.221,0.729,0.26,1.605,1.043,1.805     C308.191,155.393,309.07,154.857,309.229,154.078z"
+   id="path4626" />
+		</g>
+		
+			<radialGradient
+   id="SVGID_250_"
+   cx="493.6436"
+   cy="874.3662"
+   r="2.4364"
+   gradientTransform="matrix(0.9687 0.2482 -0.2482 0.9687 47.035 -816.7146)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#B4CB80;stop-opacity:0"
+   id="stop4629" />
+			<stop
+   offset="1"
+   style="stop-color:#60BD71"
+   id="stop4631" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_250_)"
+   enable-background="new    "
+   cx="307.805"
+   cy="153.696"
+   r="1.573"
+   id="circle4633" />
+		
+			<radialGradient
+   id="SVGID_251_"
+   cx="493.4795"
+   cy="875.3115"
+   r="1.5715"
+   gradientTransform="matrix(0.9687 0.2482 -0.2482 0.9687 47.035 -816.7146)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#3FB1CB;stop-opacity:0"
+   id="stop4636" />
+			<stop
+   offset="1"
+   style="stop-color:#456C90"
+   id="stop4638" />
+		</radialGradient>
+		<path
+   opacity="0.62"
+   fill="url(#SVGID_251_)"
+   enable-background="new    "
+   d="M309.152,152.891    c0.445,0.746,0.199,1.711-0.545,2.156c-0.746,0.443-1.711,0.199-2.154-0.547s-0.199-1.711,0.548-2.156    C307.745,151.902,308.71,152.145,309.152,152.891z"
+   id="path4640" />
+		
+			<radialGradient
+   id="SVGID_252_"
+   cx="283.8936"
+   cy="1085.7754"
+   r="1.7169"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop4643" />
+			<stop
+   offset="0.5273"
+   style="stop-color:#0B1929;stop-opacity:0.52"
+   id="stop4645" />
+			<stop
+   offset="0.7222"
+   style="stop-color:#132935;stop-opacity:0.3056"
+   id="stop4647" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C;stop-opacity:0"
+   id="stop4649" />
+		</radialGradient>
+		<path
+   opacity="0.5"
+   fill="url(#SVGID_252_)"
+   enable-background="new    "
+   d="M306.514,153.225c0.038-0.656,0.666-1.16,1.408-1.117    c0.741,0.041,1.313,0.607,1.276,1.271c-0.035,0.656-0.665,1.16-1.408,1.117C307.051,154.447,306.477,153.883,306.514,153.225z"
+   id="path4651" />
+		
+			<radialGradient
+   id="SVGID_253_"
+   cx="172.314"
+   cy="1547.5273"
+   r="1.0705"
+   gradientTransform="matrix(0.9925 -0.1225 0.1225 0.9925 -52.6962 -1360.2935)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop4654" />
+			<stop
+   offset="0.3195"
+   style="stop-color:#050709"
+   id="stop4656" />
+			<stop
+   offset="0.5599"
+   style="stop-color:#070C13"
+   id="stop4658" />
+			<stop
+   offset="0.7738"
+   style="stop-color:#0A1523"
+   id="stop4660" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0B1929"
+   id="stop4662" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C"
+   id="stop4664" />
+		</radialGradient>
+		<path
+   opacity="0.12"
+   fill="url(#SVGID_253_)"
+   enable-background="new    "
+   d="M309.168,153.73    c0.014,0.688-0.486,1.301-1.202,1.389c-0.712,0.088-1.399-0.334-1.528-0.93c0.361,0.717,1.207,0.768,1.482,0.74    C308.622,154.855,309.003,154.287,309.168,153.73z"
+   id="path4666" />
+	</g>
+	<g
+   id="g4668">
+		<g
+   id="g4670">
+			<circle
+   fill="#FFFFFF"
+   cx="303.484"
+   cy="138.754"
+   r="1.572"
+   id="circle4672" />
+			<path
+   fill="#39444F"
+   d="M305.102,139.17c-0.219,0.857-1.176,1.409-2.024,1.182c-0.854-0.183-1.466-1.14-1.224-2.022     c0.188-0.865,1.168-1.498,2.063-1.229C304.796,137.306,305.368,138.32,305.102,139.17z M304.915,139.118     c0.192-0.766-0.321-1.588-1.08-1.755c-0.721-0.192-1.575,0.262-1.762,1.036c-0.22,0.733,0.261,1.612,1.046,1.803     C303.881,140.434,304.76,139.899,304.915,139.118z"
+   id="path4674" />
+		</g>
+		
+			<radialGradient
+   id="SVGID_254_"
+   cx="485.752"
+   cy="860.9453"
+   r="2.436"
+   gradientTransform="matrix(0.9687 0.2482 -0.2482 0.9687 47.035 -816.7146)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#B4CB80;stop-opacity:0"
+   id="stop4677" />
+			<stop
+   offset="1"
+   style="stop-color:#60BD71"
+   id="stop4679" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_254_)"
+   enable-background="new    "
+   cx="303.489"
+   cy="138.737"
+   r="1.571"
+   id="circle4681" />
+		
+			<radialGradient
+   id="SVGID_255_"
+   cx="485.5879"
+   cy="861.8936"
+   r="1.5727"
+   gradientTransform="matrix(0.9687 0.2482 -0.2482 0.9687 47.035 -816.7146)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#3FB1CB;stop-opacity:0"
+   id="stop4684" />
+			<stop
+   offset="1"
+   style="stop-color:#456C90"
+   id="stop4686" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_255_)"
+   enable-background="new    "
+   cx="303.49"
+   cy="138.738"
+   r="1.572"
+   id="circle4688" />
+		
+			<radialGradient
+   id="SVGID_256_"
+   cx="-436.6674"
+   cy="1696.6035"
+   r="1.0691"
+   gradientTransform="matrix(0.8182 -0.5749 0.5749 0.8182 -314.1375 -1499.7417)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop4691" />
+			<stop
+   offset="0.3195"
+   style="stop-color:#050709"
+   id="stop4693" />
+			<stop
+   offset="0.5599"
+   style="stop-color:#070C13"
+   id="stop4695" />
+			<stop
+   offset="0.7738"
+   style="stop-color:#0A1523"
+   id="stop4697" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0B1929"
+   id="stop4699" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C"
+   id="stop4701" />
+		</radialGradient>
+		<path
+   opacity="0.3"
+   fill="url(#SVGID_256_)"
+   enable-background="new    "
+   d="M304.743,138.147c0.336,0.6,0.181,1.376-0.408,1.789    c-0.587,0.413-1.394,0.363-1.785-0.1c0.654,0.462,1.425,0.109,1.654-0.047C304.791,139.394,304.857,138.713,304.743,138.147z"
+   id="path4703" />
+		
+			<radialGradient
+   id="SVGID_257_"
+   cx="279.5127"
+   cy="1070.5928"
+   r="0.3687"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#EEF8FB"
+   id="stop4706" />
+			<stop
+   offset="0.4122"
+   style="stop-color:#EDF7F8;stop-opacity:0.8016"
+   id="stop4708" />
+			<stop
+   offset="0.5215"
+   style="stop-color:#E9F5EE;stop-opacity:0.6525"
+   id="stop4710" />
+			<stop
+   offset="0.619"
+   style="stop-color:#E2F1DE;stop-opacity:0.5196"
+   id="stop4712" />
+			<stop
+   offset="0.7096"
+   style="stop-color:#D8ECC7;stop-opacity:0.396"
+   id="stop4714" />
+			<stop
+   offset="0.7954"
+   style="stop-color:#CCE4AA;stop-opacity:0.2789"
+   id="stop4716" />
+			<stop
+   offset="0.8777"
+   style="stop-color:#BCDC86;stop-opacity:0.1667"
+   id="stop4718" />
+			<stop
+   offset="0.9557"
+   style="stop-color:#ABD25B;stop-opacity:0.0604"
+   id="stop4720" />
+			<stop
+   offset="1"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop4722" />
+		</radialGradient>
+		<circle
+   fill="url(#SVGID_257_)"
+   cx="303.514"
+   cy="137.593"
+   r="0.368"
+   id="circle4724" />
+		<circle
+   opacity="0.62"
+   fill="#FFFFFF"
+   enable-background="new    "
+   cx="303.564"
+   cy="137.464"
+   r="0.145"
+   id="circle4726" />
+		
+			<radialGradient
+   id="SVGID_258_"
+   cx="-514.6191"
+   cy="1211.4609"
+   r="0.6072"
+   gradientTransform="matrix(0.9395 -0.6599 0.6365 0.9061 16.1983 -1298.2251)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#C9DAF0;stop-opacity:0.17"
+   id="stop4729" />
+			<stop
+   offset="0.2107"
+   style="stop-color:#CCDDF1;stop-opacity:0.4586"
+   id="stop4731" />
+			<stop
+   offset="0.3822"
+   style="stop-color:#D6E4F4;stop-opacity:0.6934"
+   id="stop4733" />
+			<stop
+   offset="0.5395"
+   style="stop-color:#E7F1FA;stop-opacity:0.9088"
+   id="stop4735" />
+			<stop
+   offset="0.6061"
+   style="stop-color:#F1F9FD"
+   id="stop4737" />
+			<stop
+   offset="0.6454"
+   style="stop-color:#CEEDEF;stop-opacity:0.9002"
+   id="stop4739" />
+			<stop
+   offset="0.6966"
+   style="stop-color:#A8DFDF;stop-opacity:0.7701"
+   id="stop4741" />
+			<stop
+   offset="0.75"
+   style="stop-color:#89D4D3;stop-opacity:0.6346"
+   id="stop4743" />
+			<stop
+   offset="0.8053"
+   style="stop-color:#70CCC9;stop-opacity:0.4943"
+   id="stop4745" />
+			<stop
+   offset="0.8632"
+   style="stop-color:#5FC6C2;stop-opacity:0.3472"
+   id="stop4747" />
+			<stop
+   offset="0.9255"
+   style="stop-color:#54C2BD;stop-opacity:0.1891"
+   id="stop4749" />
+			<stop
+   offset="1"
+   style="stop-color:#51C1BC;stop-opacity:0"
+   id="stop4751" />
+		</radialGradient>
+		<path
+   opacity="0.54"
+   fill="url(#SVGID_258_)"
+   enable-background="new    "
+   d="M304.501,138.694    c0.228,0.327,0.071,0.619-0.276,0.864c-0.35,0.246-0.519,0.136-0.981,0.024c-0.323-0.077-0.138-0.79,0.217-1.034    C303.803,138.302,304.272,138.368,304.501,138.694z"
+   id="path4753" />
+	</g>
+	<g
+   id="g4755">
+		<path
+   fill="#E4F3F7"
+   d="M315.064,146.909l3.289,2.719c0.101,0.082,0.107,0.228,0.025,0.329c-0.068,0.092-0.206,0.111-0.304,0.05    l-3.615-2.269c-0.233-0.15-0.313-0.466-0.161-0.706c0.149-0.24,0.473-0.313,0.706-0.162    C315.027,146.881,315.05,146.896,315.064,146.909z"
+   id="path4757" />
+		<path
+   fill="#808B91"
+   d="M315.131,146.83l2.074,1.771l1.043,0.878c0.079,0.078,0.195,0.124,0.229,0.281    c0.021,0.139-0.063,0.272-0.189,0.313c-0.146,0.046-0.27-0.052-0.354-0.104l-0.291-0.179l-2.326-1.424l-0.582-0.354    c-0.18-0.129-0.422-0.188-0.559-0.468c-0.117-0.241-0.023-0.588,0.193-0.734c0.221-0.168,0.557-0.157,0.758,0.018L315.131,146.83z     M315.007,146.993l-0.002-0.002c-0.149-0.127-0.364-0.117-0.507-0.013c-0.154,0.124-0.203,0.307-0.139,0.487    c0.049,0.159,0.285,0.265,0.469,0.394l0.572,0.371l2.293,1.475c0.188,0.093,0.395,0.315,0.56,0.284    c0.089-0.019,0.155-0.125,0.138-0.21c0-0.083-0.119-0.155-0.203-0.226l-1.059-0.859L315.007,146.993z"
+   id="path4759" />
+	</g>
+	
+		<radialGradient
+   id="SVGID_259_"
+   cx="294.4424"
+   cy="1082.9121"
+   r="1.4199"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+		<stop
+   offset="0"
+   style="stop-color:#46C3D6;stop-opacity:0.74"
+   id="stop4762" />
+		<stop
+   offset="0.1036"
+   style="stop-color:#48C3D3;stop-opacity:0.5799"
+   id="stop4764" />
+		<stop
+   offset="0.1813"
+   style="stop-color:#4DC4C9;stop-opacity:0.4597"
+   id="stop4766" />
+		<stop
+   offset="0.2507"
+   style="stop-color:#57C5B9;stop-opacity:0.3525"
+   id="stop4768" />
+		<stop
+   offset="0.3152"
+   style="stop-color:#65C6A2;stop-opacity:0.2529"
+   id="stop4770" />
+		<stop
+   offset="0.3763"
+   style="stop-color:#76C785;stop-opacity:0.1584"
+   id="stop4772" />
+		<stop
+   offset="0.434"
+   style="stop-color:#8BC961;stop-opacity:0.0692"
+   id="stop4774" />
+		<stop
+   offset="0.4788"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop4776" />
+	</radialGradient>
+	<path
+   opacity="0.52"
+   fill="url(#SVGID_259_)"
+   enable-background="new    "
+   d="M318.354,149.628l-0.455-0.377   c0.045,0.111,0.069,0.225,0.025,0.357c-0.049,0.074-0.109,0.136-0.178,0.188l0.335,0.211c0.099,0.061,0.229,0.042,0.304-0.05   C318.467,149.856,318.454,149.71,318.354,149.628z"
+   id="path4778" />
+	<g
+   id="g4780">
+		<path
+   fill="#E4F3F7"
+   d="M308.055,152.877c-0.031,0-0.061-0.002-0.093-0.012c-0.19-0.049-0.306-0.246-0.256-0.439l0.862-3.276    c0.051-0.193,0.248-0.307,0.438-0.256c0.189,0.052,0.309,0.247,0.258,0.439l-0.863,3.276    C308.359,152.772,308.213,152.877,308.055,152.877z"
+   id="path4782" />
+		<path
+   fill="#808B91"
+   d="M308.048,152.924c-0.198,0.002-0.411-0.186-0.405-0.406c0.022-0.215,0.084-0.375,0.123-0.563l0.271-1.098    l0.273-1.094l0.141-0.547c0.008-0.182,0.216-0.459,0.468-0.438c0.243-0.011,0.478,0.219,0.463,0.465    c-0.028,0.238-0.094,0.378-0.14,0.573l-0.301,1.086l-0.31,1.09l-0.151,0.543c-0.023,0.188-0.201,0.396-0.428,0.391    L308.048,152.924L308.048,152.924z M308.055,152.83c0.371-0.018,0.328-0.549,0.449-0.875l0.27-1.096l0.275-1.095    c0.039-0.171,0.109-0.389,0.122-0.523c-0.002-0.138-0.116-0.249-0.255-0.252c-0.307-0.022-0.293,0.487-0.423,0.821l-0.3,1.088    l-0.312,1.086c-0.045,0.178-0.112,0.375-0.14,0.533C307.738,152.682,307.869,152.83,308.055,152.83L308.055,152.83z"
+   id="path4784" />
+	</g>
+	
+		<radialGradient
+   id="SVGID_260_"
+   cx="283.9268"
+   cy="1085.8125"
+   r="2.1205"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+		<stop
+   offset="0"
+   style="stop-color:#46C3D6;stop-opacity:0.74"
+   id="stop4787" />
+		<stop
+   offset="0.1036"
+   style="stop-color:#48C3D3;stop-opacity:0.5799"
+   id="stop4789" />
+		<stop
+   offset="0.1813"
+   style="stop-color:#4DC4C9;stop-opacity:0.4597"
+   id="stop4791" />
+		<stop
+   offset="0.2507"
+   style="stop-color:#57C5B9;stop-opacity:0.3525"
+   id="stop4793" />
+		<stop
+   offset="0.3152"
+   style="stop-color:#65C6A2;stop-opacity:0.2529"
+   id="stop4795" />
+		<stop
+   offset="0.3763"
+   style="stop-color:#76C785;stop-opacity:0.1584"
+   id="stop4797" />
+		<stop
+   offset="0.434"
+   style="stop-color:#8BC961;stop-opacity:0.0692"
+   id="stop4799" />
+		<stop
+   offset="0.4788"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop4801" />
+	</radialGradient>
+	<path
+   opacity="0.52"
+   fill="url(#SVGID_260_)"
+   enable-background="new    "
+   d="M307.897,151.709l-0.188,0.717   c-0.05,0.193,0.063,0.391,0.256,0.439c0.032,0.01,0.063,0.012,0.094,0.012c0.157,0,0.31-0.105,0.351-0.268l0.144-0.537   C308.273,152.082,308.055,151.928,307.897,151.709z"
+   id="path4803" />
+	
+		<linearGradient
+   id="SVGID_261_"
+   gradientUnits="userSpaceOnUse"
+   x1="284.916"
+   y1="1082.248"
+   x2="284.5319"
+   y2="1083.6927"
+   gradientTransform="matrix(1 0 0 1 24 -933)">
+		<stop
+   offset="0.1879"
+   style="stop-color:#517287"
+   id="stop4806" />
+		<stop
+   offset="0.2398"
+   style="stop-color:#7895A5;stop-opacity:0.847"
+   id="stop4808" />
+		<stop
+   offset="0.3"
+   style="stop-color:#9FB6C2;stop-opacity:0.6695"
+   id="stop4810" />
+		<stop
+   offset="0.3599"
+   style="stop-color:#BDD1D9;stop-opacity:0.4932"
+   id="stop4812" />
+		<stop
+   offset="0.4184"
+   style="stop-color:#D3E4EA;stop-opacity:0.3209"
+   id="stop4814" />
+		<stop
+   offset="0.4749"
+   style="stop-color:#E0EFF4;stop-opacity:0.1543"
+   id="stop4816" />
+		<stop
+   offset="0.5273"
+   style="stop-color:#E4F3F7;stop-opacity:0"
+   id="stop4818" />
+	</linearGradient>
+	<path
+   fill="url(#SVGID_261_)"
+   d="M309.008,148.894c-0.191-0.05-0.354,0.322-0.402,0.515l-0.166,0.575   c0.248,0.034,0.313,0.03,0.521,0.141l0.214-0.8C309.221,149.131,309.199,148.945,309.008,148.894z"
+   id="path4820" />
+	<g
+   id="g4822">
+		<path
+   fill="#E4F3F7"
+   d="M306.251,142.028l-2.604-2.712c-0.104-0.113-0.104-0.292,0.008-0.4c0.104-0.099,0.267-0.104,0.371-0.018    l2.955,2.325c0.236,0.186,0.277,0.529,0.097,0.765c-0.188,0.236-0.527,0.278-0.769,0.092    C306.286,142.064,306.268,142.045,306.251,142.028z"
+   id="path4824" />
+		<path
+   fill="#808B91"
+   d="M306.145,142.062l-1.688-1.828l-0.868-0.931c-0.153-0.215,0.029-0.525,0.286-0.5    c0.252,0.051,0.361,0.235,0.547,0.347l2.018,1.543l0.506,0.384c0.183,0.109,0.363,0.342,0.35,0.6    c-0.018,0.259-0.156,0.484-0.414,0.58c-0.23,0.096-0.523,0.016-0.688-0.152L306.145,142.062z M306.313,141.946l0.004,0.005    c0.271,0.292,0.764,0.082,0.771-0.282c0.014-0.18-0.083-0.328-0.256-0.45l-0.492-0.401l-1.973-1.597    c-0.167-0.111-0.326-0.316-0.498-0.343c-0.188-0.036-0.346,0.229-0.221,0.376l0.885,0.906L306.313,141.946z"
+   id="path4826" />
+	</g>
+	
+		<radialGradient
+   id="SVGID_262_"
+   cx="279.6934"
+   cy="1072.0264"
+   r="1.4089"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+		<stop
+   offset="0"
+   style="stop-color:#46C3D6;stop-opacity:0.74"
+   id="stop4829" />
+		<stop
+   offset="0.1036"
+   style="stop-color:#48C3D3;stop-opacity:0.5799"
+   id="stop4831" />
+		<stop
+   offset="0.1813"
+   style="stop-color:#4DC4C9;stop-opacity:0.4597"
+   id="stop4833" />
+		<stop
+   offset="0.2507"
+   style="stop-color:#57C5B9;stop-opacity:0.3525"
+   id="stop4835" />
+		<stop
+   offset="0.3152"
+   style="stop-color:#65C6A2;stop-opacity:0.2529"
+   id="stop4837" />
+		<stop
+   offset="0.3763"
+   style="stop-color:#76C785;stop-opacity:0.1584"
+   id="stop4839" />
+		<stop
+   offset="0.434"
+   style="stop-color:#8BC961;stop-opacity:0.0692"
+   id="stop4841" />
+		<stop
+   offset="0.4788"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop4843" />
+	</radialGradient>
+	<path
+   opacity="0.52"
+   fill="url(#SVGID_262_)"
+   enable-background="new    "
+   d="M304.23,139.309c0.047-0.046,0.104-0.082,0.178-0.108   l-0.383-0.303c-0.11-0.086-0.271-0.081-0.373,0.018c-0.111,0.108-0.115,0.288-0.006,0.4l0.563,0.59   C304.061,139.701,303.986,139.505,304.23,139.309z"
+   id="path4845" />
+	<g
+   id="blackball_3_">
+		
+			<radialGradient
+   id="SVGID_263_"
+   cx="285.9668"
+   cy="1078.4502"
+   r="5.8106"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#000000"
+   id="stop4849" />
+			<stop
+   offset="0.3003"
+   style="stop-color:#010203"
+   id="stop4851" />
+			<stop
+   offset="0.5262"
+   style="stop-color:#03080D"
+   id="stop4853" />
+			<stop
+   offset="0.7272"
+   style="stop-color:#08111D"
+   id="stop4855" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0B1929"
+   id="stop4857" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C"
+   id="stop4859" />
+		</radialGradient>
+		<circle
+   fill="url(#SVGID_263_)"
+   cx="310.464"
+   cy="144.755"
+   r="5.01"
+   id="circle4861" />
+		
+			<radialGradient
+   id="SVGID_264_"
+   cx="414.9903"
+   cy="547.9033"
+   r="5.2149"
+   gradientTransform="matrix(0.9525 0.3046 -0.3046 0.9525 81.9305 -503.3005)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop4864" />
+			<stop
+   offset="0.2047"
+   style="stop-color:#0D1B2C;stop-opacity:0.2447"
+   id="stop4866" />
+			<stop
+   offset="0.337"
+   style="stop-color:#132234;stop-opacity:0.4029"
+   id="stop4868" />
+			<stop
+   offset="0.4487"
+   style="stop-color:#1D2D43;stop-opacity:0.5365"
+   id="stop4870" />
+			<stop
+   offset="0.5491"
+   style="stop-color:#2B3D58;stop-opacity:0.6566"
+   id="stop4872" />
+			<stop
+   offset="0.6418"
+   style="stop-color:#3D5173;stop-opacity:0.7674"
+   id="stop4874" />
+			<stop
+   offset="0.7289"
+   style="stop-color:#536A95;stop-opacity:0.8715"
+   id="stop4876" />
+			<stop
+   offset="0.8101"
+   style="stop-color:#6D87BC;stop-opacity:0.9686"
+   id="stop4878" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#7792CA"
+   id="stop4880" />
+		</radialGradient>
+		<circle
+   opacity="0.36"
+   fill="url(#SVGID_264_)"
+   enable-background="new    "
+   cx="310.464"
+   cy="144.755"
+   r="5.01"
+   id="circle4882" />
+		
+			<radialGradient
+   id="SVGID_265_"
+   cx="288.1631"
+   cy="1074.5332"
+   r="6.5436"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#F5F9ED"
+   id="stop4885" />
+			<stop
+   offset="0.3506"
+   style="stop-color:#F3F8EB;stop-opacity:0.5296"
+   id="stop4887" />
+			<stop
+   offset="0.477"
+   style="stop-color:#ECF5E5;stop-opacity:0.3602"
+   id="stop4889" />
+			<stop
+   offset="0.5669"
+   style="stop-color:#E1F0DA;stop-opacity:0.2395"
+   id="stop4891" />
+			<stop
+   offset="0.6397"
+   style="stop-color:#D0E8CB;stop-opacity:0.1418"
+   id="stop4893" />
+			<stop
+   offset="0.7014"
+   style="stop-color:#BADEB7;stop-opacity:0.0591"
+   id="stop4895" />
+			<stop
+   offset="0.7455"
+   style="stop-color:#A5D4A4;stop-opacity:0"
+   id="stop4897" />
+			<stop
+   offset="1"
+   style="stop-color:#000000;stop-opacity:0"
+   id="stop4899" />
+		</radialGradient>
+		<path
+   opacity="0.23"
+   fill="url(#SVGID_265_)"
+   enable-background="new    "
+   d="M315.436,144.817    c-0.848,1.409-1.804,2.394-3.676,2.394c-2.744,0-4.969-2.049-4.969-4.576c0-0.759,0.366-1.3,0.723-1.93    c2.502-1.651,5.041-0.87,6.391,0.46C315.227,142.471,315.479,143.893,315.436,144.817z"
+   id="path4901" />
+	</g>
+	<g
+   id="g4903">
+		
+			<linearGradient
+   id="SVGID_266_"
+   gradientUnits="userSpaceOnUse"
+   x1="288.7539"
+   y1="1074.3438"
+   x2="295.4522"
+   y2="1074.3438"
+   gradientTransform="matrix(1 0 0 1 24 -933)">
+			<stop
+   offset="0"
+   style="stop-color:#517287"
+   id="stop4906" />
+			<stop
+   offset="0.0227"
+   style="stop-color:#6E8B9D"
+   id="stop4908" />
+			<stop
+   offset="0.0532"
+   style="stop-color:#8DA7B5"
+   id="stop4910" />
+			<stop
+   offset="0.0878"
+   style="stop-color:#A9BFCA"
+   id="stop4912" />
+			<stop
+   offset="0.1268"
+   style="stop-color:#BFD2DB"
+   id="stop4914" />
+			<stop
+   offset="0.1724"
+   style="stop-color:#D0E1E7"
+   id="stop4916" />
+			<stop
+   offset="0.2288"
+   style="stop-color:#DBEBF0"
+   id="stop4918" />
+			<stop
+   offset="0.3078"
+   style="stop-color:#E2F1F6"
+   id="stop4920" />
+			<stop
+   offset="0.5273"
+   style="stop-color:#E4F3F7"
+   id="stop4922" />
+		</linearGradient>
+		<path
+   fill="url(#SVGID_266_)"
+   d="M319.041,140.548l-5.699,2.988c-0.195,0.104-0.439,0.028-0.542-0.169    c-0.096-0.182-0.036-0.405,0.132-0.518l5.325-3.613c0.351-0.238,0.825-0.147,1.063,0.203c0.236,0.35,0.146,0.826-0.204,1.064    C319.092,140.521,319.066,140.535,319.041,140.548z"
+   id="path4924" />
+		<path
+   fill="#535A5F"
+   d="M319.148,140.756l-3.699,1.866l-1.844,0.946c-0.084,0.041-0.145,0.076-0.246,0.121    c-0.084,0.038-0.246,0.058-0.346,0.02c-0.232-0.069-0.396-0.266-0.402-0.518c-0.032-0.235,0.203-0.471,0.334-0.532l0.427-0.295    l3.401-2.367l0.848-0.595l0.425-0.297c0.044-0.029,0.05-0.041,0.127-0.084l0.114-0.063c0.119-0.049,0.24-0.081,0.35-0.085    c0.449-0.036,0.922,0.286,1.023,0.725c0.139,0.458-0.112,0.965-0.498,1.152L319.148,140.756z M318.902,140.357l0.018-0.009    c0.24-0.127,0.318-0.395,0.266-0.605c-0.06-0.245-0.285-0.403-0.521-0.399c-0.167-0.042-0.521,0.262-0.791,0.422l-0.866,0.568    l-3.457,2.285c-0.261,0.21-0.677,0.351-0.646,0.566c-0.011,0.098,0.088,0.225,0.188,0.241c0.104,0.038,0.205-0.037,0.38-0.126    l1.823-0.978L318.902,140.357z"
+   id="path4926" />
+	</g>
+	
+		<radialGradient
+   id="SVGID_267_"
+   cx="294.6377"
+   cy="1072.9883"
+   r="2.4992"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+		<stop
+   offset="0"
+   style="stop-color:#46C3D6;stop-opacity:0.74"
+   id="stop4929" />
+		<stop
+   offset="0.1036"
+   style="stop-color:#48C3D3;stop-opacity:0.5799"
+   id="stop4931" />
+		<stop
+   offset="0.1813"
+   style="stop-color:#4DC4C9;stop-opacity:0.4597"
+   id="stop4933" />
+		<stop
+   offset="0.2507"
+   style="stop-color:#57C5B9;stop-opacity:0.3525"
+   id="stop4935" />
+		<stop
+   offset="0.3152"
+   style="stop-color:#65C6A2;stop-opacity:0.2529"
+   id="stop4937" />
+		<stop
+   offset="0.3763"
+   style="stop-color:#76C785;stop-opacity:0.1584"
+   id="stop4939" />
+		<stop
+   offset="0.434"
+   style="stop-color:#8BC961;stop-opacity:0.0692"
+   id="stop4941" />
+		<stop
+   offset="0.4788"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop4943" />
+	</radialGradient>
+	<path
+   opacity="0.52"
+   fill="url(#SVGID_267_)"
+   enable-background="new    "
+   d="M319.116,140.504c0.35-0.238,0.44-0.714,0.204-1.064   c-0.238-0.35-0.715-0.441-1.063-0.203l-0.663,0.449c-0.027,0.505,0.081,1.003,0.285,1.472l1.162-0.609   C319.066,140.535,319.092,140.521,319.116,140.504z"
+   id="path4945" />
+	<g
+   id="g4947">
+		
+			<linearGradient
+   id="SVGID_268_"
+   gradientUnits="userSpaceOnUse"
+   x1="292.9229"
+   y1="1075.7373"
+   x2="298.0211"
+   y2="1080.8356"
+   gradientTransform="matrix(1 0 0 1 24 -933)">
+			<stop
+   offset="0"
+   style="stop-color:#517287"
+   id="stop4950" />
+			<stop
+   offset="0.0227"
+   style="stop-color:#6E8B9D"
+   id="stop4952" />
+			<stop
+   offset="0.0532"
+   style="stop-color:#8DA7B5"
+   id="stop4954" />
+			<stop
+   offset="0.0878"
+   style="stop-color:#A9BFCA"
+   id="stop4956" />
+			<stop
+   offset="0.1268"
+   style="stop-color:#BFD2DB"
+   id="stop4958" />
+			<stop
+   offset="0.1724"
+   style="stop-color:#D0E1E7"
+   id="stop4960" />
+			<stop
+   offset="0.2288"
+   style="stop-color:#DBEBF0"
+   id="stop4962" />
+			<stop
+   offset="0.3078"
+   style="stop-color:#E2F1F6"
+   id="stop4964" />
+			<stop
+   offset="0.5273"
+   style="stop-color:#E4F3F7"
+   id="stop4966" />
+		</linearGradient>
+		<path
+   fill="url(#SVGID_268_)"
+   d="M323.566,145.981l-8.563-0.24c-0.252-0.007-0.448-0.217-0.44-0.469    c0.006-0.242,0.203-0.436,0.44-0.443l8.563-0.239c0.385-0.01,0.705,0.292,0.716,0.676c0.01,0.384-0.293,0.704-0.677,0.715    C323.594,145.981,323.578,145.981,323.566,145.981z"
+   id="path4968" />
+		<path
+   fill="#535A5F"
+   d="M323.348,146.208l-4.973-0.219l-2.592-0.096l-0.648-0.024c-0.208,0.024-0.552-0.085-0.643-0.356    c-0.109-0.248-0.018-0.568,0.224-0.717c0.265-0.149,0.486-0.076,0.695-0.106l5.187-0.203l2.592-0.113    c0.229,0.005,0.396-0.063,0.734,0.042c0.271,0.104,0.488,0.338,0.57,0.621c0.042,0.133,0.044,0.309,0.021,0.414    c-0.037,0.171-0.102,0.303-0.189,0.416c-0.178,0.233-0.48,0.363-0.76,0.351L323.348,146.208z M323.564,145.746L323.564,145.746    c0.158-0.001,0.285-0.072,0.371-0.185c0.049-0.052,0.063-0.128,0.084-0.166c0.017-0.107,0.014-0.152-0.002-0.228    c-0.035-0.134-0.141-0.252-0.271-0.31c-0.074-0.05-0.352-0.031-0.553-0.031l-2.598,0.032l-5.188,0.087    c-0.213,0.017-0.457-0.025-0.574,0.057c-0.139,0.075-0.199,0.265-0.134,0.417c0.071,0.159,0.216,0.215,0.433,0.202l0.647,0.013    l2.594,0.05L323.564,145.746z"
+   id="path4970" />
+	</g>
+	
+		<radialGradient
+   id="SVGID_269_"
+   cx="299.2491"
+   cy="1078.4385"
+   r="2.3255"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+		<stop
+   offset="0"
+   style="stop-color:#46C3D6;stop-opacity:0.74"
+   id="stop4973" />
+		<stop
+   offset="0.1036"
+   style="stop-color:#48C3D3;stop-opacity:0.5799"
+   id="stop4975" />
+		<stop
+   offset="0.1813"
+   style="stop-color:#4DC4C9;stop-opacity:0.4597"
+   id="stop4977" />
+		<stop
+   offset="0.2507"
+   style="stop-color:#57C5B9;stop-opacity:0.3525"
+   id="stop4979" />
+		<stop
+   offset="0.3152"
+   style="stop-color:#65C6A2;stop-opacity:0.2529"
+   id="stop4981" />
+		<stop
+   offset="0.3763"
+   style="stop-color:#76C785;stop-opacity:0.1584"
+   id="stop4983" />
+		<stop
+   offset="0.434"
+   style="stop-color:#8BC961;stop-opacity:0.0692"
+   id="stop4985" />
+		<stop
+   offset="0.4788"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop4987" />
+	</radialGradient>
+	<path
+   opacity="0.52"
+   fill="url(#SVGID_269_)"
+   enable-background="new    "
+   d="M323.605,145.981   c0.384-0.011,0.687-0.331,0.677-0.715c-0.011-0.384-0.331-0.687-0.716-0.676l-1.457,0.041c-0.025,0.442,0.033,0.887,0.17,1.314   l1.287,0.037C323.578,145.981,323.594,145.981,323.605,145.981z"
+   id="path4989" />
+	<g
+   id="g4991">
+		
+			<linearGradient
+   id="SVGID_270_"
+   gradientUnits="userSpaceOnUse"
+   x1="287.0918"
+   y1="1079.375"
+   x2="288.8726"
+   y2="1087.238"
+   gradientTransform="matrix(1 0 0 1 24 -933)">
+			<stop
+   offset="0"
+   style="stop-color:#202D36"
+   id="stop4994" />
+			<stop
+   offset="0.0732"
+   style="stop-color:#517287"
+   id="stop4996" />
+			<stop
+   offset="0.1426"
+   style="stop-color:#7895A5"
+   id="stop4998" />
+			<stop
+   offset="0.2232"
+   style="stop-color:#9FB6C2"
+   id="stop5000" />
+			<stop
+   offset="0.3033"
+   style="stop-color:#BDD1D9"
+   id="stop5002" />
+			<stop
+   offset="0.3816"
+   style="stop-color:#D3E4EA"
+   id="stop5004" />
+			<stop
+   offset="0.4572"
+   style="stop-color:#E0EFF4"
+   id="stop5006" />
+			<stop
+   offset="0.5273"
+   style="stop-color:#E4F3F7"
+   id="stop5008" />
+		</linearGradient>
+		<path
+   fill="url(#SVGID_270_)"
+   d="M311.48,146.761l2.16,6.716c0.151,0.481-0.109,1.002-0.599,1.157    c-0.479,0.156-1.004-0.108-1.153-0.596c-0.017-0.033-0.021-0.065-0.027-0.101l-1.387-6.917c-0.062-0.282,0.127-0.557,0.402-0.614    C311.147,146.356,311.402,146.512,311.48,146.761z"
+   id="path5010" />
+		<path
+   fill="#535A5F"
+   d="M311.611,146.72l1.502,4.42l0.736,2.217c0.039,0.146,0.055,0.179,0.063,0.328    c0.018,0.144-0.01,0.265-0.033,0.381c-0.064,0.231-0.207,0.449-0.396,0.604c-0.188,0.162-0.439,0.238-0.666,0.248    c-0.274,0.014-0.504-0.063-0.709-0.209c-0.195-0.143-0.354-0.344-0.436-0.576c-0.07-0.244-0.083-0.396-0.128-0.6l-0.218-1.148    l-0.434-2.294l-0.427-2.296l-0.104-0.574c-0.02-0.085-0.041-0.204-0.04-0.307c0.004-0.143,0.049-0.251,0.108-0.356    C310.717,146.118,311.462,146.211,311.611,146.72z M311.352,146.803c-0.063-0.303-0.533-0.378-0.688-0.098    c-0.081,0.13-0.07,0.244-0.018,0.462l0.125,0.57l0.496,2.282l0.482,2.284l0.241,1.143c0.041,0.182,0.077,0.414,0.122,0.537    c0.049,0.145,0.146,0.254,0.264,0.334c0.107,0.086,0.279,0.123,0.395,0.115c0.16-0.012,0.301-0.053,0.41-0.145    c0.107-0.088,0.192-0.211,0.235-0.348c0.021-0.072,0.026-0.146,0.021-0.197c0.016-0.043-0.027-0.203-0.043-0.242l-0.69-2.229    L311.352,146.803z"
+   id="path5012" />
+	</g>
+	
+		<radialGradient
+   id="SVGID_271_"
+   cx="-2091.7983"
+   cy="1486.7656"
+   r="3.0093"
+   gradientTransform="matrix(-0.2616 -0.9652 0.6428 -0.1743 -1190.2666 -1606.5527)"
+   gradientUnits="userSpaceOnUse">
+		<stop
+   offset="0"
+   style="stop-color:#46C3D6;stop-opacity:0.74"
+   id="stop5015" />
+		<stop
+   offset="0.1404"
+   style="stop-color:#48C3D3;stop-opacity:0.5799"
+   id="stop5017" />
+		<stop
+   offset="0.2458"
+   style="stop-color:#4DC4C9;stop-opacity:0.4597"
+   id="stop5019" />
+		<stop
+   offset="0.3399"
+   style="stop-color:#57C5B9;stop-opacity:0.3525"
+   id="stop5021" />
+		<stop
+   offset="0.4273"
+   style="stop-color:#65C6A2;stop-opacity:0.2529"
+   id="stop5023" />
+		<stop
+   offset="0.5101"
+   style="stop-color:#76C785;stop-opacity:0.1584"
+   id="stop5025" />
+		<stop
+   offset="0.5883"
+   style="stop-color:#8BC961;stop-opacity:0.0692"
+   id="stop5027" />
+		<stop
+   offset="0.649"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop5029" />
+	</radialGradient>
+	<path
+   opacity="0.52"
+   fill="url(#SVGID_271_)"
+   enable-background="new    "
+   d="M312.152,151.305   c-0.23,0.133-0.489,0.264-0.735,0.412l0.444,2.223c0.008,0.033,0.017,0.066,0.027,0.104c0.149,0.481,0.674,0.752,1.153,0.599   s0.75-0.679,0.599-1.156l-0.738-2.295C312.619,151.18,312.346,151.229,312.152,151.305z"
+   id="path5031" />
+	<path
+   fill="#E4F3F7"
+   stroke="#3D4144"
+   stroke-width="0.3301"
+   stroke-miterlimit="10"
+   d="M306.939,148.25l-4.219,4.262   c-0.301,0.301-0.779,0.303-1.078,0.008c-0.304-0.297-0.307-0.781-0.011-1.078c0.021-0.018,0.035-0.029,0.06-0.049l4.602-3.845   c0.203-0.169,0.504-0.142,0.674,0.06C307.124,147.798,307.109,148.077,306.939,148.25z"
+   id="path5033" />
+	
+		<radialGradient
+   id="SVGID_272_"
+   cx="278.5401"
+   cy="1084.6074"
+   r="3.0483"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+		<stop
+   offset="0"
+   style="stop-color:#46C3D6;stop-opacity:0.74"
+   id="stop5036" />
+		<stop
+   offset="0.1036"
+   style="stop-color:#48C3D3;stop-opacity:0.5799"
+   id="stop5038" />
+		<stop
+   offset="0.1813"
+   style="stop-color:#4DC4C9;stop-opacity:0.4597"
+   id="stop5040" />
+		<stop
+   offset="0.2507"
+   style="stop-color:#57C5B9;stop-opacity:0.3525"
+   id="stop5042" />
+		<stop
+   offset="0.3152"
+   style="stop-color:#65C6A2;stop-opacity:0.2529"
+   id="stop5044" />
+		<stop
+   offset="0.3763"
+   style="stop-color:#76C785;stop-opacity:0.1584"
+   id="stop5046" />
+		<stop
+   offset="0.434"
+   style="stop-color:#8BC961;stop-opacity:0.0692"
+   id="stop5048" />
+		<stop
+   offset="0.4788"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop5050" />
+	</radialGradient>
+	<path
+   opacity="0.52"
+   fill="url(#SVGID_272_)"
+   enable-background="new    "
+   d="M303.326,150.175   c-0.036-0.024-0.072-0.042-0.108-0.057l-1.526,1.274c-0.02,0.015-0.037,0.026-0.055,0.049c-0.296,0.297-0.293,0.781,0.006,1.078   c0.299,0.295,0.782,0.293,1.078-0.013l1.51-1.521C304.002,150.68,303.701,150.404,303.326,150.175z"
+   id="path5052" />
+	<g
+   id="g5054">
+		
+			<linearGradient
+   id="SVGID_273_"
+   gradientUnits="userSpaceOnUse"
+   x1="280.7764"
+   y1="1079.1465"
+   x2="277.2785"
+   y2="1074.6692"
+   gradientTransform="matrix(1 0 0 1 24 -933)">
+			<stop
+   offset="0"
+   style="stop-color:#517287"
+   id="stop5057" />
+			<stop
+   offset="0.0118"
+   style="stop-color:#5C7B8F"
+   id="stop5059" />
+			<stop
+   offset="0.057"
+   style="stop-color:#809BAB"
+   id="stop5061" />
+			<stop
+   offset="0.1063"
+   style="stop-color:#9FB7C3"
+   id="stop5063" />
+			<stop
+   offset="0.1597"
+   style="stop-color:#B8CDD6"
+   id="stop5065" />
+			<stop
+   offset="0.219"
+   style="stop-color:#CCDEE5"
+   id="stop5067" />
+			<stop
+   offset="0.2872"
+   style="stop-color:#DAEAEF"
+   id="stop5069" />
+			<stop
+   offset="0.3724"
+   style="stop-color:#E2F1F5"
+   id="stop5071" />
+			<stop
+   offset="0.5273"
+   style="stop-color:#E4F3F7"
+   id="stop5073" />
+		</linearGradient>
+		<path
+   fill="url(#SVGID_273_)"
+   d="M300.389,142.727l6.045,1.094c0.27,0.048,0.439,0.302,0.396,0.566    c-0.045,0.244-0.27,0.413-0.507,0.399l-6.136-0.345c-0.479-0.026-0.842-0.435-0.813-0.911c0.024-0.476,0.438-0.841,0.913-0.814    C300.316,142.717,300.355,142.721,300.389,142.727z"
+   id="path5075" />
+		<path
+   fill="#535A5F"
+   d="M300.43,142.502l4.063,0.819l2.045,0.401c0.444,0.147,0.56,0.75,0.19,1.045    c-0.158,0.15-0.429,0.153-0.574,0.135l-0.516-0.022l-4.144-0.17l-1.035-0.038c-0.161-0.007-0.354,0-0.558-0.059    c-0.239-0.068-0.4-0.2-0.547-0.372c-0.139-0.169-0.221-0.387-0.229-0.607l-0.004-0.083c0.001-0.025-0.005-0.003,0.002-0.066    l0.004-0.032l0.021-0.128c0.033-0.109,0.076-0.242,0.142-0.326c0.222-0.389,0.728-0.581,1.127-0.498L300.43,142.502z     M300.379,142.957l-0.02-0.003c-0.563-0.093-0.947,0.577-0.623,1.002c0.154,0.221,0.354,0.271,0.75,0.286l1.033,0.079l4.133,0.295    l0.517,0.036c0.19,0.02,0.296,0.019,0.409-0.068c0.104-0.075,0.156-0.215,0.13-0.35c-0.022-0.126-0.128-0.244-0.241-0.275    l-2.027-0.351L300.379,142.957z"
+   id="path5077" />
+	</g>
+	
+		<radialGradient
+   id="SVGID_274_"
+   cx="276.836"
+   cy="1076.6475"
+   r="2.8784"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+		<stop
+   offset="0"
+   style="stop-color:#46C3D6;stop-opacity:0.74"
+   id="stop5080" />
+		<stop
+   offset="0.1036"
+   style="stop-color:#48C3D3;stop-opacity:0.5799"
+   id="stop5082" />
+		<stop
+   offset="0.1813"
+   style="stop-color:#4DC4C9;stop-opacity:0.4597"
+   id="stop5084" />
+		<stop
+   offset="0.2507"
+   style="stop-color:#57C5B9;stop-opacity:0.3525"
+   id="stop5086" />
+		<stop
+   offset="0.3152"
+   style="stop-color:#65C6A2;stop-opacity:0.2529"
+   id="stop5088" />
+		<stop
+   offset="0.3763"
+   style="stop-color:#76C785;stop-opacity:0.1584"
+   id="stop5090" />
+		<stop
+   offset="0.434"
+   style="stop-color:#8BC961;stop-opacity:0.0692"
+   id="stop5092" />
+		<stop
+   offset="0.4788"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop5094" />
+	</radialGradient>
+	<path
+   opacity="0.52"
+   fill="url(#SVGID_274_)"
+   enable-background="new    "
+   d="M301.938,143.007l-1.549-0.28   c-0.033-0.006-0.07-0.01-0.104-0.012c-0.479-0.027-0.885,0.338-0.913,0.814c-0.024,0.476,0.338,0.885,0.815,0.911l1.936,0.109   C302.23,144.068,302.186,143.546,301.938,143.007z"
+   id="path5096" />
+	<g
+   id="g5098">
+		<g
+   id="g5100">
+			<circle
+   fill="#FFFFFF"
+   cx="298.666"
+   cy="143.366"
+   r="2.2"
+   id="circle5102" />
+			<path
+   fill="#39444F"
+   d="M301.036,143.375c-0.009,0.604-0.284,1.219-0.72,1.642c-0.438,0.431-1.041,0.673-1.651,0.688     c-1.249,0.053-2.413-1.042-2.407-2.351c-0.063-1.266,1.085-2.484,2.422-2.436c0.615-0.005,1.271,0.282,1.694,0.739     c0.438,0.457,0.681,1.087,0.663,1.708L301.036,143.375z M300.695,143.366c-0.01-1.09-0.98-1.992-2.043-1.954     c-0.485,0.005-1.01,0.205-1.373,0.566c-0.368,0.365-0.592,0.853-0.605,1.398c-0.058,1.043,0.891,2.061,1.991,2.05     c1.112,0.056,2.097-0.971,2.03-2.069V143.366z"
+   id="path5104" />
+		</g>
+		
+			<radialGradient
+   id="SVGID_275_"
+   cx="454.6104"
+   cy="584.3145"
+   r="2.5904"
+   gradientTransform="matrix(0.9092 0.2908 -0.2908 0.9092 55.1576 -520.1451)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.4121"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop5107" />
+			<stop
+   offset="0.5849"
+   style="stop-color:#0A1827;stop-opacity:0.5379"
+   id="stop5109" />
+			<stop
+   offset="0.6472"
+   style="stop-color:#091420;stop-opacity:0.7317"
+   id="stop5111" />
+			<stop
+   offset="0.6914"
+   style="stop-color:#060D15;stop-opacity:0.8694"
+   id="stop5113" />
+			<stop
+   offset="0.727"
+   style="stop-color:#010204;stop-opacity:0.9803"
+   id="stop5115" />
+			<stop
+   offset="0.7333"
+   style="stop-color:#000000"
+   id="stop5117" />
+			<stop
+   offset="0.7876"
+   style="stop-color:#03080D;stop-opacity:0.6108"
+   id="stop5119" />
+			<stop
+   offset="0.8727"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop5121" />
+		</radialGradient>
+		<circle
+   opacity="0.36"
+   fill="url(#SVGID_275_)"
+   enable-background="new    "
+   cx="298.645"
+   cy="143.193"
+   r="2.376"
+   id="circle5123" />
+		
+			<radialGradient
+   id="SVGID_276_"
+   cx="313.3262"
+   cy="1123.4941"
+   r="3.5705"
+   gradientTransform="matrix(0.9545 0 0 0.9545 -0.1888 -930.3677)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#B4CB80;stop-opacity:0"
+   id="stop5126" />
+			<stop
+   offset="1"
+   style="stop-color:#60BD71"
+   id="stop5128" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_276_)"
+   enable-background="new    "
+   cx="298.666"
+   cy="143.341"
+   r="2.2"
+   id="circle5130" />
+		
+			<radialGradient
+   id="SVGID_277_"
+   cx="313.086"
+   cy="1124.8848"
+   r="2.3048"
+   gradientTransform="matrix(0.9545 0 0 0.9545 -0.1888 -930.3677)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#9FCB40;stop-opacity:0.47"
+   id="stop5133" />
+			<stop
+   offset="1"
+   style="stop-color:#458691"
+   id="stop5135" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_277_)"
+   enable-background="new    "
+   cx="298.666"
+   cy="143.341"
+   r="2.2"
+   id="circle5137" />
+		
+			<radialGradient
+   id="SVGID_278_"
+   cx="313.0381"
+   cy="1224.2568"
+   r="1.2279"
+   gradientTransform="matrix(0.9545 0 0 0.8789 -0.1888 -933.7701)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop5140" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop5142" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop5144" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop5146" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop5148" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop5150" />
+		</radialGradient>
+		<ellipse
+   opacity="0.5"
+   fill="url(#SVGID_278_)"
+   enable-background="new    "
+   cx="298.62"
+   cy="142.222"
+   rx="1.173"
+   ry="1.081"
+   id="ellipse5152" />
+		
+			<radialGradient
+   id="SVGID_279_"
+   cx="313.21"
+   cy="1123.4824"
+   r="0.6137"
+   gradientTransform="matrix(0.9545 0 0 0.9545 -0.1888 -930.3677)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#EEF8FB"
+   id="stop5155" />
+			<stop
+   offset="0.4122"
+   style="stop-color:#EDF7F8;stop-opacity:0.8016"
+   id="stop5157" />
+			<stop
+   offset="0.5215"
+   style="stop-color:#E9F5EE;stop-opacity:0.6525"
+   id="stop5159" />
+			<stop
+   offset="0.619"
+   style="stop-color:#E2F1DE;stop-opacity:0.5196"
+   id="stop5161" />
+			<stop
+   offset="0.7096"
+   style="stop-color:#D8ECC7;stop-opacity:0.396"
+   id="stop5163" />
+			<stop
+   offset="0.7954"
+   style="stop-color:#CCE4AA;stop-opacity:0.2789"
+   id="stop5165" />
+			<stop
+   offset="0.8777"
+   style="stop-color:#BCDC86;stop-opacity:0.1667"
+   id="stop5167" />
+			<stop
+   offset="0.9557"
+   style="stop-color:#ABD25B;stop-opacity:0.0604"
+   id="stop5169" />
+			<stop
+   offset="1"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop5171" />
+		</radialGradient>
+		<circle
+   fill="url(#SVGID_279_)"
+   cx="298.785"
+   cy="142.004"
+   r="0.585"
+   id="circle5173" />
+		<circle
+   opacity="0.62"
+   fill="#FFFFFF"
+   enable-background="new    "
+   cx="298.873"
+   cy="141.761"
+   r="0.23"
+   id="circle5175" />
+		
+			<radialGradient
+   id="SVGID_280_"
+   cx="-1314.9097"
+   cy="1487.5908"
+   r="1.5698"
+   gradientTransform="matrix(0.222 -0.9284 0.9284 0.222 -789.3549 -1407.3914)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop5178" />
+			<stop
+   offset="0.3195"
+   style="stop-color:#050709"
+   id="stop5180" />
+			<stop
+   offset="0.5599"
+   style="stop-color:#070C13"
+   id="stop5182" />
+			<stop
+   offset="0.7738"
+   style="stop-color:#0A1523"
+   id="stop5184" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0B1929"
+   id="stop5186" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C"
+   id="stop5188" />
+		</radialGradient>
+		<path
+   opacity="0.4"
+   fill="url(#SVGID_280_)"
+   enable-background="new    "
+   d="M299.402,141.544    c0.908,0.318,1.465,1.277,1.229,2.254s-1.127,1.672-1.968,1.551c1.114-0.123,1.595-1.207,1.69-1.584    C300.607,142.81,300.049,142.032,299.402,141.544z"
+   id="path5190" />
+	</g>
+	<g
+   id="g5192">
+		<g
+   id="g5194">
+			<circle
+   fill="#FFFFFF"
+   cx="301.1"
+   cy="153.016"
+   r="1.991"
+   id="circle5196" />
+			<path
+   fill="#39444F"
+   d="M303.314,153.027c-0.021,1.166-1.063,2.154-2.229,2.156c-1.134,0.045-2.253-0.941-2.255-2.188     c-0.066-1.188,1.008-2.354,2.281-2.308c0.572-0.004,1.193,0.274,1.593,0.709c0.409,0.438,0.629,1.028,0.604,1.608v0.017h0.004     v0.004h0.002V153.027z M302.864,153.016c-0.026-0.951-0.869-1.703-1.78-1.668c-0.854-0.006-1.686,0.734-1.701,1.68     c-0.061,0.889,0.729,1.813,1.725,1.803c0.457,0.018,0.953-0.182,1.275-0.523c0.331-0.354,0.5-0.811,0.482-1.297L302.864,153.016z     "
+   id="path5198" />
+		</g>
+		
+			<radialGradient
+   id="SVGID_281_"
+   cx="408.5576"
+   cy="558.3291"
+   r="2.238"
+   gradientTransform="matrix(0.9525 0.3046 -0.3046 0.9525 81.9305 -503.3005)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.4121"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop5201" />
+			<stop
+   offset="0.5849"
+   style="stop-color:#0A1827;stop-opacity:0.5379"
+   id="stop5203" />
+			<stop
+   offset="0.6472"
+   style="stop-color:#091420;stop-opacity:0.7317"
+   id="stop5205" />
+			<stop
+   offset="0.6914"
+   style="stop-color:#060D15;stop-opacity:0.8694"
+   id="stop5207" />
+			<stop
+   offset="0.727"
+   style="stop-color:#010204;stop-opacity:0.9803"
+   id="stop5209" />
+			<stop
+   offset="0.7333"
+   style="stop-color:#000000"
+   id="stop5211" />
+			<stop
+   offset="0.7876"
+   style="stop-color:#03080D;stop-opacity:0.6108"
+   id="stop5213" />
+			<stop
+   offset="0.8727"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop5215" />
+		</radialGradient>
+		<circle
+   opacity="0.2"
+   fill="url(#SVGID_281_)"
+   enable-background="new    "
+   cx="301.078"
+   cy="152.858"
+   r="2.15"
+   id="circle5217" />
+		
+			<radialGradient
+   id="SVGID_282_"
+   cx="277.3067"
+   cy="1084.79"
+   r="3.0826"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#8083CB;stop-opacity:0"
+   id="stop5220" />
+			<stop
+   offset="1"
+   style="stop-color:#BA74C4"
+   id="stop5222" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_282_)"
+   enable-background="new    "
+   cx="301.1"
+   cy="152.992"
+   r="1.991"
+   id="circle5224" />
+		
+			<radialGradient
+   id="SVGID_283_"
+   cx="277.0996"
+   cy="1085.9922"
+   r="1.9902"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#A0539F"
+   id="stop5227" />
+			<stop
+   offset="0.2909"
+   style="stop-color:#7452A1"
+   id="stop5229" />
+			<stop
+   offset="1"
+   style="stop-color:#674BA3"
+   id="stop5231" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_283_)"
+   enable-background="new    "
+   cx="301.1"
+   cy="152.993"
+   r="1.99"
+   id="circle5233" />
+		
+			<radialGradient
+   id="SVGID_284_"
+   cx="277.0996"
+   cy="1084.7832"
+   r="0.5281"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#EEF8FB"
+   id="stop5236" />
+			<stop
+   offset="0.4119"
+   style="stop-color:#EDF7F8;stop-opacity:0.802"
+   id="stop5238" />
+			<stop
+   offset="0.521"
+   style="stop-color:#ECF5EE;stop-opacity:0.6532"
+   id="stop5240" />
+			<stop
+   offset="0.6183"
+   style="stop-color:#E8F1DE;stop-opacity:0.5206"
+   id="stop5242" />
+			<stop
+   offset="0.7087"
+   style="stop-color:#E4ECC7;stop-opacity:0.3972"
+   id="stop5244" />
+			<stop
+   offset="0.7943"
+   style="stop-color:#DEE5AA;stop-opacity:0.2804"
+   id="stop5246" />
+			<stop
+   offset="0.8765"
+   style="stop-color:#D7DC86;stop-opacity:0.1684"
+   id="stop5248" />
+			<stop
+   offset="0.9543"
+   style="stop-color:#CFD25C;stop-opacity:0.0623"
+   id="stop5250" />
+			<stop
+   offset="1"
+   style="stop-color:#C9CB3F;stop-opacity:0"
+   id="stop5252" />
+		</radialGradient>
+		<circle
+   fill="url(#SVGID_284_)"
+   cx="301.1"
+   cy="151.783"
+   r="0.53"
+   id="circle5254" />
+		<circle
+   opacity="0.62"
+   fill="#FFFFFF"
+   enable-background="new    "
+   cx="301.212"
+   cy="151.578"
+   r="0.209"
+   id="circle5256" />
+	</g>
+	<g
+   id="g5258">
+		<g
+   id="g5260">
+			
+				<radialGradient
+   id="SVGID_285_"
+   cx="296.5606"
+   cy="1071.7773"
+   r="2.1724"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+				<stop
+   offset="0.7758"
+   style="stop-color:#D5E2EE"
+   id="stop5263" />
+				<stop
+   offset="0.8263"
+   style="stop-color:#D1DFED"
+   id="stop5265" />
+				<stop
+   offset="0.8714"
+   style="stop-color:#C7D6E8"
+   id="stop5267" />
+				<stop
+   offset="0.9144"
+   style="stop-color:#B4C6E1"
+   id="stop5269" />
+				<stop
+   offset="0.9562"
+   style="stop-color:#9BB0D8"
+   id="stop5271" />
+				<stop
+   offset="0.9968"
+   style="stop-color:#7A95CB"
+   id="stop5273" />
+				<stop
+   offset="1"
+   style="stop-color:#7792CA"
+   id="stop5275" />
+			</radialGradient>
+			<circle
+   fill="url(#SVGID_285_)"
+   cx="320.561"
+   cy="138.778"
+   r="2.172"
+   id="circle5277" />
+			<path
+   fill="#39444F"
+   d="M322.902,138.787c-0.008,0.597-0.279,1.205-0.709,1.623c-0.437,0.426-1.028,0.665-1.633,0.68     c-1.234,0.057-2.39-1.039-2.381-2.312c-0.063-1.271,1.066-2.461,2.394-2.418c0.608-0.005,1.253,0.278,1.676,0.73     c0.435,0.451,0.672,1.074,0.655,1.688L322.902,138.787z M322.563,138.778c-0.011-1.076-0.967-1.963-2.014-1.925     c-0.48,0.006-0.997,0.202-1.355,0.558c-0.356,0.356-0.582,0.85-0.596,1.368c-0.058,1.049,0.877,2.037,1.965,2.032     c1.103,0.056,2.065-0.958,2.002-2.042L322.563,138.778z"
+   id="path5279" />
+		</g>
+		
+			<radialGradient
+   id="SVGID_286_"
+   cx="-1548.6035"
+   cy="370.7784"
+   r="2.4718"
+   gradientTransform="matrix(0.0099 -1 1 0.0099 -35.0023 -1413.4995)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.4121"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop5282" />
+			<stop
+   offset="0.5849"
+   style="stop-color:#0A1827;stop-opacity:0.5379"
+   id="stop5284" />
+			<stop
+   offset="0.6472"
+   style="stop-color:#091420;stop-opacity:0.7317"
+   id="stop5286" />
+			<stop
+   offset="0.6914"
+   style="stop-color:#060D15;stop-opacity:0.8694"
+   id="stop5288" />
+			<stop
+   offset="0.727"
+   style="stop-color:#010204;stop-opacity:0.9803"
+   id="stop5290" />
+			<stop
+   offset="0.7333"
+   style="stop-color:#000000"
+   id="stop5292" />
+			<stop
+   offset="0.7876"
+   style="stop-color:#03080D;stop-opacity:0.6108"
+   id="stop5294" />
+			<stop
+   offset="0.8727"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop5296" />
+		</radialGradient>
+		<circle
+   opacity="0.28"
+   fill="url(#SVGID_286_)"
+   enable-background="new    "
+   cx="320.366"
+   cy="138.724"
+   r="2.376"
+   id="circle5298" />
+		
+			<radialGradient
+   id="SVGID_287_"
+   cx="296.7881"
+   cy="1070.4443"
+   r="3.3666"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#B4CB80;stop-opacity:0"
+   id="stop5301" />
+			<stop
+   offset="1"
+   style="stop-color:#60BD71"
+   id="stop5303" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_287_)"
+   enable-background="new    "
+   cx="320.563"
+   cy="138.755"
+   r="2.173"
+   id="circle5305" />
+		
+			<radialGradient
+   id="SVGID_288_"
+   cx="296.5606"
+   cy="1071.7549"
+   r="2.1719"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#9FCB40;stop-opacity:0.51"
+   id="stop5308" />
+			<stop
+   offset="1"
+   style="stop-color:#458691"
+   id="stop5310" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_288_)"
+   enable-background="new    "
+   cx="320.561"
+   cy="138.755"
+   r="2.172"
+   id="circle5312" />
+		
+			<radialGradient
+   id="SVGID_289_"
+   cx="296.543"
+   cy="1166.6582"
+   r="0.8482"
+   gradientTransform="matrix(1 0 0 0.9207 24 -936.5648)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop5315" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop5317" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop5319" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop5321" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop5323" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop5325" />
+		</radialGradient>
+		<ellipse
+   fill="url(#SVGID_289_)"
+   cx="320.543"
+   cy="137.577"
+   rx="0.848"
+   ry="0.78"
+   id="ellipse5327" />
+		
+			<radialGradient
+   id="SVGID_290_"
+   cx="296.4668"
+   cy="1070.3379"
+   r="0.5781"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#EEF8FB"
+   id="stop5330" />
+			<stop
+   offset="0.4122"
+   style="stop-color:#EDF7F8;stop-opacity:0.8016"
+   id="stop5332" />
+			<stop
+   offset="0.5215"
+   style="stop-color:#E9F5EE;stop-opacity:0.6525"
+   id="stop5334" />
+			<stop
+   offset="0.619"
+   style="stop-color:#E2F1DE;stop-opacity:0.5196"
+   id="stop5336" />
+			<stop
+   offset="0.7096"
+   style="stop-color:#D8ECC7;stop-opacity:0.396"
+   id="stop5338" />
+			<stop
+   offset="0.7954"
+   style="stop-color:#CCE4AA;stop-opacity:0.2789"
+   id="stop5340" />
+			<stop
+   offset="0.8777"
+   style="stop-color:#BCDC86;stop-opacity:0.1667"
+   id="stop5342" />
+			<stop
+   offset="0.9557"
+   style="stop-color:#ABD25B;stop-opacity:0.0604"
+   id="stop5344" />
+			<stop
+   offset="1"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop5346" />
+		</radialGradient>
+		<circle
+   fill="url(#SVGID_290_)"
+   cx="320.467"
+   cy="137.338"
+   r="0.578"
+   id="circle5348" />
+		<circle
+   opacity="0.62"
+   fill="#FFFFFF"
+   enable-background="new    "
+   cx="320.436"
+   cy="137.142"
+   r="0.227"
+   id="circle5350" />
+		
+			<radialGradient
+   id="SVGID_291_"
+   cx="-183.6992"
+   cy="1204.8516"
+   r="1.061"
+   gradientTransform="matrix(1.1333 -0.416 0.3445 0.9387 114.2 -1067.6246)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#46C3D6;stop-opacity:0.58"
+   id="stop5353" />
+			<stop
+   offset="0.4253"
+   style="stop-color:#48C3D3;stop-opacity:0.4545"
+   id="stop5355" />
+			<stop
+   offset="0.5444"
+   style="stop-color:#4DC4C9;stop-opacity:0.3603"
+   id="stop5357" />
+			<stop
+   offset="0.6507"
+   style="stop-color:#57C5B9;stop-opacity:0.2763"
+   id="stop5359" />
+			<stop
+   offset="0.7494"
+   style="stop-color:#65C6A2;stop-opacity:0.1982"
+   id="stop5361" />
+			<stop
+   offset="0.843"
+   style="stop-color:#76C785;stop-opacity:0.1242"
+   id="stop5363" />
+			<stop
+   offset="0.9314"
+   style="stop-color:#8BC961;stop-opacity:0.0542"
+   id="stop5365" />
+			<stop
+   offset="1"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop5367" />
+		</radialGradient>
+		<path
+   opacity="0.52"
+   fill="url(#SVGID_291_)"
+   enable-background="new    "
+   d="M322.305,139.33    c0.203,0.551-0.173,1.194-0.836,1.438c-0.666,0.244-1.367-0.004-1.568-0.555c-0.197-0.549,0.179-1.193,0.843-1.438    C321.4,138.531,322.104,138.78,322.305,139.33z"
+   id="path5369" />
+		
+			<radialGradient
+   id="SVGID_292_"
+   cx="927.7207"
+   cy="721.7422"
+   r="1.4671"
+   gradientTransform="matrix(0.701 0.7131 -0.7131 0.701 184.1534 -1027.8478)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop5372" />
+			<stop
+   offset="0.3195"
+   style="stop-color:#050709"
+   id="stop5374" />
+			<stop
+   offset="0.5599"
+   style="stop-color:#070C13"
+   id="stop5376" />
+			<stop
+   offset="0.7738"
+   style="stop-color:#0A1523"
+   id="stop5378" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0B1929"
+   id="stop5380" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C"
+   id="stop5382" />
+		</radialGradient>
+		<path
+   opacity="0.41"
+   fill="url(#SVGID_292_)"
+   enable-background="new    "
+   d="M321.781,140.424    c-0.742,0.593-1.998,0.491-2.682-0.228c-0.514-0.534-0.707-1.6-0.166-2.241c-0.48,0.998,0.09,1.789,0.371,2.053    C320.1,140.756,321.035,140.709,321.781,140.424z"
+   id="path5384" />
+	</g>
+	<g
+   id="g5386">
+		<g
+   id="g5388">
+			
+				<radialGradient
+   id="SVGID_293_"
+   cx="301.5703"
+   cy="1078.0664"
+   r="2.0688"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+				<stop
+   offset="0.7758"
+   style="stop-color:#D5E2EE"
+   id="stop5391" />
+				<stop
+   offset="0.8263"
+   style="stop-color:#D1DFED"
+   id="stop5393" />
+				<stop
+   offset="0.8714"
+   style="stop-color:#C7D6E8"
+   id="stop5395" />
+				<stop
+   offset="0.9144"
+   style="stop-color:#B4C6E1"
+   id="stop5397" />
+				<stop
+   offset="0.9562"
+   style="stop-color:#9BB0D8"
+   id="stop5399" />
+				<stop
+   offset="0.9968"
+   style="stop-color:#7A95CB"
+   id="stop5401" />
+				<stop
+   offset="1"
+   style="stop-color:#7792CA"
+   id="stop5403" />
+			</radialGradient>
+			<circle
+   fill="url(#SVGID_293_)"
+   cx="325.57"
+   cy="145.067"
+   r="2.069"
+   id="circle5405" />
+			<path
+   fill="#39444F"
+   d="M327.811,145.076c-0.008,1.184-1.063,2.204-2.246,2.199c-1.166,0.051-2.272-0.979-2.271-2.218     c-0.063-1.196,1.022-2.351,2.29-2.305c0.581-0.004,1.199,0.268,1.604,0.7c0.416,0.432,0.646,1.029,0.625,1.615v0.009H327.811     L327.811,145.076z M327.469,145.067c-0.012-1.021-0.92-1.859-1.91-1.822c-0.945-0.013-1.847,0.816-1.85,1.833     c-0.053,0.973,0.822,1.926,1.868,1.919c1.028,0.054,1.959-0.91,1.894-1.938L327.469,145.067z"
+   id="path5407" />
+		</g>
+		
+			<radialGradient
+   id="SVGID_294_"
+   cx="-1554.8428"
+   cy="375.8575"
+   r="2.3571"
+   gradientTransform="matrix(0.0099 -1 1 0.0099 -35.0023 -1413.4995)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.4121"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop5410" />
+			<stop
+   offset="0.5849"
+   style="stop-color:#0A1827;stop-opacity:0.5379"
+   id="stop5412" />
+			<stop
+   offset="0.6472"
+   style="stop-color:#091420;stop-opacity:0.7317"
+   id="stop5414" />
+			<stop
+   offset="0.6914"
+   style="stop-color:#060D15;stop-opacity:0.8694"
+   id="stop5416" />
+			<stop
+   offset="0.727"
+   style="stop-color:#010204;stop-opacity:0.9803"
+   id="stop5418" />
+			<stop
+   offset="0.7333"
+   style="stop-color:#000000"
+   id="stop5420" />
+			<stop
+   offset="0.7876"
+   style="stop-color:#03080D;stop-opacity:0.6108"
+   id="stop5422" />
+			<stop
+   offset="0.8727"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop5424" />
+		</radialGradient>
+		<circle
+   opacity="0.28"
+   fill="url(#SVGID_294_)"
+   enable-background="new    "
+   cx="325.385"
+   cy="145.016"
+   r="2.263"
+   id="circle5426" />
+		
+			<radialGradient
+   id="SVGID_295_"
+   cx="301.7862"
+   cy="1076.7979"
+   r="3.2024"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#B4CB80;stop-opacity:0"
+   id="stop5429" />
+			<stop
+   offset="1"
+   style="stop-color:#60BD71"
+   id="stop5431" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_295_)"
+   enable-background="new    "
+   cx="325.57"
+   cy="145.045"
+   r="2.069"
+   id="circle5433" />
+		
+			<radialGradient
+   id="SVGID_296_"
+   cx="301.5703"
+   cy="1078.0449"
+   r="2.0688"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#9FCB40;stop-opacity:0.53"
+   id="stop5436" />
+			<stop
+   offset="1"
+   style="stop-color:#458691"
+   id="stop5438" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_296_)"
+   enable-background="new    "
+   cx="325.57"
+   cy="145.045"
+   r="2.069"
+   id="circle5440" />
+		
+			<radialGradient
+   id="SVGID_297_"
+   cx="301.6358"
+   cy="1173.625"
+   r="1.103"
+   gradientTransform="matrix(1 0 0 0.9207 24 -936.5648)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop5443" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop5445" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop5447" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop5449" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop5451" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop5453" />
+		</radialGradient>
+		<path
+   opacity="0.5"
+   fill="url(#SVGID_297_)"
+   enable-background="new    "
+   d="M324.532,143.992c0-0.561,0.491-1.016,1.103-1.016    c0.609,0,1.104,0.455,1.104,1.016s-0.494,1.015-1.104,1.015"
+   id="path5455" />
+		
+			<radialGradient
+   id="SVGID_298_"
+   cx="301.4395"
+   cy="1076.6953"
+   r="0.5533"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#EEF8FB"
+   id="stop5458" />
+			<stop
+   offset="0.4122"
+   style="stop-color:#EDF7F8;stop-opacity:0.8016"
+   id="stop5460" />
+			<stop
+   offset="0.5215"
+   style="stop-color:#E9F5EE;stop-opacity:0.6525"
+   id="stop5462" />
+			<stop
+   offset="0.619"
+   style="stop-color:#E2F1DE;stop-opacity:0.5196"
+   id="stop5464" />
+			<stop
+   offset="0.7096"
+   style="stop-color:#D8ECC7;stop-opacity:0.396"
+   id="stop5466" />
+			<stop
+   offset="0.7954"
+   style="stop-color:#CCE4AA;stop-opacity:0.2789"
+   id="stop5468" />
+			<stop
+   offset="0.8777"
+   style="stop-color:#BCDC86;stop-opacity:0.1667"
+   id="stop5470" />
+			<stop
+   offset="0.9557"
+   style="stop-color:#ABD25B;stop-opacity:0.0604"
+   id="stop5472" />
+			<stop
+   offset="1"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop5474" />
+		</radialGradient>
+		<circle
+   fill="url(#SVGID_298_)"
+   cx="325.439"
+   cy="143.696"
+   r="0.551"
+   id="circle5476" />
+		<circle
+   opacity="0.62"
+   fill="#FFFFFF"
+   enable-background="new    "
+   cx="325.418"
+   cy="143.509"
+   r="0.217"
+   id="circle5478" />
+		
+			<radialGradient
+   id="SVGID_299_"
+   cx="-350.5381"
+   cy="1232.0391"
+   r="0.7816"
+   gradientTransform="matrix(1.042 -0.6097 0.505 0.8631 69.3665 -1130.8982)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#46C3D6;stop-opacity:0.58"
+   id="stop5481" />
+			<stop
+   offset="0.4253"
+   style="stop-color:#48C3D3;stop-opacity:0.4545"
+   id="stop5483" />
+			<stop
+   offset="0.5444"
+   style="stop-color:#4DC4C9;stop-opacity:0.3603"
+   id="stop5485" />
+			<stop
+   offset="0.6507"
+   style="stop-color:#57C5B9;stop-opacity:0.2763"
+   id="stop5487" />
+			<stop
+   offset="0.7494"
+   style="stop-color:#65C6A2;stop-opacity:0.1982"
+   id="stop5489" />
+			<stop
+   offset="0.843"
+   style="stop-color:#76C785;stop-opacity:0.1242"
+   id="stop5491" />
+			<stop
+   offset="0.9314"
+   style="stop-color:#8BC961;stop-opacity:0.0542"
+   id="stop5493" />
+			<stop
+   offset="1"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop5495" />
+		</radialGradient>
+		<path
+   opacity="0.52"
+   fill="url(#SVGID_299_)"
+   enable-background="new    "
+   d="M327.105,145.705    c0.219,0.374,0.025,0.889-0.42,1.153c-0.451,0.264-0.992,0.175-1.211-0.198c-0.224-0.372-0.029-0.888,0.422-1.152    C326.348,145.244,326.889,145.333,327.105,145.705z"
+   id="path5497" />
+		
+			<radialGradient
+   id="SVGID_300_"
+   cx="863.1016"
+   cy="-36.4526"
+   r="1.3958"
+   gradientTransform="matrix(0.108 0.9941 -0.9941 0.108 194.9519 -708.9521)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop5500" />
+			<stop
+   offset="0.3195"
+   style="stop-color:#050709"
+   id="stop5502" />
+			<stop
+   offset="0.5599"
+   style="stop-color:#070C13"
+   id="stop5504" />
+			<stop
+   offset="0.7738"
+   style="stop-color:#0A1523"
+   id="stop5506" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0B1929"
+   id="stop5508" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C"
+   id="stop5510" />
+		</radialGradient>
+		<path
+   opacity="0.42"
+   fill="url(#SVGID_300_)"
+   enable-background="new    "
+   d="M325.427,146.889    c-0.903,0.005-1.784-0.813-1.87-1.754c-0.063-0.698,0.416-1.613,1.2-1.771c-0.948,0.46-0.989,1.39-0.937,1.752    C323.975,146.145,324.701,146.662,325.427,146.889z"
+   id="path5512" />
+	</g>
+	<g
+   id="g5514">
+		<g
+   id="g5516">
+			
+				<linearGradient
+   id="SVGID_301_"
+   gradientUnits="userSpaceOnUse"
+   x1="285.8438"
+   y1="1076.4092"
+   x2="282.825"
+   y2="1066.5352"
+   gradientTransform="matrix(1 0 0 1 24 -933)">
+				<stop
+   offset="0"
+   style="stop-color:#202D36"
+   id="stop5519" />
+				<stop
+   offset="0.0848"
+   style="stop-color:#517287"
+   id="stop5521" />
+				<stop
+   offset="0.1039"
+   style="stop-color:#6E8B9D"
+   id="stop5523" />
+				<stop
+   offset="0.1295"
+   style="stop-color:#8DA7B5"
+   id="stop5525" />
+				<stop
+   offset="0.1585"
+   style="stop-color:#A9BFCA"
+   id="stop5527" />
+				<stop
+   offset="0.1913"
+   style="stop-color:#BFD2DB"
+   id="stop5529" />
+				<stop
+   offset="0.2295"
+   style="stop-color:#D0E1E7"
+   id="stop5531" />
+				<stop
+   offset="0.2768"
+   style="stop-color:#DBEBF0"
+   id="stop5533" />
+				<stop
+   offset="0.3431"
+   style="stop-color:#E2F1F6"
+   id="stop5535" />
+				<stop
+   offset="0.5273"
+   style="stop-color:#E4F3F7"
+   id="stop5537" />
+			</linearGradient>
+			<path
+   fill="url(#SVGID_301_)"
+   d="M308.727,134.782l1.621,7.96c0.057,0.299-0.143,0.588-0.438,0.644     c-0.25,0.046-0.493-0.083-0.602-0.303l-3.315-7.333c-0.394-0.81-0.052-1.782,0.761-2.171c0.811-0.391,1.45-0.014,1.842,0.795     C308.654,134.504,308.699,134.646,308.727,134.782z"
+   id="path5539" />
+			<path
+   fill="#535A5F"
+   d="M309.014,134.725l1.004,5.668l0.27,1.415l0.141,0.706c0.063,0.194,0.1,0.57-0.129,0.777     c-0.193,0.215-0.539,0.283-0.792,0.144c-0.13-0.066-0.229-0.172-0.301-0.307l-0.147-0.326l-0.604-1.305l-2.485-5.192     c-0.102-0.219-0.215-0.422-0.311-0.675c-0.096-0.281-0.122-0.557-0.092-0.841c0.063-0.562,0.393-1.093,0.877-1.403     c0.422-0.301,1.188-0.425,1.705-0.055C308.636,133.68,308.895,134.181,309.014,134.725z M308.438,134.839     c-0.094-0.382-0.353-0.773-0.646-0.963c-0.312-0.193-0.64-0.146-1.019,0.059c-0.334,0.191-0.578,0.54-0.642,0.931     c-0.032,0.191-0.017,0.405,0.034,0.58c0.063,0.201,0.171,0.424,0.262,0.646l2.26,5.295l0.58,1.316l0.146,0.329     c0.038,0.083,0.107,0.158,0.191,0.202c0.174,0.097,0.397,0.051,0.521-0.093c0.144-0.152,0.129-0.324,0.063-0.579l-0.147-0.704     l-0.312-1.405L308.438,134.839z"
+   id="path5541" />
+		</g>
+		
+			<radialGradient
+   id="SVGID_302_"
+   cx="283.4463"
+   cy="1068.3926"
+   r="4.7527"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#46C3D6;stop-opacity:0.74"
+   id="stop5544" />
+			<stop
+   offset="0.1036"
+   style="stop-color:#48C3D3;stop-opacity:0.5799"
+   id="stop5546" />
+			<stop
+   offset="0.1813"
+   style="stop-color:#4DC4C9;stop-opacity:0.4597"
+   id="stop5548" />
+			<stop
+   offset="0.2507"
+   style="stop-color:#57C5B9;stop-opacity:0.3525"
+   id="stop5550" />
+			<stop
+   offset="0.3152"
+   style="stop-color:#65C6A2;stop-opacity:0.2529"
+   id="stop5552" />
+			<stop
+   offset="0.3763"
+   style="stop-color:#76C785;stop-opacity:0.1584"
+   id="stop5554" />
+			<stop
+   offset="0.434"
+   style="stop-color:#8BC961;stop-opacity:0.0692"
+   id="stop5556" />
+			<stop
+   offset="0.4788"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop5558" />
+		</radialGradient>
+		<path
+   opacity="0.52"
+   fill="url(#SVGID_302_)"
+   enable-background="new    "
+   d="M309.395,137.627l-0.668-2.845    c-0.021-0.136-0.072-0.278-0.135-0.408c-0.391-0.81-1.031-1.186-1.841-0.795c-0.812,0.389-1.151,1.362-0.761,2.171l0.789,2.083    C307.62,138.257,308.568,138.1,309.395,137.627z"
+   id="path5560" />
+		<polygon
+   fill="#FFFFFF"
+   points="310.072,142.383 308.456,135.411 308.682,135.249   "
+   id="polygon5562" />
+	</g>
+	<g
+   id="g5564">
+		
+			<linearGradient
+   id="SVGID_303_"
+   gradientUnits="userSpaceOnUse"
+   x1="-8.2592"
+   y1="-1113.8198"
+   x2="-10.0982"
+   y2="-1119.4884"
+   gradientTransform="matrix(0.8184 -0.5747 -0.5747 -0.8184 -322.341 -768.7596)">
+			<stop
+   offset="0.1636"
+   style="stop-color:#141A2B"
+   id="stop5567" />
+			<stop
+   offset="0.3161"
+   style="stop-color:#142F3A;stop-opacity:0.825"
+   id="stop5569" />
+			<stop
+   offset="0.486"
+   style="stop-color:#143E45;stop-opacity:0.63"
+   id="stop5571" />
+			<stop
+   offset="0.6877"
+   style="stop-color:#14464B;stop-opacity:0.3984"
+   id="stop5573" />
+			<stop
+   offset="1"
+   style="stop-color:#14494D;stop-opacity:0.04"
+   id="stop5575" />
+		</linearGradient>
+		<path
+   opacity="0.36"
+   fill="url(#SVGID_303_)"
+   enable-background="new    "
+   d="M311.254,146.97    c-0.059-0.177-0.172-0.25-0.253-0.224c-0.08,0.026-0.146,0.152-0.09,0.33l1.446,6.188l0.658,1.108l0.063-1.235L311.254,146.97z"
+   id="path5577" />
+		<path
+   opacity="0.56"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M310.941,146.454c0,0,1.695,6.851,1.731,6.987    c0.244-0.07,0.509-0.125,0.81-0.117c-0.024-0.057-1.854-5.206-2.246-6.787C311.124,146.435,310.941,146.454,310.941,146.454z"
+   id="path5579" />
+		<polygon
+   fill="#FFFFFF"
+   points="311.248,146.583 313.15,153.381 313.398,153.385   "
+   id="polygon5581" />
+	</g>
+	<g
+   id="g5583">
+		<g
+   id="g5585">
+			<circle
+   fill="#FFFFFF"
+   cx="306.717"
+   cy="132.582"
+   r="3.331"
+   id="circle5587" />
+			<path
+   fill="#39444F"
+   d="M310.272,132.593c-0.012,0.91-0.42,1.833-1.068,2.471c-0.658,0.648-1.559,1.014-2.491,1.033     c-0.896,0.019-1.851-0.347-2.507-0.999c-0.678-0.652-1.076-1.56-1.083-2.53c-0.021-0.914,0.354-1.886,1.022-2.559     c0.66-0.686,1.612-1.1,2.572-1.078c0.952,0.007,1.904,0.406,2.557,1.094c0.658,0.682,1.021,1.625,1,2.557L310.272,132.593z      M309.822,132.582c-0.004-1.663-1.504-3.07-3.104-3.013c-0.788,0.017-1.567,0.32-2.139,0.874     c-0.573,0.558-0.913,1.319-0.925,2.152c-0.014,0.776,0.3,1.602,0.867,2.181c0.563,0.588,1.354,0.94,2.203,0.953     c0.812,0.026,1.646-0.325,2.221-0.917c0.587-0.593,0.896-1.404,0.878-2.241L309.822,132.582z"
+   id="path5589" />
+		</g>
+		
+			<radialGradient
+   id="SVGID_304_"
+   cx="407.6182"
+   cy="537.1406"
+   r="3.7467"
+   gradientTransform="matrix(0.9525 0.3046 -0.3046 0.9525 81.9305 -503.3005)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.4121"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop5592" />
+			<stop
+   offset="0.5849"
+   style="stop-color:#0A1827;stop-opacity:0.5379"
+   id="stop5594" />
+			<stop
+   offset="0.6472"
+   style="stop-color:#091420;stop-opacity:0.7317"
+   id="stop5596" />
+			<stop
+   offset="0.6914"
+   style="stop-color:#060D15;stop-opacity:0.8694"
+   id="stop5598" />
+			<stop
+   offset="0.727"
+   style="stop-color:#010204;stop-opacity:0.9803"
+   id="stop5600" />
+			<stop
+   offset="0.7333"
+   style="stop-color:#000000"
+   id="stop5602" />
+			<stop
+   offset="0.7876"
+   style="stop-color:#03080D;stop-opacity:0.6108"
+   id="stop5604" />
+			<stop
+   offset="0.8727"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop5606" />
+		</radialGradient>
+		<circle
+   opacity="0.36"
+   fill="url(#SVGID_304_)"
+   enable-background="new    "
+   cx="306.684"
+   cy="132.32"
+   r="3.598"
+   id="circle5608" />
+		
+			<radialGradient
+   id="SVGID_305_"
+   cx="283.0635"
+   cy="1063.5352"
+   r="5.1611"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#B4CB80;stop-opacity:0"
+   id="stop5611" />
+			<stop
+   offset="1"
+   style="stop-color:#368545"
+   id="stop5613" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_305_)"
+   enable-background="new    "
+   cx="306.717"
+   cy="132.545"
+   r="3.331"
+   id="circle5615" />
+		
+			<radialGradient
+   id="SVGID_306_"
+   cx="282.7159"
+   cy="1065.5449"
+   r="3.332"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.0242"
+   style="stop-color:#79CCCB"
+   id="stop5618" />
+			<stop
+   offset="0.4667"
+   style="stop-color:#35AED5"
+   id="stop5620" />
+			<stop
+   offset="1"
+   style="stop-color:#5F8DC2"
+   id="stop5622" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_306_)"
+   enable-background="new    "
+   cx="306.716"
+   cy="132.545"
+   r="3.332"
+   id="circle5624" />
+		
+			<radialGradient
+   id="SVGID_307_"
+   cx="282.7168"
+   cy="1063.5195"
+   r="0.8872"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#EEF8FB"
+   id="stop5627" />
+			<stop
+   offset="0.4257"
+   style="stop-color:#EBF7F8;stop-opacity:0.7831"
+   id="stop5629" />
+			<stop
+   offset="0.5452"
+   style="stop-color:#E1F3EF;stop-opacity:0.6202"
+   id="stop5631" />
+			<stop
+   offset="0.6517"
+   style="stop-color:#D1ECE0;stop-opacity:0.475"
+   id="stop5633" />
+			<stop
+   offset="0.7507"
+   style="stop-color:#BAE3CA;stop-opacity:0.34"
+   id="stop5635" />
+			<stop
+   offset="0.8445"
+   style="stop-color:#9DD7AE;stop-opacity:0.2121"
+   id="stop5637" />
+			<stop
+   offset="0.9332"
+   style="stop-color:#79C88D;stop-opacity:0.0912"
+   id="stop5639" />
+			<stop
+   offset="1"
+   style="stop-color:#59BB6E;stop-opacity:0"
+   id="stop5641" />
+		</radialGradient>
+		<circle
+   fill="url(#SVGID_307_)"
+   cx="306.717"
+   cy="130.52"
+   r="0.887"
+   id="circle5643" />
+		<circle
+   opacity="0.62"
+   fill="#FFFFFF"
+   enable-background="new    "
+   cx="306.907"
+   cy="130.178"
+   r="0.349"
+   id="circle5645" />
+		
+			<radialGradient
+   id="SVGID_308_"
+   cx="-93.3393"
+   cy="1648.6807"
+   r="2.2688"
+   gradientTransform="matrix(0.931 -0.365 0.365 0.931 -207.5863 -1434.8041)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#040506"
+   id="stop5648" />
+			<stop
+   offset="0.3232"
+   style="stop-color:#050709"
+   id="stop5650" />
+			<stop
+   offset="0.5663"
+   style="stop-color:#070E13"
+   id="stop5652" />
+			<stop
+   offset="0.7826"
+   style="stop-color:#0C1A23"
+   id="stop5654" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0D1E28"
+   id="stop5656" />
+			<stop
+   offset="1"
+   style="stop-color:#234A4C"
+   id="stop5658" />
+		</radialGradient>
+		<path
+   opacity="0.38"
+   fill="url(#SVGID_308_)"
+   enable-background="new    "
+   d="M309.537,131.903    c0.39,1.404-0.316,2.923-1.736,3.479c-1.417,0.555-3.052,0.048-3.631-1.103c1.119,1.281,2.881,0.938,3.434,0.735    C309.008,134.495,309.491,133.126,309.537,131.903z"
+   id="path5660" />
+	</g>
+	<g
+   id="g5662">
+		<g
+   id="g5664">
+			<circle
+   fill="#FFFFFF"
+   cx="313.407"
+   cy="156.131"
+   r="2.605"
+   id="circle5666" />
+			<path
+   fill="#39444F"
+   d="M316.236,156.143c-0.012,0.727-0.342,1.455-0.861,1.957c-0.521,0.52-1.24,0.801-1.969,0.822     c-1.487,0.064-2.889-1.236-2.874-2.805c-0.062-1.496,1.278-2.984,2.892-2.91c0.729,0.008,1.518,0.326,2.027,0.881     c0.523,0.547,0.811,1.303,0.787,2.043L316.236,156.143z M315.787,156.131c-0.021-1.275-1.148-2.332-2.396-2.287     c-0.563,0.018-1.18,0.242-1.604,0.66c-0.438,0.424-0.699,0.998-0.718,1.641c-0.012,0.586,0.229,1.229,0.656,1.668     c0.43,0.453,1.045,0.729,1.687,0.74c1.312,0.07,2.464-1.143,2.382-2.434L315.787,156.131z"
+   id="path5668" />
+		</g>
+		
+			<radialGradient
+   id="SVGID_309_"
+   cx="421.2022"
+   cy="557.5391"
+   r="2.9332"
+   gradientTransform="matrix(0.9525 0.3046 -0.3046 0.9525 81.9305 -503.3005)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.4121"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop5671" />
+			<stop
+   offset="0.5849"
+   style="stop-color:#0A1827;stop-opacity:0.5379"
+   id="stop5673" />
+			<stop
+   offset="0.6472"
+   style="stop-color:#091420;stop-opacity:0.7317"
+   id="stop5675" />
+			<stop
+   offset="0.6914"
+   style="stop-color:#060D15;stop-opacity:0.8694"
+   id="stop5677" />
+			<stop
+   offset="0.727"
+   style="stop-color:#010204;stop-opacity:0.9803"
+   id="stop5679" />
+			<stop
+   offset="0.7333"
+   style="stop-color:#000000"
+   id="stop5681" />
+			<stop
+   offset="0.7876"
+   style="stop-color:#03080D;stop-opacity:0.6108"
+   id="stop5683" />
+			<stop
+   offset="0.8727"
+   style="stop-color:#0B1929;stop-opacity:0"
+   id="stop5685" />
+		</radialGradient>
+		<circle
+   opacity="0.36"
+   fill="url(#SVGID_309_)"
+   enable-background="new    "
+   cx="313.381"
+   cy="155.926"
+   r="2.814"
+   id="circle5687" />
+		
+			<radialGradient
+   id="SVGID_310_"
+   cx="289.6787"
+   cy="1087.5303"
+   r="4.0405"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#B4CB80;stop-opacity:0"
+   id="stop5690" />
+			<stop
+   offset="1"
+   style="stop-color:#60BD71"
+   id="stop5692" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_310_)"
+   enable-background="new    "
+   cx="313.407"
+   cy="156.104"
+   r="2.606"
+   id="circle5694" />
+		
+			<radialGradient
+   id="SVGID_311_"
+   cx="289.4082"
+   cy="1089.1035"
+   r="2.6069"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#3FB1CB;stop-opacity:0.51"
+   id="stop5697" />
+			<stop
+   offset="1"
+   style="stop-color:#458691"
+   id="stop5699" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_311_)"
+   enable-background="new    "
+   cx="313.408"
+   cy="156.103"
+   r="2.607"
+   id="circle5701" />
+		<circle
+   opacity="0.62"
+   fill="#FFFFFF"
+   enable-background="new    "
+   cx="313.275"
+   cy="154.135"
+   r="0.272"
+   id="circle5703" />
+	</g>
+	<g
+   id="g5705">
+		<path
+   fill="#E4F3F7"
+   d="M317.098,135.194l-3.512,5.666c-0.173,0.28-0.459,0.272-0.777,0.069c-0.303-0.194-0.408-0.417-0.233-0.698    c0.013-0.013,0.021-0.027,0.026-0.04l3.967-5.357c0.104-0.142,0.31-0.171,0.447-0.066    C317.148,134.868,317.184,135.054,317.098,135.194z"
+   id="path5707" />
+		<path
+   fill="#808B91"
+   d="M317.15,135.228l-2.086,3.437l-1.059,1.711l-0.279,0.418c-0.068,0.125-0.217,0.324-0.426,0.342    c-0.193,0.024-0.365-0.061-0.512-0.155c-0.139-0.091-0.298-0.211-0.342-0.401c-0.051-0.192,0.072-0.376,0.17-0.498l0.296-0.404    l0.601-0.808l1.193-1.617l1.195-1.618l0.597-0.81c0.097-0.159,0.353-0.238,0.521-0.121    C317.195,134.798,317.266,135.056,317.15,135.228z M317.041,135.16c0.074-0.116,0.04-0.28-0.083-0.353    c-0.119-0.073-0.274-0.042-0.36,0.088l-0.6,0.806l-1.2,1.614l-1.196,1.615l-0.604,0.808l-0.297,0.403    c-0.104,0.131-0.188,0.269-0.151,0.416c0.076,0.272,0.466,0.485,0.733,0.445c0.142-0.024,0.213-0.136,0.301-0.298l0.253-0.436    l1.062-1.708L317.041,135.16z"
+   id="path5709" />
+	</g>
+	
+		<radialGradient
+   id="SVGID_312_"
+   cx="-612.9434"
+   cy="-1469.0547"
+   r="1.1687"
+   fx="-613.3561"
+   fy="-1468.9851"
+   gradientTransform="matrix(-0.4494 0.8934 -0.8205 -0.4127 -1164.3685 76.9036)"
+   gradientUnits="userSpaceOnUse">
+		<stop
+   offset="0"
+   style="stop-color:#46C3D6;stop-opacity:0.74"
+   id="stop5712" />
+		<stop
+   offset="0.1121"
+   style="stop-color:#48C3D3;stop-opacity:0.5799"
+   id="stop5714" />
+		<stop
+   offset="0.1963"
+   style="stop-color:#4DC4C9;stop-opacity:0.4597"
+   id="stop5716" />
+		<stop
+   offset="0.2713"
+   style="stop-color:#57C5B9;stop-opacity:0.3525"
+   id="stop5718" />
+		<stop
+   offset="0.3411"
+   style="stop-color:#65C6A2;stop-opacity:0.2529"
+   id="stop5720" />
+		<stop
+   offset="0.4072"
+   style="stop-color:#76C785;stop-opacity:0.1584"
+   id="stop5722" />
+		<stop
+   offset="0.4697"
+   style="stop-color:#8BC961;stop-opacity:0.0692"
+   id="stop5724" />
+		<stop
+   offset="0.5182"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop5726" />
+	</radialGradient>
+	<path
+   opacity="0.52"
+   fill="url(#SVGID_312_)"
+   enable-background="new    "
+   d="M317.016,134.769   c-0.142-0.104-0.343-0.076-0.445,0.066l-0.533,0.72c0.111,0.238,0.281,0.427,0.501,0.543l0.563-0.905   C317.184,135.054,317.148,134.868,317.016,134.769z"
+   id="path5728" />
+	<g
+   id="g5730">
+		<g
+   id="g5732">
+			<circle
+   fill="#FFFFFF"
+   cx="317.846"
+   cy="133.866"
+   r="1.676"
+   id="circle5734" />
+			<path
+   fill="#39444F"
+   d="M319.616,133.797c0.038,0.939-0.767,1.795-1.706,1.823c-0.926,0.073-1.833-0.717-1.855-1.688     c-0.074-0.938,0.738-1.878,1.717-1.878C318.744,131.996,319.623,132.85,319.616,133.797z M319.423,133.8     c-0.032-0.845-0.823-1.534-1.64-1.473c-0.815,0.024-1.543,0.756-1.498,1.606c0,0.822,0.765,1.573,1.625,1.527     C318.764,135.466,319.501,134.649,319.423,133.8z"
+   id="path5736" />
+		</g>
+		
+			<radialGradient
+   id="SVGID_313_"
+   cx="281.3067"
+   cy="1081.376"
+   r="2.5965"
+   gradientTransform="matrix(0.9992 -0.0402 0.0402 0.9992 -6.5571 -936.3723)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#B4CB80;stop-opacity:0"
+   id="stop5739" />
+			<stop
+   offset="1"
+   style="stop-color:#60BD71"
+   id="stop5741" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_313_)"
+   enable-background="new    "
+   cx="317.844"
+   cy="133.849"
+   r="1.676"
+   id="circle5743" />
+		
+			<radialGradient
+   id="SVGID_314_"
+   cx="281.1328"
+   cy="1082.3867"
+   r="1.6757"
+   gradientTransform="matrix(0.9992 -0.0402 0.0402 0.9992 -6.5571 -936.3723)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#9FCB40;stop-opacity:0.52"
+   id="stop5746" />
+			<stop
+   offset="1"
+   style="stop-color:#458691"
+   id="stop5748" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_314_)"
+   enable-background="new    "
+   cx="317.844"
+   cy="133.849"
+   r="1.676"
+   id="circle5750" />
+		
+			<radialGradient
+   id="SVGID_315_"
+   cx="280.8379"
+   cy="1081.3457"
+   r="0.4477"
+   gradientTransform="matrix(0.9992 -0.0402 0.0402 0.9992 -6.5571 -936.3723)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.2667"
+   style="stop-color:#EEF8FB"
+   id="stop5753" />
+			<stop
+   offset="0.4122"
+   style="stop-color:#EDF7F8;stop-opacity:0.8016"
+   id="stop5755" />
+			<stop
+   offset="0.5215"
+   style="stop-color:#E9F5EE;stop-opacity:0.6525"
+   id="stop5757" />
+			<stop
+   offset="0.619"
+   style="stop-color:#E2F1DE;stop-opacity:0.5196"
+   id="stop5759" />
+			<stop
+   offset="0.7096"
+   style="stop-color:#D8ECC7;stop-opacity:0.396"
+   id="stop5761" />
+			<stop
+   offset="0.7954"
+   style="stop-color:#CCE4AA;stop-opacity:0.2789"
+   id="stop5763" />
+			<stop
+   offset="0.8777"
+   style="stop-color:#BCDC86;stop-opacity:0.1667"
+   id="stop5765" />
+			<stop
+   offset="0.9557"
+   style="stop-color:#ABD25B;stop-opacity:0.0604"
+   id="stop5767" />
+			<stop
+   offset="1"
+   style="stop-color:#9FCB40;stop-opacity:0"
+   id="stop5769" />
+		</radialGradient>
+		<circle
+   fill="url(#SVGID_315_)"
+   cx="317.507"
+   cy="132.821"
+   r="0.446"
+   id="circle5771" />
+		<circle
+   opacity="0.62"
+   fill="#FFFFFF"
+   enable-background="new    "
+   cx="317.477"
+   cy="132.67"
+   r="0.176"
+   id="circle5773" />
+	</g>
+	<polygon
+   fill="#FFFFFF"
+   points="313.003,143.037 318.406,139.772 318.331,139.624  "
+   id="polygon5775" />
+	<path
+   fill="#FFFFFF"
+   d="M323.191,145.003c0,0.063-8.155,0.209-8.219,0.209c-0.064,0-0.111-0.05-0.111-0.113   s0.051-0.113,0.111-0.113c0.006,0,0.068,0.088,0.166,0.087C316.257,145.068,323.191,144.945,323.191,145.003z"
+   id="path5777" />
+	<path
+   fill="#FFFFFF"
+   d="M302.527,151.168c0.043,0.047,4.097-3.356,4.129-3.385c0.029-0.027,0.021-0.087-0.02-0.134   c-0.041-0.046-0.104-0.063-0.137-0.035c-0.001,0.002,0.021,0.098-0.021,0.138C305.921,148.239,302.49,151.123,302.527,151.168z"
+   id="path5779" />
+	<polygon
+   fill="#FFFFFF"
+   points="306.518,144.022 301.093,143.096 301.074,142.947  "
+   id="polygon5781" />
+</g>
+<g
+   id="g5783">
+	<g
+   id="g5785">
+		<path
+   fill="#39444F"
+   d="M314.657,194.835c-0.005,0.608-0.562,1.124-1.165,1.106c-0.596,0.013-1.151-0.526-1.133-1.153    c-0.014-0.604,0.541-1.185,1.182-1.146C314.161,193.643,314.701,194.225,314.657,194.835z M314.516,194.828    c0.006-0.534-0.463-0.993-0.988-0.985c-0.5-0.011-0.99,0.418-0.992,0.958c-0.029,0.516,0.422,1.02,0.97,1.024    C314.04,195.857,314.527,195.365,314.516,194.828z"
+   id="path5787" />
+		<circle
+   fill="#8FCED8"
+   cx="313.516"
+   cy="194.802"
+   r="1.07"
+   id="circle5789" />
+	</g>
+	<g
+   id="g5791">
+		<path
+   fill="#39444F"
+   d="M306.49,197.675c-0.156,0.64-0.875,1.05-1.51,0.878c-0.633-0.139-1.082-0.847-0.901-1.502    c0.141-0.642,0.868-1.113,1.534-0.912C306.266,196.289,306.688,197.043,306.49,197.675z M306.352,197.634    c0.146-0.567-0.233-1.178-0.802-1.303c-0.534-0.144-1.171,0.19-1.31,0.769c-0.161,0.545,0.191,1.195,0.775,1.338    C305.584,198.609,306.23,198.21,306.352,197.634z"
+   id="path5793" />
+		<circle
+   fill="#8FCED8"
+   cx="305.293"
+   cy="197.353"
+   r="1.167"
+   id="circle5795" />
+		
+			<radialGradient
+   id="SVGID_316_"
+   cx="611.4854"
+   cy="521.1211"
+   r="0.2743"
+   gradientTransform="matrix(0.8906 0.6566 -0.5919 0.8029 69.4326 -623.5166)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#EEF8FB"
+   id="stop5798" />
+			<stop
+   offset="0.509"
+   style="stop-color:#ECF7FA;stop-opacity:0.491"
+   id="stop5800" />
+			<stop
+   offset="0.6924"
+   style="stop-color:#E5F4F8;stop-opacity:0.3076"
+   id="stop5802" />
+			<stop
+   offset="0.823"
+   style="stop-color:#DAF0F4;stop-opacity:0.177"
+   id="stop5804" />
+			<stop
+   offset="0.9279"
+   style="stop-color:#C9E9EF;stop-opacity:0.0721"
+   id="stop5806" />
+			<stop
+   offset="1"
+   style="stop-color:#B8E2E9;stop-opacity:0"
+   id="stop5808" />
+		</radialGradient>
+		<path
+   opacity="0.52"
+   fill="url(#SVGID_316_)"
+   enable-background="new    "
+   d="M305.807,196.586    c-0.091,0.123-0.271,0.143-0.406,0.04c-0.135-0.103-0.172-0.278-0.08-0.401c0.091-0.121,0.271-0.139,0.402-0.037    C305.859,196.284,305.897,196.463,305.807,196.586z"
+   id="path5810" />
+	</g>
+	<g
+   id="g5812">
+		<path
+   fill="#39444F"
+   d="M303.286,186.564c-0.155,0.644-0.875,1.049-1.509,0.877c-0.633-0.135-1.084-0.844-0.902-1.5    c0.141-0.645,0.867-1.112,1.533-0.912C303.061,185.182,303.484,185.934,303.286,186.564z M303.147,186.525    c0.146-0.568-0.233-1.18-0.803-1.305c-0.533-0.146-1.17,0.19-1.308,0.77c-0.164,0.545,0.194,1.197,0.776,1.339    C302.382,187.501,303.025,187.102,303.147,186.525z"
+   id="path5814" />
+		<circle
+   fill="#8FCED8"
+   cx="302.09"
+   cy="186.243"
+   r="1.167"
+   id="circle5816" />
+	</g>
+	<g
+   id="g5818">
+		<path
+   fill="#CEE6EF"
+   d="M310.688,192.311l2.442,2.021c0.073,0.063,0.085,0.168,0.021,0.243c-0.056,0.067-0.148,0.083-0.226,0.038    l-2.685-1.688c-0.18-0.108-0.231-0.349-0.12-0.522c0.108-0.178,0.347-0.232,0.524-0.12    C310.659,192.291,310.675,192.301,310.688,192.311z"
+   id="path5820" />
+		<path
+   fill="#8B979E"
+   d="M310.744,192.238l1.538,1.32l0.772,0.652c0.059,0.063,0.145,0.088,0.172,0.214    c0.015,0.107-0.053,0.208-0.15,0.239c-0.112,0.035-0.202-0.04-0.268-0.077l-0.219-0.133l-1.729-1.058l-0.437-0.262    c-0.132-0.095-0.313-0.137-0.42-0.354c-0.092-0.186-0.021-0.455,0.146-0.564C310.329,192.093,310.59,192.104,310.744,192.238z     M310.629,192.385c-0.223-0.197-0.564,0.069-0.451,0.331c0.025,0.108,0.202,0.191,0.34,0.286l0.426,0.275l1.701,1.102    c0.143,0.068,0.297,0.232,0.407,0.212c0.149-0.056,0.12-0.228-0.052-0.31l-0.787-0.637L310.629,192.385z"
+   id="path5822" />
+	</g>
+	<g
+   id="g5824">
+		<path
+   fill="#CEE6EF"
+   d="M305.48,196.743c-0.022,0-0.045-0.001-0.069-0.009c-0.142-0.036-0.226-0.188-0.188-0.327l0.644-2.433    c0.034-0.146,0.185-0.229,0.323-0.189c0.146,0.038,0.229,0.184,0.189,0.326l-0.641,2.434    C305.706,196.665,305.6,196.743,305.48,196.743z"
+   id="path5826" />
+		<path
+   fill="#8B979E"
+   d="M305.479,196.786c-0.152,0.001-0.314-0.144-0.313-0.31c0.02-0.164,0.063-0.279,0.091-0.422l0.196-0.816    l0.202-0.813l0.104-0.407c0.005-0.135,0.167-0.354,0.361-0.338c0.19-0.012,0.371,0.172,0.36,0.362    c-0.021,0.187-0.067,0.283-0.104,0.431l-0.226,0.811l-0.229,0.806l-0.112,0.403C305.786,196.631,305.648,196.793,305.479,196.786z     M305.48,196.7c0.265-0.011,0.23-0.4,0.319-0.646l0.193-0.813l0.204-0.814c0.025-0.126,0.078-0.293,0.09-0.383    c-0.002-0.094-0.077-0.167-0.173-0.17c-0.203-0.024-0.202,0.343-0.302,0.597l-0.225,0.807l-0.23,0.809    c-0.028,0.131-0.09,0.275-0.104,0.396C305.257,196.593,305.352,196.704,305.48,196.7z"
+   id="path5828" />
+	</g>
+	
+		<linearGradient
+   id="SVGID_317_"
+   gradientUnits="userSpaceOnUse"
+   x1="282.1182"
+   y1="1127.0479"
+   x2="281.8335"
+   y2="1128.1188"
+   gradientTransform="matrix(1 0 0 1 24 -933)">
+		<stop
+   offset="0.1879"
+   style="stop-color:#517287"
+   id="stop5831" />
+		<stop
+   offset="0.2398"
+   style="stop-color:#7895A5;stop-opacity:0.847"
+   id="stop5833" />
+		<stop
+   offset="0.3"
+   style="stop-color:#9FB6C2;stop-opacity:0.6695"
+   id="stop5835" />
+		<stop
+   offset="0.3599"
+   style="stop-color:#BDD1D9;stop-opacity:0.4932"
+   id="stop5837" />
+		<stop
+   offset="0.4184"
+   style="stop-color:#D3E4EA;stop-opacity:0.3209"
+   id="stop5839" />
+		<stop
+   offset="0.4749"
+   style="stop-color:#E0EFF4;stop-opacity:0.1543"
+   id="stop5841" />
+		<stop
+   offset="0.5273"
+   style="stop-color:#E4F3F7;stop-opacity:0"
+   id="stop5843" />
+	</linearGradient>
+	<path
+   fill="url(#SVGID_317_)"
+   d="M306.188,193.785c-0.142-0.037-0.264,0.236-0.299,0.382l-0.123,0.429   c0.188,0.024,0.229,0.021,0.383,0.104l0.16-0.595C306.344,193.961,306.33,193.823,306.188,193.785z"
+   id="path5845" />
+	<g
+   id="g5847">
+		<path
+   fill="#CEE6EF"
+   d="M304.141,188.688l-1.935-2.015c-0.081-0.086-0.078-0.219,0.005-0.298c0.077-0.075,0.195-0.079,0.275-0.016    l2.195,1.727c0.176,0.141,0.202,0.395,0.064,0.568c-0.141,0.177-0.395,0.207-0.564,0.063    C304.165,188.714,304.152,188.699,304.141,188.688z"
+   id="path5849" />
+		<path
+   fill="#8B979E"
+   d="M304.04,188.716l-1.24-1.354c-0.216-0.229-0.432-0.444-0.643-0.693c-0.117-0.152,0.021-0.396,0.219-0.378    c0.192,0.041,0.271,0.175,0.41,0.259l1.5,1.143l0.376,0.283c0.135,0.078,0.277,0.264,0.266,0.459    c-0.011,0.197-0.119,0.371-0.318,0.444c-0.18,0.073-0.405,0.011-0.524-0.116L304.04,188.716z M304.193,188.609l0.007,0.007    c0.192,0.208,0.53,0.057,0.544-0.196c0.033-0.251-0.332-0.406-0.546-0.621l-1.462-1.189c-0.121-0.082-0.243-0.234-0.363-0.254    c-0.133-0.022-0.251,0.16-0.152,0.271c0.201,0.223,0.438,0.443,0.651,0.67L304.193,188.609z"
+   id="path5851" />
+	</g>
+	<g
+   id="blackball_4_">
+		
+			<radialGradient
+   id="SVGID_318_"
+   cx="282.8955"
+   cy="1124.2285"
+   r="4.3177"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#000000"
+   id="stop5855" />
+			<stop
+   offset="0.3003"
+   style="stop-color:#010203"
+   id="stop5857" />
+			<stop
+   offset="0.5262"
+   style="stop-color:#03080D"
+   id="stop5859" />
+			<stop
+   offset="0.7272"
+   style="stop-color:#08111D"
+   id="stop5861" />
+			<stop
+   offset="0.8364"
+   style="stop-color:#0B1929"
+   id="stop5863" />
+			<stop
+   offset="1"
+   style="stop-color:#23474C"
+   id="stop5865" />
+		</radialGradient>
+		<circle
+   fill="url(#SVGID_318_)"
+   cx="307.27"
+   cy="190.711"
+   r="3.72"
+   id="circle5867" />
+		
+			<radialGradient
+   id="SVGID_319_"
+   cx="284.5284"
+   cy="1121.3193"
+   r="4.8578"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0"
+   style="stop-color:#F5F9ED"
+   id="stop5870" />
+			<stop
+   offset="0.3506"
+   style="stop-color:#F3F8EB;stop-opacity:0.5296"
+   id="stop5872" />
+			<stop
+   offset="0.477"
+   style="stop-color:#ECF5E5;stop-opacity:0.3602"
+   id="stop5874" />
+			<stop
+   offset="0.5669"
+   style="stop-color:#E1F0DA;stop-opacity:0.2395"
+   id="stop5876" />
+			<stop
+   offset="0.6397"
+   style="stop-color:#D0E8CB;stop-opacity:0.1418"
+   id="stop5878" />
+			<stop
+   offset="0.7014"
+   style="stop-color:#BADEB7;stop-opacity:0.0591"
+   id="stop5880" />
+			<stop
+   offset="0.7455"
+   style="stop-color:#A5D4A4;stop-opacity:0"
+   id="stop5882" />
+			<stop
+   offset="1"
+   style="stop-color:#000000;stop-opacity:0"
+   id="stop5884" />
+		</radialGradient>
+		<path
+   opacity="0.23"
+   fill="url(#SVGID_319_)"
+   enable-background="new    "
+   d="M310.961,190.757    c-0.63,1.05-1.339,1.778-2.729,1.778c-2.039,0-3.69-1.521-3.69-3.396c0-0.563,0.271-0.966,0.537-1.434    c1.856-1.227,3.743-0.646,4.747,0.342C310.807,189.016,310.993,190.07,310.961,190.757z"
+   id="path5886" />
+	</g>
+	<g
+   id="g5888">
+		<path
+   fill="#535A5F"
+   d="M313.703,187.71l-2.744,1.396l-1.367,0.705c-0.099,0.049-0.251,0.156-0.424,0.104    c-0.164-0.048-0.277-0.188-0.283-0.362c-0.021-0.168,0.143-0.326,0.241-0.378l0.313-0.218l2.525-1.752l0.637-0.438    c0.229-0.127,0.354-0.346,0.734-0.39c0.313-0.021,0.65,0.2,0.723,0.517c0.098,0.318-0.082,0.678-0.353,0.813L313.703,187.71z     M313.546,187.48l0.019-0.01c0.194-0.104,0.271-0.316,0.223-0.494c-0.046-0.194-0.23-0.324-0.432-0.318    c-0.15-0.021-0.396,0.199-0.604,0.32l-0.641,0.424l-2.564,1.705c-0.188,0.158-0.506,0.254-0.486,0.438    c-0.01,0.086,0.068,0.186,0.154,0.202c0.09,0.03,0.172-0.028,0.299-0.095l1.355-0.723L313.546,187.48z"
+   id="path5890" />
+		<path
+   fill="#91ABB5"
+   d="M313.639,187.588l-4.229,2.219c-0.146,0.077-0.327,0.021-0.403-0.125    c-0.069-0.136-0.022-0.302,0.103-0.386l3.955-2.685c0.261-0.178,0.609-0.106,0.791,0.146c0.176,0.266,0.104,0.613-0.15,0.79    C313.677,187.566,313.657,187.577,313.639,187.588z"
+   id="path5892" />
+	</g>
+	<g
+   id="g5894">
+		<path
+   fill="#535A5F"
+   d="M316.998,191.761l-3.854-0.155l-1.929-0.063l-0.479-0.021c-0.153,0.021-0.396-0.063-0.461-0.254    c-0.076-0.179-0.012-0.406,0.158-0.513c0.188-0.104,0.354-0.053,0.508-0.071l3.854-0.145l1.925-0.078    c0.164,0.004,0.302-0.043,0.531,0.03c0.19,0.071,0.347,0.237,0.399,0.436c0.029,0.097,0.031,0.216,0.016,0.294    c-0.023,0.116-0.066,0.209-0.137,0.288C317.408,191.677,317.193,191.77,316.998,191.761z M317.002,191.482    c0.255-0.008,0.432-0.226,0.37-0.479c-0.028-0.107-0.112-0.208-0.222-0.253c-0.074-0.042-0.271-0.021-0.422-0.021l-1.933,0.025    l-3.854,0.074c-0.154,0.018-0.338-0.021-0.436,0.045c-0.111,0.063-0.16,0.214-0.105,0.333c0.105,0.258,0.518,0.129,0.818,0.172    l1.926,0.04L317.002,191.482z"
+   id="path5896" />
+		<path
+   fill="#91ABB5"
+   d="M317,191.622l-6.357-0.179c-0.186-0.006-0.334-0.16-0.328-0.353c0.004-0.18,0.149-0.321,0.328-0.327    l6.357-0.18c0.286-0.008,0.523,0.221,0.531,0.502c0.007,0.286-0.219,0.521-0.504,0.531    C317.022,191.622,317.009,191.622,317,191.622z"
+   id="path5898" />
+	</g>
+	<g
+   id="g5900">
+		<path
+   fill="#535A5F"
+   d="M308.154,192.161l1.137,3.276l0.555,1.643c0.032,0.125,0.041,0.13,0.053,0.257    c0.015,0.117-0.008,0.215-0.023,0.31c-0.059,0.188-0.166,0.357-0.318,0.481c-0.146,0.127-0.354,0.188-0.525,0.195    c-0.229,0.01-0.402-0.052-0.566-0.165c-0.158-0.112-0.285-0.273-0.35-0.459c-0.063-0.2-0.063-0.301-0.1-0.455l-0.156-0.854    l-0.311-1.705l-0.304-1.707l-0.076-0.43c-0.011-0.063-0.028-0.152-0.026-0.23c0.004-0.115,0.037-0.199,0.09-0.284    C307.443,191.686,308.033,191.757,308.154,192.161z M307.895,192.245c-0.035-0.201-0.35-0.255-0.449-0.065    c-0.104,0.107,0.058,0.481,0.093,0.741l0.38,1.692l0.376,1.693l0.188,0.846c0.062,0.314,0.088,0.512,0.258,0.604    c0.066,0.06,0.187,0.08,0.248,0.074c0.106-0.007,0.197-0.034,0.271-0.097c0.069-0.057,0.127-0.137,0.153-0.227    c0.012-0.047,0.02-0.093,0.018-0.121c0.012-0.019-0.022-0.152-0.027-0.166l-0.508-1.658L307.895,192.245z"
+   id="path5902" />
+		
+			<linearGradient
+   id="SVGID_320_"
+   gradientUnits="userSpaceOnUse"
+   x1="291.3262"
+   y1="813.8936"
+   x2="293.1555"
+   y2="819.991"
+   gradientTransform="matrix(1 0 0 1 16 -622)">
+			<stop
+   offset="0"
+   style="stop-color:#485660"
+   id="stop5905" />
+			<stop
+   offset="0.5273"
+   style="stop-color:#90A8B5"
+   id="stop5907" />
+		</linearGradient>
+		<path
+   fill="url(#SVGID_320_)"
+   d="M308.023,192.201l1.604,4.988c0.115,0.354-0.081,0.744-0.439,0.856    c-0.356,0.116-0.746-0.082-0.857-0.438c-0.012-0.021-0.018-0.051-0.021-0.073l-1.031-5.138c-0.041-0.209,0.097-0.412,0.308-0.455    C307.775,191.9,307.965,192.016,308.023,192.201z"
+   id="path5909" />
+	</g>
+	<g
+   id="g5911">
+		<path
+   fill="#535A5F"
+   d="M304.73,193.386l-2.01,2.165l-1.02,1.072c-0.094,0.1-0.271,0.216-0.444,0.245    c-0.173,0.034-0.354,0.004-0.515-0.075c-0.088-0.042-0.139-0.078-0.229-0.168c-0.035-0.04-0.08-0.093-0.134-0.198    c-0.079-0.172-0.094-0.346-0.062-0.519c0.033-0.176,0.141-0.329,0.268-0.441l0.285-0.236l0.578-0.463l1.16-0.916l1.162-0.912    l0.291-0.229c0.09-0.09,0.309-0.154,0.45-0.104C304.848,192.695,304.975,193.145,304.73,193.386z M304.57,193.229    c0.14-0.111,0.072-0.375-0.107-0.4c-0.097-0.012-0.146-0.012-0.234,0.072l-0.273,0.244l-1.104,0.979l-1.105,0.979l-0.557,0.48    l-0.275,0.238c-0.053,0.054-0.098,0.105-0.104,0.182c-0.076,0.287,0.346,0.551,0.563,0.281l1.063-1.023L304.57,193.229z"
+   id="path5913" />
+		<path
+   fill="#91ABB5"
+   d="M304.65,193.307l-3.133,3.166c-0.223,0.228-0.578,0.229-0.804,0.006c-0.223-0.221-0.226-0.58-0.004-0.802    c0.017-0.014,0.021-0.024,0.038-0.036l3.419-2.854c0.146-0.125,0.374-0.105,0.5,0.044    C304.788,192.973,304.777,193.178,304.65,193.307z"
+   id="path5915" />
+	</g>
+	<g
+   id="g5917">
+		<path
+   fill="#535A5F"
+   d="M299.811,189.072l3.021,0.595l1.521,0.296c0.313,0.104,0.396,0.538,0.135,0.745    c-0.113,0.104-0.301,0.106-0.411,0.095l-0.386-0.018l-3.074-0.137l-0.771-0.03c-0.217,0.015-0.604-0.039-0.789-0.308    c-0.191-0.263-0.229-0.59-0.051-0.886c0.156-0.272,0.514-0.409,0.801-0.354h0.004V189.072z M299.779,189.34l-0.008-0.002    c-0.446-0.079-0.767,0.462-0.498,0.803c0.121,0.176,0.301,0.215,0.584,0.226l0.768,0.058l3.066,0.209    c0.246-0.009,0.547,0.104,0.701-0.023c0.183-0.119,0.111-0.449-0.09-0.498l-1.509-0.268L299.779,189.34z"
+   id="path5919" />
+		<path
+   fill="#91ABB5"
+   d="M299.787,189.205l4.488,0.813c0.195,0.037,0.326,0.229,0.291,0.42c-0.033,0.188-0.195,0.313-0.375,0.297    l-4.559-0.256c-0.354-0.021-0.624-0.318-0.604-0.678c0.021-0.354,0.32-0.625,0.68-0.604    C299.734,189.198,299.762,189.201,299.787,189.205z"
+   id="path5921" />
+	</g>
+	<g
+   id="g5923">
+		<g
+   id="g5925">
+			<circle
+   fill="#FFFFFF"
+   cx="297.975"
+   cy="189.676"
+   r="1.634"
+   id="circle5927" />
+			<path
+   fill="#20262B"
+   d="M299.773,189.684c-0.017,0.952-0.858,1.762-1.812,1.768c-0.935,0.044-1.833-0.778-1.832-1.784     c-0.054-0.962,0.82-1.906,1.854-1.866c0.986-0.017,1.854,0.924,1.789,1.877V189.684z M299.438,189.676     c-0.019-0.789-0.719-1.421-1.478-1.393c-0.717-0.006-1.408,0.617-1.418,1.402c-0.046,0.737,0.622,1.484,1.435,1.482     c0.799,0.048,1.521-0.708,1.459-1.503v0.007L299.438,189.676L299.438,189.676z"
+   id="path5929" />
+		</g>
+		<circle
+   opacity="0.75"
+   fill="#64BF60"
+   enable-background="new    "
+   cx="297.975"
+   cy="189.659"
+   r="1.495"
+   id="circle5931" />
+		
+			<radialGradient
+   id="SVGID_321_"
+   cx="312.5235"
+   cy="1172.4609"
+   r="2.4264"
+   gradientTransform="matrix(0.9545 0 0 0.9545 -0.1888 -930.3677)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#B4CB80;stop-opacity:0"
+   id="stop5934" />
+			<stop
+   offset="0.8545"
+   style="stop-color:#35693F"
+   id="stop5936" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_321_)"
+   enable-background="new    "
+   cx="297.975"
+   cy="189.659"
+   r="1.495"
+   id="circle5938" />
+	</g>
+	<g
+   id="g5940">
+		<g
+   id="g5942">
+			<circle
+   fill="#FFFFFF"
+   cx="300.339"
+   cy="196.969"
+   r="1.479"
+   id="circle5944" />
+			<path
+   fill="#20262B"
+   d="M302.068,196.98c-0.035,0.901-0.842,1.649-1.742,1.662c-0.866,0.041-1.76-0.703-1.774-1.694     c-0.065-0.923,0.78-1.869,1.806-1.827c0.445-0.006,0.947,0.229,1.254,0.574c0.315,0.348,0.481,0.813,0.459,1.269v0.017H302.068     L302.068,196.98z M301.564,196.968c-0.041-0.663-0.625-1.146-1.244-1.114c-0.555,0.004-1.127,0.475-1.153,1.129     c-0.06,0.588,0.469,1.269,1.179,1.265c0.314,0.021,0.676-0.117,0.896-0.368c0.23-0.256,0.34-0.568,0.32-0.92L301.564,196.968     L301.564,196.968z"
+   id="path5946" />
+		</g>
+		<circle
+   opacity="0.62"
+   fill="#8652A0"
+   enable-background="new    "
+   cx="300.384"
+   cy="197.032"
+   r="1.302"
+   id="circle5948" />
+		
+			<radialGradient
+   id="SVGID_322_"
+   cx="276.5186"
+   cy="1129.2461"
+   r="2.0146"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#B4CB80;stop-opacity:0"
+   id="stop5951" />
+			<stop
+   offset="0.7939"
+   style="stop-color:#39386E"
+   id="stop5953" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_322_)"
+   enable-background="new    "
+   cx="300.383"
+   cy="197.03"
+   r="1.303"
+   id="circle5955" />
+		<path
+   opacity="0.62"
+   fill="#FFFFFF"
+   enable-background="new    "
+   d="M300.657,196.039c0,0.154-0.13,0.285-0.287,0.285    c-0.156,0-0.287-0.131-0.287-0.285c0-0.157,0.131-0.284,0.287-0.284C300.527,195.755,300.657,195.882,300.657,196.039z"
+   id="path5957" />
+	</g>
+	<g
+   id="g5959">
+		<g
+   id="g5961">
+			<circle
+   fill="#FFFFFF"
+   cx="314.727"
+   cy="186.274"
+   r="1.614"
+   id="circle5963" />
+			<path
+   fill="#20262B"
+   d="M316.508,186.281c-0.011,0.939-0.855,1.74-1.781,1.742c-0.935,0.051-1.813-0.775-1.814-1.75     c-0.061-0.974,0.809-1.893,1.824-1.854c0.978-0.019,1.834,0.909,1.771,1.854V186.281L316.508,186.281z M316.172,186.273     c-0.02-0.778-0.71-1.399-1.457-1.373c-0.707-0.01-1.389,0.619-1.396,1.373c-0.051,0.752,0.617,1.473,1.408,1.476     c0.799,0.047,1.5-0.699,1.446-1.483L316.172,186.273z"
+   id="path5965" />
+		</g>
+		<circle
+   opacity="0.75"
+   fill="#64BF60"
+   enable-background="new    "
+   cx="314.727"
+   cy="186.255"
+   r="1.506"
+   id="circle5967" />
+		
+			<radialGradient
+   id="SVGID_323_"
+   cx="290.8828"
+   cy="1118.3467"
+   r="2.3313"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#B4CB80;stop-opacity:0"
+   id="stop5970" />
+			<stop
+   offset="0.8545"
+   style="stop-color:#35693F"
+   id="stop5972" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_323_)"
+   enable-background="new    "
+   cx="314.727"
+   cy="186.255"
+   r="1.506"
+   id="circle5974" />
+		<circle
+   opacity="0.62"
+   fill="#FFFFFF"
+   enable-background="new    "
+   cx="314.633"
+   cy="185.06"
+   r="0.169"
+   id="circle5976" />
+	</g>
+	<g
+   id="g5978">
+		<g
+   id="g5980">
+			<circle
+   fill="#FFFFFF"
+   cx="318.32"
+   cy="191.05"
+   r="1.536"
+   id="circle5982" />
+			<path
+   fill="#20262B"
+   d="M320.023,191.059c-0.01,0.899-0.819,1.662-1.705,1.664c-0.896,0.045-1.738-0.729-1.741-1.684     c-0.056-0.91,0.772-1.809,1.754-1.77c0.933-0.02,1.754,0.875,1.69,1.775v0.014H320.023L320.023,191.059z M319.689,191.049     c-0.021-0.736-0.672-1.32-1.379-1.295c-0.662-0.006-1.313,0.571-1.318,1.305c-0.049,0.688,0.582,1.387,1.331,1.387     c0.76,0.053,1.425-0.658,1.37-1.404L319.689,191.049z"
+   id="path5984" />
+		</g>
+		<circle
+   opacity="0.75"
+   fill="#64BF60"
+   enable-background="new    "
+   cx="318.32"
+   cy="191.034"
+   r="1.413"
+   id="circle5986" />
+		
+			<radialGradient
+   id="SVGID_324_"
+   cx="294.4678"
+   cy="1123.1826"
+   r="2.1856"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#B4CB80;stop-opacity:0"
+   id="stop5989" />
+			<stop
+   offset="0.8545"
+   style="stop-color:#35693F"
+   id="stop5991" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_324_)"
+   enable-background="new    "
+   cx="318.32"
+   cy="191.034"
+   r="1.413"
+   id="circle5993" />
+	</g>
+	<g
+   id="g5995">
+		<g
+   id="g5997">
+			<path
+   fill="#535A5F"
+   d="M306.3,183.242l0.691,4.219c0.057,0.352,0.114,0.703,0.186,1.051l0.104,0.525     c0.044,0.133,0.072,0.449-0.106,0.611c-0.163,0.174-0.435,0.229-0.64,0.117c-0.104-0.056-0.189-0.143-0.242-0.248l-0.113-0.24     l-0.455-0.967c-0.615-1.285-1.261-2.56-1.897-3.832c-0.077-0.162-0.159-0.313-0.237-0.513c-0.076-0.229-0.104-0.444-0.072-0.679     c0.051-0.45,0.312-0.881,0.703-1.13c0.317-0.24,0.979-0.353,1.396-0.04C306.016,182.412,306.207,182.807,306.3,183.242z      M305.654,183.368c-0.063-0.253-0.258-0.521-0.44-0.634c-0.19-0.107-0.351-0.09-0.622,0.045     c-0.219,0.123-0.379,0.349-0.425,0.602c-0.022,0.124-0.013,0.27,0.017,0.378c0.043,0.138,0.123,0.31,0.188,0.474     c0.538,1.32,1.065,2.646,1.625,3.957l0.428,0.979l0.104,0.245c0.021,0.052,0.068,0.104,0.123,0.13     c0.113,0.063,0.266,0.034,0.339-0.062c0.09-0.104,0.085-0.189,0.032-0.396l-0.109-0.521c-0.071-0.351-0.154-0.693-0.239-1.045     L305.654,183.368z"
+   id="path5999" />
+			
+				<linearGradient
+   id="SVGID_325_"
+   gradientUnits="userSpaceOnUse"
+   x1="290.7373"
+   y1="811.7129"
+   x2="288.8617"
+   y2="805.3332"
+   gradientTransform="matrix(1 0 0 1 16 -622)">
+				<stop
+   offset="0.0788"
+   style="stop-color:#29333B"
+   id="stop6002" />
+				<stop
+   offset="0.5273"
+   style="stop-color:#92ABB8"
+   id="stop6004" />
+			</linearGradient>
+			<path
+   fill="url(#SVGID_325_)"
+   d="M305.979,183.305l1.205,5.911c0.041,0.224-0.104,0.435-0.328,0.479     c-0.187,0.033-0.362-0.063-0.44-0.229l-2.464-5.442c-0.29-0.603-0.036-1.323,0.563-1.612c0.6-0.29,1.076-0.013,1.367,0.592     C305.926,183.1,305.958,183.204,305.979,183.305z"
+   id="path6006" />
+		</g>
+	</g>
+	<g
+   id="g6008">
+		<g
+   id="g6010">
+			<circle
+   fill="#FFFFFF"
+   cx="304.486"
+   cy="181.671"
+   r="2.473"
+   id="circle6012" />
+			<path
+   fill="#20262B"
+   d="M307.213,181.686c-0.016,0.688-0.337,1.396-0.837,1.877c-0.507,0.492-1.181,0.769-1.901,0.789     c-0.679,0.021-1.412-0.254-1.92-0.752c-0.518-0.5-0.834-1.186-0.849-1.945c-0.083-1.452,1.241-2.881,2.801-2.818     c0.705-0.007,1.466,0.334,1.955,0.864c0.503,0.528,0.774,1.26,0.751,1.975V181.686L307.213,181.686z M306.708,181.671     c-0.026-1.194-1.089-2.155-2.24-2.11c-0.515,0.01-1.088,0.226-1.481,0.608c-0.396,0.396-0.646,0.915-0.668,1.517     c-0.064,1.125,0.941,2.254,2.181,2.252c0.577,0.027,1.188-0.229,1.603-0.658c0.42-0.432,0.633-1.012,0.607-1.62L306.708,181.671     L306.708,181.671L306.708,181.671z"
+   id="path6014" />
+		</g>
+		<circle
+   opacity="0.62"
+   fill="#41C3D8"
+   enable-background="new    "
+   cx="304.473"
+   cy="181.724"
+   r="2.251"
+   id="circle6016" />
+		
+			<radialGradient
+   id="SVGID_326_"
+   cx="280.7051"
+   cy="1113.3643"
+   r="3.4863"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#B4CB80;stop-opacity:0"
+   id="stop6019" />
+			<stop
+   offset="0.8485"
+   style="stop-color:#335782"
+   id="stop6021" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_326_)"
+   enable-background="new    "
+   cx="304.473"
+   cy="181.724"
+   r="2.251"
+   id="circle6023" />
+		<ellipse
+   fill="#FFFFFF"
+   cx="304.486"
+   cy="180.022"
+   rx="0.59"
+   ry="0.541"
+   id="ellipse6025" />
+	</g>
+	<g
+   id="g6027">
+		<g
+   id="g6029">
+			<circle
+   fill="#FFFFFF"
+   cx="309.454"
+   cy="199.159"
+   r="1.935"
+   id="circle6031" />
+			<path
+   fill="#20262B"
+   d="M311.557,199.168c-0.004,1.111-1.006,2.066-2.103,2.063c-1.104,0.057-2.146-0.928-2.136-2.068     c-0.045-1.137,0.951-2.221,2.146-2.18c0.55-0.004,1.129,0.252,1.509,0.658c0.394,0.406,0.603,0.967,0.584,1.521V199.168     L311.557,199.168z M311.225,199.159c-0.015-0.951-0.856-1.728-1.781-1.692c-0.873-0.019-1.729,0.758-1.723,1.692     c-0.047,0.926,0.771,1.8,1.733,1.798c0.973,0.052,1.829-0.848,1.771-1.807V199.159z"
+   id="path6033" />
+		</g>
+		<circle
+   opacity="0.62"
+   fill="#50CC88"
+   enable-background="new    "
+   cx="309.456"
+   cy="199.178"
+   r="1.815"
+   id="circle6035" />
+		
+			<radialGradient
+   id="SVGID_327_"
+   cx="285.6455"
+   cy="1131.083"
+   r="2.812"
+   gradientTransform="matrix(1 0 0 1 24 -933)"
+   gradientUnits="userSpaceOnUse">
+			<stop
+   offset="0.3333"
+   style="stop-color:#ADCB6A;stop-opacity:0"
+   id="stop6038" />
+			<stop
+   offset="1"
+   style="stop-color:#124D3B"
+   id="stop6040" />
+		</radialGradient>
+		<circle
+   opacity="0.62"
+   fill="url(#SVGID_327_)"
+   enable-background="new    "
+   cx="309.456"
+   cy="199.179"
+   r="1.815"
+   id="circle6042" />
+		<circle
+   opacity="0.62"
+   fill="#FFFFFF"
+   enable-background="new    "
+   cx="309.355"
+   cy="197.676"
+   r="0.203"
+   id="circle6044" />
+	</g>
+	<g
+   id="g6046">
+		<path
+   fill="#CEE6EF"
+   d="M312.027,183.461l-2.479,4.288c-0.122,0.209-0.337,0.211-0.575,0.065    c-0.229-0.141-0.313-0.301-0.188-0.516c0.006-0.01,0.014-0.021,0.021-0.025l2.82-4.065c0.074-0.108,0.227-0.138,0.329-0.062    C312.059,183.218,312.088,183.355,312.027,183.461z"
+   id="path6048" />
+		<path
+   fill="#8B979E"
+   d="M312.078,183.491l-1.541,2.733c-0.262,0.447-0.51,0.908-0.784,1.354c-0.108,0.695-1.392,0.311-0.983-0.328    v0.001l1.614-2.331l0.802-1.169l0.412-0.593c0.06-0.096,0.277-0.157,0.387-0.063C312.096,183.164,312.164,183.37,312.078,183.491z     M311.977,183.434c0.117-0.177-0.17-0.391-0.303-0.19l-0.402,0.567l-0.813,1.162l-1.618,2.328l0,0l0,0    c-0.184,0.213,0.022,0.449,0.263,0.525c0.11,0.046,0.242,0.051,0.313-0.021c0.067-0.063,0.122-0.201,0.185-0.313    c0.246-0.46,0.521-0.903,0.781-1.357L311.977,183.434z"
+   id="path6050" />
+	</g>
+	<g
+   id="g6052">
+		<path
+   fill="#39444F"
+   d="M313.48,182.384c0.051,0.595-0.451,1.147-1.037,1.183c-0.588,0.065-1.17-0.42-1.205-1.021    c-0.064-0.602,0.428-1.199,1.051-1.219C312.893,181.266,313.471,181.787,313.48,182.384z M313.359,182.389    c-0.039-0.529-0.545-0.949-1.067-0.895c-0.503,0.027-0.954,0.51-0.907,1.037c0.018,0.525,0.516,0.979,1.055,0.935    C312.98,183.449,313.418,182.921,313.359,182.389z"
+   id="path6054" />
+		<circle
+   fill="#90D6BD"
+   cx="312.364"
+   cy="182.45"
+   r="1.058"
+   id="circle6056" />
+	</g>
+</g>
+<g
+   display="none"
+   id="g6058">
+	<path
+   display="inline"
+   fill="#8C979B"
+   d="M325.824,234.988l-0.005,0.008c-0.211,0.419-0.779,0.595-1.201,0.371   c-0.422-0.195-0.629-0.77-0.396-1.203c0.197-0.424,0.782-0.651,1.229-0.396C325.875,233.98,326.06,234.572,325.824,234.988z    M325.724,234.936c0.188-0.373,0.024-0.859-0.354-1.035c-0.348-0.175-0.846-0.055-1.032,0.332   c-0.192,0.354-0.058,0.864,0.334,1.061C325.034,235.494,325.544,235.322,325.724,234.936z"
+   id="path6060" />
+	<circle
+   display="inline"
+   fill="#91BABC"
+   cx="330.558"
+   cy="232.854"
+   r="0.721"
+   id="circle6062" />
+	<path
+   display="inline"
+   fill="#8C979B"
+   d="M331.326,232.865v0.007c-0.007,0.403-0.378,0.752-0.787,0.739   c-0.397,0.008-0.772-0.354-0.759-0.778c-0.008-0.4,0.354-0.796,0.798-0.767C330.985,232.07,331.353,232.457,331.326,232.865z    M331.23,232.863c0.004-0.358-0.305-0.672-0.666-0.664c-0.33-0.004-0.668,0.271-0.67,0.646c-0.019,0.343,0.282,0.687,0.655,0.688   C330.908,233.554,331.235,233.229,331.23,232.863z"
+   id="path6064" />
+	<circle
+   display="inline"
+   fill="#91BABC"
+   cx="325.019"
+   cy="234.588"
+   r="0.813"
+   id="circle6066" />
+	<path
+   display="inline"
+   fill="#8C979B"
+   d="M323.674,227.305c-0.104,0.428-0.589,0.705-1.012,0.59   c-0.431-0.092-0.729-0.572-0.61-1.008c0.094-0.438,0.586-0.75,1.026-0.617C323.521,226.378,323.804,226.877,323.674,227.305z    M323.582,227.275c0.103-0.382-0.161-0.795-0.537-0.875c-0.367-0.097-0.789,0.133-0.883,0.521c-0.113,0.373,0.133,0.81,0.521,0.897   C323.069,227.934,323.496,227.667,323.582,227.275z"
+   id="path6068" />
+	<circle
+   display="inline"
+   fill="#91BABC"
+   cx="322.864"
+   cy="227.119"
+   r="0.75"
+   id="circle6070" />
+	<g
+   display="inline"
+   id="g6072">
+		<path
+   fill="#DFE7EA"
+   d="M328.653,231.171l1.646,1.358c0.05,0.039,0.06,0.106,0.019,0.164c-0.037,0.045-0.104,0.056-0.149,0.021    l-1.81-1.133c-0.118-0.075-0.153-0.233-0.08-0.354c0.072-0.121,0.23-0.156,0.354-0.082    C328.636,231.154,328.647,231.162,328.653,231.171z"
+   id="path6074" />
+		<g
+   id="g6076">
+			<path
+   fill="#8A949B"
+   d="M328.685,231.135l1.039,0.881l0.521,0.44c0.039,0.038,0.1,0.062,0.113,0.14     c0.01,0.068-0.033,0.135-0.102,0.154c-0.146,0.013-0.213-0.098-0.314-0.141l-1.164-0.713c-0.188-0.146-0.399-0.186-0.564-0.412     C328.071,231.21,328.459,230.92,328.685,231.135z M328.623,231.207c-0.152-0.141-0.412,0.053-0.325,0.242     c0.089,0.146,0.354,0.252,0.521,0.381l1.146,0.736c0.095,0.047,0.194,0.152,0.278,0.145c0.107-0.037,0.082-0.167-0.03-0.221     l-0.528-0.428L328.623,231.207z"
+   id="path6078" />
+		</g>
+	</g>
+	<g
+   display="inline"
+   id="g6080">
+		<path
+   fill="#DFE7EA"
+   d="M325.149,234.152c-0.019,0-0.028,0-0.045-0.004c-0.101-0.021-0.151-0.125-0.129-0.222l0.433-1.638    c0.024-0.096,0.125-0.152,0.221-0.127c0.095,0.025,0.151,0.123,0.128,0.22l-0.434,1.638    C325.303,234.1,325.231,234.152,325.149,234.152z"
+   id="path6082" />
+		<g
+   id="g6084">
+			<path
+   fill="#8A949B"
+   d="M325.149,234.174c-0.104-0.003-0.199-0.092-0.197-0.202c0.004-0.106,0.039-0.187,0.061-0.28l0.139-0.548     l0.141-0.546l0.063-0.273c0.016-0.096,0.104-0.215,0.229-0.213c0.125-0.006,0.224,0.104,0.226,0.229     c-0.012,0.117-0.047,0.188-0.063,0.285l-0.149,0.543l-0.148,0.543l-0.073,0.271C325.349,234.074,325.259,234.178,325.149,234.174     z M325.151,234.131c0.188-0.009,0.166-0.275,0.229-0.438l0.139-0.547l0.141-0.552c0.051-0.188,0.113-0.378-0.072-0.396     c-0.146-0.021-0.158,0.252-0.217,0.408l-0.15,0.543l-0.148,0.543C325.008,233.873,324.923,234.111,325.151,234.131z"
+   id="path6086" />
+		</g>
+	</g>
+	<g
+   display="inline"
+   id="g6088">
+		<path
+   fill="#DFE7EA"
+   d="M324.25,228.732l-1.304-1.354c-0.057-0.059-0.055-0.146,0.005-0.201c0.052-0.049,0.131-0.052,0.187-0.009    l1.479,1.162c0.116,0.093,0.142,0.266,0.047,0.382c-0.095,0.118-0.269,0.139-0.386,0.047    C324.267,228.75,324.258,228.74,324.25,228.732z"
+   id="path6090" />
+		<g
+   id="g6092">
+			<path
+   fill="#A9B7BF"
+   d="M324.218,228.767l-0.867-0.929c-0.144-0.157-0.289-0.305-0.432-0.471     c-0.076-0.104,0.016-0.26,0.143-0.246c0.125,0.025,0.185,0.117,0.272,0.173l1.007,0.771l0.252,0.192     c0.09,0.056,0.182,0.17,0.172,0.298C324.774,228.83,324.387,228.965,324.218,228.767z M324.283,228.697     c0.134,0.146,0.384,0.037,0.388-0.146c0.018-0.184-0.232-0.282-0.377-0.426l-0.986-0.799c-0.082-0.055-0.162-0.157-0.248-0.172     c-0.096-0.021-0.175,0.115-0.104,0.188l0.438,0.451L324.283,228.697z"
+   id="path6094" />
+		</g>
+	</g>
+	<g
+   display="inline"
+   id="g6096">
+		<path
+   fill="#89A4AF"
+   d="M330.64,227.992l-2.848,1.492c-0.1,0.053-0.221,0.015-0.271-0.084c-0.049-0.097-0.019-0.203,0.064-0.264    l2.659-1.806c0.177-0.12,0.414-0.073,0.532,0.104c0.117,0.177,0.072,0.409-0.104,0.528    C330.666,227.979,330.653,227.986,330.64,227.992z"
+   id="path6098" />
+		<g
+   id="g6100">
+			<path
+   fill="#535A5F"
+   d="M330.66,228.033l-1.828,0.945l-0.914,0.475c-0.079,0.035-0.149,0.099-0.256,0.078     c-0.101-0.012-0.181-0.114-0.188-0.194c-0.008-0.24,0.231-0.28,0.346-0.39l1.697-1.164c0.299-0.188,0.528-0.416,0.885-0.555     c0.191-0.037,0.396,0.09,0.468,0.264c0.073,0.188-0.003,0.406-0.162,0.517l0.004-0.003L330.66,228.033z M330.617,227.949     l0.026-0.021l-0.002,0.002l0.008-0.005c0.125-0.085,0.179-0.263,0.123-0.396c-0.061-0.146-0.207-0.236-0.358-0.215     c-0.278,0.104-0.567,0.356-0.854,0.529l-1.709,1.146c-0.127,0.104-0.338,0.172-0.324,0.319c0.024,0.185,0.229,0.188,0.36,0.076     l0.909-0.479L330.617,227.949z"
+   id="path6102" />
+		</g>
+	</g>
+	<g
+   display="inline"
+   id="g6104">
+		<path
+   fill="#89A4AF"
+   d="M332.901,230.707l-4.275-0.119c-0.125-0.004-0.227-0.109-0.225-0.234c0.004-0.121,0.104-0.219,0.225-0.223    l4.275-0.12c0.188-0.005,0.354,0.146,0.354,0.34c0.005,0.191-0.146,0.353-0.337,0.356    C332.916,230.707,332.908,230.707,332.901,230.707z"
+   id="path6106" />
+		<g
+   id="g6108">
+			<path
+   fill="#535A5F"
+   d="M332.899,230.754l-2.59-0.085l-1.3-0.043l-0.321-0.011c-0.104,0.007-0.24-0.034-0.289-0.157     c-0.047-0.111-0.006-0.246,0.104-0.312c0.107-0.063,0.223-0.039,0.327-0.054l2.592-0.086l1.296-0.043     c0.105,0.002,0.21-0.021,0.34,0.021c0.114,0.045,0.205,0.146,0.238,0.268C333.373,230.488,333.151,230.779,332.899,230.754z      M332.901,230.66c0.197,0.006,0.353-0.188,0.297-0.379c-0.055-0.205-0.258-0.25-0.479-0.219l-1.295,0.023l-2.593,0.063     c-0.104,0.008-0.227-0.015-0.307,0.037c-0.082,0.045-0.123,0.157-0.082,0.252c0.082,0.189,0.377,0.103,0.568,0.131l1.299,0.025     L332.901,230.66z"
+   id="path6110" />
+		</g>
+	</g>
+	<g
+   display="inline"
+   id="g6112">
+		<path
+   fill="#89A4AF"
+   d="M326.862,231.098l1.078,3.355c0.078,0.24-0.056,0.5-0.295,0.576c-0.244,0.08-0.502-0.059-0.58-0.297    c-0.004-0.021-0.01-0.033-0.017-0.055l-0.688-3.456c-0.028-0.142,0.063-0.272,0.203-0.307    C326.694,230.895,326.824,230.972,326.862,231.098z"
+   id="path6114" />
+		<g
+   id="g6116">
+			<path
+   fill="#535A5F"
+   d="M326.89,231.089l0.729,2.218l0.358,1.108c0.076,0.188,0.019,0.45-0.158,0.577     c-0.166,0.136-0.426,0.146-0.603,0.018c-0.192-0.123-0.221-0.365-0.253-0.543l-0.111-0.572l-0.224-1.145l-0.224-1.145     c-0.01-0.193-0.146-0.382-0.029-0.594C326.494,230.818,326.819,230.869,326.89,231.089z M326.837,231.107     c-0.05-0.177-0.314-0.228-0.417-0.061c-0.094,0.146,0.026,0.363,0.044,0.547l0.235,1.143l0.231,1.146l0.115,0.566     c0.037,0.194,0.063,0.392,0.223,0.481c0.142,0.104,0.351,0.091,0.482-0.017c0.145-0.11,0.195-0.295,0.133-0.473l-0.354-1.111     L326.837,231.107z"
+   id="path6118" />
+		</g>
+	</g>
+	<g
+   display="inline"
+   id="g6120">
+		<path
+   fill="#89A4AF"
+   d="M324.593,231.841l-2.105,2.129c-0.146,0.149-0.391,0.151-0.539,0.004    c-0.146-0.147-0.146-0.391-0.002-0.538c0.011-0.01,0.021-0.019,0.023-0.025l2.301-1.92c0.104-0.084,0.252-0.065,0.338,0.031    C324.685,231.613,324.678,231.754,324.593,231.841z"
+   id="path6122" />
+		<g
+   id="g6124">
+			<path
+   fill="#535A5F"
+   d="M324.608,231.857l-1.387,1.422l-0.693,0.711c-0.114,0.139-0.346,0.188-0.508,0.1     c-0.184-0.084-0.264-0.282-0.229-0.475c0.04-0.191,0.216-0.291,0.332-0.395l0.383-0.314l0.771-0.631l0.769-0.632     c0.132-0.085,0.231-0.271,0.44-0.219C324.676,231.463,324.742,231.719,324.608,231.857z M324.576,231.824     c0.108-0.108,0.061-0.324-0.103-0.356c-0.146-0.054-0.271,0.125-0.396,0.215l-0.76,0.644l-0.76,0.646l-0.381,0.32     c-0.125,0.107-0.271,0.195-0.295,0.347c-0.08,0.313,0.361,0.554,0.576,0.292l0.703-0.697L324.576,231.824z"
+   id="path6126" />
+		</g>
+	</g>
+	<g
+   display="inline"
+   id="g6128">
+		<path
+   fill="#89A4AF"
+   d="M321.319,229.08l3.021,0.547c0.134,0.023,0.222,0.15,0.193,0.283c-0.021,0.123-0.132,0.205-0.25,0.197    l-3.064-0.17c-0.235-0.02-0.42-0.223-0.405-0.457c0.019-0.236,0.217-0.425,0.455-0.406    C321.285,229.076,321.303,229.078,321.319,229.08z"
+   id="path6130" />
+		<g
+   id="g6132">
+			<path
+   fill="#535A5F"
+   d="M321.326,229.035l2.034,0.382l1.021,0.194c0.201,0.061,0.236,0.338,0.084,0.461     c-0.172,0.105-0.354,0.033-0.521,0.043l-2.064-0.104l-0.518-0.022c-0.158,0.006-0.387-0.025-0.498-0.191     c-0.119-0.154-0.139-0.369-0.026-0.539C320.931,229.087,321.149,229.004,321.326,229.035z M321.315,229.125     c-0.34-0.069-0.588,0.354-0.377,0.611c0.094,0.135,0.248,0.164,0.428,0.164l0.518,0.027l2.064,0.135     c0.166-0.011,0.359,0.062,0.486-0.027c0.131-0.104,0.094-0.33-0.066-0.375l-1.018-0.18L321.315,229.125z"
+   id="path6134" />
+		</g>
+	</g>
+	<g
+   display="inline"
+   id="g6136">
+		<path
+   fill="#39444F"
+   d="M321.672,229.404c-0.01,0.646-0.579,1.188-1.219,1.188c-0.625,0.026-1.234-0.521-1.229-1.199    c-0.029-0.639,0.555-1.282,1.233-1.252c0.679-0.011,1.253,0.613,1.213,1.263H321.672L321.672,229.404z"
+   id="path6138" />
+		<circle
+   fill="#36A030"
+   cx="320.471"
+   cy="229.357"
+   r="1.099"
+   id="circle6140" />
+	</g>
+	<g
+   display="inline"
+   id="g6142">
+		<path
+   fill="#39444F"
+   d="M322.622,234.539c-0.021,0.609-0.563,1.113-1.172,1.123c-0.592,0.035-1.188-0.479-1.194-1.146    c-0.044-0.619,0.522-1.259,1.215-1.229c0.646-0.008,1.206,0.625,1.151,1.24V234.539z M322.28,234.529    c-0.025-0.442-0.42-0.771-0.836-0.75c-0.37,0.004-0.758,0.317-0.774,0.763c-0.037,0.396,0.322,0.838,0.794,0.846    C321.918,235.427,322.334,234.98,322.28,234.529L322.28,234.529L322.28,234.529z"
+   id="path6144" />
+		<circle
+   fill="#B240ED"
+   cx="321.458"
+   cy="234.519"
+   r="0.897"
+   id="circle6146" />
+	</g>
+	<g
+   display="inline"
+   id="g6148">
+		<path
+   fill="#39444F"
+   d="M332.536,227.179c-0.01,0.634-0.573,1.17-1.204,1.172c-0.619,0.029-1.222-0.52-1.215-1.188    c-0.027-0.631,0.538-1.271,1.229-1.232c0.655-0.012,1.235,0.604,1.19,1.246V227.179z M332.31,227.175    c-0.015-0.521-0.474-0.944-0.979-0.927c-0.473,0.002-0.944,0.402-0.941,0.931c-0.021,0.492,0.411,0.987,0.954,0.986    c0.526,0.032,1.009-0.47,0.97-0.996v0.006H332.31z"
+   id="path6150" />
+		<circle
+   fill="#36A030"
+   cx="331.338"
+   cy="227.162"
+   r="1.085"
+   id="circle6152" />
+	</g>
+	<g
+   display="inline"
+   id="g6155">
+		<path
+   fill="#39444F"
+   d="M335.074,230.322c-0.011,0.604-0.548,1.119-1.151,1.121c-0.592,0.027-1.17-0.5-1.166-1.127    c-0.031-0.619,0.523-1.227,1.17-1.193c0.645-0.012,1.188,0.582,1.147,1.193V230.322L335.074,230.322z M334.849,230.316    c-0.012-0.494-0.459-0.894-0.922-0.873c-0.459,0-0.896,0.385-0.896,0.873c-0.021,0.479,0.393,0.938,0.902,0.94    c0.5,0.028,0.955-0.447,0.916-0.947V230.316z"
+   id="path6157" />
+		<circle
+   fill="#36A030"
+   cx="333.927"
+   cy="230.305"
+   r="1.034"
+   id="circle6159" />
+	</g>
+	<g
+   display="inline"
+   id="g6161">
+		<g
+   id="g6163">
+			<path
+   fill="#89A4AF"
+   d="M325.485,225.111l0.813,3.979c0.025,0.147-0.07,0.294-0.222,0.319c-0.125,0.021-0.246-0.041-0.3-0.148     l-1.657-3.664c-0.193-0.402-0.022-0.895,0.382-1.085c0.4-0.192,0.727-0.008,0.92,0.396     C325.449,224.973,325.474,225.043,325.485,225.111z"
+   id="path6165" />
+			<g
+   id="g6167">
+				<path
+   fill="#535A5F"
+   d="M325.528,225.102l0.56,2.82l0.14,0.705l0.068,0.354c0.028,0.106,0.046,0.26-0.054,0.354      c-0.089,0.096-0.229,0.127-0.351,0.065c-0.125-0.063-0.156-0.199-0.207-0.304l-0.305-0.647l-1.197-2.611      c-0.103-0.209-0.225-0.447-0.185-0.708c0.026-0.251,0.187-0.481,0.396-0.616c0.201-0.136,0.508-0.188,0.729-0.027      C325.344,224.626,325.474,224.859,325.528,225.102z M325.44,225.119c-0.051-0.219-0.181-0.438-0.362-0.557      c-0.188-0.136-0.435-0.091-0.625,0.027c-0.191,0.115-0.332,0.316-0.36,0.545c-0.039,0.229,0.063,0.441,0.166,0.663l1.172,2.625      l0.293,0.657c0.055,0.104,0.079,0.229,0.188,0.277c0.096,0.061,0.235,0.029,0.309-0.059c0.085-0.086,0.07-0.206,0.039-0.322      l-0.071-0.353l-0.146-0.703L325.44,225.119z"
+   id="path6169" />
+			</g>
+		</g>
+	</g>
+	<g
+   display="inline"
+   id="g6171">
+		<path
+   fill="#39444F"
+   d="M326.315,224.022c-0.018,0.967-0.875,1.793-1.842,1.793c-0.949,0.045-1.865-0.791-1.863-1.813    c-0.063-0.979,0.85-1.938,1.871-1.896c1.026-0.02,1.896,0.938,1.834,1.908V224.022z M325.798,224.012    c-0.012-0.805-0.65-1.27-1.313-1.242c-0.664-0.006-1.271,0.553-1.281,1.258c-0.043,0.666,0.557,1.336,1.287,1.332    C325.205,225.404,325.853,224.726,325.798,224.012L325.798,224.012z"
+   id="path6173" />
+		<circle
+   fill="#1CC9F2"
+   cx="324.507"
+   cy="224.057"
+   r="1.396"
+   id="circle6175" />
+	</g>
+	<g
+   display="inline"
+   id="g6177">
+		<path
+   fill="#39444F"
+   d="M329.239,235.785c-0.004,0.748-0.678,1.39-1.416,1.388c-0.741,0.033-1.44-0.618-1.438-1.401    c-0.028-0.748,0.644-1.49,1.445-1.453c0.771-0.016,1.453,0.707,1.403,1.461v0.006H329.239L329.239,235.785z M329.017,235.779    c-0.012-0.638-0.574-1.166-1.197-1.144c-0.588-0.001-1.166,0.505-1.157,1.149c-0.03,0.604,0.521,1.207,1.166,1.203    c0.651,0.035,1.229-0.57,1.188-1.215V235.779z"
+   id="path6179" />
+		<circle
+   fill="#36A030"
+   cx="327.815"
+   cy="235.78"
+   r="1.261"
+   id="circle6181" />
+	</g>
+	<g
+   display="inline"
+   id="g6183">
+		<path
+   fill="#DFE7EA"
+   d="M328.581,225.837l-1.171,2.53c-0.069,0.146-0.211,0.164-0.384,0.082c-0.162-0.075-0.229-0.183-0.159-0.33    c0.004-0.008,0.009-0.02,0.013-0.021l1.418-2.404c0.043-0.076,0.137-0.104,0.217-0.062    C328.586,225.672,328.614,225.763,328.581,225.837z"
+   id="path6185" />
+		<g
+   id="g6187">
+			<path
+   fill="#A9B7BF"
+   d="M328.606,225.85l-0.857,1.926c-0.146,0.319-0.066,0.146-0.229,0.459c-0.018,0.479-0.887,0.291-0.66-0.146     l0.002-0.001l0.722-1.163l0.466-0.831l0.236-0.42C328.382,225.476,328.713,225.645,328.606,225.85z M328.556,225.824     c0.073-0.137-0.15-0.271-0.229-0.121l-0.232,0.414l-0.467,0.828l-0.729,1.162l0,0c-0.108,0.154,0.054,0.312,0.215,0.344     c0.188,0.065,0.271-0.082,0.326-0.258c0.133-0.326,0.08-0.142,0.229-0.459L328.556,225.824z"
+   id="path6189" />
+		</g>
+	</g>
+	<path
+   display="inline"
+   fill="#8C979B"
+   d="M329.742,224.988c0.084,0.459-0.271,0.938-0.729,1.011   c-0.459,0.095-0.953-0.243-1.027-0.718c-0.098-0.467,0.248-0.979,0.731-1.041C329.192,224.154,329.685,224.518,329.742,224.988z    M329.647,225c-0.063-0.418-0.504-0.711-0.903-0.625c-0.402,0.063-0.72,0.472-0.646,0.887c0.053,0.414,0.481,0.732,0.901,0.658   C329.428,225.863,329.733,225.419,329.647,225z"
+   id="path6191" />
+	<circle
+   display="inline"
+   fill="#91BABC"
+   cx="328.873"
+   cy="225.131"
+   r="0.795"
+   id="circle6193" />
+	<circle
+   display="inline"
+   fill="#282E30"
+   cx="326.355"
+   cy="230.094"
+   r="2.503"
+   id="circle6195" />
+	<circle
+   display="inline"
+   fill="#4E6368"
+   cx="326.997"
+   cy="229.074"
+   r="0.85"
+   id="circle6197" />
+	<circle
+   display="inline"
+   fill="#FFFFFF"
+   cx="324.72"
+   cy="222.953"
+   r="0.392"
+   id="circle6199" />
+	<circle
+   display="inline"
+   fill="#FFFFFF"
+   cx="321.836"
+   cy="233.775"
+   r="0.209"
+   id="circle6201" />
+	<circle
+   display="inline"
+   fill="#FFFFFF"
+   cx="327.963"
+   cy="234.797"
+   r="0.209"
+   id="circle6203" />
+</g>
+<g
+   id="g6205">
+	<path
+   fill="#8C979B"
+   d="M302.694,234.399l-0.005,0.008c-0.207,0.412-0.766,0.584-1.181,0.364c-0.414-0.191-0.617-0.756-0.39-1.182   c0.194-0.417,0.769-0.64,1.208-0.39C302.744,233.409,302.926,233.991,302.694,234.399z M302.596,234.348   c0.185-0.366,0.023-0.845-0.348-1.017c-0.342-0.172-0.831-0.054-1.015,0.326c-0.188,0.347-0.057,0.849,0.328,1.042   C301.918,234.897,302.419,234.728,302.596,234.348z"
+   id="path6207" />
+	<circle
+   fill="#91BABC"
+   cx="307.345"
+   cy="232.302"
+   r="0.708"
+   id="circle6209" />
+	<path
+   fill="#8C979B"
+   d="M308.101,232.314v0.007c-0.007,0.396-0.372,0.739-0.773,0.727c-0.391,0.008-0.759-0.349-0.746-0.765   c-0.008-0.394,0.349-0.782,0.784-0.754C307.766,231.532,308.126,231.912,308.101,232.314z M308.005,232.312   c0.004-0.353-0.299-0.66-0.654-0.652c-0.324-0.004-0.656,0.267-0.658,0.634c-0.018,0.337,0.277,0.675,0.645,0.677   C307.689,232.99,308.011,232.671,308.005,232.312z"
+   id="path6211" />
+	<circle
+   fill="#91BABC"
+   cx="301.902"
+   cy="234.006"
+   r="0.798"
+   id="circle6213" />
+	<path
+   fill="#8C979B"
+   d="M300.581,226.85c-0.103,0.421-0.578,0.693-0.994,0.58c-0.423-0.091-0.717-0.563-0.6-0.99   c0.092-0.431,0.576-0.737,1.009-0.606C300.431,225.939,300.709,226.43,300.581,226.85z M300.491,226.821   c0.101-0.376-0.158-0.781-0.528-0.86c-0.36-0.095-0.775,0.131-0.867,0.512c-0.111,0.366,0.131,0.796,0.512,0.882   C299.987,227.468,300.406,227.206,300.491,226.821z"
+   id="path6215" />
+	<circle
+   fill="#91BABC"
+   cx="299.786"
+   cy="226.668"
+   r="0.737"
+   id="circle6217" />
+	<g
+   id="g6219">
+		<path
+   fill="#DFE7EA"
+   d="M305.474,230.648l1.617,1.335c0.049,0.038,0.059,0.104,0.019,0.161c-0.037,0.044-0.102,0.055-0.147,0.021    l-1.777-1.113c-0.116-0.074-0.151-0.229-0.079-0.349c0.071-0.119,0.227-0.153,0.349-0.08    C305.457,230.633,305.469,230.64,305.474,230.648z"
+   id="path6221" />
+		<g
+   id="g6223">
+			<path
+   fill="#8A949B"
+   d="M305.505,230.613l1.021,0.865l0.513,0.433c0.038,0.038,0.098,0.061,0.111,0.138     c0.01,0.067-0.032,0.132-0.1,0.151c-0.145,0.013-0.209-0.096-0.31-0.138l-1.144-0.701c-0.185-0.144-0.393-0.182-0.555-0.404     C304.902,230.688,305.283,230.402,305.505,230.613z M305.444,230.685c-0.149-0.139-0.405,0.052-0.319,0.237     c0.087,0.144,0.347,0.248,0.512,0.375l1.126,0.723c0.093,0.047,0.191,0.15,0.273,0.143c0.105-0.037,0.081-0.164-0.029-0.217     l-0.52-0.421L305.444,230.685z"
+   id="path6225" />
+		</g>
+	</g>
+	<g
+   id="g6227">
+		<path
+   fill="#DFE7EA"
+   d="M302.031,233.578c-0.019,0-0.028,0-0.044-0.004c-0.1-0.02-0.149-0.123-0.127-0.218l0.425-1.609    c0.024-0.094,0.123-0.149,0.217-0.124c0.094,0.024,0.149,0.12,0.126,0.216l-0.426,1.608    C302.182,233.526,302.111,233.578,302.031,233.578z"
+   id="path6229" />
+		<g
+   id="g6231">
+			<path
+   fill="#8A949B"
+   d="M302.031,233.6c-0.103-0.003-0.196-0.091-0.194-0.199c0.004-0.104,0.039-0.183,0.06-0.275l0.137-0.538     l0.138-0.536l0.062-0.269c0.016-0.095,0.103-0.211,0.226-0.21c0.123-0.005,0.22,0.104,0.222,0.226     c-0.012,0.115-0.046,0.186-0.063,0.28l-0.146,0.534l-0.146,0.533l-0.072,0.266C302.227,233.502,302.139,233.604,302.031,233.6z      M302.033,233.557c0.184-0.008,0.163-0.271,0.225-0.43l0.136-0.537l0.139-0.542c0.05-0.186,0.111-0.371-0.071-0.389     c-0.144-0.021-0.155,0.247-0.213,0.401l-0.147,0.533l-0.146,0.533C301.892,233.304,301.809,233.538,302.033,233.557z"
+   id="path6233" />
+		</g>
+	</g>
+	<g
+   id="g6235">
+		<path
+   fill="#DFE7EA"
+   d="M301.147,228.253l-1.281-1.33c-0.056-0.058-0.054-0.145,0.005-0.198c0.051-0.048,0.129-0.051,0.184-0.008    l1.453,1.142c0.114,0.091,0.14,0.261,0.047,0.375c-0.094,0.116-0.265,0.137-0.38,0.046    C301.164,228.27,301.155,228.261,301.147,228.253z"
+   id="path6237" />
+		<g
+   id="g6239">
+			<path
+   fill="#A9B7BF"
+   d="M301.115,228.286l-0.852-0.912c-0.142-0.155-0.284-0.3-0.424-0.463c-0.075-0.103,0.015-0.255,0.14-0.242     c0.123,0.025,0.182,0.115,0.268,0.17l0.989,0.758l0.248,0.188c0.088,0.055,0.179,0.167,0.169,0.293     C301.663,228.349,301.281,228.481,301.115,228.286z M301.18,228.218c0.132,0.144,0.377,0.037,0.381-0.144     c0.018-0.181-0.229-0.277-0.37-0.418l-0.969-0.785c-0.081-0.054-0.159-0.154-0.244-0.169c-0.094-0.021-0.172,0.113-0.102,0.185     l0.43,0.442L301.18,228.218z"
+   id="path6241" />
+		</g>
+	</g>
+	<g
+   id="g6243">
+		<path
+   fill="#89A4AF"
+   d="M307.426,227.525l-2.798,1.466c-0.098,0.052-0.217,0.015-0.267-0.082c-0.049-0.095-0.019-0.2,0.063-0.259    l2.613-1.774c0.174-0.118,0.407-0.072,0.523,0.102c0.114,0.174,0.07,0.402-0.104,0.519    C307.451,227.512,307.439,227.52,307.426,227.525z"
+   id="path6245" />
+		<g
+   id="g6247">
+			<path
+   fill="#535A5F"
+   d="M307.446,227.565l-1.797,0.929l-0.897,0.467c-0.078,0.034-0.147,0.097-0.252,0.076     c-0.099-0.011-0.178-0.111-0.186-0.19c-0.007-0.236,0.228-0.275,0.34-0.383l1.668-1.144c0.294-0.185,0.52-0.409,0.869-0.545     c0.188-0.037,0.39,0.088,0.46,0.259c0.072,0.184-0.003,0.399-0.159,0.508l0.004-0.003L307.446,227.565z M307.403,227.483     l0.026-0.021l-0.002,0.002l0.008-0.005c0.123-0.083,0.176-0.258,0.121-0.389c-0.06-0.144-0.204-0.232-0.353-0.211     c-0.273,0.102-0.558,0.351-0.84,0.521l-1.679,1.126c-0.125,0.102-0.332,0.169-0.319,0.313c0.024,0.182,0.226,0.186,0.354,0.075     l0.894-0.471L307.403,227.483z"
+   id="path6249" />
+		</g>
+	</g>
+	<g
+   id="g6251">
+		<path
+   fill="#89A4AF"
+   d="M309.544,230.147l-4.035-0.044c-0.123-0.004-0.311-0.095-0.309-0.218c0.004-0.119,0.114-0.235,0.233-0.239    l4.208-0.127c0.185-0.005,0.298,0.217,0.298,0.407C309.944,230.114,309.544,230.147,309.544,230.147L309.544,230.147z"
+   id="path6253" />
+		<g
+   id="g6255">
+			<path
+   fill="#535A5F"
+   d="M309.647,230.239l-2.545-0.084l-1.277-0.042l-0.315-0.011c-0.103,0.007-0.236-0.033-0.284-0.154     c-0.046-0.109-0.006-0.242,0.102-0.306c0.105-0.063,0.219-0.039,0.321-0.054l2.547-0.084l1.273-0.042     c0.104,0.002,0.206-0.021,0.334,0.02c0.112,0.045,0.201,0.145,0.234,0.264C310.111,229.978,309.894,230.264,309.647,230.239z      M309.648,230.147c0.193,0.006,0.346-0.185,0.291-0.372c-0.054-0.201-0.253-0.245-0.471-0.215l-1.272,0.023l-2.548,0.061     c-0.102,0.008-0.223-0.014-0.301,0.037c-0.081,0.044-0.121,0.154-0.081,0.247c0.081,0.187,0.37,0.102,0.559,0.129l1.276,0.025     L309.648,230.147z"
+   id="path6257" />
+		</g>
+	</g>
+	<g
+   id="g6259">
+		<path
+   fill="#89A4AF"
+   d="M303.714,230.577l1.06,3.297c0.077,0.235-0.055,0.491-0.29,0.565c-0.239,0.079-0.493-0.057-0.569-0.291    c-0.004-0.021-0.01-0.033-0.017-0.054l-0.677-3.396c-0.027-0.139,0.062-0.268,0.2-0.301    C303.549,230.377,303.677,230.453,303.714,230.577z"
+   id="path6261" />
+		<g
+   id="g6263">
+			<path
+   fill="#535A5F"
+   d="M303.741,230.568l0.717,2.179l0.352,1.089c0.075,0.186,0.019,0.442-0.155,0.567     c-0.163,0.134-0.418,0.144-0.592,0.018c-0.189-0.121-0.217-0.359-0.248-0.534l-0.109-0.562l-0.221-1.125l-0.22-1.124     c-0.009-0.19-0.144-0.376-0.028-0.584C303.353,230.303,303.672,230.353,303.741,230.568z M303.689,230.586     c-0.049-0.173-0.31-0.224-0.41-0.06c-0.092,0.145,0.026,0.357,0.043,0.538l0.231,1.122l0.228,1.127l0.113,0.557     c0.036,0.19,0.062,0.385,0.219,0.473c0.14,0.103,0.345,0.09,0.474-0.016c0.143-0.108,0.192-0.29,0.131-0.465l-0.348-1.092     L303.689,230.586z"
+   id="path6265" />
+		</g>
+	</g>
+	<g
+   id="g6267">
+		<path
+   fill="#89A4AF"
+   d="M301.484,231.307l-2.069,2.092c-0.143,0.147-0.384,0.149-0.529,0.004    c-0.144-0.145-0.144-0.384-0.002-0.528c0.011-0.01,0.021-0.019,0.023-0.025l2.261-1.886c0.103-0.083,0.247-0.064,0.332,0.03    C301.574,231.083,301.567,231.222,301.484,231.307z"
+   id="path6269" />
+		<g
+   id="g6271">
+			<path
+   fill="#535A5F"
+   d="M301.5,231.323l-1.363,1.397l-0.681,0.698c-0.112,0.137-0.34,0.186-0.499,0.098     c-0.181-0.082-0.26-0.277-0.225-0.466c0.039-0.188,0.212-0.286,0.326-0.388l0.376-0.31l0.758-0.619l0.755-0.621     c0.13-0.084,0.228-0.266,0.434-0.215C301.565,230.936,301.631,231.187,301.5,231.323z M301.468,231.291     c0.106-0.106,0.06-0.319-0.101-0.351c-0.145-0.053-0.267,0.123-0.39,0.211l-0.747,0.633l-0.746,0.635l-0.374,0.314     c-0.123,0.106-0.267,0.192-0.29,0.341c-0.078,0.309,0.355,0.544,0.566,0.287l0.69-0.686L301.468,231.291z"
+   id="path6273" />
+		</g>
+	</g>
+	<g
+   id="g6275">
+		<path
+   fill="#89A4AF"
+   d="M298.268,228.595l2.968,0.537c0.132,0.022,0.218,0.147,0.19,0.278c-0.021,0.121-0.13,0.201-0.246,0.193    l-3.011-0.167c-0.231-0.019-0.413-0.219-0.398-0.449c0.019-0.231,0.213-0.417,0.447-0.398    C298.234,228.591,298.251,228.593,298.268,228.595z"
+   id="path6277" />
+		<g
+   id="g6279">
+			<path
+   fill="#535A5F"
+   d="M298.274,228.55l1.999,0.376l1.003,0.19c0.197,0.06,0.231,0.332,0.082,0.453     c-0.169,0.104-0.349,0.032-0.512,0.042l-2.028-0.103l-0.509-0.022c-0.155,0.006-0.38-0.024-0.489-0.188     c-0.117-0.152-0.136-0.363-0.025-0.53C297.886,228.601,298.101,228.52,298.274,228.55z M298.264,228.639     c-0.334-0.068-0.577,0.347-0.37,0.601c0.092,0.132,0.243,0.161,0.42,0.161l0.509,0.026l2.028,0.133     c0.163-0.011,0.354,0.061,0.479-0.026c0.128-0.104,0.092-0.325-0.065-0.369l-1-0.177L298.264,228.639z"
+   id="path6281" />
+		</g>
+	</g>
+	<g
+   id="g6283">
+		<path
+   fill="#39444F"
+   d="M298.749,229.423c-0.009,0-0.416,0.818-1.32,0.818c-0.692,0-1.309-0.635-1.304-1.302    c-0.029-0.627,0.383-1.484,1.309-1.429C298.404,227.511,299.049,228.379,298.749,229.423L298.749,229.423z"
+   id="path6285" />
+		<circle
+   fill="#36A030"
+   cx="297.434"
+   cy="228.866"
+   r="1.08"
+   id="circle6287" />
+	</g>
+	<g
+   id="g6289">
+		<path
+   fill="#39444F"
+   d="M299.586,233.981c0,0.599-0.506,1.07-1.104,1.08c-0.581,0.035-1.211-0.471-1.217-1.126    c-0.043-0.608,0.578-1.237,1.258-1.207C299.158,232.721,299.586,233.377,299.586,233.981L299.586,233.981z M299.212,233.948    c-0.025-0.435-0.413-0.757-0.821-0.736c-0.364,0.004-0.745,0.312-0.761,0.749c-0.037,0.389,0.316,0.823,0.78,0.831    C298.855,234.83,299.265,234.392,299.212,233.948L299.212,233.948L299.212,233.948z"
+   id="path6291" />
+		<circle
+   fill="#B240ED"
+   cx="298.404"
+   cy="233.939"
+   r="0.881"
+   id="circle6293" />
+	</g>
+	<g
+   id="g6295">
+		<path
+   fill="#39444F"
+   d="M309.437,226.811c0,0.832-0.764,1.21-1.383,1.212c-0.608,0.028-1.234-0.656-1.228-1.313    c-0.027-0.62,0.597-1.359,1.275-1.321C308.986,225.387,309.437,226.179,309.437,226.811L309.437,226.811z M309.066,226.722    c-0.015-0.511-0.465-0.928-0.961-0.91c-0.465,0.002-0.928,0.396-0.926,0.914c-0.021,0.484,0.404,0.971,0.938,0.97    c0.518,0.031,0.991-0.462,0.953-0.979v0.005H309.066z"
+   id="path6297" />
+		<circle
+   fill="#36A030"
+   cx="308.112"
+   cy="226.709"
+   r="1.066"
+   id="circle6299" />
+	</g>
+	<g
+   id="g6301">
+		<path
+   fill="#39444F"
+   d="M312,229.799c0,0.593-0.568,1.242-1.33,1.241c-0.581,0.027-1.332-0.615-1.328-1.231    c-0.03-0.607,0.519-1.365,1.153-1.332C311.551,228.336,312,229.198,312,229.799L312,229.799z M311.562,229.809    c-0.012-0.485-0.451-0.878-0.906-0.857c-0.45,0-0.881,0.378-0.881,0.857c-0.021,0.472,0.386,0.923,0.887,0.925    c0.491,0.027,0.938-0.439,0.9-0.931V229.809z"
+   id="path6303" />
+		<circle
+   fill="#36A030"
+   cx="310.655"
+   cy="229.798"
+   r="1.016"
+   id="circle6305" />
+	</g>
+	<g
+   id="g6307">
+		<g
+   id="g6309">
+			<path
+   fill="#89A4AF"
+   d="M302.361,224.694l0.798,3.91c0.025,0.146-0.068,0.289-0.218,0.314c-0.122,0.02-0.241-0.041-0.294-0.146     l-1.629-3.6c-0.189-0.396-0.021-0.879,0.375-1.066c0.394-0.189,0.714-0.008,0.904,0.389     C302.326,224.559,302.35,224.627,302.361,224.694z"
+   id="path6311" />
+			<g
+   id="g6313">
+				<path
+   fill="#535A5F"
+   d="M302.403,224.685l0.55,2.771l0.138,0.693l0.066,0.347c0.028,0.104,0.046,0.256-0.053,0.349      c-0.087,0.094-0.226,0.125-0.344,0.064c-0.123-0.063-0.154-0.196-0.204-0.299l-0.299-0.636l-1.177-2.566      c-0.101-0.205-0.221-0.439-0.182-0.695c0.026-0.247,0.184-0.473,0.389-0.605c0.198-0.134,0.499-0.185,0.717-0.027      C302.222,224.218,302.35,224.447,302.403,224.685z M302.317,224.702c-0.05-0.215-0.178-0.431-0.356-0.547      c-0.186-0.134-0.427-0.089-0.614,0.027c-0.188,0.112-0.326,0.311-0.354,0.535c-0.039,0.225,0.062,0.434,0.163,0.651l1.151,2.579      l0.288,0.646c0.054,0.102,0.077,0.224,0.185,0.272c0.095,0.059,0.231,0.028,0.304-0.058c0.083-0.085,0.068-0.203,0.038-0.317      l-0.07-0.346l-0.143-0.691L302.317,224.702z"
+   id="path6315" />
+			</g>
+		</g>
+	</g>
+	<g
+   id="g6317">
+		<path
+   fill="#39444F"
+   d="M303.135,223.615c0.056,0.687-0.455,1.772-1.532,1.771c-0.933,0.044-1.951-0.672-1.948-1.781    c-0.063-0.962,0.894-1.801,1.897-1.761C302.386,221.843,303.135,222.662,303.135,223.615L303.135,223.615z M302.668,223.614    c-0.012-0.791-0.639-1.248-1.289-1.221c-0.652-0.006-1.25,0.543-1.259,1.236c-0.043,0.654,0.547,1.313,1.265,1.309    C302.086,224.982,302.722,224.315,302.668,223.614L302.668,223.614z"
+   id="path6319" />
+		<circle
+   fill="#1CC9F2"
+   cx="301.399"
+   cy="223.658"
+   r="1.372"
+   id="circle6321" />
+	</g>
+	<g
+   id="g6323">
+		<path
+   fill="#39444F"
+   d="M306.212,235.37c0,0.353-0.322,1.321-1.53,1.32c-0.729,0.032-1.548-0.731-1.546-1.501    c-0.028-0.735,0.646-1.68,1.585-1.629C306.081,233.6,306.212,235.017,306.212,235.37z"
+   id="path6325" />
+		<circle
+   fill="#36A030"
+   cx="304.65"
+   cy="235.178"
+   r="1.239"
+   id="circle6327" />
+	</g>
+	<g
+   id="g6329">
+		<path
+   fill="#DFE7EA"
+   d="M305.403,225.407l-1.15,2.486c-0.068,0.144-0.208,0.161-0.378,0.081c-0.159-0.074-0.226-0.18-0.156-0.324    c0.004-0.008,0.009-0.02,0.013-0.021l1.394-2.362c0.042-0.075,0.134-0.102,0.213-0.061    C305.408,225.245,305.436,225.335,305.403,225.407z"
+   id="path6331" />
+		<g
+   id="g6333">
+			<path
+   fill="#A9B7BF"
+   d="M305.428,225.42l-0.842,1.893c-0.145,0.313-0.065,0.084-0.225,0.391     c-0.018,0.471-0.872,0.797-0.649-0.203h0.002l0.709-1.084l0.458-0.786l0.232-0.396     C305.207,225.038,305.532,225.219,305.428,225.42z M305.378,225.396c0.072-0.135-0.147-0.267-0.225-0.119l-0.229,0.406     l-0.458,0.814l-0.716,1.142l0,0c-0.106,0.151,0.053,0.306,0.211,0.338c0.185,0.064,0.267-0.081,0.32-0.254     c0.131-0.32,0.079-0.139,0.225-0.451L305.378,225.396z"
+   id="path6335" />
+		</g>
+	</g>
+	<path
+   fill="#8C979B"
+   d="M306.544,224.573c0.082,0.451-0.266,0.922-0.717,0.993c-0.451,0.094-0.937-0.238-1.01-0.705   c-0.096-0.458,0.244-0.962,0.719-1.022C306.004,223.754,306.487,224.111,306.544,224.573z M306.451,224.585   c-0.062-0.41-0.495-0.698-0.888-0.614c-0.396,0.062-0.707,0.464-0.635,0.872c0.052,0.406,0.474,0.72,0.886,0.646   C306.235,225.434,306.535,224.997,306.451,224.585z"
+   id="path6337" />
+	<circle
+   fill="#91BABC"
+   cx="305.689"
+   cy="224.714"
+   r="0.781"
+   id="circle6339" />
+	<circle
+   fill="#282E30"
+   cx="303.215"
+   cy="229.59"
+   r="2.459"
+   id="circle6341" />
+	<circle
+   fill="#4E6368"
+   cx="303.847"
+   cy="228.588"
+   r="0.835"
+   id="circle6343" />
+	<circle
+   fill="#FFFFFF"
+   cx="301.609"
+   cy="222.574"
+   r="0.385"
+   id="circle6345" />
+	<circle
+   fill="#FFFFFF"
+   cx="298.775"
+   cy="233.208"
+   r="0.205"
+   id="circle6347" />
+	<circle
+   fill="#FFFFFF"
+   cx="304.796"
+   cy="234.211"
+   r="0.206"
+   id="circle6349" />
+</g>
+<path
+   fill="#39444F"
+   d="M346.5,237.413"
+   id="path6351" />
+</svg>
\ No newline at end of file
diff --git a/data/org.gnome.Empathy.gschema.xml.in b/data/org.gnome.Empathy.gschema.xml.in
index 6f8f14638..de57af80c 100644
--- a/data/org.gnome.Empathy.gschema.xml.in
+++ b/data/org.gnome.Empathy.gschema.xml.in
@@ -23,11 +23,6 @@
       <_summary>Empathy should auto-away when idle</_summary>
       <_description>Whether Empathy should go into away mode automatically if the user is idle.</_description>
     </key>
-    <key name="butterfly-logs-migrated" type="b">
-      <default>false</default>
-      <_summary>Empathy has migrated butterfly logs</_summary>
-      <_description>Whether Empathy has migrated butterfly logs.</_description>
-    </key>
     <key name="file-transfer-default-folder" type="s">
       <default>''</default>
       <_summary>Empathy default download folder</_summary>
@@ -231,6 +226,11 @@ present them to the user immediately.</_description>
       <_summary>Empathy should use the avatar of the contact as the chat window icon</_summary>
       <_description>Whether Empathy should use the avatar of the contact as the chat window icon.</_description>
     </key>
+    <key name="room-last-account" type="o">
+      <default>"/"</default>
+      <_summary>Last account selected in Join Room dialog</_summary>
+      <_description>D-Bus object path of the last account selected to join a room.</_description>
+    </key>
   </schema>
   <schema id="org.gnome.Empathy.call" path="/org/gnome/empathy/call/">
     <key name="volume" type="d">
diff --git a/goa-mc-plugin/Makefile.am b/goa-mc-plugin/Makefile.am
new file mode 100644
index 000000000..18fc9eae6
--- /dev/null
+++ b/goa-mc-plugin/Makefile.am
@@ -0,0 +1,18 @@
+AM_CPPFLAGS = \
+        $(GOA_CFLAGS)
+
+pluginsdir = $(MISSION_CONTROL_PLUGINS_DIR)
+plugins_LTLIBRARIES = \
+        mcp-account-manager-goa.la
+
+mcp_account_manager_goa_la_SOURCES = \
+        mission-control-plugin.c \
+        mcp-account-manager-goa.c mcp-account-manager-goa.h \
+	$(NULL)
+
+mcp_account_manager_goa_la_LIBADD = \
+        $(GOA_LIBS)
+
+mcp_account_manager_goa_la_LDFLAGS = \
+        -module \
+        -avoid-version
diff --git a/goa-mc-plugin/mcp-account-manager-goa.c b/goa-mc-plugin/mcp-account-manager-goa.c
new file mode 100644
index 000000000..d81c60816
--- /dev/null
+++ b/goa-mc-plugin/mcp-account-manager-goa.c
@@ -0,0 +1,589 @@
+/*
+ * mcp-account-manager-goa.c
+ *
+ * McpAccountManagerGoa - a Mission Control plugin to expose GNOME Online
+ * Accounts with chat capabilities (e.g. Facebook) to Mission Control
+ *
+ * Copyright (C) 2010-2011 Collabora Ltd.
+ *
+ * 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.1 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *    Danielle Madeley <danielle.madeley@collabora.co.uk>
+ */
+
+#include <glib/gi18n.h>
+
+#include <telepathy-glib/util.h>
+
+#define GOA_API_IS_SUBJECT_TO_CHANGE /* awesome! */
+#include <goa/goa.h>
+
+#include "mcp-account-manager-goa.h"
+
+#define DEBUG g_debug
+#define GET_PRIVATE(self) (((McpAccountManagerGoa *) self)->priv)
+#define DECLARE_GASYNC_CALLBACK(name) \
+  static void name (GObject *, GAsyncResult *, gpointer);
+
+#define PLUGIN_NAME "goa"
+#define PLUGIN_PRIORITY (MCP_ACCOUNT_STORAGE_PLUGIN_PRIO_KEYRING + 10)
+#define PLUGIN_DESCRIPTION "Provide Telepathy Accounts from GOA"
+#define PLUGIN_PROVIDER "org.gnome.OnlineAccounts"
+
+#define INITIAL_COMMENT "Parameters of GOA Telepathy accounts"
+
+static void account_storage_iface_init (McpAccountStorageIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (McpAccountManagerGoa,
+    mcp_account_manager_goa,
+    G_TYPE_OBJECT,
+    G_IMPLEMENT_INTERFACE (MCP_TYPE_ACCOUNT_STORAGE,
+      account_storage_iface_init))
+
+struct _McpAccountManagerGoaPrivate
+{
+  gboolean ready;
+
+  GoaClient *client;
+  GHashTable *accounts; /* alloc'ed string -> ref'ed GoaObject */
+
+  GKeyFile *store;
+  gchar *filename;
+};
+
+
+static void
+mcp_account_manager_goa_dispose (GObject *self)
+{
+  McpAccountManagerGoaPrivate *priv = GET_PRIVATE (self);
+
+  tp_clear_object (&priv->client);
+
+  G_OBJECT_CLASS (mcp_account_manager_goa_parent_class)->dispose (self);
+}
+
+
+static void
+mcp_account_manager_goa_finalize (GObject *self)
+{
+  McpAccountManagerGoaPrivate *priv = GET_PRIVATE (self);
+
+  g_hash_table_destroy (priv->accounts);
+  g_key_file_free (priv->store);
+  g_free (priv->filename);
+
+  G_OBJECT_CLASS (mcp_account_manager_goa_parent_class)->finalize (self);
+}
+
+
+static void
+mcp_account_manager_goa_class_init (McpAccountManagerGoaClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+  gobject_class->dispose = mcp_account_manager_goa_dispose;
+  gobject_class->finalize = mcp_account_manager_goa_finalize;
+
+  g_type_class_add_private (gobject_class,
+      sizeof (McpAccountManagerGoaPrivate));
+}
+
+static GHashTable *
+get_tp_parameters (GoaAccount *account)
+{
+  GHashTable *params = g_hash_table_new_full (g_str_hash, g_str_equal,
+      NULL, g_free);
+  const char *type = goa_account_get_provider_type (account);
+
+#define PARAM(key, value) g_hash_table_insert (params, key, g_strdup (value));
+
+  if (!tp_strdiff (type, "google"))
+    {
+      PARAM ("manager", "gabble");
+      PARAM ("protocol", "jabber");
+      PARAM ("Icon", "im-google-talk");
+      PARAM ("Service", "google-talk");
+
+      PARAM ("param-account", goa_account_get_identity (account));
+      PARAM ("param-server", "talk.google.com");
+      PARAM ("param-fallback-servers",
+          "talkx.l.google.com;"
+          "talkx.l.google.com:443,oldssl;"
+          "talkx.l.google.com:80");
+      PARAM ("param-extra-certificate-identities", "talk.google.com");
+      PARAM ("param-require-encryption", "true");
+    }
+  else
+    {
+      /* unknown account type */
+      g_hash_table_destroy (params);
+      return NULL;
+    }
+
+  /* TODO: add Facebook support */
+
+  /* generic properties */
+  PARAM ("DisplayName", goa_account_get_presentation_identity (account));
+
+#undef PARAM
+
+  return params;
+}
+
+
+static char *
+get_tp_account_name (GoaAccount *account)
+{
+  GHashTable *params = get_tp_parameters (account);
+  const char *type = goa_account_get_provider_type (account);
+  const char *id = goa_account_get_id (account);
+  char *name;
+
+  if (params == NULL)
+    return NULL;
+
+  name = g_strdup_printf ("%s/%s/goa_%s_%s",
+      (char *) g_hash_table_lookup (params, "manager"),
+      (char *) g_hash_table_lookup (params, "protocol"),
+      type, id);
+
+  g_hash_table_destroy (params);
+
+  return name;
+}
+
+static void
+object_chat_changed_cb (GoaObject *object,
+    GParamSpec *spec,
+    McpAccountManagerGoa *self)
+{
+  GoaAccount *account = goa_object_peek_account (object);
+  char *name = get_tp_account_name (account);
+  gboolean enabled;
+
+  enabled = (goa_object_peek_chat (object) != NULL);
+
+  DEBUG ("%s %s", name, enabled ? "enabled" : "disabled");
+
+  if (self->priv->ready)
+    g_signal_emit_by_name (self, "toggled", name, enabled);
+}
+
+static void
+_new_account (McpAccountManagerGoa *self,
+    GoaObject *object)
+{
+  GoaAccount *account = goa_object_peek_account (object);
+  char *account_name = get_tp_account_name (account);
+
+  if (account_name == NULL)
+    return;
+
+  /* @account_name now is owned by the hash table */
+  g_hash_table_insert (self->priv->accounts, account_name,
+      g_object_ref (object));
+
+  if (self->priv->ready)
+    g_signal_emit_by_name (self, "created", account_name);
+
+  tp_g_signal_connect_object (object, "notify::chat",
+      G_CALLBACK (object_chat_changed_cb), self, 0);
+}
+
+
+DECLARE_GASYNC_CALLBACK (_goa_client_new_cb);
+
+static void
+load_store (McpAccountManagerGoa *self)
+{
+  GError *error = NULL;
+
+  if (!g_key_file_load_from_file (self->priv->store, self->priv->filename,
+        G_KEY_FILE_KEEP_COMMENTS, &error))
+    {
+      gchar *dir;
+
+      DEBUG ("Failed to load keyfile, creating a new one: %s", error->message);
+
+      dir = g_path_get_dirname (self->priv->filename);
+
+      g_mkdir_with_parents (dir, 0700);
+      g_free (dir);
+
+      g_key_file_set_comment (self->priv->store, NULL, NULL, INITIAL_COMMENT,
+          NULL);
+
+      g_error_free (error);
+    }
+}
+
+static void
+mcp_account_manager_goa_init (McpAccountManagerGoa *self)
+{
+  gchar *path;
+
+  DEBUG ("GOA MC plugin initialised");
+
+  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
+      MCP_TYPE_ACCOUNT_MANAGER_GOA, McpAccountManagerGoaPrivate);
+
+  self->priv->accounts = g_hash_table_new_full (g_str_hash, g_str_equal,
+      g_free, g_object_unref);
+
+  goa_client_new (NULL, _goa_client_new_cb, self);
+
+  /* key file store */
+  self->priv->store = g_key_file_new ();
+  self->priv->filename = g_build_filename (g_get_user_data_dir (), "telepathy",
+      "mission-control", "accounts-goa.cfg", NULL);
+
+  load_store (self);
+}
+
+
+static void
+_account_added_cb (GoaClient *client,
+    GoaObject *object,
+    McpAccountManagerGoa *self)
+{
+  _new_account (self, object);
+}
+
+
+static void
+_account_removed_cb (GoaClient *client,
+    GoaObject *object,
+    McpAccountManagerGoa *self)
+{
+  GoaAccount *account = goa_object_peek_account (object);
+  char *name = get_tp_account_name (account);
+
+  if (self->priv->ready)
+    g_signal_emit_by_name (self, "deleted", name);
+
+  g_hash_table_remove (self->priv->accounts, name);
+
+  g_free (name);
+}
+
+static void
+_goa_client_new_cb (GObject *obj,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  McpAccountManagerGoa *self = user_data;
+  GoaClient *client;
+  GList *accounts, *ptr;
+  GError *error = NULL;
+
+  self->priv->client = goa_client_new_finish (result, &error);
+
+  if (error != NULL)
+    {
+      DEBUG ("Failed to connect to GOA");
+      return;
+    }
+
+  accounts = goa_client_get_accounts (self->priv->client);
+
+  for (ptr = accounts; ptr != NULL; ptr = ptr->next)
+    {
+      _new_account (self, ptr->data);
+    }
+
+  g_list_free_full (accounts, g_object_unref);
+
+  g_signal_connect (self->priv->client, "account-added",
+      G_CALLBACK (_account_added_cb), self);
+  g_signal_connect (self->priv->client, "account-removed",
+      G_CALLBACK (_account_removed_cb), self);
+}
+
+
+static GList *
+mcp_account_manager_goa_list (const McpAccountStorage *self,
+    const McpAccountManager *am)
+{
+  McpAccountManagerGoaPrivate *priv = GET_PRIVATE (self);
+  GList *accounts = NULL;
+  GHashTableIter iter;
+  gpointer key;
+
+  DEBUG (G_STRFUNC);
+
+  g_hash_table_iter_init (&iter, priv->accounts);
+  while (g_hash_table_iter_next (&iter, &key, NULL))
+    accounts = g_list_prepend (accounts, g_strdup (key));
+
+  return accounts;
+}
+
+
+static void
+get_enabled (const McpAccountStorage *self,
+    const McpAccountManager *am,
+    const gchar *acct,
+    GoaObject *object)
+{
+  mcp_account_manager_set_value (am, acct, "Enabled",
+      goa_object_peek_chat (object) != NULL ? "true" : "false");
+}
+
+
+static gboolean
+mcp_account_manager_goa_get (const McpAccountStorage *self,
+    const McpAccountManager *am,
+    const gchar *acct,
+    const gchar *key)
+{
+  McpAccountManagerGoaPrivate *priv = GET_PRIVATE (self);
+  GoaObject *object;
+  GoaAccount *account;
+
+  DEBUG ("%s: %s, %s", G_STRFUNC, acct, key);
+
+  object = g_hash_table_lookup (priv->accounts, acct);
+
+  if (object == NULL)
+    return FALSE;
+
+  account = goa_object_peek_account (object);
+
+  if (account == NULL)
+    return FALSE;
+
+  if (key == NULL)
+    {
+      /* load all keys */
+      GHashTable *params = get_tp_parameters (account);
+      GHashTableIter iter;
+      gpointer key, value;
+      GStrv keys;
+      guint i;
+      gssize nkeys = 0;
+
+      /* Properties from GOA */
+      g_hash_table_iter_init (&iter, params);
+      while (g_hash_table_iter_next (&iter, &key, &value))
+        mcp_account_manager_set_value (am, acct, key, value);
+
+      g_hash_table_destroy (params);
+
+      /* Stored properties */
+      keys = g_key_file_get_keys (priv->store, acct, &nkeys, NULL);
+
+      for (i = 0; i < nkeys; i++)
+        {
+          gchar *v = g_key_file_get_value (priv->store, acct, keys[i], NULL);
+
+          if (v != NULL)
+            {
+              mcp_account_manager_set_value (am, acct, keys[i], v);
+              g_free (v);
+            }
+        }
+
+      g_strfreev (keys);
+
+      /* Enabled */
+      get_enabled (self, am, acct, object);
+    }
+  else if (!tp_strdiff (key, "Enabled"))
+    {
+      get_enabled (self, am, acct, object);
+    }
+  else
+    {
+      /* get a specific key */
+      GHashTable *params = get_tp_parameters (account);
+      gchar *value;
+
+      value = g_hash_table_lookup (params, key);
+
+      if (value == NULL)
+        value = g_key_file_get_value (priv->store, acct, key, NULL);
+      else
+        value = g_strdup (value);
+
+      mcp_account_manager_set_value (am, acct, key, value);
+
+      g_hash_table_destroy (params);
+      g_free (value);
+    }
+
+  return TRUE;
+}
+
+static gboolean
+account_is_in_goa (const McpAccountStorage *self,
+    const gchar *account)
+{
+  McpAccountManagerGoaPrivate *priv = GET_PRIVATE (self);
+
+  return (g_hash_table_lookup (priv->accounts, acct) != NULL);
+}
+
+static gboolean
+mcp_account_manager_goa_set (const McpAccountStorage *self,
+    const McpAccountManager *am,
+    const gchar *account,
+    const gchar *key,
+    const gchar *val)
+{
+  McpAccountManagerGoaPrivate *priv = GET_PRIVATE (self);
+  GError *error = NULL;
+
+  if (!account_is_in_goa (self, account))
+    return FALSE;
+
+  /* No need to save Enabled, it's up to the GOA configuration if the account
+   * is configured or not. */
+  if (!tp_strdiff (key, "Enabled"))
+    return TRUE;
+
+  DEBUG ("%s: (%s, %s, %s)", G_STRFUNC, account, key, val);
+
+  if (val != NULL)
+    g_key_file_set_value (priv->store, account, key, val);
+  else
+    g_key_file_remove_key (priv->store, account, key, NULL);
+
+  /* Pretend we save everything so MC won't save this in accounts.cfg */
+  return TRUE;
+}
+
+
+static gboolean
+mcp_account_manager_goa_delete (const McpAccountStorage *self,
+    const McpAccountManager *am,
+    const gchar *account,
+    const gchar *key)
+{
+  McpAccountManagerGoaPrivate *priv = GET_PRIVATE (self);
+
+  if (!account_is_in_goa (self, account))
+    return FALSE;
+
+  DEBUG ("%s: (%s, %s)", G_STRFUNC, account, key);
+
+  if (key == NULL)
+    {
+      g_key_file_remove_group (priv->store, account, NULL);
+    }
+  else
+    {
+      g_key_file_remove_key (priv->store, account, key, NULL);
+    }
+
+  /* Pretend we deleted everything */
+  return TRUE;
+}
+
+
+static gboolean
+mcp_account_manager_goa_commit (const McpAccountStorage *self,
+    const McpAccountManager *am)
+{
+  McpAccountManagerGoaPrivate *priv = GET_PRIVATE (self);
+  gchar *data;
+  gsize len;
+  GError *error = NULL;
+
+  DEBUG ("Save config to %s", priv->filename);
+
+  data = g_key_file_to_data (priv->store, &len, &error);
+  if (data == NULL)
+    {
+      DEBUG ("Failed to get data from store: %s", error->message);
+
+      g_error_free (error);
+      return FALSE;
+    }
+
+  if (!g_file_set_contents (priv->filename, data, len, &error))
+    {
+      DEBUG ("Failed to write file: %s", error->message);
+
+      g_free (data);
+      g_error_free (error);
+      return FALSE;
+    }
+
+  g_free (data);
+
+  return TRUE;
+}
+
+
+static void
+mcp_account_manager_goa_ready (const McpAccountStorage *self,
+    const McpAccountManager *am)
+{
+  McpAccountManagerGoaPrivate *priv = GET_PRIVATE (self);
+
+  priv->ready = TRUE;
+}
+
+
+static guint
+mcp_account_manager_goa_get_restrictions (const McpAccountStorage *self,
+    const gchar *account)
+{
+  return TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_PARAMETERS |
+         TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_SERVICE |
+         TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_ENABLED;
+}
+
+
+static void
+mcp_account_manager_goa_get_identifier (const McpAccountStorage *self,
+    const gchar *acct,
+    GValue *identifier)
+{
+  McpAccountManagerGoaPrivate *priv = GET_PRIVATE (self);
+  GoaObject *object;
+  GoaAccount *account;
+
+  object = g_hash_table_lookup (priv->accounts, acct);
+  g_return_if_fail (object != NULL);
+
+  account = goa_object_peek_account (object);
+  g_return_if_fail (account != NULL);
+
+  g_value_init (identifier, G_TYPE_STRING);
+  g_value_set_string (identifier, goa_account_get_id (account));
+}
+
+
+static void
+account_storage_iface_init (McpAccountStorageIface *iface)
+{
+  mcp_account_storage_iface_set_name (iface, PLUGIN_NAME);
+  mcp_account_storage_iface_set_desc (iface, PLUGIN_DESCRIPTION);
+  mcp_account_storage_iface_set_priority (iface, PLUGIN_PRIORITY);
+  mcp_account_storage_iface_set_provider (iface, PLUGIN_PROVIDER);
+
+#define IMPLEMENT(x) mcp_account_storage_iface_implement_##x(iface, \
+    mcp_account_manager_goa_##x)
+  IMPLEMENT (get);
+  IMPLEMENT (list);
+  IMPLEMENT (set);
+  IMPLEMENT (delete);
+  IMPLEMENT (commit);
+  IMPLEMENT (ready);
+  IMPLEMENT (get_restrictions);
+  IMPLEMENT (get_identifier);
+#undef IMPLEMENT
+}
diff --git a/goa-mc-plugin/mcp-account-manager-goa.h b/goa-mc-plugin/mcp-account-manager-goa.h
new file mode 100644
index 000000000..bc4cfde67
--- /dev/null
+++ b/goa-mc-plugin/mcp-account-manager-goa.h
@@ -0,0 +1,60 @@
+/*
+ * mcp-account-manager-goa.h
+ *
+ * McpAccountManagerGoa - a Mission Control plugin to expose GNOME Online
+ * Accounts with chat capabilities (e.g. Facebook) to Mission Control
+ *
+ * Copyright (C) 2010-2011 Collabora Ltd.
+ *
+ * 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.1 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *    Danielle Madeley <danielle.madeley@collabora.co.uk>
+ */
+
+#include <mission-control-plugins/mission-control-plugins.h>
+
+#ifndef __MCP_ACCOUNT_MANAGER_GOA_H__
+#define __MCP_ACCOUNT_MANAGER_GOA_H__
+
+G_BEGIN_DECLS
+
+#define MCP_TYPE_ACCOUNT_MANAGER_GOA	(mcp_account_manager_goa_get_type ())
+#define MCP_ACCOUNT_MANAGER_GOA(obj)	(G_TYPE_CHECK_INSTANCE_CAST ((obj), MCP_TYPE_ACCOUNT_MANAGER_GOA, McpAccountManagerGoa))
+#define MCP_ACCOUNT_MANAGER_GOA_CLASS(obj)	(G_TYPE_CHECK_CLASS_CAST ((obj), MCP_TYPE_ACCOUNT_MANAGER_GOA, McpAccountManagerGoaClass))
+#define MCP_IS_ACCOUNT_MANAGER_GOA(obj)	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), MCP_TYPE_ACCOUNT_MANAGER_GOA))
+#define MCP_IS_ACCOUNT_MANAGER_GOA_CLASS(obj)	(G_TYPE_CHECK_CLASS_TYPE ((obj), MCP_TYPE_ACCOUNT_MANAGER_GOA))
+#define MCP_ACCOUNT_MANAGER_GOA_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), MCP_TYPE_ACCOUNT_MANAGER_GOA, McpAccountManagerGoaClass))
+
+typedef struct _McpAccountManagerGoa McpAccountManagerGoa;
+typedef struct _McpAccountManagerGoaClass McpAccountManagerGoaClass;
+typedef struct _McpAccountManagerGoaPrivate McpAccountManagerGoaPrivate;
+
+struct _McpAccountManagerGoa
+{
+  GObject parent;
+
+  McpAccountManagerGoaPrivate *priv;
+};
+
+struct _McpAccountManagerGoaClass
+{
+  GObjectClass parent_class;
+};
+
+GType mcp_account_manager_goa_get_type (void);
+
+G_END_DECLS
+
+#endif
diff --git a/goa-mc-plugin/mission-control-plugin.c b/goa-mc-plugin/mission-control-plugin.c
new file mode 100644
index 000000000..406530560
--- /dev/null
+++ b/goa-mc-plugin/mission-control-plugin.c
@@ -0,0 +1,48 @@
+/*
+ * mission-control-plugin.c
+ *
+ * A Mission Control plugin to expose GNOME Online Accounts with chat
+ * capabilities (e.g. Facebook) to Mission Control
+ *
+ * Copyright (C) 2010-2011 Collabora Ltd.
+ *
+ * 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.1 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *    Danielle Madeley <danielle.madeley@collabora.co.uk>
+ */
+
+#include <mission-control-plugins/mission-control-plugins.h>
+
+#include "mcp-account-manager-goa.h"
+
+GObject *
+mcp_plugin_ref_nth_object (guint n)
+{
+  static void *plugin_0 = NULL;
+
+  switch (n)
+    {
+      case 0:
+        if (plugin_0 == NULL)
+          plugin_0 = g_object_new (MCP_TYPE_ACCOUNT_MANAGER_GOA, NULL);
+        else
+          g_object_ref (plugin_0);
+
+        return plugin_0;
+
+      default:
+        return NULL;
+    }
+}
diff --git a/help/C/irc-manage.page b/help/C/irc-manage.page
index 2f9cbaea4..2a85f1567 100644
--- a/help/C/irc-manage.page
+++ b/help/C/irc-manage.page
@@ -1,5 +1,6 @@
 <page xmlns="http://projectmallard.org/1.0/"
       xmlns:e="http://projectmallard.org/experimental/"
+      xmlns:if="http://projectmallard.org/experimental/if/"
       type="guide" style="2column"
       id="irc-manage"
       groups="one two">
@@ -36,6 +37,11 @@
   <note style="info package">
     <p>You must have the <sys>telepathy-idle</sys> package installed to use IRC 
     in <app>Empathy</app>.</p>
+    <if:choose>
+      <if:when test="if:supports('action:install')">
+        <p><link action="install:telepathy-idle" xref="index" style="button">Install telepathy-idle</link></p>
+      </if:when>
+    </if:choose>
   </note>
 
   <section id="manage" style="2column">
diff --git a/help/C/share-desktop.page b/help/C/share-desktop.page
index 08a7dd6b4..f7cf463d2 100644
--- a/help/C/share-desktop.page
+++ b/help/C/share-desktop.page
@@ -5,14 +5,19 @@
   <info>
     <link type="guide" xref="index#advanced"/>
     <desc>
-      Share the desktop with your contacts.
+      Show your desktop to your contacts.
     </desc>
     <revision pkgversion="2.28" version="0.1" date="2009-08-02" status="stub"/>
     <revision pkgversion="2.28" version="0.2" date="2009-08-10" status="review"/>
+    <revision pkgversion="2.28" version="0.3" date="2009-09-05" status="review"/>
     <credit type="author">
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
+    <credit type="author">
+      <name>Ekaterina Gerasimova</name>
+      <email>kittykat3756@gmail.com</email>
+    </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
     </license>    
@@ -28,62 +33,71 @@
   <title>Share your desktop</title>
 
   <p>
-    It is possible, with some of your contacts, to share your desktop with them, or to start
-     using your contacts desktop. You can use
-     this functionality to show your desktop to your contacts, to ask for help or to
-     help your contacts resolve a problem.
+    It is possible to share your desktop with some of your contacts. You can
+    use this functionality to show your desktop to your contacts to, for
+    example, ask for help or help your contacts resolve a problem.
   </p>
 
   <note style="tip">
     <p>
-      In order to be able to share your desktop or to remotely use your contacts desktop,
-       it is necessary to have a remote desktop viewer application installed in your system.
+      To be able to share your desktop, you need to have a VNC server, which
+      has support for the feature, installed on your system. <app>Vino</app>,
+      the GNOME VNC server, has the required support.
     </p>
   </note>
 
   <steps>
     <item>
       <p>
-        From the <gui>Contact List</gui> window, perform one of the following:
+        From the <gui>Contact List</gui> window, do one of the following:
       </p>
       <list>
         <item>
           <p>
-            Select the contact you want to share your desktop with, and choose
-             <guiseq><gui>Edit</gui><gui>Contact</gui><gui>Share my desktop</gui></guiseq>.
+            Select the contact you want to share your desktop with and choose
+            <guiseq><gui>Edit</gui><gui>Contact</gui>
+	    <gui>Share My Desktop</gui></guiseq>.
           </p>
         </item>
         <item>
           <p>
-            Right-click on the name of the contact you want to share your desktop with,
-             and select <gui>Share my desktop</gui>.
+            Right-click on the name of the contact you want to share your
+	    desktop with and select <gui>Share My Desktop</gui>.
           </p>
         </item>
       </list>
     </item>
     <item>
       <p>
-        A request will be sent to the contact you want to share your desktop with.
-         If they accept, the default remote desktop viewer application will be launched in
-         order to permit you to disconnect the user that is controlling your desktop.
+	An invitation to view your desktop will be sent to the contact you have
+	selected. To view your desktop, they will need to accept it.
       </p>
+    </item>
+    <item>
       <p>
-        For more information about how to use the remote desktop viewer application,
-         refer to its help.
+        You can disconnect the contact from your computer using your desktop
+	sharing application.
       </p>
+      <note>
+        <p>
+	  For more information about how to use the remote desktop sharing
+	  application, refer to its help.
+        </p>
+      </note>
     </item>
   </steps>
 
   <p>
     When you share your desktop with someone else, it is possible to experience
-     system performance slowdown and low Internet speed.
+    system performance slowdown and low Internet speed.
   </p>
 
   <note>
     <p>
-      Not all your contacts might be able to support this functionality. It is necessary
-       for them to have at least the 2.28 version of <app>Empathy</app> and a remote desktop
-       viewer application installed in their system.
+      Some of your contacts may not be able to use this feature. It is
+      necessary for them to have version 2.28, or newer, of <app>Empathy</app>
+      and a compatible remote desktop viewer application installed in their
+      system.
     </p>
   </note>
 
diff --git a/help/de/de.po b/help/de/de.po
index 52964b6de..4f6e78c5f 100644
--- a/help/de/de.po
+++ b/help/de/de.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy help master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-01 10:03+0000\n"
-"PO-Revision-Date: 2011-04-01 12:02+0200\n"
+"POT-Creation-Date: 2011-09-05 18:45+0000\n"
+"PO-Revision-Date: 2011-09-06 20:40+0100\n"
 "Last-Translator: Mario Blättermann <mariobl@freenet.de>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -34,14 +34,14 @@ msgid "Start a video conversation with one of your contacts."
 msgstr "Beginnen Sie eine Videounterhaltung mit einem Ihrer Kontakte."
 
 #: C/video-call.page:21(name) C/status-icons.page:16(name)
-#: C/share-desktop.page:13(name) C/set-custom-status.page:19(name)
+#: C/share-desktop.page:14(name) C/set-custom-status.page:19(name)
 #: C/send-file.page:21(name) C/salut-protocol.page:18(name)
 #: C/remove-account.page:18(name) C/prob-conn-neterror.page:18(name)
 #: C/prob-conn-name.page:17(name) C/prob-conn-auth.page:21(name)
 #: C/prob-conn-acctdisabled.page:18(name) C/prev-conv.page:16(name)
 #: C/link-contacts.page:15(name) C/irc-start-conversation.page:15(name)
 #: C/irc-send-file.page:16(name) C/irc-nick-password.page:18(name)
-#: C/irc-manage.page:19(name) C/irc-join-room.page:16(name)
+#: C/irc-manage.page:20(name) C/irc-join-room.page:16(name)
 #: C/irc-join-pwd.page:17(name) C/irc-commands.page:10(name)
 #: C/introduction.page:13(name) C/index.page:19(name)
 #: C/import-account.page:23(name) C/hide-contacts.page:11(name)
@@ -56,14 +56,14 @@ msgid "Milo Casagrande"
 msgstr "Milo Casagrande"
 
 #: C/video-call.page:22(email) C/status-icons.page:17(email)
-#: C/share-desktop.page:14(email) C/set-custom-status.page:20(email)
+#: C/share-desktop.page:15(email) C/set-custom-status.page:20(email)
 #: C/send-file.page:22(email) C/salut-protocol.page:19(email)
 #: C/remove-account.page:19(email) C/prob-conn-neterror.page:19(email)
 #: C/prob-conn-name.page:18(email) C/prob-conn-auth.page:22(email)
 #: C/prob-conn-acctdisabled.page:19(email) C/prev-conv.page:17(email)
 #: C/link-contacts.page:16(email) C/irc-start-conversation.page:16(email)
 #: C/irc-send-file.page:17(email) C/irc-nick-password.page:19(email)
-#: C/irc-manage.page:20(email) C/irc-join-room.page:17(email)
+#: C/irc-manage.page:21(email) C/irc-join-room.page:17(email)
 #: C/irc-join-pwd.page:18(email) C/irc-commands.page:11(email)
 #: C/introduction.page:14(email) C/index.page:20(email)
 #: C/import-account.page:24(email) C/hide-contacts.page:12(email)
@@ -77,27 +77,27 @@ msgstr "Milo Casagrande"
 msgid "milo@ubuntu.com"
 msgstr "milo@ubuntu.com"
 
-#: C/video-call.page:25(p) C/status-icons.page:24(p)
-#: C/share-desktop.page:17(p) C/set-custom-status.page:23(p)
-#: C/send-message.page:21(p) C/send-file.page:25(p)
-#: C/salut-protocol.page:22(p) C/remove-account.page:22(p)
-#: C/prob-conn.page:18(p) C/prob-conn-neterror.page:22(p)
-#: C/prob-conn-name.page:21(p) C/prob-conn-auth.page:25(p)
-#: C/prob-conn-acctdisabled.page:22(p) C/prev-conv.page:24(p)
-#: C/link-contacts.page:19(p) C/irc-start-conversation.page:19(p)
-#: C/irc-send-file.page:20(p) C/irc-nick-password.page:22(p)
-#: C/irc-manage.page:23(p) C/irc-join-room.page:20(p)
-#: C/irc-join-pwd.page:21(p) C/irc-commands.page:14(p)
-#: C/introduction.page:17(p) C/index.page:23(p) C/import-account.page:31(p)
-#: C/hide-contacts.page:15(p) C/group-conversations.page:23(p)
-#: C/geolocation-what-is.page:22(p) C/geolocation-turn.page:22(p)
-#: C/geolocation-supported.page:20(p) C/geolocation-privacy.page:21(p)
-#: C/geolocation-not-showing.page:21(p) C/geolocation.page:21(p)
-#: C/favorite-rooms.page:18(p) C/disable-account.page:28(p)
-#: C/create-account.page:23(p) C/change-status.page:23(p)
-#: C/audio-video.page:21(p) C/audio-call.page:23(p) C/add-contact.page:22(p)
-#: C/add-account.page:28(p) C/accounts-window.page:22(p)
-#: C/account-jabber.page:18(p) C/account-irc.page:20(p)
+#: C/video-call.page:25(p) C/status-icons.page:24(p) C/share-desktop.page:22(p)
+#: C/set-custom-status.page:23(p) C/send-message.page:21(p)
+#: C/send-file.page:25(p) C/salut-protocol.page:22(p)
+#: C/remove-account.page:22(p) C/prob-conn.page:18(p)
+#: C/prob-conn-neterror.page:22(p) C/prob-conn-name.page:21(p)
+#: C/prob-conn-auth.page:25(p) C/prob-conn-acctdisabled.page:22(p)
+#: C/prev-conv.page:24(p) C/link-contacts.page:19(p)
+#: C/irc-start-conversation.page:19(p) C/irc-send-file.page:20(p)
+#: C/irc-nick-password.page:22(p) C/irc-manage.page:24(p)
+#: C/irc-join-room.page:20(p) C/irc-join-pwd.page:21(p)
+#: C/irc-commands.page:14(p) C/introduction.page:17(p) C/index.page:23(p)
+#: C/import-account.page:31(p) C/hide-contacts.page:15(p)
+#: C/group-conversations.page:23(p) C/geolocation-what-is.page:22(p)
+#: C/geolocation-turn.page:22(p) C/geolocation-supported.page:20(p)
+#: C/geolocation-privacy.page:21(p) C/geolocation-not-showing.page:21(p)
+#: C/geolocation.page:21(p) C/favorite-rooms.page:18(p)
+#: C/disable-account.page:28(p) C/create-account.page:23(p)
+#: C/change-status.page:23(p) C/audio-video.page:21(p) C/audio-call.page:23(p)
+#: C/add-contact.page:22(p) C/add-account.page:28(p)
+#: C/accounts-window.page:22(p) C/account-jabber.page:18(p)
+#: C/account-irc.page:20(p)
 msgid "Creative Commons Share Alike 3.0"
 msgstr "Creative Commons Share Alike 3.0"
 
@@ -119,15 +119,15 @@ msgstr ""
 
 #: C/video-call.page:37(p)
 msgid ""
-"From the <gui>Contact List</gui> window, click the <media type=\"image\" "
-"mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon "
-"next to the name of the contact you wish to call and choose <gui style="
-"\"menuitem\">Video Call</gui>."
+"From the <gui>Contact List</gui> window, click the <media type=\"image\" mime="
+"\"image/png\" src=\"figures/camera-web.png\">video call</media> icon next to "
+"the name of the contact you wish to call and choose <gui style=\"menuitem"
+"\">Video Call</gui>."
 msgstr ""
-"Klicken Sie im <gui>Kontaktlisten</gui>-Fenster auf das <media type=\"image"
-"\" mime=\"image/png\" src=\"figures/camera-web.png\">Videoanruf</media>-"
-"Symbol neben dem Namen des Kontakts, den Sie anrufen wollen, und wählen Sie "
-"<gui style=\"menuitem\">Videoanruf</gui>."
+"Klicken Sie im <gui>Kontaktlisten</gui>-Fenster auf das <media type=\"image\" "
+"mime=\"image/png\" src=\"figures/camera-web.png\">Videoanruf</media>-Symbol "
+"neben dem Namen des Kontakts, den Sie anrufen wollen, und wählen Sie <gui "
+"style=\"menuitem\">Videoanruf</gui>."
 
 #: C/video-call.page:43(p) C/audio-call.page:42(p)
 msgid ""
@@ -135,9 +135,9 @@ msgid ""
 "<gui>Connected</gui> at the bottom of the window, along with the total "
 "conversation time."
 msgstr ""
-"Ein neues Fenster wird geöffnet. Sobald die Verbindung aufgebaut wurde, "
-"sehen Sie am unteren Rand des Fensters <gui>Verbunden</gui> und die "
-"Gesamtzeit der Unterhaltung."
+"Ein neues Fenster wird geöffnet. Sobald die Verbindung aufgebaut wurde, sehen "
+"Sie am unteren Rand des Fensters <gui>Verbunden</gui> und die Gesamtzeit der "
+"Unterhaltung."
 
 #: C/video-call.page:48(p) C/audio-call.page:48(p)
 msgid "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
@@ -150,9 +150,9 @@ msgid ""
 "To turn a video conversation into an audio conversation, choose <guiseq><gui "
 "style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</gui></guiseq>."
 msgstr ""
-"Um eine Video-Unterhaltung in eine Audio-Unterhaltung umzuwandeln, wählen "
-"Sie <guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video "
-"aus</gui></guiseq>."
+"Um eine Video-Unterhaltung in eine Audio-Unterhaltung umzuwandeln, wählen Sie "
+"<guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video aus</"
+"gui></guiseq>."
 
 #: C/video-call.page:60(title)
 msgid "Start a video conversation with a meta-contact"
@@ -174,9 +174,9 @@ msgstr ""
 #: C/video-call.page:75(p) C/send-message.page:65(p) C/audio-call.page:78(p)
 msgid ""
 "To recognize if a contact is a <em>meta-contact</em>, move your mouse on a "
-"contact in the <gui>Contact List</gui> window, and stop over it for a "
-"second: a small pop-up message will appear showing the number of the "
-"contacts that form the meta-contact."
+"contact in the <gui>Contact List</gui> window, and stop over it for a second: "
+"a small pop-up message will appear showing the number of the contacts that "
+"form the meta-contact."
 msgstr ""
 "Bewegen und halten Sie den Mauszeiger über einen Kontakt im Fenster "
 "<gui>Kontaktliste</gui>, um erkennen zu können, ob es sich um einen <em>Meta-"
@@ -258,18 +258,18 @@ msgstr "Beschäftigt"
 
 #: C/status-icons.page:47(p)
 msgid ""
-"Use the <em>Busy</em> status to let your contacts know that you don’t want "
-"to chat right now. They can still contact you, for instance if they have "
+"Use the <em>Busy</em> status to let your contacts know that you don’t want to "
+"chat right now. They can still contact you, for instance if they have "
 "something urgent they need to discuss. By default, <app>Empathy</app> will "
 "not use notification bubbles and sounds when you are busy. You can set a "
 "custom message for this status."
 msgstr ""
-"Verwenden Sie den Status <em>Beschäftigt</em>, wenn Sie Ihre Kontakte "
-"darüber informieren wollen, dass Sie gerade keine Unterhaltung wünschen. "
-"Diese können Sie trotzdem noch kontaktieren, beispielsweise in dringenden "
-"Fällen. Per Vorgabe zeigt <app>Empathy</app> keine einblendenden "
-"Benachrichtigungen an oder spielt Klänge ab, wenn Sie beschäftigt sind. Sie "
-"können für diesen Status eine benutzerdefinierte Nachricht festlegen."
+"Verwenden Sie den Status <em>Beschäftigt</em>, wenn Sie Ihre Kontakte darüber "
+"informieren wollen, dass Sie gerade keine Unterhaltung wünschen. Diese können "
+"Sie trotzdem noch kontaktieren, beispielsweise in dringenden Fällen. Per "
+"Vorgabe zeigt <app>Empathy</app> keine einblendenden Benachrichtigungen an "
+"oder spielt Klänge ab, wenn Sie beschäftigt sind. Sie können für diesen "
+"Status eine benutzerdefinierte Nachricht festlegen."
 
 #: C/status-icons.page:53(media)
 msgid "Away icon"
@@ -292,8 +292,8 @@ msgstr ""
 "abwesend, wenn Sie Ihren Rechner für einen gewissen Zeitraum nicht bedienen "
 "oder wenn der Bildschirmschoner eingeschaltet ist. <app>Empathy</app> zeigt "
 "keine einblendenden Benachrichtigungen an oder spielt Klänge ab, wenn Sie "
-"abwesend sind. Sie können für diesen Status eine benutzerdefinierte "
-"Nachricht festlegen."
+"abwesend sind. Sie können für diesen Status eine benutzerdefinierte Nachricht "
+"festlegen."
 
 #: C/status-icons.page:62(media) C/status-icons.page:69(media)
 msgid "Offline icon"
@@ -305,14 +305,13 @@ msgstr "Unsichtbar"
 
 #: C/status-icons.page:64(p)
 msgid ""
-"When you set your status to <em>Invisible</em>, you will appear as offline "
-"to your contacts. You will still be connected to your accounts, and you "
-"still see your contacts’ statuses and start conversations with them."
+"When you set your status to <em>Invisible</em>, you will appear as offline to "
+"your contacts. You will still be connected to your accounts, and you still "
+"see your contacts’ statuses and start conversations with them."
 msgstr ""
-"Wenn Sie Ihren Status auf <em>Unsichtbar</em> setzen, erscheinen Sie für "
-"Ihre Kontakte als abgemeldet. Sie sind noch immer mit Ihren Kontakten "
-"verbunden. Sie sehen deren Status und können Unterhaltungen mit Ihnen "
-"beginnen."
+"Wenn Sie Ihren Status auf <em>Unsichtbar</em> setzen, erscheinen Sie für Ihre "
+"Kontakte als abgemeldet. Sie sind noch immer mit Ihren Kontakten verbunden. "
+"Sie sehen deren Status und können Unterhaltungen mit Ihnen beginnen."
 
 #: C/status-icons.page:70(gui)
 msgid "Offline"
@@ -327,83 +326,92 @@ msgstr ""
 "Verbindungen zu Ihren Kontakten getrennt."
 
 #: C/share-desktop.page:7(desc)
-msgid "Share the desktop with your contacts."
+msgid "Show your desktop to your contacts."
 msgstr "Freigeben der Arbeitsumgebung für Ihre Kontakte."
 
-#: C/share-desktop.page:28(title)
+#: C/share-desktop.page:18(name)
+msgid "Ekaterina Gerasimova"
+msgstr "Ekaterina Gerasimova"
+
+#: C/share-desktop.page:19(email)
+msgid "kittykat3756@gmail.com"
+msgstr "kittykat3756@gmail.com"
+
+#: C/share-desktop.page:33(title)
 msgid "Share your desktop"
 msgstr "Freigabe Ihrer Arbeitsumgebung"
 
-#: C/share-desktop.page:30(p)
+#: C/share-desktop.page:35(p)
 msgid ""
-"It is possible, with some of your contacts, to share your desktop with them, "
-"or to start using your contacts desktop. You can use this functionality to "
-"show your desktop to your contacts, to ask for help or to help your contacts "
-"resolve a problem."
+"It is possible to share your desktop with some of your contacts. You can use "
+"this functionality to show your desktop to your contacts to, for example, ask "
+"for help or help your contacts resolve a problem."
 msgstr ""
 "Es ist möglich, Ihre Arbeitsumgebung für einige Ihrer Kontakte freizugeben "
 "oder deren freigegebene Arbeitsumgebungen zu benutzen. Sie können auf diese "
 "Weise Ihre Arbeitsumgebung Ihren Kontakten zeigen, um ihnen bei der Lösung "
 "von Problemen zu helfen oder selbst um Hilfe zu bitten."
 
-#: C/share-desktop.page:38(p)
+#: C/share-desktop.page:42(p)
 msgid ""
-"In order to be able to share your desktop or to remotely use your contacts "
-"desktop, it is necessary to have a remote desktop viewer application "
-"installed in your system."
+"To be able to share your desktop, you need to have a VNC server, which has "
+"support for the feature, installed on your system. <app>Vino</app>, the GNOME "
+"VNC server, has the required support."
 msgstr ""
-"Um Ihre Arbeitsumgebung freizugeben oder die Arbeitsumgebungen Ihrer "
-"entfernten Kontakte zu benutzen, ist eine auf Ihrem System installierte "
-"Anwendung zum Betrachten entfernter Arbeitsumgebungen notwendig."
+"Um Ihren Bildschirm freigeben zu können, benötigen Sie einen auf Ihrem System "
+"installierten VNC-Server, der dieses Funktionsmerkmal unterstützt. <app>Vino</"
+"app>, der VNC-Server von GNOME, verfügt über diese Funktionalität."
 
-#: C/share-desktop.page:46(p) C/send-file.page:40(p)
-#: C/favorite-rooms.page:66(p)
-msgid "From the <gui>Contact List</gui> window, perform one of the following:"
+#: C/share-desktop.page:51(p)
+msgid "From the <gui>Contact List</gui> window, do one of the following:"
 msgstr ""
 "Führen Sie im <gui>Kontaktlisten</gui>-Fenster eine der folgenden Aktionen "
 "aus:"
 
-#: C/share-desktop.page:51(p)
+#: C/share-desktop.page:56(p)
 msgid ""
-"Select the contact you want to share your desktop with, and choose "
-"<guiseq><gui>Edit</gui><gui>Contact</gui><gui>Share my desktop</gui></"
-"guiseq>."
+"Select the contact you want to share your desktop with and choose "
+"<guiseq><gui>Edit</gui><gui>Contact</gui><gui>Share My Desktop</gui></guiseq>."
 msgstr ""
 "Wählen Sie den Kontakt aus, für den Sie Ihre Arbeitsumgebung freigeben "
 "wollen, und wählen Sie <guiseq><gui>Bearbeiten</gui><gui>Kontakt</"
 "gui><gui>Meine Arbeitsumgebung freigeben</gui></guiseq>."
 
-#: C/share-desktop.page:57(p)
+#: C/share-desktop.page:63(p)
 msgid ""
-"Right-click on the name of the contact you want to share your desktop with, "
-"and select <gui>Share my desktop</gui>."
+"Right-click on the name of the contact you want to share your desktop with "
+"and select <gui>Share My Desktop</gui>."
 msgstr ""
-"Klicken Sie mit der rechten Maustaste auf den Namen des Kontakts, für den "
-"Sie Ihre Arbeitsumgebung freigeben wollen und wählen Sie <gui>Meine "
+"Klicken Sie mit der rechten Maustaste auf den Namen des Kontakts, für den Sie "
+"Ihre Arbeitsumgebung freigeben wollen und wählen Sie <gui>Meine "
 "Arbeitsumgebung freigeben</gui>."
 
-#: C/share-desktop.page:65(p)
+#: C/share-desktop.page:71(p)
+msgid ""
+"An invitation to view your desktop will be sent to the contact you have "
+"selected. To view your desktop, they will need to accept it."
+msgstr ""
+"Eine Einladung zum Betrachten Ihres Bildschirms wird an die ausgewählten "
+"Kontakte gesendet. Um Ihren Bildschirm anzuzeigen, müssen die Kontakte diese "
+"akzeptieren."
+
+#: C/share-desktop.page:77(p)
 msgid ""
-"A request will be sent to the contact you want to share your desktop with. "
-"If they accept, the default remote desktop viewer application will be "
-"launched in order to permit you to disconnect the user that is controlling "
-"your desktop."
+"You can disconnect the contact from your computer using your desktop sharing "
+"application."
 msgstr ""
-"Es wird eine Anfrage an den Kontakt gesendet, dem Sie Ihre Arbeitsumgebung "
-"freigeben wollen. Falls diese akzeptiert wird, dann wird die voreingestellte "
-"Anwendung zum Betrachten entfernter Arbeitsumgebungen gestartet, damit es "
-"Ihnen ermöglicht wird, die Verbindung zu dem Benutzer zu trennen, der Ihre "
-"Arbeitsumgebung steuert."
+"Sie können die Verbindung zum Kontakt über die Anwendung zur Freigabe Ihrer "
+"Arbeitsumgebung trennen."
 
-#: C/share-desktop.page:70(p)
+#: C/share-desktop.page:82(p)
 msgid ""
-"For more information about how to use the remote desktop viewer application, "
+"For more information about how to use the remote desktop sharing application, "
 "refer to its help."
 msgstr ""
 "Für weitere Informationen über die Benutzung der Anwendung zum Betrachten "
 "entfernter Arbeitsumgebungen ziehen Sie deren Hilfe zu Rate."
 
-#: C/share-desktop.page:77(p)
+#: C/share-desktop.page:90(p)
 msgid ""
 "When you share your desktop with someone else, it is possible to experience "
 "system performance slowdown and low Internet speed."
@@ -411,11 +419,11 @@ msgstr ""
 "Wenn Sie Ihre Arbeitsumgebung für jemanden freigeben, kann das eine sinkende "
 "Systemleistung und eine langsamere Internetgeschwindigkeit zur Folge haben."
 
-#: C/share-desktop.page:83(p)
+#: C/share-desktop.page:96(p)
 msgid ""
-"Not all your contacts might be able to support this functionality. It is "
-"necessary for them to have at least the 2.28 version of <app>Empathy</app> "
-"and a remote desktop viewer application installed in their system."
+"Some of your contacts may not be able to use this feature. It is necessary "
+"for them to have version 2.28, or newer, of <app>Empathy</app> and a "
+"compatible remote desktop viewer application installed in their system."
 msgstr ""
 "Beachten Sie, dass nicht alle Ihre Kontakte diese Funktionalität "
 "unterstützen. Sie benötigen dafür mindestens die Version 2.28 von "
@@ -425,8 +433,7 @@ msgstr ""
 #: C/set-custom-status.page:9(desc)
 msgid "Add, edit or delete personal messages for your status."
 msgstr ""
-"Hinzufügen, Bearbeiten oder Löschen persönlicher Nachrichten für Ihren "
-"Status."
+"Hinzufügen, Bearbeiten oder Löschen persönlicher Nachrichten für Ihren Status."
 
 #: C/set-custom-status.page:15(name)
 msgid "Jim Campbell"
@@ -446,8 +453,8 @@ msgid ""
 "to let people know that you will be unavailable for a certain period of time."
 msgstr ""
 "Vielleicht wollen Sie eine benutzerdefinierte Nachricht für Ihren Status "
-"festlegen, zum Beispiel um jemanden darüber zu informieren, dass Sie für "
-"eine bestimmte Zeitspanne nicht verfügbar sein werden."
+"festlegen, zum Beispiel um jemanden darüber zu informieren, dass Sie für eine "
+"bestimmte Zeitspanne nicht verfügbar sein werden."
 
 #: C/set-custom-status.page:40(p)
 msgid ""
@@ -466,17 +473,17 @@ msgstr ""
 
 #: C/set-custom-status.page:52(p)
 msgid ""
-"Select the status you want to add a custom message to. You have to select "
-"the one identified with the label <gui>Custom Message</gui>."
+"Select the status you want to add a custom message to. You have to select the "
+"one identified with the label <gui>Custom Message</gui>."
 msgstr ""
-"Wählen Sie den Status aus, dem Sie eine benutzerdefinierte Nachricht "
-"zuordnen wollen. Sie müssen denjenigen mit der Bezeichnung "
-"<gui>Benutzerdefinierte Nachricht</gui> auswählen."
+"Wählen Sie den Status aus, dem Sie eine benutzerdefinierte Nachricht zuordnen "
+"wollen. Sie müssen denjenigen mit der Bezeichnung <gui>Benutzerdefinierte "
+"Nachricht</gui> auswählen."
 
 #: C/set-custom-status.page:58(p)
 msgid ""
-"Enter your custom message in the text box at the top of the window, and "
-"press <key>Enter</key> to set the message."
+"Enter your custom message in the text box at the top of the window, and press "
+"<key>Enter</key> to set the message."
 msgstr ""
 "Geben Sie Ihre benutzerdefinierte Nachricht in das Textfeld am oberen Rand "
 "des Fensters ein und drücken Sie die <key>Eingabetaste</key>, um sie zu "
@@ -485,13 +492,13 @@ msgstr ""
 #: C/set-custom-status.page:64(p)
 msgid ""
 "If you want to set the custom message as a favorite, saving it in order to "
-"use it again, click on the little star on the right of the text box where "
-"you wrote your custom message."
+"use it again, click on the little star on the right of the text box where you "
+"wrote your custom message."
 msgstr ""
 "Wenn Sie die benutzerdefinierte Nachricht als bevorzugt festlegen wollen, "
-"speichern Sie sie, um sie wiederverwenden zu können. Klicken Sie "
-"anschließend auf den kleinen Stern an der rechten Seite des Textfeldes, in "
-"welches Sie Ihre benutzerdefinierte Nachricht eingegeben haben."
+"speichern Sie sie, um sie wiederverwenden zu können. Klicken Sie anschließend "
+"auf den kleinen Stern an der rechten Seite des Textfeldes, in welches Sie "
+"Ihre benutzerdefinierte Nachricht eingegeben haben."
 
 #: C/set-custom-status.page:69(p)
 msgid ""
@@ -520,8 +527,8 @@ msgid ""
 "From the <gui>Saved Presets</gui> box, select the status message you want to "
 "edit and double-click on it."
 msgstr ""
-"Wählen Sie in <gui>Gespeicherte Voreinstellungen</gui> die Statusmeldung "
-"aus, die Sie bearbeiten wollen, und klicken Sie zweimal darauf."
+"Wählen Sie in <gui>Gespeicherte Voreinstellungen</gui> die Statusmeldung aus, "
+"die Sie bearbeiten wollen, und klicken Sie zweimal darauf."
 
 #: C/set-custom-status.page:106(p)
 msgid "Type the new custom message and press <key>Enter</key> to modify it."
@@ -538,19 +545,18 @@ msgid ""
 "From the <gui>Saved Presets</gui> box, select the status message you want to "
 "remove."
 msgstr ""
-"Wählen Sie in <gui>Gespeicherte Voreinstellungen</gui> die Statusmeldung "
-"aus, die Sie entfernen wollen."
+"Wählen Sie in <gui>Gespeicherte Voreinstellungen</gui> die Statusmeldung aus, "
+"die Sie entfernen wollen."
 
 #: C/set-custom-status.page:124(p)
 msgid "Click on the <gui>Remove</gui> button."
 msgstr "Klicken Sie auf den Knopf <gui>Entfernen</gui>."
 
 #: C/set-custom-status.page:131(p)
-msgid ""
-"To add a new custom message, from the <gui>Add New Preset</gui> section:"
+msgid "To add a new custom message, from the <gui>Add New Preset</gui> section:"
 msgstr ""
-"So fügen Sie im Abschnitt <gui>Neue Voreinstellung hinzufügen</gui> eine "
-"neue benutzerdefinierte Nachricht hinzu:"
+"So fügen Sie im Abschnitt <gui>Neue Voreinstellung hinzufügen</gui> eine neue "
+"benutzerdefinierte Nachricht hinzu:"
 
 #: C/set-custom-status.page:136(p)
 msgid ""
@@ -610,8 +616,8 @@ msgstr "Jemandem eine Nachricht senden"
 
 #: C/send-message.page:36(p)
 msgid ""
-"From the <gui>Contact List</gui> window, double-click the name of the "
-"contact that you want to have a conversation with."
+"From the <gui>Contact List</gui> window, double-click the name of the contact "
+"that you want to have a conversation with."
 msgstr ""
 "Klicken Sie im Fenster <gui>Kontaktliste</gui> doppelt auf den Namen des "
 "Kontakts, mit dem Sie eine Unterhaltung beginnen wollen."
@@ -622,8 +628,8 @@ msgid ""
 "window and press <key>Enter</key> to send it."
 msgstr ""
 "Ein neues Fenster wird geöffnet. Geben Sie eine Nachricht in das Feld am "
-"unteren Rand des Fensters ein und drücken Sie die <key>Eingabetaste</key>, "
-"um sie zu senden."
+"unteren Rand des Fensters ein und drücken Sie die <key>Eingabetaste</key>, um "
+"sie zu senden."
 
 #: C/send-message.page:50(title)
 msgid "Send a message to a meta-contact"
@@ -645,14 +651,20 @@ msgstr "Senden Sie eine Datei von Ihrem Rechner an einen Ihrer Kontakte."
 msgid "Send files"
 msgstr "Dateien senden"
 
+#: C/send-file.page:40(p) C/favorite-rooms.page:66(p)
+msgid "From the <gui>Contact List</gui> window, perform one of the following:"
+msgstr ""
+"Führen Sie im <gui>Kontaktlisten</gui>-Fenster eine der folgenden Aktionen "
+"aus:"
+
 #: C/send-file.page:45(p)
 msgid ""
 "Right click on the contact you want to send a file to, and choose <gui>Send "
 "file</gui>."
 msgstr ""
 "Klicken Sie mit der rechten Maustaste auf den Namen des Kontakts, dem Sie "
-"eine Datei senden wollen, und klicken Sie anschließend auf <gui>Datei "
-"senden</gui>."
+"eine Datei senden wollen, und klicken Sie anschließend auf <gui>Datei senden</"
+"gui>."
 
 #: C/send-file.page:50(p)
 msgid ""
@@ -694,10 +706,9 @@ msgid ""
 "<gui>Clear</gui> to empty the list. This will only remove the files from the "
 "list and will not delete them from your computer."
 msgstr ""
-"Falls mehrere abgeschlossene Dateiübertragungen in diesem Fenster "
-"aufgelistet sind, dann klicken Sie auf <gui>Leeren</gui>, um die Liste zu "
-"leeren. Dies entfernt die Dateien nur aus der Liste, aber nicht von Ihrem "
-"Rechner."
+"Falls mehrere abgeschlossene Dateiübertragungen in diesem Fenster aufgelistet "
+"sind, dann klicken Sie auf <gui>Leeren</gui>, um die Liste zu leeren. Dies "
+"entfernt die Dateien nur aus der Liste, aber nicht von Ihrem Rechner."
 
 #: C/send-file.page:87(p)
 msgid ""
@@ -709,8 +720,8 @@ msgstr ""
 
 #: C/send-file.page:93(p)
 msgid ""
-"In order to send a file to someone, you need to be connected to the "
-"Internet, or to a local area network."
+"In order to send a file to someone, you need to be connected to the Internet, "
+"or to a local area network."
 msgstr ""
 "Um jemandem eine Datei senden zu können, müssen Sie mit dem Internet oder "
 "einem lokalen Netzwerk verbunden sein."
@@ -733,8 +744,8 @@ msgid ""
 "need to connect and authenticate to a central server in order to use it."
 msgstr ""
 "Der Dienst »People Nearby« ist ein Kommunikationsdienst, der ohne Server "
-"auskommt: Es ist nicht notwendig, sich mit einem Server zu verbinden und "
-"sich zu legitimieren, um den Dienst zu nutzen."
+"auskommt: Es ist nicht notwendig, sich mit einem Server zu verbinden und sich "
+"zu legitimieren, um den Dienst zu nutzen."
 
 #: C/salut-protocol.page:45(p)
 msgid ""
@@ -759,8 +770,8 @@ msgid ""
 "All the modern local area networks should be able to support this kind of "
 "service."
 msgstr ""
-"Alle modernen lokalen Netzwerke sollten in der Lage sein, diese Art Dienst "
-"zu unterstützen."
+"Alle modernen lokalen Netzwerke sollten in der Lage sein, diese Art Dienst zu "
+"unterstützen."
 
 #: C/remove-account.page:8(desc)
 msgid "Completely remove an account from <app>Empathy</app>."
@@ -772,10 +783,9 @@ msgstr "Löschen eines Kontos"
 
 #: C/remove-account.page:35(p)
 msgid ""
-"You can completely remove an account from <app>Empathy</app> if you no "
-"longer wish to use the account. If you wish to use the account in "
-"<app>Empathy</app> again in the future, you will have to add your account "
-"details again."
+"You can completely remove an account from <app>Empathy</app> if you no longer "
+"wish to use the account. If you wish to use the account in <app>Empathy</app> "
+"again in the future, you will have to add your account details again."
 msgstr ""
 "Sie können ein Konto aus <app>Empathy</app> vollständig löschen, falls Sie "
 "dieses nicht mehr benutzen wollen. Sollten Sie in Zukunft dieses Konto in "
@@ -793,8 +803,8 @@ msgstr ""
 
 #: C/remove-account.page:46(p)
 msgid ""
-"Select the account you wish to remove from the accounts list on the left "
-"side of the window."
+"Select the account you wish to remove from the accounts list on the left side "
+"of the window."
 msgstr ""
 "Wählen Sie das Konto, das Sie aus der Kontenliste entfernen wollen, an der "
 "linken Seite des Fensters aus."
@@ -906,8 +916,8 @@ msgstr ""
 
 #: C/prob-conn-neterror.page:82(p) C/prob-conn-auth.page:68(p)
 msgid ""
-"Deselect the <gui>Enabled</gui>, and then select it again to try to "
-"reconnect to the service."
+"Deselect the <gui>Enabled</gui>, and then select it again to try to reconnect "
+"to the service."
 msgstr ""
 "Deaktivieren Sie das Ankreuzfeld <gui>Aktiviert</gui> und aktivieren Sie es "
 "erneut, um einen neuen Verbindungsversuch zu starten."
@@ -961,10 +971,9 @@ msgid ""
 "the password for that nickname. For more information, see <link xref=\"irc-"
 "nick-password\"/>."
 msgstr ""
-"Falls Sie diesen Spitznamen in dem von Ihnen verwendeten Netzwerk "
-"registriert haben, legen Sie für diesen Spitznamen ein Passwort fest. "
-"Weitere Informationen hierzu finden Sie in <link xref=\"irc-nick-password\"/"
-">."
+"Falls Sie diesen Spitznamen in dem von Ihnen verwendeten Netzwerk registriert "
+"haben, legen Sie für diesen Spitznamen ein Passwort fest. Weitere "
+"Informationen hierzu finden Sie in <link xref=\"irc-nick-password\"/>."
 
 #: C/prob-conn-name.page:64(p)
 msgid ""
@@ -977,8 +986,8 @@ msgstr ""
 
 #: C/prob-conn-auth.page:8(desc)
 msgid ""
-"An error message which says “<gui>Authentication failed</gui>� appears in "
-"the main window."
+"An error message which says “<gui>Authentication failed</gui>� appears in the "
+"main window."
 msgstr ""
 "Eine Fehlermeldung »<gui>Legitimierung fehlgeschlagen</gui>« erscheint im "
 "Hauptfenster."
@@ -999,13 +1008,13 @@ msgstr ""
 
 #: C/prob-conn-auth.page:50(p)
 msgid ""
-"Make sure that you have registered an account with the service you are "
-"trying to connect to. If you do not have an account, most services will not "
-"allow you to connect."
+"Make sure that you have registered an account with the service you are trying "
+"to connect to. If you do not have an account, most services will not allow "
+"you to connect."
 msgstr ""
 "Stellen Sie sicher, dass Sie bei dem Dienst ein Konto registriert haben, mit "
-"dem Sie sich verbinden wollen. Falls Sie über kein Konto verfügen, "
-"verweigern die meisten Dienste die Verbindung."
+"dem Sie sich verbinden wollen. Falls Sie über kein Konto verfügen, verweigern "
+"die meisten Dienste die Verbindung."
 
 #: C/prob-conn-auth.page:63(p) C/prob-conn-acctdisabled.page:54(p)
 msgid ""
@@ -1016,8 +1025,8 @@ msgstr ""
 
 #: C/prob-conn-acctdisabled.page:7(desc)
 msgid ""
-"The instant messaging account that you want to use is not enabled in the "
-"list of accounts."
+"The instant messaging account that you want to use is not enabled in the list "
+"of accounts."
 msgstr ""
 "Das Sofortnachrichten-Konto, welches Sie verwenden wollen, ist in der "
 "Kontenliste nicht aktiviert."
@@ -1041,8 +1050,8 @@ msgid ""
 "Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq> and select the "
 "account that is not working."
 msgstr ""
-"Wählen Sie <guiseq><gui>Bearbeiten</gui><gui>Konten</gui></guiseq> und "
-"wählen Sie den nicht funktionierenden Kontakt aus."
+"Wählen Sie <guiseq><gui>Bearbeiten</gui><gui>Konten</gui></guiseq> und wählen "
+"Sie den nicht funktionierenden Kontakt aus."
 
 #: C/prob-conn-acctdisabled.page:65(p)
 msgid ""
@@ -1050,8 +1059,8 @@ msgid ""
 "If it is not, select the check-box to enable the account."
 msgstr ""
 "Stellen Sie sicher, dass das Ankreuzfeld <gui style=\"checkbox\">Aktiviert</"
-"gui> neben dem Namen Ihres Kontos ausgewählt ist. Falls nicht, aktivieren "
-"Sie das Ankreuzfeld, um das Konto zu aktivieren."
+"gui> neben dem Namen Ihres Kontos ausgewählt ist. Falls nicht, aktivieren Sie "
+"das Ankreuzfeld, um das Konto zu aktivieren."
 
 #: C/prev-conv.page:8(desc)
 msgid "Browse or search your previous conversations."
@@ -1078,8 +1087,8 @@ msgstr ""
 #: C/prev-conv.page:46(p)
 msgid ""
 "<app>Empathy</app> automatically saves all your text conversations you have "
-"with your contacts. You can <link xref=\"#search\">search through all of "
-"your previous conversations</link> or <link xref=\"#browse\">browse previous "
+"with your contacts. You can <link xref=\"#search\">search through all of your "
+"previous conversations</link> or <link xref=\"#browse\">browse previous "
 "conversations</link> by contact and date."
 msgstr ""
 "<app>Empathy</app> speichert automatisch alle Ihre Text-Unterhaltungen, die "
@@ -1101,16 +1110,15 @@ msgstr "Vorherige Unterhaltungen durchsuchen"
 
 #: C/prev-conv.page:63(p)
 msgid ""
-"You can perform a full-text search through all of your previous "
-"conversations."
+"You can perform a full-text search through all of your previous conversations."
 msgstr ""
 "Sie können den Volltext aller Ihrer vorherigen Unterhaltungen durchsuchen."
 
 #: C/prev-conv.page:67(p) C/prev-conv.page:96(p)
 msgid ""
 "From the <gui>Contact List</gui> window, choose <guiseq><gui>View</"
-"gui><gui>Previous Conversations</gui></guiseq>. Alternatively, press "
-"<key>F3</key>."
+"gui><gui>Previous Conversations</gui></guiseq>. Alternatively, press <key>F3</"
+"key>."
 msgstr ""
 "Wählen Sie im <gui>Kontaktlisten</gui>-Fenster <guiseq><gui>Ansicht</"
 "gui><gui>Vorherige Unterhaltungen</gui></guiseq>. Alternativ drücken Sie "
@@ -1135,8 +1143,8 @@ msgid ""
 "below the search field. By default, conversations are ordered by date."
 msgstr ""
 "Jegliche Unterhaltungen, die auf Ihre Suchbegriffe zutreffen, werden in der "
-"Liste unterhalb des Suchfeldes angezeigt. Per Vorgabe sind die "
-"Unterhaltungen nach Datum geordnet."
+"Liste unterhalb des Suchfeldes angezeigt. Per Vorgabe sind die Unterhaltungen "
+"nach Datum geordnet."
 
 #: C/prev-conv.page:82(p)
 msgid ""
@@ -1164,8 +1172,8 @@ msgstr "Wählen Sie den Reiter <gui>Unterhaltungen</gui>."
 
 #: C/prev-conv.page:103(p)
 msgid ""
-"Select an account from the drop-down list in the top left. A list of "
-"contacts and chat room for that account will be shown below."
+"Select an account from the drop-down list in the top left. A list of contacts "
+"and chat room for that account will be shown below."
 msgstr ""
 "Wählen Sie ein Konto in der Auswahlliste oben links. Eine Liste der Kontakte "
 "und Unterhaltungsräume für dieses Konto wird darunter angezeigt."
@@ -1197,8 +1205,8 @@ msgid ""
 "You can search for text in the displayed conversation by typing into the "
 "search field at the top. The matching text will be highlighted."
 msgstr ""
-"Sie können nach Text in der angezeigten Unterhaltung suchen, indem Sie ihn "
-"in das Suchfeld oben eingeben. Der damit übereinstimmende Text wird "
+"Sie können nach Text in der angezeigten Unterhaltung suchen, indem Sie ihn in "
+"das Suchfeld oben eingeben. Der damit übereinstimmende Text wird "
 "hervorgehoben."
 
 #: C/prev-conv.page:121(p)
@@ -1309,8 +1317,8 @@ msgid ""
 "select <gui style=\"menuitem\">Link Contacts...</gui>."
 msgstr ""
 "Wählen Sie in der <gui>Kontakliste</gui> den Kontakt mit der rechten "
-"Maustaste aus, den Sie aufteilen möchten, und wählen Sie <gui style="
-"\"menuitem\">Kontakte verknüpfen …</gui>."
+"Maustaste aus, den Sie aufteilen möchten, und wählen Sie <gui style=\"menuitem"
+"\">Kontakte verknüpfen …</gui>."
 
 #: C/link-contacts.page:100(p)
 msgid "Click <gui style=\"button\">Unlink</gui>."
@@ -1364,13 +1372,13 @@ msgstr "Weitergabe"
 
 #: C/license.page:39(p)
 msgid ""
-"You must attribute the work in the manner specified by the author or "
-"licensor (but not in any way that suggests that they endorse you or your use "
-"of the work)."
+"You must attribute the work in the manner specified by the author or licensor "
+"(but not in any way that suggests that they endorse you or your use of the "
+"work)."
 msgstr ""
 "Sie dürfen das Werk nur unter gleichen Bedingungen weitergeben, wie Sie vom "
-"Autor oder Lizenzgeber festgelegt wurden (aber nicht so, dass es wie Ihr "
-"Werk aussieht)."
+"Autor oder Lizenzgeber festgelegt wurden (aber nicht so, dass es wie Ihr Werk "
+"aussieht)."
 
 #: C/license.page:46(em)
 msgid "Share Alike"
@@ -1389,10 +1397,10 @@ msgstr ""
 
 #: C/license.page:53(p)
 msgid ""
-"For the full text of the license, see the <link href=\"http://"
-"creativecommons.org/licenses/by-sa/3.0/legalcode\">CreativeCommons website</"
-"link>, or read the full <link href=\"http://creativecommons.org/licenses/by-"
-"sa/3.0/\">Commons Deed</link>."
+"For the full text of the license, see the <link href=\"http://creativecommons."
+"org/licenses/by-sa/3.0/legalcode\">CreativeCommons website</link>, or read "
+"the full <link href=\"http://creativecommons.org/licenses/by-sa/3.0/"
+"\">Commons Deed</link>."
 msgstr ""
 "Den vollständigen Text der Lizenz finden sie auf der <link href=\"http://"
 "creativecommons.org/licenses/by-sa/3.0/legalcode\">CreativeCommons-Webseite</"
@@ -1413,8 +1421,8 @@ msgid ""
 "public IRC chat rooms. To start a conversation with another IRC user:"
 msgstr ""
 "Sie können private Unterhaltungen mit anderen IRC-Benutzern außerhalb der "
-"öffentlichen IRC-Unterhaltungsräume führen. So beginnen Sie eine "
-"Unterhaltung mit einem anderen IRC-Benutzer:"
+"öffentlichen IRC-Unterhaltungsräume führen. So beginnen Sie eine Unterhaltung "
+"mit einem anderen IRC-Benutzer:"
 
 #: C/irc-start-conversation.page:37(p)
 msgid ""
@@ -1429,20 +1437,20 @@ msgstr ""
 
 #: C/irc-start-conversation.page:45(p)
 msgid ""
-"The IRC room contact list is not the same as <app>Empathy</app> contact "
-"list. It contains a list of users in the IRC chat room you joined. Different "
-"rooms can have different contacts listed."
+"The IRC room contact list is not the same as <app>Empathy</app> contact list. "
+"It contains a list of users in the IRC chat room you joined. Different rooms "
+"can have different contacts listed."
 msgstr ""
-"Die Kontaktliste in IRC-Unterhaltungsräumen ist nicht mit der Kontaktliste "
-"in <app>Empathy</app> vergleichbar. Sie enthält eine Liste von Benutzern des "
+"Die Kontaktliste in IRC-Unterhaltungsräumen ist nicht mit der Kontaktliste in "
+"<app>Empathy</app> vergleichbar. Sie enthält eine Liste von Benutzern des "
 "Raumes, den Sie betreten haben. Verschiedene Räume können unterschiedliche "
 "Kontaktlisten haben."
 
 #: C/irc-start-conversation.page:52(p)
 msgid ""
 "The IRC room contact list is usually on the right side of the IRC room "
-"window. If you do not see it, choose <guiseq><gui>Conversation</"
-"gui><gui>Show Contact List</gui></guiseq>."
+"window. If you do not see it, choose <guiseq><gui>Conversation</gui><gui>Show "
+"Contact List</gui></guiseq>."
 msgstr ""
 "Die Kontaktliste des IRC-Raumes befindet sich üblicherweise an der rechten "
 "Seite des IRC-Fensters. Falls sie nicht angezeigt wird, wählen Sie "
@@ -1465,8 +1473,8 @@ msgstr "Derzeit ist es nicht möglich, Dateien im IRC zu versenden."
 #: C/irc-nick-password.page:10(desc)
 msgid "Protect your nickname to prevent other IRC users from using it."
 msgstr ""
-"Schützen Sie Ihren Spitznamen, um zu verhindern, dass andere IRC-Benutzer "
-"ihn verwenden."
+"Schützen Sie Ihren Spitznamen, um zu verhindern, dass andere IRC-Benutzer ihn "
+"verwenden."
 
 #: C/irc-nick-password.page:33(title)
 msgid "Use a nickname password on IRC"
@@ -1487,18 +1495,18 @@ msgstr ""
 
 #: C/irc-nick-password.page:40(p)
 msgid ""
-"<app>Empathy</app> does not currently support nickname registration. Some "
-"IRC networks, however, will automatically forward a <em>server password</em> "
-"to NickServ. On these networks, you can use the IRC password in "
-"<app>Empathy</app> to identify yourself to NickServ. The popular freenode "
-"network is known to have this feature."
+"<app>Empathy</app> does not currently support nickname registration. Some IRC "
+"networks, however, will automatically forward a <em>server password</em> to "
+"NickServ. On these networks, you can use the IRC password in <app>Empathy</"
+"app> to identify yourself to NickServ. The popular freenode network is known "
+"to have this feature."
 msgstr ""
 "<app>Empathy</app> unterstützt gegenwärtig die Registrierung von Spitznamen "
-"nicht. Einige IRC-Netzwerke leiten jedoch automatisch ein "
-"<em>Serverpasswort</em> an NickServ weiter. In diesen Netzwerken können Sie "
-"das IRC-Passwort in <app>Empathy</app> verwenden, um sich bei NickServ zu "
-"identifizieren. Das populäre FreeNode-Netzwerk verfügt bekanntermaßen über "
-"dieses Funktionsmerkmal."
+"nicht. Einige IRC-Netzwerke leiten jedoch automatisch ein <em>Serverpasswort</"
+"em> an NickServ weiter. In diesen Netzwerken können Sie das IRC-Passwort in "
+"<app>Empathy</app> verwenden, um sich bei NickServ zu identifizieren. Das "
+"populäre FreeNode-Netzwerk verfügt bekanntermaßen über dieses "
+"Funktionsmerkmal."
 
 #: C/irc-nick-password.page:46(p)
 msgid "To set an IRC server password:"
@@ -1511,8 +1519,8 @@ msgstr ""
 
 #: C/irc-nick-password.page:57(p)
 msgid ""
-"In the <gui>Password</gui> field, type the password you used to register "
-"your nikcname."
+"In the <gui>Password</gui> field, type the password you used to register your "
+"nikcname."
 msgstr ""
 "Geben Sie im Textfeld <gui>Passwort</gui> das Passwort ein, dass Sie bei der "
 "Registrierung Ihres Spitznamens verwendet haben."
@@ -1532,15 +1540,15 @@ msgstr ""
 "gegenwärtig nicht möglich, mit <app>Empathy</app> einen IRC-Spitznamen zu "
 "registrieren oder das Passwort für Ihren Spitznamen zu ändern."
 
-#: C/irc-manage.page:9(desc)
+#: C/irc-manage.page:10(desc)
 msgid "How to use IRC with <app>Empathy</app>."
 msgstr "Benutzung des IRC mit <app>Empathy</app>."
 
-#: C/irc-manage.page:34(title)
+#: C/irc-manage.page:35(title)
 msgid "Internet Relay Chat (IRC)"
 msgstr "Internet Relay Chat (IRC)"
 
-#: C/irc-manage.page:37(p) C/account-irc.page:39(p)
+#: C/irc-manage.page:38(p) C/account-irc.page:39(p)
 msgid ""
 "You must have the <sys>telepathy-idle</sys> package installed to use IRC in "
 "<app>Empathy</app>."
@@ -1548,19 +1556,23 @@ msgstr ""
 "Sie müssen das Paket <sys>telepathy-idle</sys> installiert haben, um das IRC "
 "in <app>Empathy</app> nutzen zu können."
 
-#: C/irc-manage.page:43(title)
+#: C/irc-manage.page:42(link)
+msgid "Install telepathy-idle"
+msgstr "telepathy-idle installieren"
+
+#: C/irc-manage.page:49(title)
 msgid "IRC Chat Rooms and Conversations"
 msgstr "IRC-Räume und Unterhaltungen"
 
-#: C/irc-manage.page:45(title)
+#: C/irc-manage.page:51(title)
 msgid "Chat Rooms and Conversations"
 msgstr "Unterhaltungsräume und Unterhaltungen"
 
-#: C/irc-manage.page:50(title)
+#: C/irc-manage.page:56(title)
 msgid "Common IRC Problems"
 msgstr "Häufige Probleme im IRC"
 
-#: C/irc-manage.page:52(title) C/index.page:55(title)
+#: C/irc-manage.page:58(title) C/index.page:55(title)
 msgid "Common Problems"
 msgstr "Häufig auftretende Probleme"
 
@@ -1688,15 +1700,14 @@ msgstr "Einführung"
 
 #: C/introduction.page:23(p)
 msgid ""
-"<app>Empathy</app> is an instant messaging application for the GNOME "
-"Desktop. It supports text messaging, voice &amp; video calls, file "
-"transfers, and all the most used messaging systems such as MSN and Google "
-"Talk."
+"<app>Empathy</app> is an instant messaging application for the GNOME Desktop. "
+"It supports text messaging, voice &amp; video calls, file transfers, and all "
+"the most used messaging systems such as MSN and Google Talk."
 msgstr ""
 "<app>Empathy</app> ist eine Sofortnachrichten-Anwendung für die GNOME-"
-"Arbeitsumgebung. Textnachrichten, Sprach- und Videoanrufe, "
-"Dateiübertragungen sowie alle gängigen Nachrichtensysteme wie MSN und "
-"GoogleTalk werden unterstützt."
+"Arbeitsumgebung. Textnachrichten, Sprach- und Videoanrufe, Dateiübertragungen "
+"sowie alle gängigen Nachrichtensysteme wie MSN und GoogleTalk werden "
+"unterstützt."
 
 #: C/introduction.page:28(p)
 msgid ""
@@ -1773,8 +1784,7 @@ msgstr "Fortgeschrittene Aktionen"
 
 #: C/import-account.page:10(desc)
 msgid "Import an account from another instant messaging application."
-msgstr ""
-"Importieren eines Kontos aus einer anderen Sofortnachrichten-Anwendung."
+msgstr "Importieren eines Kontos aus einer anderen Sofortnachrichten-Anwendung."
 
 #: C/import-account.page:19(name)
 msgid "Peter Haslam"
@@ -1794,9 +1804,9 @@ msgid ""
 "accounts from other instant messaging applications. Currently, the only "
 "supported application is <app>Pidgin</app>."
 msgstr ""
-"Wenn Sie <app>Empathy</app> zum ersten Mal starten, wird Ihnen der Import "
-"von Konten aus anderen Sofortnachrichten-Anwendungen angeboten. Gegenwärtig "
-"wird als einzige Anwendung <app>Pidgin</app> unterstützt."
+"Wenn Sie <app>Empathy</app> zum ersten Mal starten, wird Ihnen der Import von "
+"Konten aus anderen Sofortnachrichten-Anwendungen angeboten. Gegenwärtig wird "
+"als einzige Anwendung <app>Pidgin</app> unterstützt."
 
 #: C/import-account.page:50(p)
 msgid ""
@@ -1808,8 +1818,8 @@ msgstr ""
 
 #: C/import-account.page:54(p)
 msgid ""
-"Select <gui>Yes, import my account details from</gui> and click "
-"<gui>Forward</gui>."
+"Select <gui>Yes, import my account details from</gui> and click <gui>Forward</"
+"gui>."
 msgstr ""
 "Wählen Sie <gui>Ja, meine Kontodetails importieren von</gui> und klicken Sie "
 "auf <gui>Weiter</gui>."
@@ -1866,8 +1876,7 @@ msgstr ""
 
 #: C/group-conversations.page:8(desc)
 msgid "Start or join a group conversation with your contacts."
-msgstr ""
-"Starten oder betreten Sie eine Gruppenunterhaltung mit Ihren Kontakten."
+msgstr "Starten oder betreten Sie eine Gruppenunterhaltung mit Ihren Kontakten."
 
 #: C/group-conversations.page:34(title)
 msgid "Group conversations"
@@ -1875,8 +1884,8 @@ msgstr "Gruppenunterhaltungen"
 
 #: C/group-conversations.page:36(p)
 msgid ""
-"Group conversations permits you to have text conversations with more than "
-"one contact at the same time."
+"Group conversations permits you to have text conversations with more than one "
+"contact at the same time."
 msgstr ""
 "Gruppenunterhaltungen ermöglichen Ihnen Textunterhaltungen mit mehreren "
 "Kontakten zugleich."
@@ -1945,8 +1954,8 @@ msgid ""
 "<gui>Contact List</gui> window, select the contact you want to invite, and "
 "perform one of the following:"
 msgstr ""
-"Um im <gui>Kontaktlisten</gui>-Fenster andere Kontakte zur Teilnahme an "
-"einer Gruppenunterhaltung einzuladen, gehen Sie wie folgt vor:"
+"Um im <gui>Kontaktlisten</gui>-Fenster andere Kontakte zur Teilnahme an einer "
+"Gruppenunterhaltung einzuladen, gehen Sie wie folgt vor:"
 
 #: C/group-conversations.page:97(p)
 msgid "Right-click on the contact and choose <gui>Invite to chatroom</gui>."
@@ -1964,8 +1973,8 @@ msgstr ""
 
 #: C/group-conversations.page:107(p)
 msgid ""
-"If you have more than one group conversation open, select the one you want "
-"to invite your contacts."
+"If you have more than one group conversation open, select the one you want to "
+"invite your contacts."
 msgstr ""
 "Falls Sie mehrere Gruppenunterhaltung geöffnet haben, wählen Sie diejenige "
 "aus, in welche Sie Ihre Kontakte einladen wollen."
@@ -1977,8 +1986,8 @@ msgstr "Einer Gruppenunterhaltung beitreten"
 #: C/group-conversations.page:128(p)
 msgid "Expand the <gui>Room List</gui> section to see all the existing rooms."
 msgstr ""
-"Klappen Sie den Abschnitt <gui>Raumliste</gui> aus, um alle vorhandenen "
-"Räume anzuzeigen."
+"Klappen Sie den Abschnitt <gui>Raumliste</gui> aus, um alle vorhandenen Räume "
+"anzuzeigen."
 
 #: C/group-conversations.page:133(p)
 msgid "Double-click on the name of a room to join it."
@@ -2008,8 +2017,8 @@ msgid ""
 "computer or a device connected to the Internet."
 msgstr ""
 "Geoposition ermöglicht Ihnen die Ermittlung des wirklichen geografischen "
-"Ortes eines Rechners oder anderen Gerätes, welches mit dem Internet "
-"verbunden ist."
+"Ortes eines Rechners oder anderen Gerätes, welches mit dem Internet verbunden "
+"ist."
 
 #: C/geolocation-what-is.page:37(p)
 msgid "With geolocation in <app>Empathy</app> you can:"
@@ -2153,9 +2162,9 @@ msgstr ""
 
 #: C/geolocation-privacy.page:40(p)
 msgid ""
-"The accuracy and the quantity of information about your geographical "
-"position are based on the software or on the infrastructure used to discover "
-"your position."
+"The accuracy and the quantity of information about your geographical position "
+"are based on the software or on the infrastructure used to discover your "
+"position."
 msgstr ""
 "Die Genauigkeit und die Menge der verfügbaren Informationen über Ihre "
 "geografische Position hängen von der Software oder der Infrastruktur ab, die "
@@ -2163,9 +2172,9 @@ msgstr ""
 
 #: C/geolocation-privacy.page:44(p)
 msgid ""
-"Different kind of networks may have different accuracy settings, and may "
-"send different information. The use of external devices such as GPS or "
-"mobile phone will increase the accuracy of the information sent."
+"Different kind of networks may have different accuracy settings, and may send "
+"different information. The use of external devices such as GPS or mobile "
+"phone will increase the accuracy of the information sent."
 msgstr ""
 "Verschiedene Arten von Netzwerken haben unterschiedliche "
 "Genauigkeitseinstellungen und senden daher verschiedene Informationen. Die "
@@ -2174,8 +2183,8 @@ msgstr ""
 
 #: C/geolocation-privacy.page:49(p)
 msgid ""
-"When the privacy mode is enabled, nothing more precise than your city will "
-"be sent, even if you are using an external device."
+"When the privacy mode is enabled, nothing more precise than your city will be "
+"sent, even if you are using an external device."
 msgstr ""
 "Wenn der Privatsphäre-Modus aktiviert ist, wird nichts Genaueres als "
 "lediglich Angaben über die Stadt gesendet, in der Sie sich befinden, selbst "
@@ -2222,8 +2231,7 @@ msgid "Privacy mode is enabled by default."
 msgstr "Der Datenschutzmodus ist per Vorgabe aktiviert."
 
 #: C/geolocation-privacy.page:87(p)
-msgid ""
-"Privacy mode prevails even when using external and more precise devices."
+msgid "Privacy mode prevails even when using external and more precise devices."
 msgstr ""
 "Der Privatsphäre-Modus ist auch dann wirksam, wenn externe und genauere "
 "Geräte benutzt werden."
@@ -2245,8 +2253,8 @@ msgid ""
 "If your contacts cannot see your location, <app>Empathy</app> might not be "
 "able to discover with a good margin of precision your geographical position."
 msgstr ""
-"Falls Ihre Kontakte Ihren Ort nicht sehen können, dann ist <app>Empathy</"
-"app> möglicherweise nicht in der Lage, Ihren Ort mit einer hinreichenden "
+"Falls Ihre Kontakte Ihren Ort nicht sehen können, dann ist <app>Empathy</app> "
+"möglicherweise nicht in der Lage, Ihren Ort mit einer hinreichenden "
 "Genauigkeit zu bestimmen."
 
 #: C/geolocation-not-showing.page:38(p)
@@ -2269,9 +2277,9 @@ msgstr ""
 msgid ""
 "In order to publish your geographical location, your Jabber server needs to "
 "support the Personal Eventing Protocal (PEP). A list of <link href=\"http://"
-"coccinella.im/servers/servers_by_pubsub_pep.html\">servers which support "
-"PEP</link> is maintained online. Google Talk does not support this feature "
-"at this time."
+"coccinella.im/servers/servers_by_pubsub_pep.html\">servers which support PEP</"
+"link> is maintained online. Google Talk does not support this feature at this "
+"time."
 msgstr ""
 "Um Ihre geografische Position übermitteln zu können, muss Ihr Jabber-Server "
 "das »Personal Eventing Protocol« (PEP) unterstützen. Eine Liste von <link "
@@ -2313,19 +2321,19 @@ msgstr "Betreten eines Raumes."
 
 #: C/favorite-rooms.page:40(p)
 msgid ""
-"See <link xref=\"irc-join-room\"/> for more information on how to join an "
-"IRC room."
+"See <link xref=\"irc-join-room\"/> for more information on how to join an IRC "
+"room."
 msgstr ""
 "In <link xref=\"irc-join-room\"/> finden Sie weitere Informationen über das "
 "Betreten eines Raumes im IRC."
 
 #: C/favorite-rooms.page:46(p)
 msgid ""
-"See <link xref=\"group-conversations\"/> for more information on how to "
-"start or join a group conversation."
+"See <link xref=\"group-conversations\"/> for more information on how to start "
+"or join a group conversation."
 msgstr ""
-"In <link xref=\"group-conversations\"/> finden Sie weitere Informationen "
-"über das Starten oder Teilnehmen an einer Gruppenunterhaltung."
+"In <link xref=\"group-conversations\"/> finden Sie weitere Informationen über "
+"das Starten oder Teilnehmen an einer Gruppenunterhaltung."
 
 #: C/favorite-rooms.page:54(p)
 msgid ""
@@ -2345,8 +2353,8 @@ msgstr "Drücken Sie <key>F5</key>."
 
 #: C/favorite-rooms.page:76(p)
 msgid ""
-"Choose <guiseq><gui>Room</gui><gui>Join Favorites</gui></guiseq>, to join "
-"all your favorite rooms."
+"Choose <guiseq><gui>Room</gui><gui>Join Favorites</gui></guiseq>, to join all "
+"your favorite rooms."
 msgstr ""
 "Wählen Sie <guiseq><gui>Raum</gui><gui>Favoriten betreten</gui></guiseq>, um "
 "alle Ihre bevorzugten Räume zu betreten."
@@ -2359,8 +2367,8 @@ msgstr ""
 
 #: C/favorite-rooms.page:90(p)
 msgid ""
-"To join a favorite room, you need to be connected to the Internet and to "
-"your account."
+"To join a favorite room, you need to be connected to the Internet and to your "
+"account."
 msgstr ""
 "Um einen bevorzugten Raum zu betreten, müssen Sie mit dem Internet und mit "
 "Ihrem Konto verbunden sein."
@@ -2382,8 +2390,8 @@ msgid ""
 "From the <gui>Account</gui> drop-down list, select the account you want to "
 "manage the favorite rooms of."
 msgstr ""
-"Aus der <guilabel>Konto</guilabel>-Aufklappliste wählen Sie das Konto, "
-"dessen bevorzugte Räume Sie verwalten wollen."
+"Aus der <guilabel>Konto</guilabel>-Aufklappliste wählen Sie das Konto, dessen "
+"bevorzugte Räume Sie verwalten wollen."
 
 #: C/favorite-rooms.page:111(p)
 msgid "Select <gui>All</gui> to see all you favorite rooms."
@@ -2398,8 +2406,8 @@ msgid ""
 "Select the <gui>Auto-Connect</gui> check-box in order to automatically join "
 "that room when you connect to your account."
 msgstr ""
-"Aktivieren Sie das Ankreuzfeld <gui>Auto-Verbinden</gui>, um einen Raum "
-"immer dann automatisch zu betreten, wenn Sie sich an Ihrem Konto anmelden."
+"Aktivieren Sie das Ankreuzfeld <gui>Auto-Verbinden</gui>, um einen Raum immer "
+"dann automatisch zu betreten, wenn Sie sich an Ihrem Konto anmelden."
 
 #: C/favorite-rooms.page:127(p)
 msgid "Click on <gui>Remove</gui> to remove the room from your favorites."
@@ -2431,8 +2439,8 @@ msgstr ""
 "Sie können ein Konto deaktivieren, um zu verhindern, dass <app>Empathy</app> "
 "sich an diesem Konto anmeldet. Das Konto wird dabei nicht völlig entfernt. "
 "Vielleicht wollen Sie ein Konto deaktivieren und erneut aktivieren, wenn Sie "
-"nur zeitweise angemeldet sein wollen, aber <app>Empathy</app> noch für "
-"andere Konten nutzen wollen."
+"nur zeitweise angemeldet sein wollen, aber <app>Empathy</app> noch für andere "
+"Konten nutzen wollen."
 
 #: C/disable-account.page:52(p)
 msgid ""
@@ -2452,8 +2460,7 @@ msgstr ""
 
 #: C/disable-account.page:62(p)
 msgid ""
-"To re-enable the account, simply select <gui style=\"checkbox\">Enabled</"
-"gui>."
+"To re-enable the account, simply select <gui style=\"checkbox\">Enabled</gui>."
 msgstr ""
 "Um das Konto erneut zu aktivieren, wählen Sie <gui style=\"checkbox"
 "\">Aktiviert</gui>."
@@ -2474,19 +2481,19 @@ msgid ""
 "app> to register for a new account, using the same steps as you would to "
 "<link xref=\"add-account\">add an account</link>."
 msgstr ""
-"Für die meisten Kontentypen ist es erforderlich, dass Sie ein Konto bei "
-"einem Dienstanbieter erstellen, bevor Sie sich über Sofortnachrichten-"
-"Anwendungen wie <gui>Empathy</gui> verbinden können. Für einige "
-"Kontenanbieter können Sie <gui>Empathy</gui> verwenden, um ein neues Konto "
-"zu registrieren, unter Anwendung der gleichen Schritte wie für das <link "
-"xref=\"add-account\">Hinzufügen eines Kontos</link>."
+"Für die meisten Kontentypen ist es erforderlich, dass Sie ein Konto bei einem "
+"Dienstanbieter erstellen, bevor Sie sich über Sofortnachrichten-Anwendungen "
+"wie <gui>Empathy</gui> verbinden können. Für einige Kontenanbieter können Sie "
+"<gui>Empathy</gui> verwenden, um ein neues Konto zu registrieren, unter "
+"Anwendung der gleichen Schritte wie für das <link xref=\"add-account"
+"\">Hinzufügen eines Kontos</link>."
 
 #: C/create-account.page:42(p)
 msgid ""
-"This page provides information on creating a new account for various types "
-"of accounts. Your account provider should give you a login ID and a "
-"password, as well as any additional information you need to connect using "
-"<app>Empathy</app>."
+"This page provides information on creating a new account for various types of "
+"accounts. Your account provider should give you a login ID and a password, as "
+"well as any additional information you need to connect using <app>Empathy</"
+"app>."
 msgstr ""
 "Diese Seite stellt für die verschiedenen Kontentypen Informationen über das "
 "Anlegen eines neuen Kontos bereit. Sie sollten von Ihrem Dienstanbieter eine "
@@ -2502,9 +2509,9 @@ msgid ""
 "Facebook is one of the most-used social networks. It allows users to create "
 "their own profile and to communicate with their friends."
 msgstr ""
-"Facebook ist eines der am meisten genutzten sozialen Netzwerke. Den "
-"Benutzern wird die Erstellung eines eigenen Profils und die Kommunikation "
-"mit ihren Freunden ermöglicht."
+"Facebook ist eines der am meisten genutzten sozialen Netzwerke. Den Benutzern "
+"wird die Erstellung eines eigenen Profils und die Kommunikation mit ihren "
+"Freunden ermöglicht."
 
 #: C/create-account.page:52(p)
 msgid ""
@@ -2527,8 +2534,8 @@ msgid ""
 "regardless of their account provider."
 msgstr ""
 "Jabber ist ein offenes Sofortnachrichtensystem. Wie E-Mail, erlaubt Jabber "
-"die Wahl Ihres Konto-Dienstanbieters und die Kommunikation mit anderen "
-"Jabber-Benutzern, unabhängig von deren Konto-Dienstanbietern."
+"die Wahl Ihres Konto-Dienstanbieters und die Kommunikation mit anderen Jabber-"
+"Benutzern, unabhängig von deren Konto-Dienstanbietern."
 
 #: C/create-account.page:66(p)
 msgid ""
@@ -2546,10 +2553,9 @@ msgid ""
 "Google Talk is a Jabber service. Simply use your Google Mail address and "
 "password in <app>Empathy</app> to connect."
 msgstr ""
-"Falls Sie Google Mail oder Google Talk benutzen, haben Sie bereits ein "
-"Jabber-Konto. Google Talk ist ein Jabber-Dienst. Verwenden Sie einfach Ihre "
-"Google Mail-Adresse und Ihr Passwort in <app>Empathy</app> für die "
-"Verbindung."
+"Falls Sie Google Mail oder Google Talk benutzen, haben Sie bereits ein Jabber-"
+"Konto. Google Talk ist ein Jabber-Dienst. Verwenden Sie einfach Ihre Google "
+"Mail-Adresse und Ihr Passwort in <app>Empathy</app> für die Verbindung."
 
 #: C/create-account.page:78(title) C/audio-video.page:190(p)
 msgid "People Nearby"
@@ -2565,8 +2571,8 @@ msgstr ""
 "Sie müssen kein Konto bei einem Dienstanbieter anlegen, um dieses "
 "Funktionsmerkmal nutzen zu können. Dieser Dienst ist immer dann verfügbar, "
 "wenn Sie mit einem lokalen Netzwerk verbunden sind, zum Beispiel einem "
-"drahtlosen Zugangspunkt (Hotspot). Andere Benutzer, die diesen Dienst "
-"nutzen, werden im Netzwerk automatisch gefunden."
+"drahtlosen Zugangspunkt (Hotspot). Andere Benutzer, die diesen Dienst nutzen, "
+"werden im Netzwerk automatisch gefunden."
 
 #: C/create-account.page:85(p)
 msgid "For more information, see <link xref=\"salut-protocol\"/>."
@@ -2585,8 +2591,8 @@ msgid ""
 msgstr ""
 "SIP ist ein offenes System für Audio- und Video-Unterhaltungen übar das "
 "Internet. Sie müssen ein SIP-Konto bei einem Dienstanbieter erstellen. "
-"Unabhängig davon, welchen Dienstanbieter Ihre Kontakte nutzen, können Sie "
-"mit allen anderen SIP-Benutzern kommunizieren."
+"Unabhängig davon, welchen Dienstanbieter Ihre Kontakte nutzen, können Sie mit "
+"allen anderen SIP-Benutzern kommunizieren."
 
 #: C/create-account.page:97(p)
 msgid ""
@@ -2603,9 +2609,9 @@ msgid ""
 "Some SIP providers allow you to call normal phones from your computer. "
 "Generally, you will need to subscribe to a paid service for this feature."
 msgstr ""
-"Einige SIP-Dienste ermöglichen es, von Ihrem Rechner aus gewöhnliche "
-"Telefone anzurufen. Im Allgemeinen werden Sie sich hierfür an einem zu "
-"bezahlenden Dienst registrieren müssen."
+"Einige SIP-Dienste ermöglichen es, von Ihrem Rechner aus gewöhnliche Telefone "
+"anzurufen. Im Allgemeinen werden Sie sich hierfür an einem zu bezahlenden "
+"Dienst registrieren müssen."
 
 #: C/create-account.page:107(title) C/audio-video.page:165(p)
 msgid "IRC"
@@ -2613,16 +2619,16 @@ msgstr "IRC"
 
 #: C/create-account.page:109(p)
 msgid ""
-"You do not need to register for an account to use IRC. Although you specify "
-"a nickname when you add an IRC account to <app>Empathy</app>, this nickname "
-"is only established each time you connect. If another user is using the "
+"You do not need to register for an account to use IRC. Although you specify a "
+"nickname when you add an IRC account to <app>Empathy</app>, this nickname is "
+"only established each time you connect. If another user is using the "
 "nickname, you will need to choose a new nickname."
 msgstr ""
-"Sie müssen kein Konto registrieren, um das IRC zu benutzen. Obgleich Sie "
-"beim Hinzufügen eines IRC-Kontos in <app>Empathy</app> einen Spitznamen "
-"angeben, wird dieser Spitzname zwar jedes Mal bei einem Verbindungsaufbau "
-"festgelegt. Falls aber ein anderer Benutzer diesen Spitznamen verwendet, "
-"müssen Sie einen neuen wählen."
+"Sie müssen kein Konto registrieren, um das IRC zu benutzen. Obgleich Sie beim "
+"Hinzufügen eines IRC-Kontos in <app>Empathy</app> einen Spitznamen angeben, "
+"wird dieser Spitzname zwar jedes Mal bei einem Verbindungsaufbau festgelegt. "
+"Falls aber ein anderer Benutzer diesen Spitznamen verwendet, müssen Sie einen "
+"neuen wählen."
 
 #: C/create-account.page:114(p)
 msgid ""
@@ -2630,8 +2636,8 @@ msgid ""
 "their nicknames. See <link xref=\"irc-nick-password\"/> for more information."
 msgstr ""
 "Einige IRC-Netzwerke verwenden einen Dienst namens NickServ, um Benutzern zu "
-"ermöglichen, ihre Spitznamen zu schützen. Weitere Informationen finden Sie "
-"in <link xref=\"irc-nick-password\"/>."
+"ermöglichen, ihre Spitznamen zu schützen. Weitere Informationen finden Sie in "
+"<link xref=\"irc-nick-password\"/>."
 
 #: C/create-account.page:117(p)
 msgid ""
@@ -2709,22 +2715,22 @@ msgstr "Wählen Sie einen Status in der Liste aus."
 msgid ""
 "See <link xref=\"status-icons\"/> for a list of the built-in statuses and "
 "what they mean. You can also <link xref=\"set-custom-message\">add custom "
-"status messages</link> to provide more information about your availability "
-"to your contacts."
+"status messages</link> to provide more information about your availability to "
+"your contacts."
 msgstr ""
 "In <link xref=\"status-icons\"/> finden Sie eine Liste mitgelieferter Status "
 "sowie deren Bedeutung. Sie können auch <link xref=\"set-custom-message"
-"\">benutzerdefinierte Statusmeldungen hinzufügen</link>, um für Ihre "
-"Kontakte weitere Informationen über Ihren Status bereitzustellen."
+"\">benutzerdefinierte Statusmeldungen hinzufügen</link>, um für Ihre Kontakte "
+"weitere Informationen über Ihren Status bereitzustellen."
 
 #: C/change-status.page:58(p)
 msgid ""
-"If you do not use your computer for a while, or if the screensaver is on, "
-"the status will be automatically set to Away."
+"If you do not use your computer for a while, or if the screensaver is on, the "
+"status will be automatically set to Away."
 msgstr ""
 "Falls Sie Ihren Rechner für eine gewisse Zeit nicht bedienen oder der "
-"Bildschirmschoner eingeschaltet ist, wird der Status automatisch auf "
-"abwesend gesetzt."
+"Bildschirmschoner eingeschaltet ist, wird der Status automatisch auf abwesend "
+"gesetzt."
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
@@ -2746,8 +2752,8 @@ msgstr "Audio- und Video-Unterstützung"
 
 #: C/audio-video.page:34(p)
 msgid ""
-"You can only have audio and video conversation with contacts who are using "
-"an application which also supports this feature. When your contacts support "
+"You can only have audio and video conversation with contacts who are using an "
+"application which also supports this feature. When your contacts support "
 "audio or video conversations, you will see the following icons next to their "
 "names in the contact list:"
 msgstr ""
@@ -2782,8 +2788,8 @@ msgstr "Der Kontakt kann eine Video-Unterhaltung führen."
 
 #: C/audio-video.page:83(p)
 msgid ""
-"In order to have an audio conversation, you need to have a sound card that "
-"is supported by your operating system, and a working microphone."
+"In order to have an audio conversation, you need to have a sound card that is "
+"supported by your operating system, and a working microphone."
 msgstr ""
 "Um eine Audio-Unterhaltung führen zu können, benötigen Sie eine von Ihrem "
 "Betriebssystem unterstützte Soundkarte sowie ein funktionierendes Mikrofon."
@@ -2806,10 +2812,9 @@ msgid ""
 "supported services. The following table lists whether audio and video is "
 "supported for each type of account."
 msgstr ""
-"Sie können nur mit denjenigen Konten Audio- oder Video-Unterhaltungen "
-"führen, welche die entsprechenden Dienste unterstützen. In der folgenden "
-"Tabelle wird für jeden Kontentyp aufgelistet, ob Audio und Video unterstützt "
-"werden."
+"Sie können nur mit denjenigen Konten Audio- oder Video-Unterhaltungen führen, "
+"welche die entsprechenden Dienste unterstützen. In der folgenden Tabelle wird "
+"für jeden Kontentyp aufgelistet, ob Audio und Video unterstützt werden."
 
 #: C/audio-video.page:102(p)
 msgid ""
@@ -2819,21 +2824,21 @@ msgid ""
 "are listed as unsupported here."
 msgstr ""
 "Kontentypen werden durch Plugins bereitgestellt. Auf Ihrem System könnten "
-"nicht alle der folgenden Typen verfügbar sein, oder die bei Ihnen "
-"verfügbaren Typen sind hier nicht aufgelistet. Durch aktualisierte Plugins "
-"könnte es möglich sein, dass hier als nicht unterstützte Typen aufgelistete "
-"Konten dennoch Audio- und Video-Unterhaltungen ermöglichen."
+"nicht alle der folgenden Typen verfügbar sein, oder die bei Ihnen verfügbaren "
+"Typen sind hier nicht aufgelistet. Durch aktualisierte Plugins könnte es "
+"möglich sein, dass hier als nicht unterstützte Typen aufgelistete Konten "
+"dennoch Audio- und Video-Unterhaltungen ermöglichen."
 
 #: C/audio-video.page:110(p)
 msgid ""
 "I'd like to do tables like this using nothing for No and ✔ for Yes, but we "
-"need to look at the accessibility impact. I've <link href=\"http://mail."
-"gnome.org/archives/gnome-doc-list/2009-September/msg00006.html\">asked the "
+"need to look at the accessibility impact. I've <link href=\"http://mail.gnome."
+"org/archives/gnome-doc-list/2009-September/msg00006.html\">asked the "
 "accessibility team</link> for input."
 msgstr ""
 "I'd like to do tables like this using nothing for No and ✔ for Yes, but we "
-"need to look at the accessibility impact. I've <link href=\"http://mail."
-"gnome.org/archives/gnome-doc-list/2009-September/msg00006.html\">asked the "
+"need to look at the accessibility impact. I've <link href=\"http://mail.gnome."
+"org/archives/gnome-doc-list/2009-September/msg00006.html\">asked the "
 "accessibility team</link> for input."
 
 #: C/audio-video.page:118(p)
@@ -2930,8 +2935,8 @@ msgstr "Eine Audio-Unterhaltung starten"
 #: C/audio-call.page:29(p)
 msgid ""
 "You can call your contacts and have an audio conversation with them. This "
-"features only works with certain types of accounts, and it requires the "
-"other person to have an application that supports audio calls."
+"features only works with certain types of accounts, and it requires the other "
+"person to have an application that supports audio calls."
 msgstr ""
 "Sie können Ihre Kontakte anrufen und eine Audio-Unterhaltung mit ihnen "
 "führen. Dieses Funktionsmerkmal unterstützt verschiedene Kontentypen. "
@@ -2940,24 +2945,24 @@ msgstr ""
 
 #: C/audio-call.page:34(p)
 msgid ""
-"From the <gui>Contact List</gui> window, click the <media type=\"image\" "
-"mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon "
-"next to the name of the contact you wish to call and choose <gui style="
-"\"menuitem\">Audio Call</gui>."
+"From the <gui>Contact List</gui> window, click the <media type=\"image\" mime="
+"\"image/png\" src=\"figures/camera-web.png\">video call</media> icon next to "
+"the name of the contact you wish to call and choose <gui style=\"menuitem"
+"\">Audio Call</gui>."
 msgstr ""
-"Klicken Sie im <gui>Kontaktlisten</gui>-Fenster auf das <media type=\"image"
-"\" mime=\"image/png\" src=\"figures/camera-web.png\">Videoanruf</media>-"
-"Symbol neben dem Namen des Kontakts, den Sie anrufen wollen, und wählen Sie "
-"<gui style=\"menuitem\">Videoanruf</gui>."
+"Klicken Sie im <gui>Kontaktlisten</gui>-Fenster auf das <media type=\"image\" "
+"mime=\"image/png\" src=\"figures/camera-web.png\">Videoanruf</media>-Symbol "
+"neben dem Namen des Kontakts, den Sie anrufen wollen, und wählen Sie <gui "
+"style=\"menuitem\">Videoanruf</gui>."
 
 #: C/audio-call.page:55(p)
 msgid ""
 "To turn an audio conversation into a video conversation, choose <guiseq><gui "
 "style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</gui></guiseq>."
 msgstr ""
-"Um eine Audio-Unterhaltung in eine Video-Unterhaltung umzuwandeln, wählen "
-"Sie <guiseq><gui style=\"menu\">Anruf</gui><gui style=\"menuitem\">Video "
-"ein</gui></guiseq>."
+"Um eine Audio-Unterhaltung in eine Video-Unterhaltung umzuwandeln, wählen Sie "
+"<guiseq><gui style=\"menu\">Anruf</gui><gui style=\"menuitem\">Video ein</"
+"gui></guiseq>."
 
 #: C/audio-call.page:63(title)
 msgid "Start an audio conversation with a meta-contact"
@@ -2992,8 +2997,8 @@ msgid ""
 "service as the account you select."
 msgstr ""
 "Wählen Sie in der <gui>Konten</gui>-Auswahlliste das Konto aus, mit dem Sie "
-"sich zu Ihrem Kontakt verbinden wollen. Es ist erforderlich, dass Ihr "
-"Kontakt den gleichen Dienst verwendet, den Sie hier angeben."
+"sich zu Ihrem Kontakt verbinden wollen. Es ist erforderlich, dass Ihr Kontakt "
+"den gleichen Dienst verwendet, den Sie hier angeben."
 
 #: C/add-contact.page:45(p)
 msgid ""
@@ -3009,8 +3014,8 @@ msgid ""
 "In the <gui>Alias</gui> field, type your contact’s name as you would like it "
 "to appear in your contact list."
 msgstr ""
-"Geben Sie in das <guilabel>Alias</guilabel>-Textfeld den Namen ein, so wie "
-"er in der Kontaktliste erscheinen soll."
+"Geben Sie in das <guilabel>Alias</guilabel>-Textfeld den Namen ein, so wie er "
+"in der Kontaktliste erscheinen soll."
 
 #: C/add-contact.page:53(p)
 msgid "Click <gui>Add</gui> to add the person to your list of contacts."
@@ -3020,8 +3025,8 @@ msgstr ""
 
 #: C/add-contact.page:61(p)
 msgid ""
-"To add a new person to your list of contacts, you need to be connected to "
-"the Internet and to your account."
+"To add a new person to your list of contacts, you need to be connected to the "
+"Internet and to your account."
 msgstr ""
 "Um eine neue Person zu Ihrer Kontaktliste hinzuzufügen, müssen Sie mit dem "
 "Internet und mit Ihrem Konto verbunden sein."
@@ -3037,9 +3042,9 @@ msgstr "Hinzufügen eines neuen Kontos"
 #: C/add-account.page:41(p)
 msgid ""
 "You can add instant messaging accounts from any supported service to "
-"communicate with all of your contacts in <app>Empathy</app>. For some "
-"account providers, these steps will also allow you to register for a new "
-"account. For more details, see <link xref=\"create-account\"/>."
+"communicate with all of your contacts in <app>Empathy</app>. For some account "
+"providers, these steps will also allow you to register for a new account. For "
+"more details, see <link xref=\"create-account\"/>."
 msgstr ""
 "Sie können Sofortnachrichten-Konten für jeden unterstützten Dienst anlegen, "
 "um mit allen Ihren Kontakten in <app>Empathy</app> zu kommunizieren. Für "
@@ -3074,9 +3079,9 @@ msgstr ""
 
 #: C/add-account.page:66(p)
 msgid ""
-"Enter the required information. For most accounts, you will only need a "
-"login ID and a password. Some accounts may require additional information. "
-"See <link xref=\"accounts-window#details\"/> for more information."
+"Enter the required information. For most accounts, you will only need a login "
+"ID and a password. Some accounts may require additional information. See "
+"<link xref=\"accounts-window#details\"/> for more information."
 msgstr ""
 "Geben Sie die benötigten Informationen ein. Für die meisten Konten wird die "
 "Eingabe einer Anmeldekennung und eines Passworts genügen. Einige Konten "
@@ -3091,8 +3096,8 @@ msgstr "Klicken Sie auf <gui style=\"button\">Anmelden</gui>."
 msgid ""
 "To change the name that identifies the account in the <gui>Accounts</gui> "
 "window, select the account from the list on the left and either click on the "
-"name or press the space bar. Edit the account name and press <key>Enter</"
-"key> when you’re finished."
+"name or press the space bar. Edit the account name and press <key>Enter</key> "
+"when you’re finished."
 msgstr ""
 "Um den Namen zu ändern, der das Konto im <gui>Konten</gui>-Fenster "
 "identifiziert, wählen Sie das Konto aus der linken Liste aus und klicken Sie "
@@ -3110,8 +3115,7 @@ msgstr "Konten-Fenster"
 
 #: C/accounts-window.page:35(p)
 msgid ""
-"The <gui>Accounts</gui> window allows you to add, modify, and delete "
-"accounts."
+"The <gui>Accounts</gui> window allows you to add, modify, and delete accounts."
 msgstr ""
 "Das <gui>Konten</gui> ermöglicht Ihnen das Hinzufügen, Bearbeiten oder "
 "Entfernen von Kontakten."
@@ -3142,16 +3146,16 @@ msgstr "Jabber-Kontendetails"
 msgid ""
 "Most Jabber accounts will require only a login ID and a password to connect. "
 "For some accounts or on certain types of networks, you may need to enter "
-"additional information in the <gui>Advanced</gui> section. Normally, you "
-"will not need to use the advanced options below. For general instructions on "
+"additional information in the <gui>Advanced</gui> section. Normally, you will "
+"not need to use the advanced options below. For general instructions on "
 "adding an account, see <link xref=\"add-account\"/>."
 msgstr ""
 "Die meisten Jabber-Konten erfordern nur eine Anmeldekennung und ein Passwort "
-"für die Verbindung. Für einige Konten oder bestimmte Netzwerktypen können "
-"Sie zusätzliche Informationen im Abschnitt <gui>Fortgeschritten</gui> "
-"eingeben. Normalerweise werden Sie die unten angegebenen zusätzlichen "
-"Optionen nicht benötigen. Allgemeine Informationen über das Hinzufügen eines "
-"Kontos finden Sie in <link xref=\"add-account\"/>."
+"für die Verbindung. Für einige Konten oder bestimmte Netzwerktypen können Sie "
+"zusätzliche Informationen im Abschnitt <gui>Fortgeschritten</gui> eingeben. "
+"Normalerweise werden Sie die unten angegebenen zusätzlichen Optionen nicht "
+"benötigen. Allgemeine Informationen über das Hinzufügen eines Kontos finden "
+"Sie in <link xref=\"add-account\"/>."
 
 #: C/account-jabber.page:39(p)
 msgid ""
@@ -3172,17 +3176,17 @@ msgstr "SSL-Zertifikat-Fehler ignorieren"
 #: C/account-jabber.page:47(p)
 msgid ""
 "Whenever possible, communication between <app>Empathy</app> and the Jabber "
-"server is encrypted. If encrypted communication is not possible, messages "
-"may be sent unencrypted. Select <gui>Encryption required</gui> to prevent "
+"server is encrypted. If encrypted communication is not possible, messages may "
+"be sent unencrypted. Select <gui>Encryption required</gui> to prevent "
 "<app>Empathy</app> from communicating with the Jabber server when encryption "
 "is not possible."
 msgstr ""
-"Wann immer es möglich ist, wird die Kommunikation zwischen <app>Empathy</"
-"app> und dem Jabber-Server verschlüsselt. Falls verschlüsselte Kommunikation "
-"nicht möglich ist, können Nachrichten unverschlüsselt gesendet werden. "
-"Wählen Sie <gui>Verschlüsselung erforderlich</gui>, um eine Kommunikation "
-"von <app>Empathy</app> mit dem Jabber-Server zu verhindern, wenn "
-"Verschlüsselung nicht möglich ist."
+"Wann immer es möglich ist, wird die Kommunikation zwischen <app>Empathy</app> "
+"und dem Jabber-Server verschlüsselt. Falls verschlüsselte Kommunikation nicht "
+"möglich ist, können Nachrichten unverschlüsselt gesendet werden. Wählen Sie "
+"<gui>Verschlüsselung erforderlich</gui>, um eine Kommunikation von "
+"<app>Empathy</app> mit dem Jabber-Server zu verhindern, wenn Verschlüsselung "
+"nicht möglich ist."
 
 #: C/account-jabber.page:52(p)
 msgid ""
@@ -3214,15 +3218,15 @@ msgid ""
 msgstr ""
 "Falls Sie über mehrere Anwendungen gleichzeitig mit Ihrem Konto verbunden "
 "sind, beispielsweise von verschiedenen Rechnern aus, können Sie eine "
-"Ressource zur eindeutigen Identifizierung jeder dieser Anmeldungen "
-"festlegen. Als Vorgabe verwendet <app>Empathy</app> als Ressource "
-"<input>Telepathy</input>."
+"Ressource zur eindeutigen Identifizierung jeder dieser Anmeldungen festlegen. "
+"Als Vorgabe verwendet <app>Empathy</app> als Ressource <input>Telepathy</"
+"input>."
 
 #: C/account-jabber.page:65(p)
 msgid ""
-"You can set the priority to specify which application should receive "
-"incoming messages from your contacts. New messages will be sent to the "
-"application with the highest priority."
+"You can set the priority to specify which application should receive incoming "
+"messages from your contacts. New messages will be sent to the application "
+"with the highest priority."
 msgstr ""
 "Sie können die Priorität festlegen, um anzugeben, welche Anwendung die "
 "eingehenden Nachrichten von Ihren Kontakten annehmen soll. Neue Nachrichten "
@@ -3236,13 +3240,13 @@ msgstr "Server-Einstellungen überschreiben"
 msgid ""
 "<app>Empathy</app> will use default settings to connect to the Jabber server "
 "based on your login ID. For some Jabber servers, you will need to enter "
-"custom server settings manually. These settings should be provided for you "
-"by your Jabber provider."
+"custom server settings manually. These settings should be provided for you by "
+"your Jabber provider."
 msgstr ""
-"<app>Empathy</app> verwendet Vorgabeeinstellungen für Verbindungen zum "
-"Jabber-Server, basierend auf Ihrer Anmeldekennung. Für einige Jabber-Server "
-"müssen Sie benutzerdefinierte Einstellungen manuell eingeben. Diese "
-"Einstellungen sollte Ihnen Ihr Jabber-Dienstanbieter zur Verfügung stellen."
+"<app>Empathy</app> verwendet Vorgabeeinstellungen für Verbindungen zum Jabber-"
+"Server, basierend auf Ihrer Anmeldekennung. Für einige Jabber-Server müssen "
+"Sie benutzerdefinierte Einstellungen manuell eingeben. Diese Einstellungen "
+"sollte Ihnen Ihr Jabber-Dienstanbieter zur Verfügung stellen."
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
@@ -3267,9 +3271,9 @@ msgstr "IRC-Kontendetails"
 
 #: C/account-irc.page:33(p)
 msgid ""
-"IRC accounts require different information than many other types of "
-"accounts. To create an IRC account, you must specify at least an IRC network "
-"and a nickname. This page details the information you can provide for an IRC "
+"IRC accounts require different information than many other types of accounts. "
+"To create an IRC account, you must specify at least an IRC network and a "
+"nickname. This page details the information you can provide for an IRC "
 "account."
 msgstr ""
 "IRC-Konten erfordern andere Informationen als die meisten anderen "
@@ -3285,15 +3289,14 @@ msgstr "Netzwerk"
 msgid ""
 "IRC is an open system that allows people to run separate IRC networks. Each "
 "network is distinct and has its own users and chat rooms. <app>Empathy</app> "
-"lists the most popular networks in the <gui>Network</gui> drop-down list. "
-"You can add additional networks. See <link xref=\"#networks\"/> below."
+"lists the most popular networks in the <gui>Network</gui> drop-down list. You "
+"can add additional networks. See <link xref=\"#networks\"/> below."
 msgstr ""
 "IRC ist ein offenes System, welches Personen erlaubt, separate IRC-Netzwerke "
 "zu betreiben. Jedes Netzwerk ist in sich abgeschlossen und hat seine eigenen "
 "Benutzer und Unterhaltungsräume. <app>Empathy</app> listet die populärsten "
-"Netzwerke in der Auswahlliste <gui>Netzwerk</gui> auf. Sie können "
-"zusätzliche Netzwerke hinzufügen. Siehe <link xref=\"#networks\"/> "
-"nachfolgend."
+"Netzwerke in der Auswahlliste <gui>Netzwerk</gui> auf. Sie können zusätzliche "
+"Netzwerke hinzufügen. Siehe <link xref=\"#networks\"/> nachfolgend."
 
 #: C/account-irc.page:53(gui)
 msgid "Nickname"
@@ -3302,13 +3305,13 @@ msgstr "Spitzname"
 #: C/account-irc.page:54(p)
 msgid ""
 "Your nickname is your unique name on the IRC network. Only one person on a "
-"network may use a given nickname. If you get an error message that says "
-"<link xref=\"prob-conn-name\" role=\"error-msg\"/> you will need to change "
-"your nickname."
+"network may use a given nickname. If you get an error message that says <link "
+"xref=\"prob-conn-name\" role=\"error-msg\"/> you will need to change your "
+"nickname."
 msgstr ""
 "Ihr Spitzname ist Ihr eindeutiger Name im IRC-Netzwerk. Nur eine einzige "
-"Person in einem Netzwerk darf einen gegebenen Spitznamen verwenden. Falls "
-"Sie die Fehlermeldung <link xref=\"prob-conn-name\" role=\"error-msg\"/> "
+"Person in einem Netzwerk darf einen gegebenen Spitznamen verwenden. Falls Sie "
+"die Fehlermeldung <link xref=\"prob-conn-name\" role=\"error-msg\"/> "
 "erhalten, müssen Sie Ihren Spitznamen ändern."
 
 #: C/account-irc.page:60(gui)
@@ -3318,8 +3321,8 @@ msgstr "Passwort"
 #: C/account-irc.page:61(p)
 msgid ""
 "Some servers, particularly those on private networks, require a password to "
-"connect. If you are authorized to use the network, the network "
-"administrators should provide you with a password."
+"connect. If you are authorized to use the network, the network administrators "
+"should provide you with a password."
 msgstr ""
 "Einige Server, insbesondere diejenigen in privaten Netzwerken, erfordern ein "
 "Passwort für die Verbindung. Falls Sie legitimiert sind, das Netzwerk zu "
@@ -3333,9 +3336,9 @@ msgstr "NickServ-Passwörter"
 #: C/account-irc.page:66(p)
 msgid ""
 "On some networks, nicknames can be registered using a service known as "
-"NickServ. <app>Empathy</app> does not directly support nickname passwords. "
-"On some networks, including the popular freenode network, server passwords "
-"are automatically forwarded to NickServ, allowing you to set this field to "
+"NickServ. <app>Empathy</app> does not directly support nickname passwords. On "
+"some networks, including the popular freenode network, server passwords are "
+"automatically forwarded to NickServ, allowing you to set this field to "
 "identify yourself with NickServ. See <link xref=\"irc-nick-password\"/> for "
 "more details."
 msgstr ""
@@ -3352,8 +3355,8 @@ msgstr "Realname"
 
 #: C/account-irc.page:77(p)
 msgid ""
-"You can provide your real name in addition to your nickname. Other users "
-"will be able to see this when they view your information."
+"You can provide your real name in addition to your nickname. Other users will "
+"be able to see this when they view your information."
 msgstr ""
 "Zusätzlich zu Ihrem Spitznamen können Sie auch Ihren echten Namen angeben. "
 "Dieser wird anderen Benutzern angezeigt, wenn diese Ihre persönlichen "
@@ -3385,31 +3388,31 @@ msgstr "Netzwerke"
 #: C/account-irc.page:99(p)
 msgid ""
 "<app>Empathy</app> includes a list of popular IRC networks. If you wish to "
-"another IRC network, you can add it to the list. You can also modify "
-"networks and remove them from the list."
+"another IRC network, you can add it to the list. You can also modify networks "
+"and remove them from the list."
 msgstr ""
 "<app>Empathy</app> enthält eine Liste populärer IRC-Netzwerke. Falls Sie ein "
-"anderes IRC-Netzwerk wünschen, können Sie es zur Liste hinzufügen. Sie "
-"können auch Netzwerke bearbeiten oder aus der Liste entfernen."
+"anderes IRC-Netzwerk wünschen, können Sie es zur Liste hinzufügen. Sie können "
+"auch Netzwerke bearbeiten oder aus der Liste entfernen."
 
 #: C/account-irc.page:104(p)
 msgid ""
 "To add a network to the list, click <media type=\"image\" mime=\"image/png\" "
 "src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Add</media>."
 msgstr ""
-"Um ein Netzwerk zur Liste hinzuzufügen, klicken Sie auf <media type=\"image"
-"\" mime=\"image/png\" src=\"figures/gtk-add.png\" width=\"16\" height=\"16"
-"\">Hinzufügen</media>."
+"Um ein Netzwerk zur Liste hinzuzufügen, klicken Sie auf <media type=\"image\" "
+"mime=\"image/png\" src=\"figures/gtk-add.png\" width=\"16\" height="
+"\"16\">Hinzufügen</media>."
 
 #: C/account-irc.page:107(p)
 msgid ""
 "To modify a network in the list, select the network and click <media type="
-"\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" "
-"height=\"16\">Edit</media>."
+"\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" height="
+"\"16\">Edit</media>."
 msgstr ""
-"Um ein Netzwerk in der Liste zu bearbeiten, wählen Sie es aus und klicken "
-"auf <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" "
-"width=\"16\" height=\"16\">Bearbeiten</media>."
+"Um ein Netzwerk in der Liste zu bearbeiten, wählen Sie es aus und klicken auf "
+"<media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width="
+"\"16\" height=\"16\">Bearbeiten</media>."
 
 #: C/account-irc.page:110(p)
 msgid ""
@@ -3417,9 +3420,9 @@ msgid ""
 "\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" "
 "height=\"16\">Remove</media>."
 msgstr ""
-"Um ein Netzwerk aus der Liste zu entfernen, wählen Sie es aus und klicken "
-"auf <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" "
-"width=\"16\" height=\"16\">Entfernen</media>."
+"Um ein Netzwerk aus der Liste zu entfernen, wählen Sie es aus und klicken auf "
+"<media type=\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width="
+"\"16\" height=\"16\">Entfernen</media>."
 
 #: C/account-irc.page:115(p)
 msgid ""
@@ -3442,20 +3445,19 @@ msgstr "Zeichensatz"
 
 #: C/account-irc.page:126(p)
 msgid ""
-"This specifies the character encoding that is typically used on this "
-"network. A character encoding is a specific way of recording characters "
-"internally in a computer. There are many character encodings, and you need "
-"to use the same character encoding as other users to see their messages "
-"correctly."
+"This specifies the character encoding that is typically used on this network. "
+"A character encoding is a specific way of recording characters internally in "
+"a computer. There are many character encodings, and you need to use the same "
+"character encoding as other users to see their messages correctly."
 msgstr ""
 "Dies legt die Zeichenkodierung fest, die typischerweise in diesem Netzwerk "
 "verwendet wird. Eine Zeichenkodierung ist eine spezifische Art der internen "
 "Aufzeichnung von Zeichen in einem Rechner. Es gibt zahlreiche "
-"Zeichenkodierungen. Sie müssen die gleiche Kodierung wie die anderen "
-"Benutzer verwenden, damit deren Nachrichten korrekt angezeigt werden können."
+"Zeichenkodierungen. Sie müssen die gleiche Kodierung wie die anderen Benutzer "
+"verwenden, damit deren Nachrichten korrekt angezeigt werden können."
 
 #. Translators: Recommend character encodings that are common
-#.             for your language.
+#. for your language.
 #: C/account-irc.page:135(p)
 msgid ""
 "By default, <app>Empathy</app> uses UTF-8, a modern character encoding that "
@@ -3491,10 +3493,10 @@ msgid ""
 "<gui>Port</gui> to edit it. Alternatively, use the left and right arrow keys "
 "to focus the field, and press the space bar to begin editing."
 msgstr ""
-"Wenn ein Server ausgewählt ist, klicken Sie auf die Felder unter "
-"<gui>Server</gui> oder <gui>Port</gui>, um diese zu bearbeiten. Alternativ "
-"verwenden Sie die linke und rechte Pfeiltaste, um das Feld zu fokussieren. "
-"Mit der Leertaste beginnen Sie mit der Bearbeitung."
+"Wenn ein Server ausgewählt ist, klicken Sie auf die Felder unter <gui>Server</"
+"gui> oder <gui>Port</gui>, um diese zu bearbeiten. Alternativ verwenden Sie "
+"die linke und rechte Pfeiltaste, um das Feld zu fokussieren. Mit der "
+"Leertaste beginnen Sie mit der Bearbeitung."
 
 #: C/account-irc.page:151(p)
 msgid ""
@@ -3503,9 +3505,9 @@ msgid ""
 "the network from seeing what you write on public chat rooms."
 msgstr ""
 "Aktivieren Sie das Ankreuzfeld in der <gui>SSL</gui>-Spalte, um jegliche "
-"Kommunikation mit dem Server zu verschlüsseln. Beachten Sie, dass dies "
-"andere Benutzer des Netzwerks nicht daran hindern wird, alles zu sehen, was "
-"Sie in öffentlichen Unterhaltungsräumen schreiben."
+"Kommunikation mit dem Server zu verschlüsseln. Beachten Sie, dass dies andere "
+"Benutzer des Netzwerks nicht daran hindern wird, alles zu sehen, was Sie in "
+"öffentlichen Unterhaltungsräumen schreiben."
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
 #: C/index.page:0(None)
@@ -3514,3 +3516,24 @@ msgstr ""
 "Mario Blättermann <mariobl@freenet.de>, 2008, 2009, 2010, 2011\n"
 "Philipp Kerling <k.philipp@gmail.com>, 2008\n"
 "Christian Kirbach <Christian.Kirbach@googlemail.com>, 2010."
+
+#~ msgid ""
+#~ "In order to be able to share your desktop or to remotely use your contacts "
+#~ "desktop, it is necessary to have a remote desktop viewer application "
+#~ "installed in your system."
+#~ msgstr ""
+#~ "Um Ihre Arbeitsumgebung freizugeben oder die Arbeitsumgebungen Ihrer "
+#~ "entfernten Kontakte zu benutzen, ist eine auf Ihrem System installierte "
+#~ "Anwendung zum Betrachten entfernter Arbeitsumgebungen notwendig."
+
+#~ msgid ""
+#~ "A request will be sent to the contact you want to share your desktop with. "
+#~ "If they accept, the default remote desktop viewer application will be "
+#~ "launched in order to permit you to disconnect the user that is controlling "
+#~ "your desktop."
+#~ msgstr ""
+#~ "Es wird eine Anfrage an den Kontakt gesendet, dem Sie Ihre Arbeitsumgebung "
+#~ "freigeben wollen. Falls diese akzeptiert wird, dann wird die "
+#~ "voreingestellte Anwendung zum Betrachten entfernter Arbeitsumgebungen "
+#~ "gestartet, damit es Ihnen ermöglicht wird, die Verbindung zu dem Benutzer "
+#~ "zu trennen, der Ihre Arbeitsumgebung steuert."
diff --git a/help/es/es.po b/help/es/es.po
index 71e7225d8..f35a961d6 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy-help.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-01 02:16+0000\n"
-"PO-Revision-Date: 2011-04-02 20:54+0200\n"
+"POT-Creation-Date: 2011-09-05 18:45+0000\n"
+"PO-Revision-Date: 2011-09-05 23:28+0200\n"
 "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
-"Language-Team: Español <gnome-es-list@gnome.org>\n"
+"Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
@@ -29,14 +29,14 @@ msgid "Start a video conversation with one of your contacts."
 msgstr "Iniciar una conversación de vídeo con uno de sus contactos."
 
 #: C/video-call.page:21(name) C/status-icons.page:16(name)
-#: C/share-desktop.page:13(name) C/set-custom-status.page:19(name)
+#: C/share-desktop.page:14(name) C/set-custom-status.page:19(name)
 #: C/send-file.page:21(name) C/salut-protocol.page:18(name)
 #: C/remove-account.page:18(name) C/prob-conn-neterror.page:18(name)
 #: C/prob-conn-name.page:17(name) C/prob-conn-auth.page:21(name)
 #: C/prob-conn-acctdisabled.page:18(name) C/prev-conv.page:16(name)
 #: C/link-contacts.page:15(name) C/irc-start-conversation.page:15(name)
 #: C/irc-send-file.page:16(name) C/irc-nick-password.page:18(name)
-#: C/irc-manage.page:19(name) C/irc-join-room.page:16(name)
+#: C/irc-manage.page:20(name) C/irc-join-room.page:16(name)
 #: C/irc-join-pwd.page:17(name) C/irc-commands.page:10(name)
 #: C/introduction.page:13(name) C/index.page:19(name)
 #: C/import-account.page:23(name) C/hide-contacts.page:11(name)
@@ -51,14 +51,14 @@ msgid "Milo Casagrande"
 msgstr "Milo Casagrande"
 
 #: C/video-call.page:22(email) C/status-icons.page:17(email)
-#: C/share-desktop.page:14(email) C/set-custom-status.page:20(email)
+#: C/share-desktop.page:15(email) C/set-custom-status.page:20(email)
 #: C/send-file.page:22(email) C/salut-protocol.page:19(email)
 #: C/remove-account.page:19(email) C/prob-conn-neterror.page:19(email)
 #: C/prob-conn-name.page:18(email) C/prob-conn-auth.page:22(email)
 #: C/prob-conn-acctdisabled.page:19(email) C/prev-conv.page:17(email)
 #: C/link-contacts.page:16(email) C/irc-start-conversation.page:16(email)
 #: C/irc-send-file.page:17(email) C/irc-nick-password.page:19(email)
-#: C/irc-manage.page:20(email) C/irc-join-room.page:17(email)
+#: C/irc-manage.page:21(email) C/irc-join-room.page:17(email)
 #: C/irc-join-pwd.page:18(email) C/irc-commands.page:11(email)
 #: C/introduction.page:14(email) C/index.page:20(email)
 #: C/import-account.page:24(email) C/hide-contacts.page:12(email)
@@ -73,7 +73,7 @@ msgid "milo@ubuntu.com"
 msgstr "milo@ubuntu.com"
 
 #: C/video-call.page:25(p) C/status-icons.page:24(p)
-#: C/share-desktop.page:17(p) C/set-custom-status.page:23(p)
+#: C/share-desktop.page:22(p) C/set-custom-status.page:23(p)
 #: C/send-message.page:21(p) C/send-file.page:25(p)
 #: C/salut-protocol.page:22(p) C/remove-account.page:22(p)
 #: C/prob-conn.page:18(p) C/prob-conn-neterror.page:22(p)
@@ -81,7 +81,7 @@ msgstr "milo@ubuntu.com"
 #: C/prob-conn-acctdisabled.page:22(p) C/prev-conv.page:24(p)
 #: C/link-contacts.page:19(p) C/irc-start-conversation.page:19(p)
 #: C/irc-send-file.page:20(p) C/irc-nick-password.page:22(p)
-#: C/irc-manage.page:23(p) C/irc-join-room.page:20(p)
+#: C/irc-manage.page:24(p) C/irc-join-room.page:20(p)
 #: C/irc-join-pwd.page:21(p) C/irc-commands.page:14(p)
 #: C/introduction.page:17(p) C/index.page:23(p) C/import-account.page:31(p)
 #: C/hide-contacts.page:15(p) C/group-conversations.page:23(p)
@@ -182,29 +182,24 @@ msgstr ""
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/status-icons.page:39(None)
-#| msgid ""
-#| "@@image: 'figures/available.png'; md5=1952a8952efbe87e84b21e09e0587e71"
 msgid "@@image: 'figures/available.png'; md5=2196b2f0ad4ce26fdb7b9d48e75d1947"
 msgstr "@@image: 'figures/available.png'; md5=2196b2f0ad4ce26fdb7b9d48e75d1947"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/status-icons.page:45(None)
-#| msgid "@@image: 'figures/busy.png'; md5=6cab57171fb6d732a85ace48f11cf207"
 msgid "@@image: 'figures/busy.png'; md5=15eb2adff5faedf97b0cb9105d09410a"
 msgstr "@@image: 'figures/busy.png'; md5=15eb2adff5faedf97b0cb9105d09410a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/status-icons.page:53(None)
-#| msgid "@@image: 'figures/away.png'; md5=9a93ccca527af39cbe11db5c9d915ca0"
 msgid "@@image: 'figures/away.png'; md5=9c504d6ffa0cf1a9cc8933d16e1bea33"
 msgstr "@@image: 'figures/away.png'; md5=9c504d6ffa0cf1a9cc8933d16e1bea33"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/status-icons.page:62(None) C/status-icons.page:69(None)
-#| msgid "@@image: 'figures/offline.png'; md5=565ba82fbedd22e4eb5b810750199527"
 msgid "@@image: 'figures/offline.png'; md5=c5b0c21181cbd6e13f8909243c0fa964"
 msgstr "@@image: 'figures/offline.png'; md5=c5b0c21181cbd6e13f8909243c0fa964"
 
@@ -325,82 +320,109 @@ msgstr ""
 "cuentas."
 
 #: C/share-desktop.page:7(desc)
-msgid "Share the desktop with your contacts."
-msgstr "Compartir el escritorio con sus contactos."
+#| msgid "Share the desktop with your contacts."
+msgid "Show your desktop to your contacts."
+msgstr "Mostrar su escritorio a sus contactos."
+
+#: C/share-desktop.page:18(name)
+msgid "Ekaterina Gerasimova"
+msgstr "Ekaterina Gerasimova"
 
-#: C/share-desktop.page:28(title)
+#: C/share-desktop.page:19(email)
+msgid "kittykat3756@gmail.com"
+msgstr "kittykat3756@gmail.com"
+
+#: C/share-desktop.page:33(title)
 msgid "Share your desktop"
 msgstr "Compartir su escritorio"
 
-#: C/share-desktop.page:30(p)
+#: C/share-desktop.page:35(p)
+#| msgid ""
+#| "It is possible, with some of your contacts, to share your desktop with "
+#| "them, or to start using your contacts desktop. You can use this "
+#| "functionality to show your desktop to your contacts, to ask for help or "
+#| "to help your contacts resolve a problem."
 msgid ""
-"It is possible, with some of your contacts, to share your desktop with them, "
-"or to start using your contacts desktop. You can use this functionality to "
-"show your desktop to your contacts, to ask for help or to help your contacts "
-"resolve a problem."
+"It is possible to share your desktop with some of your contacts. You can use "
+"this functionality to show your desktop to your contacts to, for example, "
+"ask for help or help your contacts resolve a problem."
 msgstr ""
-"Es posible, con algunos de sus contactos, compartir su escritorio con ellos, "
-"o usar el escritorio de sus contactos. Puede usar esta funcionalidad para "
-"mostrar su escritorio a sus contactos, o preguntar por ayuda o ayudar a sus "
-"contactos a resolver problemas."
+"Es posible compartir su escritorio con algunos de sus contactos. Puede usar "
+"esta funcionalidad para mostrar su escritorio a sus contactos, o preguntar "
+"por ayuda o ayudar a sus contactos a resolver problemas."
 
-#: C/share-desktop.page:38(p)
+#: C/share-desktop.page:42(p)
 msgid ""
-"In order to be able to share your desktop or to remotely use your contacts "
-"desktop, it is necessary to have a remote desktop viewer application "
-"installed in your system."
+"To be able to share your desktop, you need to have a VNC server, which has "
+"support for the feature, installed on your system. <app>Vino</app>, the "
+"GNOME VNC server, has the required support."
 msgstr ""
-"Para poder compartir su escritorio o usar remotamente el escritorio de sus "
-"contactos es necesario tener una aplicación de visión remota de escritorios "
-"instalada en su sistema."
+"Para poder compartir su escritorio necesita tener un servidor VNC, que "
+"soporte para la característica, instalado en su sistema. <app>Vino</app>, el "
+"servidor VNC de GNOME, tiene el soporte necesario."
 
-#: C/share-desktop.page:46(p) C/send-file.page:40(p)
-#: C/favorite-rooms.page:66(p)
-msgid "From the <gui>Contact List</gui> window, perform one of the following:"
+#: C/share-desktop.page:51(p)
+#| msgid ""
+#| "From the <gui>Contact List</gui> window, perform one of the following:"
+msgid "From the <gui>Contact List</gui> window, do one of the following:"
 msgstr ""
 "En la ventana de la <gui>Lista de contactos</gui> realice una de las "
-"siguientes acciones:"
+"siguientes:"
 
-#: C/share-desktop.page:51(p)
+#: C/share-desktop.page:56(p)
+#| msgid ""
+#| "Select the contact you want to share your desktop with, and choose "
+#| "<guiseq><gui>Edit</gui><gui>Contact</gui><gui>Share my desktop</gui></"
+#| "guiseq>."
 msgid ""
-"Select the contact you want to share your desktop with, and choose "
-"<guiseq><gui>Edit</gui><gui>Contact</gui><gui>Share my desktop</gui></"
+"Select the contact you want to share your desktop with and choose "
+"<guiseq><gui>Edit</gui><gui>Contact</gui><gui>Share My Desktop</gui></"
 "guiseq>."
 msgstr ""
-"Seleccione el contacto con el que quiera compartir su escritorio y pulse "
+"Seleccione el contacto con el que quiere compartir su escritorio y elija "
 "<guiseq><gui>Editar</gui><gui>Contacto</gui><gui>Compartir mi escritorio</"
 "gui></guiseq>."
 
-#: C/share-desktop.page:57(p)
+#: C/share-desktop.page:63(p)
+#| msgid ""
+#| "Right-click on the name of the contact you want to share your desktop "
+#| "with, and select <gui>Share my desktop</gui>."
 msgid ""
-"Right-click on the name of the contact you want to share your desktop with, "
-"and select <gui>Share my desktop</gui>."
+"Right-click on the name of the contact you want to share your desktop with "
+"and select <gui>Share My Desktop</gui>."
 msgstr ""
 "Pulse con el botón derecho del ratón sobre el nombre del contacto con el que "
 "quiera compartir su escritorio y seleccione <gui>Compartir mi escritorio</"
 "gui>."
 
-#: C/share-desktop.page:65(p)
+#: C/share-desktop.page:71(p)
 msgid ""
-"A request will be sent to the contact you want to share your desktop with. "
-"If they accept, the default remote desktop viewer application will be "
-"launched in order to permit you to disconnect the user that is controlling "
-"your desktop."
+"An invitation to view your desktop will be sent to the contact you have "
+"selected. To view your desktop, they will need to accept it."
 msgstr ""
-"Se enviará una solicitud al contacto con el que quiere compartir su "
-"escritorio. Si acepta, se lanzará la aplicación de visión remota de "
-"escritorios para permitirle desconectar al usuario que está controlando su "
-"escritorio."
+"Se enviará una invitación para ver su escritorio al contacto que haya "
+"seleccionado. Deberán aceptarla para poder ver su escritorio."
 
-#: C/share-desktop.page:70(p)
+#: C/share-desktop.page:77(p)
 msgid ""
-"For more information about how to use the remote desktop viewer application, "
-"refer to its help."
+"You can disconnect the contact from your computer using your desktop sharing "
+"application."
 msgstr ""
-"Para obtener más información acerca de cómo usar la aplicación de visión de "
-"escritorios remotos, consulte su ayuda."
+"Puede desconectar el contacto de su equipo usando su aplicación de "
+"compartición de escritorio."
 
-#: C/share-desktop.page:77(p)
+#: C/share-desktop.page:82(p)
+#| msgid ""
+#| "For more information about how to use the remote desktop viewer "
+#| "application, refer to its help."
+msgid ""
+"For more information about how to use the remote desktop sharing "
+"application, refer to its help."
+msgstr ""
+"Consulte la ayuda para obtener más información acerca de cómo usar la "
+"aplicación de compartición de escritorio."
+
+#: C/share-desktop.page:90(p)
 msgid ""
 "When you share your desktop with someone else, it is possible to experience "
 "system performance slowdown and low Internet speed."
@@ -408,15 +430,19 @@ msgstr ""
 "Cuando comparte su escritorio con otros, es posible que experimente una "
 "ralentización del rendimiento del sistema y una baja velocidad de Internet."
 
-#: C/share-desktop.page:83(p)
+#: C/share-desktop.page:96(p)
+#| msgid ""
+#| "Not all your contacts might be able to support this functionality. It is "
+#| "necessary for them to have at least the 2.28 version of <app>Empathy</"
+#| "app> and a remote desktop viewer application installed in their system."
 msgid ""
-"Not all your contacts might be able to support this functionality. It is "
-"necessary for them to have at least the 2.28 version of <app>Empathy</app> "
-"and a remote desktop viewer application installed in their system."
+"Some of your contacts may not be able to use this feature. It is necessary "
+"for them to have version 2.28, or newer, of <app>Empathy</app> and a "
+"compatible remote desktop viewer application installed in their system."
 msgstr ""
-"No todos sus contactos pueden usar esta funcionalidad. Es necesario que "
-"tengan al menos la versión 2.28 de <app>Empathy</app> y una aplicación de "
-"visión remota de escritorios instalada en su sistema."
+"Puede que algunos de sus contactos no puedan usar esta característica. Es "
+"necesario que tengan al menos la versión 2.28 de <app>Empathy</app> y una "
+"aplicación de visión remota de escritorios instalada en su sistema."
 
 #: C/set-custom-status.page:9(desc)
 msgid "Add, edit or delete personal messages for your status."
@@ -632,6 +658,12 @@ msgstr "Enviar un archivo desde su equipo a uno de sus contactos."
 msgid "Send files"
 msgstr "Enviar archivos"
 
+#: C/send-file.page:40(p) C/favorite-rooms.page:66(p)
+msgid "From the <gui>Contact List</gui> window, perform one of the following:"
+msgstr ""
+"En la ventana de la <gui>Lista de contactos</gui> realice una de las "
+"siguientes acciones:"
+
 #: C/send-file.page:45(p)
 msgid ""
 "Right click on the contact you want to send a file to, and choose <gui>Send "
@@ -1497,15 +1529,15 @@ msgstr ""
 "en ciertas redes de IRC. Actualmente no es posible registrar un apodo IRC o "
 "cambiar la contraseña de su apodo con <app>Empathy</app>."
 
-#: C/irc-manage.page:9(desc)
+#: C/irc-manage.page:10(desc)
 msgid "How to use IRC with <app>Empathy</app>."
 msgstr "Cómo usar el IRC con <app>Empathy</app>."
 
-#: C/irc-manage.page:34(title)
+#: C/irc-manage.page:35(title)
 msgid "Internet Relay Chat (IRC)"
 msgstr "Internet Relay Chat (IRC)"
 
-#: C/irc-manage.page:37(p) C/account-irc.page:39(p)
+#: C/irc-manage.page:38(p) C/account-irc.page:39(p)
 msgid ""
 "You must have the <sys>telepathy-idle</sys> package installed to use IRC in "
 "<app>Empathy</app>."
@@ -1513,19 +1545,23 @@ msgstr ""
 "Debe tener instalado el paquete <sys>telepathy-idle</sys> para poder usar el "
 "IRC en <app>Empathy</app>."
 
-#: C/irc-manage.page:43(title)
+#: C/irc-manage.page:42(link)
+msgid "Install telepathy-idle"
+msgstr "Instale telepathy-idle"
+
+#: C/irc-manage.page:49(title)
 msgid "IRC Chat Rooms and Conversations"
 msgstr "Salas de chat y conversaciones en el IRC"
 
-#: C/irc-manage.page:45(title)
+#: C/irc-manage.page:51(title)
 msgid "Chat Rooms and Conversations"
 msgstr "Salas de chat y conversaciones"
 
-#: C/irc-manage.page:50(title)
+#: C/irc-manage.page:56(title)
 msgid "Common IRC Problems"
 msgstr "Problemas comunes en el IRC"
 
-#: C/irc-manage.page:52(title) C/index.page:55(title)
+#: C/irc-manage.page:58(title) C/index.page:55(title)
 msgid "Common Problems"
 msgstr "Problemas comunes"
 
@@ -1638,9 +1674,6 @@ msgstr ""
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/introduction.page:41(None)
-#| msgid ""
-#| "@@image: 'figures/empathy-main-window.png'; "
-#| "md5=489ba00b0fc377aba4c691210b6e0650"
 msgid ""
 "@@image: 'figures/empathy-main-window.png'; "
 "md5=54908dcb2588beddb15ef0968d2c2582"
@@ -1703,8 +1736,6 @@ msgstr "Ventana principal de <app>Empathy</app>."
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/index.page:28(None)
-#| msgid ""
-#| "@@image: 'figures/empathy-logo.png'; md5=14568248b11d2cfe7992c5edd7e157e8"
 msgid ""
 "@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2"
 msgstr ""
@@ -3456,6 +3487,26 @@ msgid "translator-credits"
 msgstr "Jorge González <jorgegonz@svn.gnome.org>, 2008-2010"
 
 #~ msgid ""
+#~ "In order to be able to share your desktop or to remotely use your "
+#~ "contacts desktop, it is necessary to have a remote desktop viewer "
+#~ "application installed in your system."
+#~ msgstr ""
+#~ "Para poder compartir su escritorio o usar remotamente el escritorio de "
+#~ "sus contactos es necesario tener una aplicación de visión remota de "
+#~ "escritorios instalada en su sistema."
+
+#~ msgid ""
+#~ "A request will be sent to the contact you want to share your desktop "
+#~ "with. If they accept, the default remote desktop viewer application will "
+#~ "be launched in order to permit you to disconnect the user that is "
+#~ "controlling your desktop."
+#~ msgstr ""
+#~ "Se enviará una solicitud al contacto con el que quiere compartir su "
+#~ "escritorio. Si acepta, se lanzará la aplicación de visión remota de "
+#~ "escritorios para permitirle desconectar al usuario que está controlando "
+#~ "su escritorio."
+
+#~ msgid ""
 #~ "There are a number of popular free SIP account providers; one popular "
 #~ "provider is <link href=\"https://signup.sipphone.com/new-users/app?"
 #~ "class=NewUser;proc=start\">Sipphone</link>."
diff --git a/help/fr/figures/empathy-main-window.png b/help/fr/figures/empathy-main-window.png
index 7d3b15537..d2bb977cc 100644
--- a/help/fr/figures/empathy-main-window.png
+++ b/help/fr/figures/empathy-main-window.png
diff --git a/help/fr/figures/empathy-new-account.png b/help/fr/figures/empathy-new-account.png
deleted file mode 100644
index 39e4d81a4..000000000
--- a/help/fr/figures/empathy-new-account.png
+++ /dev/null
diff --git a/help/fr/fr.po b/help/fr/fr.po
index 8db2a3ab9..c2b331c71 100644
--- a/help/fr/fr.po
+++ b/help/fr/fr.po
@@ -11,8 +11,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy help fr\n"
-"POT-Creation-Date: 2011-04-01 02:16+0000\n"
-"PO-Revision-Date: 2011-04-05 11:38+0200\n"
+"POT-Creation-Date: 2011-10-01 17:42+0000\n"
+"PO-Revision-Date: 2011-10-04 20:07+0200p\n"
 "Last-Translator: Bruno Brouard <annoa.b@gmail.com>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "MIME-Version: 1.0\n"
@@ -33,14 +33,14 @@ msgid "Start a video conversation with one of your contacts."
 msgstr "Commencer une conversation vidéo avec un de vos contacts."
 
 #: C/video-call.page:21(name) C/status-icons.page:16(name)
-#: C/share-desktop.page:13(name) C/set-custom-status.page:19(name)
+#: C/share-desktop.page:14(name) C/set-custom-status.page:19(name)
 #: C/send-file.page:21(name) C/salut-protocol.page:18(name)
 #: C/remove-account.page:18(name) C/prob-conn-neterror.page:18(name)
 #: C/prob-conn-name.page:17(name) C/prob-conn-auth.page:21(name)
 #: C/prob-conn-acctdisabled.page:18(name) C/prev-conv.page:16(name)
 #: C/link-contacts.page:15(name) C/irc-start-conversation.page:15(name)
 #: C/irc-send-file.page:16(name) C/irc-nick-password.page:18(name)
-#: C/irc-manage.page:19(name) C/irc-join-room.page:16(name)
+#: C/irc-manage.page:20(name) C/irc-join-room.page:16(name)
 #: C/irc-join-pwd.page:17(name) C/irc-commands.page:10(name)
 #: C/introduction.page:13(name) C/index.page:19(name)
 #: C/import-account.page:23(name) C/hide-contacts.page:11(name)
@@ -55,14 +55,14 @@ msgid "Milo Casagrande"
 msgstr "Milo Casagrande"
 
 #: C/video-call.page:22(email) C/status-icons.page:17(email)
-#: C/share-desktop.page:14(email) C/set-custom-status.page:20(email)
+#: C/share-desktop.page:15(email) C/set-custom-status.page:20(email)
 #: C/send-file.page:22(email) C/salut-protocol.page:19(email)
 #: C/remove-account.page:19(email) C/prob-conn-neterror.page:19(email)
 #: C/prob-conn-name.page:18(email) C/prob-conn-auth.page:22(email)
 #: C/prob-conn-acctdisabled.page:19(email) C/prev-conv.page:17(email)
 #: C/link-contacts.page:16(email) C/irc-start-conversation.page:16(email)
 #: C/irc-send-file.page:17(email) C/irc-nick-password.page:19(email)
-#: C/irc-manage.page:20(email) C/irc-join-room.page:17(email)
+#: C/irc-manage.page:21(email) C/irc-join-room.page:17(email)
 #: C/irc-join-pwd.page:18(email) C/irc-commands.page:11(email)
 #: C/introduction.page:14(email) C/index.page:20(email)
 #: C/import-account.page:24(email) C/hide-contacts.page:12(email)
@@ -77,7 +77,7 @@ msgid "milo@ubuntu.com"
 msgstr "milo@ubuntu.com"
 
 #: C/video-call.page:25(p) C/status-icons.page:24(p)
-#: C/share-desktop.page:17(p) C/set-custom-status.page:23(p)
+#: C/share-desktop.page:22(p) C/set-custom-status.page:23(p)
 #: C/send-message.page:21(p) C/send-file.page:25(p)
 #: C/salut-protocol.page:22(p) C/remove-account.page:22(p)
 #: C/prob-conn.page:18(p) C/prob-conn-neterror.page:22(p)
@@ -85,7 +85,7 @@ msgstr "milo@ubuntu.com"
 #: C/prob-conn-acctdisabled.page:22(p) C/prev-conv.page:24(p)
 #: C/link-contacts.page:19(p) C/irc-start-conversation.page:19(p)
 #: C/irc-send-file.page:20(p) C/irc-nick-password.page:22(p)
-#: C/irc-manage.page:23(p) C/irc-join-room.page:20(p)
+#: C/irc-manage.page:24(p) C/irc-join-room.page:20(p)
 #: C/irc-join-pwd.page:21(p) C/irc-commands.page:14(p)
 #: C/introduction.page:17(p) C/index.page:23(p) C/import-account.page:31(p)
 #: C/hide-contacts.page:15(p) C/group-conversations.page:23(p)
@@ -328,80 +328,91 @@ msgstr ""
 "comptes."
 
 #: C/share-desktop.page:7(desc)
-msgid "Share the desktop with your contacts."
-msgstr "Partager son bureau avec ses contacts."
+msgid "Show your desktop to your contacts."
+msgstr "Montrer son bureau à ses contacts."
 
-#: C/share-desktop.page:28(title)
+#: C/share-desktop.page:18(name)
+msgid "Ekaterina Gerasimova"
+msgstr "Ekaterina Gerasimova"
+
+#: C/share-desktop.page:19(email)
+msgid "kittykat3756@gmail.com"
+msgstr "kittykat3756@gmail.com"
+
+#: C/share-desktop.page:33(title)
 msgid "Share your desktop"
 msgstr "Partage du bureau"
 
-#: C/share-desktop.page:30(p)
+#: C/share-desktop.page:35(p)
 msgid ""
-"It is possible, with some of your contacts, to share your desktop with them, "
-"or to start using your contacts desktop. You can use this functionality to "
-"show your desktop to your contacts, to ask for help or to help your contacts "
-"resolve a problem."
+"It is possible to share your desktop with some of your contacts. You can use "
+"this functionality to show your desktop to your contacts to, for example, "
+"ask for help or help your contacts resolve a problem."
 msgstr ""
 "Vous avez la possibilité de partager votre bureau avec certains de vos "
-"contacts ou d'utiliser leur bureau. Vous pouvez utiliser cette "
-"fonctionnalité pour montrer votre bureau à vos contacts afin de leur "
-"demander de l'aide ou encore les assister dans la résolution d'un problème."
+"contacts. Vous pouvez utiliser cette fonctionnalité pour montrer votre "
+"bureau à vos contacts afin de, par exemple, leur demander de l'aide ou "
+"encore les assister dans la résolution d'un problème."
 
-#: C/share-desktop.page:38(p)
+#: C/share-desktop.page:42(p)
 msgid ""
-"In order to be able to share your desktop or to remotely use your contacts "
-"desktop, it is necessary to have a remote desktop viewer application "
-"installed in your system."
+"To be able to share your desktop, you need to have a VNC server, which has "
+"support for the feature, installed on your system. <app>Vino</app>, the "
+"GNOME VNC server, has the required support."
 msgstr ""
-"Avant de pouvoir partager votre bureau ou accéder au bureau de vos contacts, "
-"vous devez avoir installé une application de contrôle à distance."
+"Pour partager votre bureau vous avez besoin d'un serveur VNC qui prend en "
+"charge cette fonctionnalité, installé sur votre système. <app>Vino</app>, le "
+"serveur VNC de GNOME, a la configuration requise."
 
-#: C/share-desktop.page:46(p) C/send-file.page:40(p)
-#: C/favorite-rooms.page:66(p)
-msgid "From the <gui>Contact List</gui> window, perform one of the following:"
+#: C/share-desktop.page:51(p)
+msgid "From the <gui>Contact List</gui> window, do one of the following:"
 msgstr ""
 "À partir de la fenêtre <gui>Liste des contacts</gui>, effectuez une des "
 "actions suivantes :"
 
-#: C/share-desktop.page:51(p)
+#: C/share-desktop.page:56(p)
 msgid ""
-"Select the contact you want to share your desktop with, and choose "
-"<guiseq><gui>Edit</gui><gui>Contact</gui><gui>Share my desktop</gui></"
+"Select the contact you want to share your desktop with and choose "
+"<guiseq><gui>Edit</gui><gui>Contact</gui><gui>Share My Desktop</gui></"
 "guiseq>."
 msgstr ""
 "Sélectionnez le contact avec lequel vous voulez partager votre bureau, et "
 "sélectionnez <guiseq><gui>Édition</gui><gui>Contact</gui><gui>Partager mon "
 "bureau</gui></guiseq>."
 
-#: C/share-desktop.page:57(p)
+#: C/share-desktop.page:63(p)
 msgid ""
-"Right-click on the name of the contact you want to share your desktop with, "
-"and select <gui>Share my desktop</gui>."
+"Right-click on the name of the contact you want to share your desktop with "
+"and select <gui>Share My Desktop</gui>."
 msgstr ""
 "Faites un clic droit sur le contact avec lequel vous voulez partager votre "
 "bureau et sélectionnez <gui>Partager mon bureau</gui>."
 
-#: C/share-desktop.page:65(p)
+#: C/share-desktop.page:71(p)
+msgid ""
+"An invitation to view your desktop will be sent to the contact you have "
+"selected. To view your desktop, they will need to accept it."
+msgstr ""
+"Une invitation va être envoyée aux contacts que vous avez sélectionnés. Pour "
+"voir votre bureau, ils devront accepter l'invitation."
+
+#: C/share-desktop.page:77(p)
 msgid ""
-"A request will be sent to the contact you want to share your desktop with. "
-"If they accept, the default remote desktop viewer application will be "
-"launched in order to permit you to disconnect the user that is controlling "
-"your desktop."
+"You can disconnect the contact from your computer using your desktop sharing "
+"application."
 msgstr ""
-"Une demande est envoyée au contact avec lequel vous voulez partager votre "
-"bureau. S'il accepte, l'application de contrôle à distance par défaut est "
-"lancée afin de vous permettre de déconnecter l'utilisateur qui contrôle "
-"votre bureau."
+"Vous pouvez déconnecter le contact de votre ordinateur en utilisant votre "
+"application de partage de bureau."
 
-#: C/share-desktop.page:70(p)
+#: C/share-desktop.page:82(p)
 msgid ""
-"For more information about how to use the remote desktop viewer application, "
-"refer to its help."
+"For more information about how to use the remote desktop sharing "
+"application, refer to its help."
 msgstr ""
 "Pour plus de détails sur l'utilisation de l'application de contrôle à "
 "distance, référez-vous à sa documentation."
 
-#: C/share-desktop.page:77(p)
+#: C/share-desktop.page:90(p)
 msgid ""
 "When you share your desktop with someone else, it is possible to experience "
 "system performance slowdown and low Internet speed."
@@ -410,15 +421,16 @@ msgstr ""
 "que vous remarquiez une baisse des performances du système ainsi qu'un "
 "ralentissement de la connexion internet."
 
-#: C/share-desktop.page:83(p)
+#: C/share-desktop.page:96(p)
 msgid ""
-"Not all your contacts might be able to support this functionality. It is "
-"necessary for them to have at least the 2.28 version of <app>Empathy</app> "
-"and a remote desktop viewer application installed in their system."
+"Some of your contacts may not be able to use this feature. It is necessary "
+"for them to have version 2.28, or newer, of <app>Empathy</app> and a "
+"compatible remote desktop viewer application installed in their system."
 msgstr ""
-"Vos contacts ne prendront pas nécessairement en charge cette fonctionnalité. "
-"Ils devront utiliser au minimum la version 2.28 d'<app>Empathy</app> et "
-"installer une application de contrôle à distance."
+"Certains de vos contacts ne prendront pas nécessairement en charge cette "
+"fonctionnalité. Ils devront utiliser au minimum la version 2.28 "
+"d'<app>Empathy</app> et installer une application de contrôle à distance "
+"compatible."
 
 #: C/set-custom-status.page:9(desc)
 msgid "Add, edit or delete personal messages for your status."
@@ -638,6 +650,12 @@ msgstr "Envoyer un fichier de votre ordinateur à l'un de vos contacts."
 msgid "Send files"
 msgstr "Envoi de fichiers"
 
+#: C/send-file.page:40(p) C/favorite-rooms.page:66(p)
+msgid "From the <gui>Contact List</gui> window, perform one of the following:"
+msgstr ""
+"À partir de la fenêtre <gui>Liste des contacts</gui>, effectuez une des "
+"actions suivantes :"
+
 #: C/send-file.page:45(p)
 msgid ""
 "Right click on the contact you want to send a file to, and choose <gui>Send "
@@ -707,11 +725,11 @@ msgstr ""
 
 #: C/salut-protocol.page:8(desc)
 msgid "Understanding the People Nearby feature."
-msgstr " Comprendre la fonctionnalité « Personnes à proximité »."
+msgstr "Comprendre la fonctionnalité « Personnes à proximité »."
 
 #: C/salut-protocol.page:33(title)
 msgid "What is People Nearby?"
-msgstr "Que sont les « Personnes à proximité » ?"
+msgstr "Fonctionnalité « Personnes à proximité » ?"
 
 #: C/salut-protocol.page:37(p)
 msgid "I'd like to see this played up a bit more."
@@ -1515,15 +1533,15 @@ msgstr ""
 "d'inscrire un pseudonyme IRC ou de modifier le mot de passe de votre "
 "pseudonyme en utilisant <app>Empathy</app>."
 
-#: C/irc-manage.page:9(desc)
+#: C/irc-manage.page:10(desc)
 msgid "How to use IRC with <app>Empathy</app>."
 msgstr "Comment utiliser IRC avec <app>Empathy</app>."
 
-#: C/irc-manage.page:34(title)
+#: C/irc-manage.page:35(title)
 msgid "Internet Relay Chat (IRC)"
 msgstr "« Internet Relay Chat » (IRC)"
 
-#: C/irc-manage.page:37(p) C/account-irc.page:39(p)
+#: C/irc-manage.page:38(p) C/account-irc.page:39(p)
 msgid ""
 "You must have the <sys>telepathy-idle</sys> package installed to use IRC in "
 "<app>Empathy</app>."
@@ -1531,19 +1549,23 @@ msgstr ""
 "Le paquet <sys>telepathy-idle</sys> doit être installé pour utiliser IRC "
 "avec <app>Empathy</app>."
 
-#: C/irc-manage.page:43(title)
+#: C/irc-manage.page:42(link)
+msgid "Install telepathy-idle"
+msgstr "Installer telepathy-idle"
+
+#: C/irc-manage.page:49(title)
 msgid "IRC Chat Rooms and Conversations"
 msgstr "Salon de discussion et conversations IRC"
 
-#: C/irc-manage.page:45(title)
+#: C/irc-manage.page:51(title)
 msgid "Chat Rooms and Conversations"
 msgstr "Salon de discussion et conversations"
 
-#: C/irc-manage.page:50(title)
+#: C/irc-manage.page:56(title)
 msgid "Common IRC Problems"
 msgstr "Problèmes IRC courants"
 
-#: C/irc-manage.page:52(title) C/index.page:55(title)
+#: C/irc-manage.page:58(title) C/index.page:55(title)
 msgid "Common Problems"
 msgstr "Problèmes courants"
 
@@ -1656,16 +1678,12 @@ msgstr "L'usage de toutes les commandes disponibles est décrit succinctement."
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/introduction.page:41(None)
-#, fuzzy
-#| msgid ""
-#| "@@image: 'figures/empathy-main-window.png'; "
-#| "md5=489ba00b0fc377aba4c691210b6e0650"
 msgid ""
 "@@image: 'figures/empathy-main-window.png'; "
 "md5=54908dcb2588beddb15ef0968d2c2582"
 msgstr ""
 "@@image: 'figures/empathy-main-window.png'; "
-"md5=489ba00b0fc377aba4c691210b6e0650"
+"md5=54908dcb2588beddb15ef0968d2c2582"
 
 #: C/introduction.page:9(desc)
 msgid "Introduction to the <app>Empathy</app> instant messenger."
@@ -3510,4 +3528,3 @@ msgstr ""
 "Bruno Brouard <annoa.b@gmail.com>, 2007,2011\n"
 "Frédéric Péters <fpeters@0d.be>, 2008\n"
 "Rémi Peixoto <remi.peixoto@gmail.com>, 2009"
-
diff --git a/help/gl/gl.po b/help/gl/gl.po
index 769f694ef..c2f0f98cc 100644
--- a/help/gl/gl.po
+++ b/help/gl/gl.po
@@ -3,1669 +3,4029 @@
 # This file is distributed under the same license as the tomboy package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # Fran Diéguez <frandieguez@gnome.org>, 2011.
+# Fran Dieguez <frandieguez@gnome.org>, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: tomboy gnome-2-28\n"
-"POT-Creation-Date: 2010-03-24 15:06+0000\n"
-"PO-Revision-Date: 2011-08-18 02:00+0200\n"
-"Last-Translator: Fran Diéguez <frandieguez@gnome.org>\n"
+"POT-Creation-Date: 2011-09-08 06:13+0000\n"
+"PO-Revision-Date: 2011-09-09 14:54+0200\n"
+"Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
 "Language-Team: Galician <gnome-l10n-gl@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: C/legal.xml:2(para)
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/video-call.page:38(None) C/audio-video.page:70(None)
+#: C/audio-call.page:36(None)
+#| msgid ""
+#| "@@image: 'figures/add-to-notebook.png'; "
+#| "md5=03469ddb5137f525ac4f8318caed5532"
+msgid "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
+msgstr ""
+"@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
+
+#: C/video-call.page:10(desc)
+msgid "Start a video conversation with one of your contacts."
+msgstr "Comezar unha conversa de vi�deo con un dos seus contactos."
+
+#: C/video-call.page:21(name) C/status-icons.page:16(name)
+#: C/share-desktop.page:14(name) C/set-custom-status.page:19(name)
+#: C/send-file.page:21(name) C/salut-protocol.page:18(name)
+#: C/remove-account.page:18(name) C/prob-conn-neterror.page:18(name)
+#: C/prob-conn-name.page:17(name) C/prob-conn-auth.page:21(name)
+#: C/prob-conn-acctdisabled.page:18(name) C/prev-conv.page:16(name)
+#: C/link-contacts.page:15(name) C/irc-start-conversation.page:15(name)
+#: C/irc-send-file.page:16(name) C/irc-nick-password.page:18(name)
+#: C/irc-manage.page:20(name) C/irc-join-room.page:16(name)
+#: C/irc-join-pwd.page:17(name) C/irc-commands.page:10(name)
+#: C/introduction.page:13(name) C/index.page:19(name)
+#: C/import-account.page:23(name) C/hide-contacts.page:11(name)
+#: C/group-conversations.page:19(name) C/geolocation-what-is.page:18(name)
+#: C/geolocation-turn.page:18(name) C/geolocation-supported.page:16(name)
+#: C/geolocation-privacy.page:17(name) C/geolocation-not-showing.page:17(name)
+#: C/geolocation.page:17(name) C/favorite-rooms.page:14(name)
+#: C/disable-account.page:20(name) C/create-account.page:19(name)
+#: C/audio-video.page:17(name) C/audio-call.page:19(name)
+#: C/add-account.page:20(name)
+msgid "Milo Casagrande"
+msgstr "Milo Casagrande"
+
+#: C/video-call.page:22(email) C/status-icons.page:17(email)
+#: C/share-desktop.page:15(email) C/set-custom-status.page:20(email)
+#: C/send-file.page:22(email) C/salut-protocol.page:19(email)
+#: C/remove-account.page:19(email) C/prob-conn-neterror.page:19(email)
+#: C/prob-conn-name.page:18(email) C/prob-conn-auth.page:22(email)
+#: C/prob-conn-acctdisabled.page:19(email) C/prev-conv.page:17(email)
+#: C/link-contacts.page:16(email) C/irc-start-conversation.page:16(email)
+#: C/irc-send-file.page:17(email) C/irc-nick-password.page:19(email)
+#: C/irc-manage.page:21(email) C/irc-join-room.page:17(email)
+#: C/irc-join-pwd.page:18(email) C/irc-commands.page:11(email)
+#: C/introduction.page:14(email) C/index.page:20(email)
+#: C/import-account.page:24(email) C/hide-contacts.page:12(email)
+#: C/group-conversations.page:20(email) C/geolocation-what-is.page:19(email)
+#: C/geolocation-turn.page:19(email) C/geolocation-supported.page:17(email)
+#: C/geolocation-privacy.page:18(email)
+#: C/geolocation-not-showing.page:18(email) C/geolocation.page:18(email)
+#: C/favorite-rooms.page:15(email) C/disable-account.page:21(email)
+#: C/create-account.page:20(email) C/audio-video.page:18(email)
+#: C/audio-call.page:20(email) C/add-account.page:21(email)
+msgid "milo@ubuntu.com"
+msgstr "milo@ubuntu.com"
+
+#: C/video-call.page:25(p) C/status-icons.page:24(p)
+#: C/share-desktop.page:22(p) C/set-custom-status.page:23(p)
+#: C/send-message.page:21(p) C/send-file.page:25(p)
+#: C/salut-protocol.page:22(p) C/remove-account.page:22(p)
+#: C/prob-conn.page:18(p) C/prob-conn-neterror.page:22(p)
+#: C/prob-conn-name.page:21(p) C/prob-conn-auth.page:25(p)
+#: C/prob-conn-acctdisabled.page:22(p) C/prev-conv.page:24(p)
+#: C/link-contacts.page:19(p) C/irc-start-conversation.page:19(p)
+#: C/irc-send-file.page:20(p) C/irc-nick-password.page:22(p)
+#: C/irc-manage.page:24(p) C/irc-join-room.page:20(p)
+#: C/irc-join-pwd.page:21(p) C/irc-commands.page:14(p)
+#: C/introduction.page:17(p) C/index.page:23(p) C/import-account.page:31(p)
+#: C/hide-contacts.page:15(p) C/group-conversations.page:23(p)
+#: C/geolocation-what-is.page:22(p) C/geolocation-turn.page:22(p)
+#: C/geolocation-supported.page:20(p) C/geolocation-privacy.page:21(p)
+#: C/geolocation-not-showing.page:21(p) C/geolocation.page:21(p)
+#: C/favorite-rooms.page:18(p) C/disable-account.page:28(p)
+#: C/create-account.page:23(p) C/change-status.page:23(p)
+#: C/audio-video.page:21(p) C/audio-call.page:23(p) C/add-contact.page:22(p)
+#: C/add-account.page:28(p) C/accounts-window.page:22(p)
+#: C/account-jabber.page:18(p) C/account-irc.page:20(p)
+msgid "Creative Commons Share Alike 3.0"
+msgstr "Creative Commons Compartir Igual 3.0"
+
+#: C/video-call.page:28(title)
+msgid "Start a video conversation"
+msgstr "Comezar unha conversa de vi�deo"
+
+#: C/video-call.page:30(p)
+msgid ""
+"If you have a webcam, you can call your contacts and have a video "
+"conversation with them. This features only works with certain types of "
+"accounts, and it requires the other person to have an application that "
+"supports video calls."
+msgstr ""
+"Se ten unha ca�mara web podera� facer chamadas aos seus contactos e ter unha "
+"conversa con vi�deo con eles. Estas funcionalidades so� funcionara�n con certos "
+"tipos de contas, e require que outra persoa teña un aplicativo que admita as "
+"videochamadas."
+
+#: C/video-call.page:37(p)
+msgid ""
+"From the <gui>Contact List</gui> window, click the <media type=\"image\" "
+"mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon "
+"next to the name of the contact you wish to call and choose <gui style="
+"\"menuitem\">Video Call</gui>."
+msgstr ""
+"Desde a xanela <gui>Lista de contactos</gui>, prema a icona <media type="
+"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">videochamada</"
+"media> ao lado do nome do contacto ao que quere chamar e seleccione <gui "
+"style=\"menuitem\">Videochamada</gui>."
+
+#: C/video-call.page:43(p) C/audio-call.page:42(p)
+msgid ""
+"A new window will open. When the connection is established, you will see "
+"<gui>Connected</gui> at the bottom of the window, along with the total "
+"conversation time."
+msgstr ""
+"Abrirase unha nova xanela. Cando a conexio�n se estabeleza vera� "
+"<placeholder-2/> na parte inferior da xanela, ao caro�n do tempo de conversa "
+"total."
+
+#: C/video-call.page:48(p) C/audio-call.page:48(p)
+msgid "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
+msgstr "Para rematar a conversa, prema sobre <placeholder-1/>"
+
+#: C/video-call.page:54(p)
+msgid ""
+"To turn a video conversation into an audio conversation, choose <guiseq><gui "
+"style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</gui></guiseq>."
+msgstr ""
+"Para trocar unha conversa de vi�deo nunha conversa de son, seleccione "
+"<guiseq><gui style=\"menu\">Vi�deo</gui><gui style=\"menuitem\">Desactivar "
+"vi�deo</gui></guiseq>."
+
+#: C/video-call.page:60(title)
+msgid "Start a video conversation with a meta-contact"
+msgstr "Comezar unha conversa de vi�deo con un metacontacto."
+
+#: C/video-call.page:63(p) C/send-message.page:53(p) C/audio-call.page:66(p)
+msgid ""
+"From the <gui>Contact List</gui> window, right-click on the meta-contact."
+msgstr ""
+"Desde a xanela <gui>Lista de contactos</gui>, prema co boto�n dereito sobre "
+"un metacontacto."
+
+#: C/video-call.page:68(p)
+msgid ""
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Video Call</gui>."
+msgstr ""
+"Seleccione o contacto co que desexe ter unha conversa e desde o menu� "
+"seleccione <gui style=\"menuitem\">Vi�deochamada</gui>."
+
+#: C/video-call.page:75(p) C/send-message.page:65(p) C/audio-call.page:78(p)
+msgid ""
+"To recognize if a contact is a <em>meta-contact</em>, move your mouse on a "
+"contact in the <gui>Contact List</gui> window, and stop over it for a "
+"second: a small pop-up message will appear showing the number of the "
+"contacts that form the meta-contact."
+msgstr ""
+"Para recoñecer se un contacto e� un <em>metacontacto</em>, mova o rato sobre "
+"o contacto na xanela <gui>Lista de contactos</gui> e deteñase sobre el un "
+"segundo: aparecera� unha pequena mensaxe emerxente que mostra o nu�mero de "
+"contactos que forman o metacontacto."
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/status-icons.page:39(None)
+#| msgid ""
+#| "@@image: 'figures/note-template.png'; md5=49ee364d7e060de4e7a583e49a2f7db7"
+msgid "@@image: 'figures/available.png'; md5=2196b2f0ad4ce26fdb7b9d48e75d1947"
+msgstr "@@image: 'figures/available.png'; md5=2196b2f0ad4ce26fdb7b9d48e75d1947"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/status-icons.page:45(None)
+#| msgid ""
+#| "@@image: 'figures/tomboy-panel.png'; md5=37fb8231c5dece7539e3471b76ec0d00"
+msgid "@@image: 'figures/busy.png'; md5=15eb2adff5faedf97b0cb9105d09410a"
+msgstr "@@image: 'figures/busy.png'; md5=15eb2adff5faedf97b0cb9105d09410a"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/status-icons.page:53(None)
+msgid "@@image: 'figures/away.png'; md5=9c504d6ffa0cf1a9cc8933d16e1bea33"
+msgstr "@@image: 'figures/away.png'; md5=9c504d6ffa0cf1a9cc8933d16e1bea33"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/status-icons.page:62(None) C/status-icons.page:69(None)
+#| msgid ""
+#| "@@image: 'figures/tomboy-panel.png'; md5=37fb8231c5dece7539e3471b76ec0d00"
+msgid "@@image: 'figures/offline.png'; md5=c5b0c21181cbd6e13f8909243c0fa964"
+msgstr "@@image: 'figures/offline.png'; md5=c5b0c21181cbd6e13f8909243c0fa964"
+
+#: C/status-icons.page:7(desc)
+msgid "Understanding the various statuses and status icons."
+msgstr "Entendendo os diferentes estados e iconas de estado."
+
+#: C/status-icons.page:20(name) C/salut-protocol.page:36(cite)
+#: C/prev-conv.page:20(name) C/prev-conv.page:38(cite)
+#: C/import-account.page:27(name) C/disable-account.page:24(name)
+#: C/audio-video.page:109(cite) C/audio-video.page:117(cite)
+#: C/add-account.page:24(name) C/accounts-window.page:18(name)
+#: C/account-jabber.page:14(name) C/account-irc.page:16(name)
+msgid "Shaun McCance"
+msgstr "Shaun McCance"
+
+#: C/status-icons.page:21(email) C/prev-conv.page:21(email)
+#: C/import-account.page:28(email) C/disable-account.page:25(email)
+#: C/add-account.page:25(email) C/accounts-window.page:19(email)
+#: C/account-jabber.page:15(email) C/account-irc.page:17(email)
+msgid "shaunm@gnome.org"
+msgstr "shaunm@gnome.org"
+
+#: C/status-icons.page:35(title)
+msgid "Status Types and Icons"
+msgstr "Tipos de estados e iconas"
+
+#: C/status-icons.page:39(media)
+msgid "Available icon"
+msgstr "Icona de dispoñi�bel"
+
+#: C/status-icons.page:40(gui)
+msgid "Available"
+msgstr "Dispoñible"
+
+#: C/status-icons.page:41(p)
+msgid ""
+"Use the <em>Available</em> status when you are at your computer and able to "
+"chat with your contacts. You can set a custom message for this status."
+msgstr ""
+"Use o estado <em>Dispoñi�bel</em> cando esta� no seu computador e pode falar "
+"cos seus contactos. Vostede pode estabelecer unha mensaxe personalizada para "
+"este estado."
+
+#: C/status-icons.page:45(media)
+msgid "Busy icon"
+msgstr "Icona de ocupado"
+
+#: C/status-icons.page:46(gui)
+msgid "Busy"
+msgstr "Ocupado"
+
+#: C/status-icons.page:47(p)
+msgid ""
+"Use the <em>Busy</em> status to let your contacts know that you don’t want "
+"to chat right now. They can still contact you, for instance if they have "
+"something urgent they need to discuss. By default, <app>Empathy</app> will "
+"not use notification bubbles and sounds when you are busy. You can set a "
+"custom message for this status."
+msgstr "Use o estado <em>Ocupado</em> para dicirlle aos seus contactos"
+
+#: C/status-icons.page:53(media)
+msgid "Away icon"
+msgstr "Icona de ausente"
+
+#: C/status-icons.page:54(gui)
+msgid "Away"
+msgstr "Ausente"
+
+#: C/status-icons.page:55(p)
 msgid ""
-"Permission is granted to copy, distribute and/or modify this document under "
-"the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
-"later version published by the Free Software Foundation with no Invariant "
-"Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
-"in the file COPYING-DOCS distributed with this manual."
+"Use the <em>Away</em> status when you are going away from your computer. "
+"<app>Empathy</app> automatically sets your status to Away if you do not use "
+"your computer for a while, or if your screensaver is on. By default, "
+"<app>Empathy</app> will not use notification bubbles and sounds when you are "
+"away. You can set a custom message for this status."
 msgstr ""
+"Use o estado <em>Ausente</em> cando non esta� no seu computador. "
+"<app>Empathy</app> automaticamente estabelecer o seu estado a Ausente se non "
+"usa o seu computador por un anaco, ou se o seu protector de pantalla esta� "
+"activado. Por omisio�n, <app>Empathy</app> non usa as notificacio�ns e sons "
+"cando esta� Ausente. Vostede pode estabelecer unha mensaxe personalizada para "
+"este estado."
+
+#: C/status-icons.page:62(media) C/status-icons.page:69(media)
+msgid "Offline icon"
+msgstr "Icona de desconectado"
 
-#: C/legal.xml:12(para)
+#: C/status-icons.page:63(gui)
+msgid "Invisible"
+msgstr "Invisi�bel"
+
+#: C/status-icons.page:64(p)
 msgid ""
-"This manual is part of a collection of GNOME manuals distributed under the "
-"GFDL. If you want to distribute this manual separately from the collection, "
-"you can do so by adding a copy of the license to the manual, as described in "
-"section 6 of the license."
+"When you set your status to <em>Invisible</em>, you will appear as offline "
+"to your contacts. You will still be connected to your accounts, and you "
+"still see your contacts’ statuses and start conversations with them."
 msgstr ""
+"Ao estabelecer o seu estado <em>Invisi�bel</em>, aparecera� como desconectado "
+"para os seus contactos. Ai�nda asi� vostede estara� conectado aos seus "
+"contactos e podera� ver os estados dos seus contactos e iniciar unha conversa "
+"con eles."
+
+#: C/status-icons.page:70(gui)
+msgid "Offline"
+msgstr "Desconectada"
 
-#: C/legal.xml:19(para)
+#: C/status-icons.page:71(p)
 msgid ""
-"Many of the names used by companies to distinguish their products and "
-"services are claimed as trademarks. Where those names appear in any GNOME "
-"documentation, and the members of the GNOME Documentation Project are made "
-"aware of those trademarks, then the names are in capital letters or initial "
-"capital letters."
+"Setting your status to <em>Offline</em> disconnects you from all of your "
+"accounts."
 msgstr ""
+"Estabelecer o seu estado a <em>Desconectado</em> desconectaralle de todas as "
+"su�as contas."
+
+#: C/share-desktop.page:7(desc)
+msgid "Show your desktop to your contacts."
+msgstr "Compartir o escritorio cos seus contactos."
+
+#: C/share-desktop.page:18(name)
+msgid "Ekaterina Gerasimova"
+msgstr "Ekaterina Gerasimova"
 
-#: C/legal.xml:35(para)
+#: C/share-desktop.page:19(email)
+#| msgid "btimothy@gmail.com"
+msgid "kittykat3756@gmail.com"
+msgstr "kittykat3756@gmail.com"
+
+#: C/share-desktop.page:33(title)
+#| msgid "Synchronize your notes"
+msgid "Share your desktop"
+msgstr "Compartir o seu escritorio"
+
+#: C/share-desktop.page:35(p)
 msgid ""
-"DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, "
-"EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT "
-"THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS "
-"MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE "
-"RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR "
-"MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR "
-"MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL "
-"WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY "
-"SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN "
-"ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION "
-"OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND "
-"UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING "
-"NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY "
-"CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE "
-"DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON "
-"FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF "
-"ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, "
-"WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES "
-"OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED "
-"VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE "
-"POSSIBILITY OF SUCH DAMAGES."
+"It is possible to share your desktop with some of your contacts. You can use "
+"this functionality to show your desktop to your contacts to, for example, "
+"ask for help or help your contacts resolve a problem."
 msgstr ""
+"E� posi�bel compartir o escritorio con algu�ns dos seus contactos. Pode usar "
+"esta funcionalidade para mostrarlle o seu escritorio aos seus contactos "
+"para, por exemplo, pedirlle axuda ou axudar aos seus contactos a solucionar "
+"un problema."
 
-#: C/legal.xml:28(para)
+#: C/share-desktop.page:42(p)
 msgid ""
-"DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS "
-"OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: "
-"<placeholder-1/>"
+"To be able to share your desktop, you need to have a VNC server, which has "
+"support for the feature, installed on your system. <app>Vino</app>, the "
+"GNOME VNC server, has the required support."
 msgstr ""
+"Para poder compartir o seu escritorio, precisa ter un servidor VNC, que é o "
+"que fornece esta funcionalidade. Instale no seu sistema <app>Vino</app>, o "
+"servidor VNC de GNOME, para fornecer esta compatibilidade."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/tomboy.xml:257(None)
+#: C/share-desktop.page:51(p)
+msgid "From the <gui>Contact List</gui> window, do one of the following:"
+msgstr "Desde a xanela <gui>Lista de contactos</gui> leve a cabo o seguinte:"
+
+#: C/share-desktop.page:56(p)
 msgid ""
-"@@image: 'figures/tomboy-panel.png'; md5=37fb8231c5dece7539e3471b76ec0d00"
+"Select the contact you want to share your desktop with and choose "
+"<guiseq><gui>Edit</gui><gui>Contact</gui><gui>Share My Desktop</gui></"
+"guiseq>."
 msgstr ""
-"@@image: 'figures/tomboy-panel.png'; md5=37fb8231c5dece7539e3471b76ec0d00"
+"Seleccione o contacto co que quere compartir o seu escritorio e seleccione "
+"<guiseq><gui>Editar</gui><gui>Contacto</gui><gui>Compartir o meu escritorio</"
+"gui></guiseq>."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/tomboy.xml:386(None)
+#: C/share-desktop.page:63(p)
 msgid ""
-"@@image: 'figures/tomboy-new-note.png'; md5=ba337ad3ae256f3fdf79afeef82d7883"
+"Right-click on the name of the contact you want to share your desktop with "
+"and select <gui>Share My Desktop</gui>."
 msgstr ""
-"@@image: 'figures/tomboy-new-note.png'; md5=ba337ad3ae256f3fdf79afeef82d7883"
+"Prema co botón dereito sobre o nome do contacto que quere compartir o seu "
+"escritorio e seleccione <gui>Compartir o meu escritorio</gui>."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/tomboy.xml:785(None)
+#: C/share-desktop.page:71(p)
 msgid ""
-"@@image: 'figures/tomboy-main-menu.png'; md5=420af676a38a074abd5431e7a07d1fec"
+"An invitation to view your desktop will be sent to the contact you have "
+"selected. To view your desktop, they will need to accept it."
 msgstr ""
-"@@image: 'figures/tomboy-main-menu.png'; md5=420af676a38a074abd5431e7a07d1fec"
+"Enviarase un convite para ver o seu escritorio ao contacto que seleccionou. "
+"Para ver o seu escritorio, terá que aceptalo."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/tomboy.xml:941(None)
+#: C/share-desktop.page:77(p)
 msgid ""
-"@@image: 'figures/new-notebook.png'; md5=b5645185d7fed6183b550c0dab7b72cb"
+"You can disconnect the contact from your computer using your desktop sharing "
+"application."
 msgstr ""
-"@@image: 'figures/new-notebook.png'; md5=b5645185d7fed6183b550c0dab7b72cb"
+"Pode desconectar o contacto do seu computador empregando o aplicativo de "
+"compartición de escritorio."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/tomboy.xml:979(None)
+#: C/share-desktop.page:82(p)
 msgid ""
-"@@image: 'figures/add-notebook-search.png'; "
-"md5=8a98d72edc3c4351a632889c5edbb81f"
+"For more information about how to use the remote desktop sharing "
+"application, refer to its help."
 msgstr ""
-"@@image: 'figures/add-notebook-search.png'; "
-"md5=8a98d72edc3c4351a632889c5edbb81f"
+"Para obter máis información sobre como usar o aplicativo de compartición de "
+"escritorio remoto conxulte a súa axuda."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/tomboy.xml:1016(None)
+#: C/share-desktop.page:90(p)
 msgid ""
-"@@image: 'figures/add-to-notebook.png'; md5=03469ddb5137f525ac4f8318caed5532"
+"When you share your desktop with someone else, it is possible to experience "
+"system performance slowdown and low Internet speed."
 msgstr ""
-"@@image: 'figures/add-to-notebook.png'; md5=03469ddb5137f525ac4f8318caed5532"
+"Cando comparte o seu escritorio con outros, e posi�bel que experimente unha "
+"ralentizacio�n de rendemento de sistema e unha baixa velocidade de Internet."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/tomboy.xml:1056(None)
+#: C/share-desktop.page:96(p)
 msgid ""
-"@@image: 'figures/note-template.png'; md5=49ee364d7e060de4e7a583e49a2f7db7"
+"Some of your contacts may not be able to use this feature. It is necessary "
+"for them to have version 2.28, or newer, of <app>Empathy</app> and a "
+"compatible remote desktop viewer application installed in their system."
 msgstr ""
-"@@image: 'figures/note-template.png'; md5=49ee364d7e060de4e7a583e49a2f7db7"
+"Algúns dos seus contactos non poderán usar esta funcionalidade. É preciso "
+"ter a versión 2.28 ou superior do <app>Empathy</app> e un visor de "
+"escritorio remoto compatíbel instalado no seu sistema."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/tomboy.xml:1092(None)
+#: C/set-custom-status.page:9(desc)
+msgid "Add, edit or delete personal messages for your status."
+msgstr "Engadir, editar e borrar un mensaxe persoal para o seu estado."
+
+#: C/set-custom-status.page:15(name)
+msgid "Jim Campbell"
+msgstr "Jim Campbell"
+
+#: C/set-custom-status.page:16(email)
+msgid "jwcampbell@gmail.com"
+msgstr "jwcampbell@gmail.com"
+
+#: C/set-custom-status.page:34(title)
+msgid "Set a custom message"
+msgstr "Estabelecer unha mensaxe personalizada"
+
+#: C/set-custom-status.page:36(p)
 msgid ""
-"@@image: 'figures/delete-notebook.png'; md5=f1b41a9034715d6314ee36b66389c897"
+"Sometimes you may want to set a custom message for your status, for example "
+"to let people know that you will be unavailable for a certain period of time."
 msgstr ""
-"@@image: 'figures/delete-notebook.png'; md5=f1b41a9034715d6314ee36b66389c897"
+"En ocasio�ns pode querer usar unha mensaxe persoal para o seu escritorio, por "
+"exemplo, para facer saber aos seus contactos que non estara� dispoñi�bel por "
+"un peri�odo de tempo."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/tomboy.xml:1139(None)
+#: C/set-custom-status.page:40(p)
 msgid ""
-"@@image: 'figures/tomboy-preferences-synchronization.png'; "
-"md5=68e7a980720d8e9e1384cab9960a7adc"
+"It is possible to set a custom message based on the different statuses "
+"available."
 msgstr ""
-"@@image: 'figures/tomboy-preferences-synchronization.png'; "
-"md5=68e7a980720d8e9e1384cab9960a7adc"
+"E� posi�bel estabelecer unha mensaxe personalizada baseada nos diferentes "
+"estados dispoñi�beis."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/tomboy.xml:1302(None)
+#: C/set-custom-status.page:46(p) C/set-custom-status.page:82(p)
 msgid ""
-"@@image: 'figures/tomboy-preferences-editing.png'; "
-"md5=288184a8d9645881eaf3173892583d73"
+"From the <gui>Contact List</gui> window, click on the drop-down list at the "
+"top."
 msgstr ""
-"@@image: 'figures/tomboy-preferences-editing.png'; "
-"md5=288184a8d9645881eaf3173892583d73"
+"Desde a xanela <gui>Lista de contactos</gui>, prema na lista desprega�bel na "
+"parte superior."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/tomboy.xml:1361(None)
+#: C/set-custom-status.page:52(p)
 msgid ""
-"@@image: 'figures/tomboy-preferences-hotkeys.png'; "
-"md5=57510249057a144dbb81ae35e15c694c"
+"Select the status you want to add a custom message to. You have to select "
+"the one identified with the label <gui>Custom Message</gui>."
 msgstr ""
-"@@image: 'figures/tomboy-preferences-hotkeys.png'; "
-"md5=57510249057a144dbb81ae35e15c694c"
+"Seleccione un estado ao que quere engadir a mensaxe personalizada. Ten que "
+"seleccionar o identificado coa etiqueta <gui>Mensaxe personalizada</gui>."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/tomboy.xml:1394(None)
+#: C/set-custom-status.page:58(p)
 msgid ""
-"@@image: 'figures/tomboy-preferences-add-ins.png'; "
-"md5=bb3114a219b8bfdf31549fced9618245"
+"Enter your custom message in the text box at the top of the window, and "
+"press <key>Enter</key> to set the message."
 msgstr ""
-"@@image: 'figures/tomboy-preferences-add-ins.png'; "
-"md5=bb3114a219b8bfdf31549fced9618245"
-
-#: C/tomboy.xml:23(title)
-msgid "Tomboy Notes Manual"
-msgstr "Manual de Notas de Tomboy"
-
-#: C/tomboy.xml:26(para)
+"Introduza a su�a mensaxe personalizada na caixa de texto da parte superior da "
+"xanela e prema <key>Intro</key> para estabelecer a mensaxe."
+
+#: C/set-custom-status.page:64(p)
 msgid ""
-"Tomboy is a simple desktop note-taking application, with many features "
-"designed to help organize ideas, such as spell checking, highlighting, auto-"
-"linking URLs, lists, font stylizing, quick access with a table of contents "
-"for notes, and add-ins to extend Tomboy's capabilities. ."
+"If you want to set the custom message as a favorite, saving it in order to "
+"use it again, click on the little star on the right of the text box where "
+"you wrote your custom message."
 msgstr ""
-"Tomboy é un aplicativo de escritorio sinxelo de creación de notas, con "
-"algunhas funcionalidades deseñadas para axudarlle a organizar ideas, como a "
-"corrección ortográfica, realzado, autoligado de URL, listas, estilos de "
-"tipos de letra, acceso rápido  con unha táboa de contidos para as notas e "
-"engadidos para extender as capacidades de Tomboy."
+"Se quere estabelecer a mensaxe personalizada como un favorito, garda�ndoo "
+"para usalo de novo, prema na pequena estrela a� dereita da caixa de texto "
+"onde escribiu a su�a mensaxe personalizada."
 
-#: C/tomboy.xml:34(year) C/tomboy.xml:40(year) C/tomboy.xml:46(year)
-#: C/tomboy.xml:52(year) C/tomboy.xml:58(year) C/tomboy.xml:64(year)
-msgid "2009"
-msgstr "2009"
+#: C/set-custom-status.page:69(p)
+msgid ""
+"If you do not do it, the custom message will not be available the next time "
+"you use <app>Empathy</app>. It will be saved only for the current session."
+msgstr ""
+"Se non o fai a mensaxe personalizada non estara� dispoñi�bel a pro�xima vez que "
+"use <app>Empathy</app>. So� se gardara� durante a sesio�n actual."
 
-#: C/tomboy.xml:36(holder)
-msgid "Alex Graveley"
-msgstr "Alex Graveley"
+#: C/set-custom-status.page:78(title)
+msgid "Edit, remove and add a custom message"
+msgstr "Editar, quitar e engadir unha mensaxe personalizada"
 
-#: C/tomboy.xml:42(holder)
-msgid "Brent Smith"
-msgstr "Brent Smith"
+#: C/set-custom-status.page:88(p)
+msgid "Select <gui>Edit Custom Message</gui>."
+msgstr "Editar a mensaxe personalizada"
 
-#: C/tomboy.xml:48(holder)
-msgid "Free Software Foundation"
-msgstr "Free Software Foundation"
+#: C/set-custom-status.page:95(p)
+msgid "To edit a custom message:"
+msgstr "Para editar unha mensaxe personalizada:"
 
-#: C/tomboy.xml:54(holder) C/tomboy.xml:214(para)
-msgid "Boyd Timothy"
-msgstr "Boyd Timothy"
+#: C/set-custom-status.page:100(p)
+msgid ""
+"From the <gui>Saved Presets</gui> box, select the status message you want to "
+"edit and double-click on it."
+msgstr ""
+"Desde a caixa <gui>Estados gardados</gui>, seleccione a mensaxe de estado "
+"que quere editar e prema du�as veces sobre el."
 
-#: C/tomboy.xml:60(holder) C/tomboy.xml:202(para)
-msgid "Sandy Armstrong"
-msgstr "Sandy Armstrong"
+#: C/set-custom-status.page:106(p)
+msgid "Type the new custom message and press <key>Enter</key> to modify it."
+msgstr ""
+"Escriba a mensaxe personalizada nova e prema <key>Intro</key> para "
+"modificalo."
 
-#: C/tomboy.xml:66(holder) C/tomboy.xml:178(para) C/tomboy.xml:190(para)
-msgid "Paul Cutler"
-msgstr "Paul Cutler"
+#: C/set-custom-status.page:113(p)
+msgid "To remove a custom message:"
+msgstr "Para eliminar unha mensaxe personalizada:"
 
-#: C/tomboy.xml:77(publishername) C/tomboy.xml:93(orgname)
-#: C/tomboy.xml:105(orgname) C/tomboy.xml:117(orgname)
-#: C/tomboy.xml:129(orgname) C/tomboy.xml:141(orgname) C/tomboy.xml:180(para)
-#: C/tomboy.xml:192(para) C/tomboy.xml:204(para) C/tomboy.xml:216(para)
-msgid "GNOME Documentation Project"
-msgstr "Proxecto de documentacio�n de GNOME"
+#: C/set-custom-status.page:118(p)
+msgid ""
+"From the <gui>Saved Presets</gui> box, select the status message you want to "
+"remove."
+msgstr ""
+"Desde a caixa <gui>Estados gardados</gui>, seleccione a mensaxe de estado "
+"que quere editar."
 
-#: C/tomboy.xml:88(firstname)
-msgid "Alex"
-msgstr "Alex"
+#: C/set-custom-status.page:124(p)
+msgid "Click on the <gui>Remove</gui> button."
+msgstr "Prema sobre o boto�n <placeholder-1/>"
 
-#: C/tomboy.xml:90(surname)
-msgid "Graveley"
-msgstr "Agraveley"
+#: C/set-custom-status.page:131(p)
+msgid ""
+"To add a new custom message, from the <gui>Add New Preset</gui> section:"
+msgstr ""
+"Para engadir unha mensaxe personalizada nova, desde a seccio�n <gui>Engadir "
+"estado gardado</gui>."
 
-#: C/tomboy.xml:95(email)
-msgid "alex@beatniksoftware.com"
-msgstr "alex@beatniksoftware.com"
+#: C/set-custom-status.page:136(p)
+msgid ""
+"Click on the drop-down list to select the status you want to set a custom "
+"message to."
+msgstr ""
+"Prema na lista desprega�bel para seleccionar o estado no que quere "
+"estabelecer unha mensaxe personalizada."
 
-#: C/tomboy.xml:100(firstname)
-msgid "Brent"
-msgstr "Brent"
+#: C/set-custom-status.page:142(p)
+msgid "Click on the text box, and type the new custom message."
+msgstr "Prema sobre a caixa de texto e escriba a nova mensaxe personalizada."
 
-#: C/tomboy.xml:102(surname)
-msgid "Smith"
-msgstr "Smith"
+#: C/set-custom-status.page:147(p)
+msgid "Click on <gui>Add</gui> to add the new message to the presets ones."
+msgstr "Prema <gui>Engadir</gui> para engadir unha mensaxe nova aos gardados."
 
-#: C/tomboy.xml:107(email)
-msgid "gnome@nextreality.net"
-msgstr "gnome@nextreality.net"
+#: C/set-custom-status.page:156(p)
+msgid "When finished, click on <gui>Close</gui>."
+msgstr "Ao rematar, prema en <placeholder-/>"
 
-#: C/tomboy.xml:112(firstname)
-msgid "Boyd"
-msgstr "Boyd"
+#: C/set-custom-status.page:163(p)
+msgid ""
+"When you edit or add a new custom message, it will not be set as the current "
+"status message. You will need to select it from the <gui>Contact List</gui> "
+"window."
+msgstr ""
+"Cando edita ou engade unha mensaxe personalizada nova non se estabelece como "
+"a mensaxe de estado actual. Ten que seleccionalo na xanela <gui>Lista de "
+"contactos</gui>."
 
-#: C/tomboy.xml:114(surname)
-msgid "Timothy"
-msgstr "Timothy"
+#: C/send-message.page:8(desc)
+msgid "Send a message to one of your contacts."
+msgstr "Enviar unha mensaxe a un dos seus contactos."
 
-#: C/tomboy.xml:119(email)
-msgid "btimothy@gmail.com"
-msgstr "btimothy@gmail.com"
+#: C/send-message.page:17(name) C/send-file.page:17(name)
+#: C/prob-conn.page:14(name) C/prob-conn-neterror.page:14(name)
+#: C/prob-conn-auth.page:17(name) C/prob-conn-acctdisabled.page:14(name)
+#: C/change-status.page:19(name) C/add-contact.page:18(name)
+msgid "Phil Bull"
+msgstr "Phil Bull"
 
-#: C/tomboy.xml:124(firstname)
-msgid "Sandy"
-msgstr "Sandy"
+#: C/send-message.page:18(email) C/send-file.page:18(email)
+#: C/prob-conn.page:15(email) C/prob-conn-neterror.page:15(email)
+#: C/prob-conn-auth.page:18(email) C/prob-conn-acctdisabled.page:15(email)
+#: C/change-status.page:20(email) C/add-contact.page:19(email)
+#| msgid "btimothy@gmail.com"
+msgid "philbull@gmail.com"
+msgstr "philbull@gmail.com"
 
-#: C/tomboy.xml:126(surname)
-msgid "Armstrong"
-msgstr "Armstrong"
+#: C/send-message.page:32(title)
+msgid "Send a message to someone"
+msgstr "Enviar unha mensaxe a algue�n"
 
-#: C/tomboy.xml:131(email)
-msgid "sanfordarmstrong@gmail.com"
-msgstr "sanfordarmstrong@gmail.com"
-
-#: C/tomboy.xml:136(firstname)
-msgid "Paul"
-msgstr "Paul"
-
-#: C/tomboy.xml:138(surname)
-msgid "Cutler"
-msgstr "Cutler"
-
-#: C/tomboy.xml:143(email)
-msgid "pcutler@foresightlinux.org"
-msgstr "pcutler@foresightlinux.org"
-
-#: C/tomboy.xml:173(revnumber)
-msgid "Tomboy Manual 2.1"
-msgstr "Manual de Tomboy 2.1"
+#: C/send-message.page:36(p)
+msgid ""
+"From the <gui>Contact List</gui> window, double-click the name of the "
+"contact that you want to have a conversation with."
+msgstr ""
+"Desde a xanela <gui>Lista de contactos</gui>, prema du�as veces sobre o nome "
+"do contacto co que quere ter unha conversa."
 
-#: C/tomboy.xml:175(date)
-msgid "2009-03-23"
-msgstr "23-03-2009"
+#: C/send-message.page:42(p)
+msgid ""
+"A new window will open. Type a message into the box at the bottom of the "
+"window and press <key>Enter</key> to send it."
+msgstr ""
+"Abrirase unha nova xanela. Escriba a mensaxe na caixa na parte inferior da "
+"xanela e prema <placeholder-1/> para enviala."
 
-#: C/tomboy.xml:185(revnumber)
-msgid "Tomboy Manual 4.0"
-msgstr "Manual de Tomboy 4.0"
+#: C/send-message.page:50(title)
+msgid "Send a message to a meta-contact"
+msgstr "Enviar unha mensaxe a un metacontacto"
 
-#: C/tomboy.xml:187(date)
-msgid "2008-03-07"
-msgstr "07-03-2008"
+#: C/send-message.page:58(p)
+msgid ""
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Chat</gui>."
+msgstr ""
+"Prema co boto�n dereito sobre o nome do contacto co que quere manter unha "
+"conversa e desde o menu� seleccione <gui style=\"menuitem\">Conversa</gui>."
 
-#: C/tomboy.xml:197(revnumber)
-msgid "Tomboy Manual 3.0"
-msgstr "Manual de Tomboy 3.0"
+#: C/send-file.page:8(desc)
+msgid "Send a file from your computer to one of your contacts."
+msgstr "Enviar un ficheiro desde o seu computador a un dos seus contactos."
 
-#: C/tomboy.xml:199(date)
-msgid "2007-09-13"
-msgstr "13-09-2007"
+#: C/send-file.page:36(title)
+msgid "Send files"
+msgstr "Enviar ficheiros"
 
-#: C/tomboy.xml:209(revnumber)
-msgid "Tomboy Manual 2.0"
-msgstr "Manual de Tomboy 2.0"
+#: C/send-file.page:40(p) C/favorite-rooms.page:66(p)
+msgid "From the <gui>Contact List</gui> window, perform one of the following:"
+msgstr ""
+"Desde a xanela <gui>Lista de contactos</gui> leve a cabo unha das seguintes "
+"opcio�ns:"
 
-#: C/tomboy.xml:211(date)
-msgid "2007-02-28"
-msgstr "28-02-2007"
+#: C/send-file.page:45(p)
+msgid ""
+"Right click on the contact you want to send a file to, and choose <gui>Send "
+"file</gui>."
+msgstr ""
+"Prema co boto�n dereito sobre o nome do contacto co que quere manter unha "
+"conversa e seleccione <placeholder-1/>."
 
-#: C/tomboy.xml:221(releaseinfo)
-msgid "This manual describes version 0.14.0 of Tomboy"
-msgstr "Este manual describe a versión 0.14.0 de Tomboy"
+#: C/send-file.page:50(p)
+msgid ""
+"Click on the contact you want to send a file, and choose <guiseq><gui>Edit</"
+"gui><gui>Contact</gui><gui>Send file</gui></guiseq>."
+msgstr ""
+"Prema sobre o contacto ao que quere enviar un ficheiro e elixa "
+"<guiseq><gui>Editar</gui><gui>Contacto</gui><gui>Enviar ficheiro</gui></"
+"guiseq>."
+
+#: C/send-file.page:58(p)
+msgid "Select the file to send, and click on <gui>Send</gui>."
+msgstr "Seleccione o ficheiro para enviar e prema <gui>Enviar</gui>."
 
-#: C/tomboy.xml:224(title)
-msgid "Feedback"
-msgstr "Comentarios e suxestio�ns"
+#: C/send-file.page:63(p)
+msgid "The <gui>File Transfers</gui> window will appear."
+msgstr "Aparecera� a xanela <gui>Transferencia de ficheiros</gui>."
 
-#: C/tomboy.xml:226(para)
+#: C/send-file.page:66(p)
 msgid ""
-"To report a bug or make a suggestion regarding the Tomboy application or "
-"this manual, follow the directions in the <ulink type=\"help\" url=\"ghelp:"
-"gnome-feedback\">GNOME Feedback Page</ulink>."
+"Wait for your contact to accept the file transfer, or click <gui>Stop</gui> "
+"to halt the transfer."
 msgstr ""
-"Para informar dun erro ou facer unha suxestio�n sobre o aplicativo "
-"<application>Brasero</application> ou este manual, siga os consellos da "
-"<ulink url=\"ghelp:gnome-feedback\" type=\"help\">Pa�xina de Feedback de "
-"GNOME</ulink>."
+"Agarde a que o seu contacto acepte a transferencia de ficheiro e prema "
+"<gui>Deter</gui> para deter a transferencia."
 
-#: C/tomboy.xml:236(primary)
-msgid "Tomboy Notes"
-msgstr "Notas de Tomboy"
+#: C/send-file.page:72(p)
+msgid ""
+"Once the transfer is finished, it is possible to close the <gui>File "
+"Transfers</gui> window."
+msgstr ""
+"Cano remate a transferencia e� posi�bel pechar a xanela <gui>Transferencia de "
+"ficheiro</gui>."
 
-#: C/tomboy.xml:240(primary)
-msgid "Tomboy"
-msgstr "Tomboy"
+#: C/send-file.page:80(p)
+msgid ""
+"If you have multiple finished transfers listed in the window, click on "
+"<gui>Clear</gui> to empty the list. This will only remove the files from the "
+"list and will not delete them from your computer."
+msgstr ""
+"Se ten mu�ltiples transferencias finalizadas listas na xanela prema "
+"<gui>Limpar</gui> para baleirar a lista. Isto so� quitara� os ficheiros da "
+"lista e non os borrara� do computador."
 
-#: C/tomboy.xml:244(primary)
-msgid "notes"
-msgstr "notas"
+#: C/send-file.page:87(p)
+msgid ""
+"It is possible to send files only using the following services: <em>Jabber</"
+"em>, <em>Google Talk</em> and <em>People Nearby</em>."
+msgstr ""
+"So e� posi�bel enviar ficheiros ao usar os seguintes servizos: <em>Jabber</"
+"em>, <em>Google Talk</em> e <em>Personas pro�ximas</em>."
 
-#: C/tomboy.xml:250(title)
-msgid "Introduction"
-msgstr "Introdución"
+#: C/send-file.page:93(p)
+msgid ""
+"In order to send a file to someone, you need to be connected to the "
+"Internet, or to a local area network."
+msgstr ""
+"Para enviarlle un ficheiro a unha persoa debe estar conectado a Internet ou "
+"a� rede local."
+
+#: C/salut-protocol.page:8(desc)
+msgid "Understanding the People Nearby feature."
+msgstr "Entender a caracteri�stica de Persoas pro�ximas."
+
+#: C/salut-protocol.page:33(title)
+msgid "What is People Nearby?"
+msgstr "Que e� Persoas pro�ximas"
 
-#: C/tomboy.xml:253(title)
-msgid "Notes Application"
-msgstr "Notas do aplicativo"
+#: C/salut-protocol.page:37(p)
+msgid "I'd like to see this played up a bit more."
+msgstr "Gustari�ame ver isto explicado un pouco ma�is."
 
-#: C/tomboy.xml:262(para)
+#: C/salut-protocol.page:40(p)
 msgid ""
-"Tomboy is a desktop note-taking application for GNOME, Microsoft Windows, "
-"and Mac OS X. It is simple and easy to use, and allows you to organize the "
-"ideas and information you deal with every day. Tomboy has some very useful "
-"editing features to help you customize your notes, including:"
+"The People Nearby service is a serverless communication service: you do not "
+"need to connect and authenticate to a central server in order to use it."
 msgstr ""
-"Tomboy é un aplicativo de creación de notas para o escritorio GNOME, "
-"Microsoft Windows e Mac OS X. É moi sinxelo e doado de usar e permítelle "
-"organizar as súas ideas e información que xestiona cada día. Tomoby ten "
-"algunhas características de edición moi útiles para axudarlle a personalizar "
-"as súas notas, incluíndo:"
+"O servizo de Xente pro�xima e� un servizo de comunicacio�n sen servidores: non "
+"precisa conectarse e autenticarse contra un servidor central para poder "
+"usalo."
 
-#: C/tomboy.xml:269(para)
-msgid "Highlighting Search Text"
-msgstr "Busca de texto con realce"
+#: C/salut-protocol.page:45(p)
+msgid ""
+"This kind of serverless messaging system is restricted to a local area "
+"network and an active Internet connection is not necessary."
+msgstr ""
+"Este tipo de sistemas de mensaxeri�a sen servidores esta� restrinxido a redes "
+"de a�rea local e non se necesita unha conexio�n activa con Internet."
 
-#: C/tomboy.xml:273(para)
-msgid "Inline Spell Checking"
-msgstr "Comprobación ortográfica en liña"
+#: C/salut-protocol.page:49(p)
+msgid ""
+"The people that use this service inside the same local area network will be "
+"auto-discovered, and it will be possible to send them messages and files as "
+"with other services."
+msgstr ""
+"A xente que usa o servizo dentro da mesma rede de a�rea local autodestruirase "
+"e sera� posi�bel enviarlles mensaxes e ficheiros ao igual que con outros "
+"servizos"
 
-#: C/tomboy.xml:277(para)
-msgid "Auto-linking Web &amp; Email Addresses"
-msgstr "Autoligado de enderezos web e correo electrónico"
+#: C/salut-protocol.page:54(p)
+msgid ""
+"All the modern local area networks should be able to support this kind of "
+"service."
+msgstr ""
+"Todas as redes modernas de a�rea local deberi�an poder admitir este tipo de "
+"servizos."
 
-#: C/tomboy.xml:281(para)
-msgid "Undo/Redo Support"
-msgstr "Compatibilidade para desfacer/refacer"
+#: C/remove-account.page:8(desc)
+msgid "Completely remove an account from <app>Empathy</app>."
+msgstr "Quitar completamente unha conta en <app>Empathy</app>."
 
-#: C/tomboy.xml:285(para)
-msgid "Font Styling &amp; Sizing"
-msgstr "Estilos de tipo de letra e tamaño"
+#: C/remove-account.page:33(title)
+msgid "Remove an account"
+msgstr "Eliminar unha conta"
 
-#: C/tomboy.xml:289(para) C/tomboy.xml:795(title)
-msgid "Bulleted Lists"
+#: C/remove-account.page:35(p)
+msgid ""
+"You can completely remove an account from <app>Empathy</app> if you no "
+"longer wish to use the account. If you wish to use the account in "
+"<app>Empathy</app> again in the future, you will have to add your account "
+"details again."
+msgstr ""
+"Pode quitar completamente unha conta de <app>Empathy</app> se non quere "
+"seguir usa�ndoa. Se quere usar de novo a conta en <app>Empathy</app> no "
+"futuro, debera� engadir os detalles da conta de novo."
+
+#: C/remove-account.page:42(p) C/irc-nick-password.page:50(p)
+#: C/disable-account.page:48(p) C/add-account.page:48(p)
+msgid ""
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>Edit</"
+"gui><gui>Accounts</gui></guiseq>, or press <key>F4</key>."
+msgstr ""
+"Desde a xanela <gui>Lista de contactos</gui> seleccione <guiseq><gui>Editar</"
+"gui><gui>Contas</gui></guiseq> ou prema <key>F4</key>."
+
+#: C/remove-account.page:46(p)
+msgid ""
+"Select the account you wish to remove from the accounts list on the left "
+"side of the window."
+msgstr ""
+"Seleccione a conta que desexa eliminar desde a lista de contas na parte "
+"esquerda da xanela."
+
+#: C/remove-account.page:50(p)
+msgid "Click on <gui style=\"button\">Remove</gui>."
+msgstr "Prema <gui style=\"button\">Quitar</gui>."
+
+#: C/remove-account.page:53(p)
+msgid ""
+"A dialog will be shown asking for confirmation. Click the <gui>Remove</gui> "
+"button to permanently remove the account."
+msgstr ""
+"Mostrarase un dia�logo preguntando por unha confirmacio�n. Prema no boto�n "
+"<gui>Eliminar</gui> para quitar a conta permanentemente."
+
+#: C/remove-account.page:59(p)
+msgid ""
+"Even after removing an account, <app>Empathy</app> does not delete your "
+"conversation history for that account."
 msgstr ""
+"Incluso despois de eliminar unha conta <app>Empathy</app> non borra o seu "
+"historial de conversas para esa conta."
+
+#: C/prob-conn.page:7(desc)
+msgid "Diagnose common problems connecting to an instant messaging service."
+msgstr ""
+"Diagnosticar problemas comu�ns ao conectarse a un servizo de mensaxari�a "
+"instanta�nea."
+
+#: C/prob-conn.page:29(title)
+msgid "Problems connecting to an instant messaging service"
+msgstr "Problemas ao conectarse a un servizo de mensaxari�a instanta�nea"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/prob-conn-neterror.page:58(None) C/prob-conn-name.page:43(None)
+#: C/prob-conn-auth.page:58(None) C/account-irc.page:109(None)
+#| msgid ""
+#| "@@image: 'figures/note-template.png'; md5=49ee364d7e060de4e7a583e49a2f7db7"
+msgid "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b"
+msgstr "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b"
 
-#: C/tomboy.xml:293(para)
+#: C/prob-conn-neterror.page:7(desc)
 msgid ""
-"Tomboy is accessed through the GNOME panel, the taskbar in Microsoft "
-"Windows, or the dock in Mac OS X. To startup Tomboy automatically when you "
-"log into GNOME, see <xref linkend=\"add-to-panel\"/>."
+"An error message which says “<gui>Network error</gui>� appears in the main "
+"window."
 msgstr ""
-"Pode acceder a Tomboy dese o panel de GNOME, a barra de tarefas de Microsoft "
-"Windows ou o Dock en Mac OS X. Para iniciar automaticamente Tomboy ao "
-"iniciar sesión en GNOME vexa <xref linkend=\"add-to-panel\"/>."
+"Aparecera� a mensaxe de erro «<gui>Erro de rede</gui>» na xanela principal."
 
-#: C/tomboy.xml:301(title)
-msgid "Getting Started"
-msgstr "Comezando"
+#: C/prob-conn-neterror.page:33(title)
+msgid "I get a message that says “Network error�"
+msgstr "Obteño unha mensaxe que mostra «Erro de rede»"
 
-#: C/tomboy.xml:304(title)
-msgid "Adding Tomboy to the GNOME Panel"
-msgstr "Engadir Tomboy ao panel de GNOME"
+#: C/prob-conn-neterror.page:36(cite)
+msgid "shaunm"
+msgstr "shaunm"
 
-#: C/tomboy.xml:306(para)
+#: C/prob-conn-neterror.page:37(p)
 msgid ""
-"To add Tomboy to a panel in GNOME, right-click on the panel, then choose "
-"<menuchoice><guimenuitem>Add to Panel</guimenuitem></menuchoice>. Select "
-"Tomboy Notes in the Add to the panel dialog, then click "
-"<menuchoice><guibutton>Add</guibutton></menuchoice>. You should see a yellow "
-"note icon appear in the panel, representing Tomboy. The panel icon is "
-"illustrated in <xref linkend=\"tomboy-panel\"/>."
+"Empathy no longer allows you to create an IRC account without a valid nick. "
+"I've removed the guide link. Remove the text."
 msgstr ""
+"Empathy xa non lle permite crear unha conta de IRC sen un alcume va�lido. "
+"Quitouse a ligazo�n da gui�a. Quitar o texto."
 
-#: C/tomboy.xml:315(para)
+#: C/prob-conn-neterror.page:41(p)
 msgid ""
-"Tomboy is automatically added to the taskbar when run on Microsoft Windows, "
-"or the dock when run on Mac OS X."
+"This kind of error happens when <app>Empathy</app> cannot communicate with "
+"the instant messaging service for some reason."
 msgstr ""
+"Este tipo de mensaxe sucede cando <app>Empathy</app> non se pode comunicar "
+"co servizo de mensaxari�a instanta�nea por algunha razo�n."
 
-#: C/tomboy.xml:319(title)
-msgid "Creating Notes"
-msgstr "Crear notas"
+#: C/prob-conn-neterror.page:45(p)
+msgid ""
+"Also, this kind of error happens when you try to use an IRC account without "
+"setting a nickname."
+msgstr ""
+"Este tipo de erro tame�n sucede cando intenta usar unha conta de IRC sen ter "
+"configurado o alcume"
 
-#: C/tomboy.xml:321(para)
+#: C/prob-conn-neterror.page:52(p) C/prob-conn-auth.page:45(p)
+#: C/prob-conn-acctdisabled.page:43(p)
 msgid ""
-"Once you have successfully added Tomboy to the panel, you can create new "
-"notes using one of the following methods."
+"Make sure that you are connected to the Internet, or to a local area network."
 msgstr ""
+"Asegu�rese de que esta� conectado a Internet ou a unha rede de a�rea local."
 
-#: C/tomboy.xml:324(para)
-msgid "To create a new note using the mouse:"
-msgstr "Para crear unha nova usando o rato:"
+#: C/prob-conn-neterror.page:57(p) C/prob-conn-name.page:42(p)
+#: C/prob-conn-auth.page:57(p)
+msgid ""
+"Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png"
+"\">edit</media> icon in the error message."
+msgstr ""
+"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png"
+"\">Logotipo da mensaxari�a instanta�nea Empathy</media>Mensaxari�a instanta�nea "
+"Empathy"
 
-#: C/tomboy.xml:328(para)
+#: C/prob-conn-neterror.page:65(p) C/prob-conn-acctdisabled.page:59(p)
 msgid ""
-"Click on the Tomboy note icon present in the GNOME Panel or Windows taskbar. "
-"A menu will appear."
+"Check in the <gui>Advanced</gui> section that all the details are correct. "
+"You should be able to find these details from the website of the messaging "
+"service."
 msgstr ""
-"Prema na icona de nota de Tomboy presente no panel de GNOME ou na barra de "
-"tarefas de Windows e aparecerá un menú."
+"Comprobe na seccio�n <placeholder-1/> que todos os detalles son correctos. "
+"Vostede podera� encontrar estes detalles no sitio web do seu servizo de "
+"mensaxeri�a."
 
-#: C/tomboy.xml:333(para)
+#: C/prob-conn-neterror.page:82(p) C/prob-conn-auth.page:68(p)
 msgid ""
-"Select the <menuchoice><guimenuitem>Create New Note</guimenuitem></"
-"menuchoice> option in the menu."
+"Deselect the <gui>Enabled</gui>, and then select it again to try to "
+"reconnect to the service."
 msgstr ""
-"Seleccione a opción <menuchoice><guimenuitem>Crear nova nota</guimenuitem></"
-"menuchoice> desde o menú."
+"Deseleccione <placeholder-1/>, e seleccio�neo de novo para tentar "
+"reconectarse ao servizo."
 
-#: C/tomboy.xml:339(para)
-msgid "To create a new note using the keyboard:"
-msgstr "Para crear unha nota usando o teclado:"
+#: C/prob-conn-neterror.page:90(title)
+msgid "Proxy support"
+msgstr "Compatibilidade de proxy"
 
-#: C/tomboy.xml:343(para)
+#: C/prob-conn-neterror.page:91(p)
 msgid ""
-"Open the Tomboy menu using the key combination <keycombo><keycap>Alt</"
-"keycap><keycap>F12</keycap></keycombo>."
+"At the moment <app>Empathy</app> can not be configured to work with a proxy."
 msgstr ""
-"Abra o menú de Tomboy usando a combinación de teclas <keycombo><keycap>Alt</"
-"keycap><keycap>F12</keycap></keycombo>."
+"Polo momento <app>Empathy</app> non se pode configurar para que funcione cun "
+"proxy."
+
+#: C/prob-conn-name.page:9(title)
+msgid "“Name in use�"
+msgstr "\"Nome en uso\""
 
-#: C/tomboy.xml:351(para)
+#: C/prob-conn-name.page:10(desc)
 msgid ""
-"Use the <keycap>N</keycap> key to select the menu option "
-"<menuchoice><guimenuitem>Create New Note</guimenuitem></menuchoice>."
+"An error message which says “<gui>Name in use</gui>� appears in the main "
+"window."
 msgstr ""
-"Use a tecla <keycap>N</keycap> para seleccionar a opción de menú "
-"<menuchoice><guimenuitem>Crear nova nota</guimenuitem></menuchoice>."
+"Aparecen na xanela principal unha mensaxe de erro que dice «<gui>Nome en "
+"uso</gui>»"
 
-#: C/tomboy.xml:360(title)
-msgid "Editing Notes"
-msgstr "Editar notas"
+#: C/prob-conn-name.page:32(title)
+msgid "I get a message that says “Name in use�"
+msgstr "Obteño unha mensaxe de erro que mostra «Nome en uso»"
 
-#: C/tomboy.xml:362(para)
+#: C/prob-conn-name.page:34(p)
 msgid ""
-"After creating a new note, a new window will appear with the title "
-"<literal>New Note <replaceable>N</replaceable></literal>. At the top of the "
-"note is a toolbar with several buttons and text. Directly below this toolbar "
-"is the content area of the note. This is illustrated in <xref linkend=\"new-"
-"note\"/>."
+"This kind of error happens when you try to connect to your IRC account and "
+"you are using a nickname that is already being used by someone else on that "
+"particular network."
 msgstr ""
-"Logo de crear unha nova nota, aparecerá unha nova xanela co título "
-"<literal>Nova nota <replaceable>N</replaceable></literal>. Na parte superior "
-"da nota está a barra de ferramentas con varios botóns e texto. Xusto embaixo "
-"da barra de ferramentas está a área de contido da nota. Isto está ilustrado "
-"en <xref linkend=\"new-note\"/>."
+"Este tipo de erro sucede cando tenta conectarse a� su�a conta de IRC e esta� "
+"usando un alcume que xa esta� usando outra persoa nesa rede en particular."
+
+#: C/prob-conn-name.page:50(p)
+msgid "In the <gui>Nickname</gui> text box, type a new nickname."
+msgstr "Na caixa de texto <gui>Alcume</gui> escriba un alcume novo."
 
-#: C/tomboy.xml:368(para)
+#: C/prob-conn-name.page:55(p)
 msgid ""
-"The note can be edited by clicking in the content area and using the "
-"keyboard to add and remove content. The first line is considered the title "
-"of the note. By default this is populated with the text <quote><literal>New "
-"Note <replaceable>N</replaceable></literal></quote>. The title is changed by "
-"clicking in the content area on the first line and using the keyboard to "
-"change the title. By default, focus is given to the content area upon "
-"creation of a new note, so you can immediately start editing the note "
-"without the need to click on the content area with the mouse."
+"If you have registered that nickname within the network you are using, set "
+"the password for that nickname. For more information, see <link xref=\"irc-"
+"nick-password\"/>."
 msgstr ""
+"Se rexistrou ese alcume na rede que esta� usando, estabeleza o contrasinal "
+"para ese alcume. Para obter ma�is informacio�n consulte a <link xref=\"irc-"
+"nick-password\"/>."
 
-#: C/tomboy.xml:378(para)
+#: C/prob-conn-name.page:64(p)
 msgid ""
-"Using the toolbar available on each note is discussed in <xref linkend="
-"\"working-with-notes\"/>."
+"Deselect the <gui>Enabled</gui> check-box next to the name of your account, "
+"and then select it again to try to reconnect to the service."
 msgstr ""
+"Deseleccione <placeholder-1/>, e seleccio�neo de novo para tentar "
+"reconectarse ao servizo."
 
-#: C/tomboy.xml:382(title)
-msgid "The default window for a New Note"
-msgstr "A xanela predeterminada para a Nova nota"
+#: C/prob-conn-auth.page:8(desc)
+msgid ""
+"An error message which says “<gui>Authentication failed</gui>� appears in "
+"the main window."
+msgstr ""
+"Aparece unha mensaxe de erro na xanela principal que mostra «<gui>Fallo de "
+"autenticacio�n</gui>»."
 
-#: C/tomboy.xml:393(title)
-msgid "Table of Contents"
-msgstr "Táboa de contidos"
+#: C/prob-conn-auth.page:36(title)
+msgid "I get a message that says “Authentication failed�"
+msgstr "Obteño unha mensaxe que di «Produciuse un fallo na autenticacio�n»"
 
-#: C/tomboy.xml:395(para)
+#: C/prob-conn-auth.page:38(p)
 msgid ""
-"To get an overview of all the notes managed by Tomboy, select the "
-"<menuchoice><guimenuitem>Search All Notes</guimenuitem></menuchoice> menu "
-"item from the panel menu. By default, the <interface>Search All Notes</"
-"interface> dialog will display the notes in the order that they were last "
-"modified. Click the <guilabel>Note</guilabel> or <guilabel>Last Changed</"
-"guilabel> column headings to change the sort order. Click the column heading "
-"a second time to toggle between ascending and descending order."
+"This kind of error happens when your instant messaging service is not "
+"allowing you to connect because it does not recognize your username or "
+"password for some reason."
 msgstr ""
+"Este tipo de erro produ�cese cando o seu servizo de mensaxari�a intanta�nea non "
+"lle esta� permitindo conectar porque por algunha razo�n non recoñece o seu "
+"nome de usuario ou contrasinal."
 
-#: C/tomboy.xml:405(para)
+#: C/prob-conn-auth.page:50(p)
 msgid ""
-"You can find specific notes by entering text into the search field in the "
-"<interface>Search All Notes</interface> dialog. The list of notes will "
-"automatically update to list only the notes which have matching text."
+"Make sure that you have registered an account with the service you are "
+"trying to connect to. If you do not have an account, most services will not "
+"allow you to connect."
 msgstr ""
+"Asegu�rese de que rexistrou unha conta co servizo ao que esta� tentando "
+"conectarse. Se non ten unha conta a maiori�a dos servizos non lle permitira�n "
+"que se conecte."
 
-#: C/tomboy.xml:410(para)
+#: C/prob-conn-auth.page:63(p) C/prob-conn-acctdisabled.page:54(p)
 msgid ""
-"To open a note in the <interface>Search All Notes</interface> dialog, do one "
-"of the following:"
+"Type your username and password again to make sure that they are correct."
 msgstr ""
+"Escriba o seu nome de usuario e contrasinal de novo e asegu�rese de que son "
+"correctos."
 
-#: C/tomboy.xml:415(para)
-msgid "Double-click on a note."
-msgstr "Prema dúas veces sobre unha nota."
+#: C/prob-conn-acctdisabled.page:7(desc)
+msgid ""
+"The instant messaging account that you want to use is not enabled in the "
+"list of accounts."
+msgstr ""
+"A conta de mensaxari�a instanta�nea que quere usar non esta� activada na lista "
+"de contas."
+
+#: C/prob-conn-acctdisabled.page:33(title)
+msgid "My account is not enabled"
+msgstr "A miña conta non esta� activada"
 
-#: C/tomboy.xml:419(para)
+#: C/prob-conn-acctdisabled.page:35(p)
 msgid ""
-"Highlight a note by selecting it and then select "
-"<menuchoice><guimenuitem>Open</guimenuitem></menuchoice> from the "
-"<guimenuitem>File</guimenuitem> menu."
+"If the instant messaging account that you want to use is not enabled in the "
+"drop-down account list when you try to start a new conversation or join a "
+"room, your account details may not be correct."
 msgstr ""
+"Se a conta de mensaxari�a instanta�nea que quere usar non esta� activada na "
+"lista desprega�bel de contas, cando tenta iniciar unha conversa nova ou "
+"unirse a unha charla, pode que os detalles da su�a conta non sexa correctos."
 
-#: C/tomboy.xml:425(para)
+#: C/prob-conn-acctdisabled.page:48(p)
 msgid ""
-"Right-click on a note and select <menuchoice><guimenuitem>Open</"
-"guimenuitem></menuchoice> from the context menu that appears."
+"Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq> and select the "
+"account that is not working."
 msgstr ""
+"Elixa <guiseq><gui>Editar</gui><gui>Contas</gui></guiseq> e seleccione a "
+"conta que non esta� funcionando."
 
-#: C/tomboy.xml:431(para)
+#: C/prob-conn-acctdisabled.page:65(p)
 msgid ""
-"Highlight a note by selecting it and then press the key combination "
-"<keycombo><keycap>Ctrl</keycap><keycap>O</keycap></keycombo>."
+"Check that the <gui style=\"checkbox\">Enabled</gui> check-box is selected. "
+"If it is not, select the check-box to enable the account."
 msgstr ""
+"Comprobe que a casilla de verificacio�n <gui style=\"checkbox\">Activada</"
+"gui> esta� seleccionada. Se non o esta� marque a casilla de verificacio�n para "
+"activar a conta."
 
-#: C/tomboy.xml:445(title)
-msgid "Working With Notes"
-msgstr "Traballar con notas"
+#: C/prev-conv.page:8(desc)
+msgid "Browse or search your previous conversations."
+msgstr "Explorar ou buscar nas su�as mensaxes anteriores."
 
-#: C/tomboy.xml:447(para)
+#: C/prev-conv.page:35(title)
+msgid "View previous conversations"
+msgstr "Ver as conversas anteriores"
+
+#: C/prev-conv.page:39(p)
 msgid ""
-"Notes are modified and edited through the main window for each note. The "
-"toolbar at the top of each note allows you to stylize the note and perform "
-"other note-related functions. We discuss the functions of each item on the "
-"toolbar in the following sections."
+"Highlighting text is quirky: <link href=\"http://bugzilla.gnome.org/show_bug."
+"cgi?id=593733\">#593733</link>. If there's an actual highlighting going on, "
+"independent of the selection (like in yellow or something), we can use the "
+"term \"highlight\". Otherwise we need to use the term \"select\". Watch that "
+"bug."
 msgstr ""
+"Resaltar texto e� estraño <link href=\"http://bugzilla.gnome.org/show_bug.cgi?"
+"id=593733\">#59733</link>. Se existe un resaltado actualmente, independente "
+"da seleccio�n (en amarelo, por exemplo), po�dese usar o termo «resaltar». De "
+"outra forma de�bese usar o termo «seleccionado». Siga o proceso do erro."
 
-#: C/tomboy.xml:453(title)
-msgid "Search"
-msgstr "Buscar"
+#: C/prev-conv.page:46(p)
+msgid ""
+"<app>Empathy</app> automatically saves all your text conversations you have "
+"with your contacts. You can <link xref=\"#search\">search through all of "
+"your previous conversations</link> or <link xref=\"#browse\">browse previous "
+"conversations</link> by contact and date."
+msgstr ""
+"<app>Empathy</app> garda automaticamente todas as conversas de texto que ten "
+"cos seus contactos. Pode <link xref=\"#search\">buscar a trave�s de todas as "
+"su�as conversas anteriores</link> ou <link xref=\"#browse\">buscar conversas "
+"anteriores</link> por contacto e data."
 
-#: C/tomboy.xml:455(para)
+#: C/prev-conv.page:54(p)
 msgid ""
-"Clicking the <guibutton>Search</guibutton> button will open the "
-"<interface>Search All Notes</interface> dialog described earlier (<xref "
-"linkend=\"search-all-notes\"/>.)"
+"You do not need to be connected to the Internet to view and search your "
+"previous conversations."
 msgstr ""
+"Non necesita estar conectado a Internet para ver e buscar nas su�as conversas "
+"anteriores."
 
-#: C/tomboy.xml:461(title)
-msgid "Link"
-msgstr "Ligazón"
+#: C/prev-conv.page:61(title)
+msgid "Search previous conversations"
+msgstr "Buscar conversas anteriores"
 
-#: C/tomboy.xml:463(para)
+#: C/prev-conv.page:63(p)
 msgid ""
-"The <guibutton>Link</guibutton> button allows you to create a link to a new "
-"note from within the current note. For example, if your note contains the "
-"phrase <quote>FinalExam</quote>, you can select this text with the mouse and "
-"click the <guibutton>Link</guibutton> button to create a new note with the "
-"title <quote>FinalExam</quote>. A link will also be created in the current "
-"note that can be clicked to open the new <quote>FinalExam</quote> note."
+"You can perform a full-text search through all of your previous "
+"conversations."
 msgstr ""
+"Pode realizar unha busca de texto completo sobre todas as su�as conversas "
+"anteriores."
 
-#: C/tomboy.xml:472(para)
+#: C/prev-conv.page:67(p) C/prev-conv.page:96(p)
 msgid ""
-"Changing the title of a note will update links present in other notes. This "
-"prevents broken links from occurring when a note is renamed."
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>View</"
+"gui><gui>Previous Conversations</gui></guiseq>. Alternatively, press "
+"<key>F3</key>."
 msgstr ""
+"Desde a xanela <gui>Lista de contactos</gui> seleccione <guiseq><gui>Ver</"
+"gui><gui>Conversas previas</gui></guiseq>. De forma alternativa prema "
+"<key>F3</key>."
 
-#: C/tomboy.xml:479(title)
-msgid "Text"
-msgstr "Texto"
+#: C/prev-conv.page:71(p)
+msgid "Select the <gui>Search</gui> tab."
+msgstr "Seleccione o separador <gui>Buscar</gui>."
 
-#: C/tomboy.xml:481(para)
+#: C/prev-conv.page:74(p)
 msgid ""
-"Formatting text within your notes can be done using the <guibutton>Text</"
-"guibutton> button. The <guibutton>Text</guibutton> button will display a "
-"menu with several options from which you can choose. Each menu item is "
-"explained next."
+"In the <gui>For</gui> field, type the text you want to search for. Click "
+"<gui>Find</gui> or press <key>Enter</key>."
 msgstr ""
+"No campo <gui>Para</gui> escriba o texto que quere buscar. Prema "
+"<gui>Buscar</gui> ou prema <key>Intro</key>."
 
-#: C/tomboy.xml:488(term)
-msgid "Undo"
-msgstr "Desfacer"
+#: C/prev-conv.page:78(p)
+msgid ""
+"Any conversations that matched your search terms will be shown in the list "
+"below the search field. By default, conversations are ordered by date."
+msgstr ""
+"Mostrarase na lista baixo o campo de busca calquera conversa que coincida "
+"cos seus termos de busca. As conversas orde�nanse por data de forma "
+"predefinida."
 
-#: C/tomboy.xml:491(para)
+#: C/prev-conv.page:82(p)
 msgid ""
-"Support for <quote>Undo</quote> is available in Tomboy through this menu "
-"item. The Undo function allows you to revert previous changes made to your "
-"note during the current session. To undo your last change using the "
-"keyboard, use the standard keybinding, <keycombo><keycap>Ctrl</"
-"keycap><keycap>Z</keycap></keycombo>."
+"Click on a conversation to view it. <app>Empathy</app> will select the text "
+"in the conversation that matched your search terms."
 msgstr ""
+"Prema sobre unha conversa para vela. <app>Empathy</app> seleccionara� o texto "
+"na conversa que coincida cos seus termos de busca."
 
-#: C/tomboy.xml:504(term)
-msgid "Redo"
-msgstr "Refacer"
+#: C/prev-conv.page:89(title)
+msgid "Browse previous conversations"
+msgstr "Explorar as conversas anteriores"
 
-#: C/tomboy.xml:507(para)
+#: C/prev-conv.page:91(p)
 msgid ""
-"The <quote>Redo</quote> function is used to put back changes that were "
-"removed using the <quote>Undo</quote> feature. To redo your last change "
-"using the keyboard, use the standard keybinding, <keycombo><keycap>Shift</"
-"keycap><keycap>Ctrl</keycap><keycap>Z</keycap></keycombo>."
+"You can browse your previous conversations with your contacts or in chat "
+"rooms by date."
 msgstr ""
+"Pode examinar por data as conversas previas cos seus contactos ou en salas "
+"de conversa."
 
-#: C/tomboy.xml:521(term)
-msgid "Bold"
-msgstr "Negra"
+#: C/prev-conv.page:100(p)
+msgid "Select the <gui>Conversations</gui> tab."
+msgstr "Seleccione o separador <gui>Conversas</gui>."
 
-#: C/tomboy.xml:524(para)
+#: C/prev-conv.page:103(p)
 msgid ""
-"To make text within your note bold, first select the text you want to "
-"modify. Then select the <menuchoice><guimenuitem>Bold</guimenuitem></"
-"menuchoice> option from the <guibutton>Text</guibutton> menu. You may also "
-"use the keybinding <keycombo><keycap>Ctrl</keycap><keycap>B</keycap></"
-"keycombo> after selecting the text."
+"Select an account from the drop-down list in the top left. A list of "
+"contacts and chat room for that account will be shown below."
 msgstr ""
+"Seleccione unha conta desde a lista desprega�bel na parte superior esquerda. "
+"Mostrarase unha lista de contactos e salas de conversa para dita conta."
 
-#: C/tomboy.xml:537(term)
-msgid "Italic"
-msgstr "Cursiva"
+#: C/prev-conv.page:107(p)
+msgid ""
+"Select a contact or chat room to view your previous conversations from. By "
+"default the most recent conversation will be shown."
+msgstr ""
+"Seleccione un contacto ou sala de conversa desde a que ver as anteriores "
+"conversas. Por omisio�n mostrarase a conversa ma�is recente."
 
-#: C/tomboy.xml:540(para)
+#: C/prev-conv.page:111(p)
 msgid ""
-"To make text within your note italic, first select the text you want to "
-"modify. Then select the <menuchoice><guimenuitem>Italic</guimenuitem></"
-"menuchoice> option from the <guibutton>Text</guibutton> menu. You may also "
-"use the keybinding <keycombo><keycap>Ctrl</keycap><keycap>I</keycap></"
-"keycombo> after selecting the text."
+"You can browse your conversations by date. Days on which you had a "
+"conversation with the selected contact will be shown in bold text. Click a "
+"date to select it. Click the arrows next to the month and year to browse "
+"earlier dates."
 msgstr ""
+"Pode explorar as su�as conversas por data. Mostraranse os di�as nos que tipo "
+"unha conversa co contacto seleccionado en texto en negriña. Prema na data "
+"para seleccionala e prema nas frechas ao lado do mes e ano para explorar as "
+"datas ma�is cercanas."
 
-#: C/tomboy.xml:553(term)
-msgid "Strikeout"
-msgstr "Riscado"
+#: C/prev-conv.page:117(p)
+msgid ""
+"You can search for text in the displayed conversation by typing into the "
+"search field at the top. The matching text will be highlighted."
+msgstr ""
+"Pode buscar dentro do texto das conversas mostradas escribindo na caixa de "
+"busca na parte superior. O texto coincidente resaltarase."
 
-#: C/tomboy.xml:556(para)
+#: C/prev-conv.page:121(p)
 msgid ""
-"The strikeout style will put a line through the selected text. To add a "
-"strikeout, select the text and then select the "
-"<menuchoice><guimenuitem>Strikeout</guimenuitem></menuchoice> option from "
-"the <guibutton>Text</guibutton> menu. You may also use the keybinding "
-"<keycombo><keycap>Ctrl</keycap><keycap>S</keycap></keycombo> after selecting "
-"the text."
+"You can quickly view the previous conversations with one of your contacts "
+"from the <gui>Contact List</gui> window. Simply right click the contact and "
+"choose <gui>View Previous Conversations</gui>. The <gui>Previous "
+"Conversations</gui> window will open with that contact already selected."
 msgstr ""
+"Pode ver rapidamente as conversas anteriores con un dos seus contactos desde "
+"a xanela <gui>Lista de contactos</gui>. Simplemente prema co boto�n dereito "
+"do rato sobre o contacto e seleccione <gui>Conversas anteriores</gui>. "
+"Abrirase a xanela <gui>Ver conversas previas</gui> co contacto seleccionado."
+
+#: C/link-contacts.page:11(desc)
+msgid "Merge and separate different contacts into a single one."
+msgstr "Unir e separar diferentes contactos nun so�."
+
+#: C/link-contacts.page:25(title)
+msgid "Combine and separate contacts"
+msgstr "Combinar e separar contactos"
 
-#: C/tomboy.xml:570(term)
-msgid "Highlight"
-msgstr "Realzar"
+#: C/link-contacts.page:26(p)
+msgid ""
+"If one, or more, of your contacts has multiple accounts with different "
+"messaging services, you can combine these contacts into a single one."
+msgstr ""
+"Se un, ou ma�is, dos seus contactos ten mu�ltiples contas con diferentes "
+"servizos de mensaxari�a, pode combinar estes contactos nun u�nico."
+
+#: C/link-contacts.page:30(p)
+msgid ""
+"The resulting contact is called a <em>meta-contact</em>: a contact composed "
+"from different single contacts."
+msgstr ""
+"O contacto resultante cha�mase un <em>meta-contacto</em>: un contacto "
+"composto por diferentes contactos sinxelos."
 
-#: C/tomboy.xml:573(para)
+#: C/link-contacts.page:34(p)
 msgid ""
-"The highlight style will put a yellow background around the selected text. "
-"To add a highlight, select the text and then select the "
-"<menuchoice><guimenuitem>Highlight</guimenuitem></menuchoice> option from "
-"the <guibutton>Text</guibutton> menu. You may also use the keybinding "
-"<keycombo><keycap>Ctrl</keycap><keycap>H</keycap></keycombo> after selecting "
-"the text."
+"If you have a Jane Smith contact that is using three different messaging "
+"services like:"
 msgstr ""
+"Se ten un contacto Xoa�n Souto que esta� usando tres servizos de mensaxari�a "
+"como:"
+
+#: C/link-contacts.page:40(p)
+msgid "janes@facebook"
+msgstr "xoan@facebook"
+
+#: C/link-contacts.page:45(p)
+msgid "jane.smith@gmail"
+msgstr "xoan.souto@gmail"
+
+#: C/link-contacts.page:50(p)
+msgid "jane_smith@hotmail"
+msgstr "xoan_souto@hotmail"
+
+#: C/link-contacts.page:55(p)
+msgid "You can combine these contacts into a single Jane Smith one."
+msgstr "Pode combinar estes contactos nun so� Xoa�n Souto"
 
-#: C/tomboy.xml:587(term) C/tomboy.xml:1414(member) C/tomboy.xml:1499(term)
-msgid "Fixed Width"
-msgstr "Largura fixa"
+#: C/link-contacts.page:60(title)
+msgid "Combining contacts"
+msgstr "Combinar contactos"
 
-#: C/tomboy.xml:590(para)
+#: C/link-contacts.page:63(p)
 msgid ""
-"The fixed width style allows text to use a fixed width font. To change "
-"existing text, first select the text you want to modify. Then select the "
-"<menuchoice><guimenuitem>Fixed Width</guimenuitem></menuchoice> option from "
-"the <guibutton>Text</guibutton> menu. You can also select the "
-"<menuchoice><guimenuitem>Fixed Width</guimenuitem></menuchoice> option from "
-"the <guibutton>Text</guibutton> before you start typing to have the text you "
-"type be in a fixed width style."
+"From the <gui>Contact List</gui> window, right-click one of the contact that "
+"has different accounts, and select <gui style=\"menuitem\">Link Contacts...</"
+"gui>."
 msgstr ""
+"Desde a xanela <gui>Lista de contactos</gui>, prema co boto�n dereito un dos "
+"contactos que ten diferentes contas, e seleccione <gui style=\"menuitem"
+"\">Ligar contactos...</gui>."
+
+#: C/link-contacts.page:70(p)
+msgid ""
+"From the left pane in the <gui>Link Contacts</gui> window, select the "
+"contacts you want to combine."
+msgstr ""
+"Desde o panel lateral na xanela <gui>Contactos ligados</gui> seleccione os "
+"contactos que quere combinar."
+
+#: C/link-contacts.page:76(p)
+msgid "Click <gui style=\"button\">Link</gui>."
+msgstr "Prema <gui style=\"button\">Ligar</gui>."
 
-#: C/tomboy.xml:601(para)
+#: C/link-contacts.page:82(p)
 msgid ""
-"The <menuchoice><guimenuitem>Fixed Width</guimenuitem></menuchoice> option "
-"is a feature provided by the Fixed Width Add-in. For more information on add-"
-"ins, see <xref linkend=\"plugins\"/>."
+"When a meta-contact has been created, the default contact that will be used "
+"to have a conversation with when you double-click on it, is the contact with "
+"the highest presence on-line."
 msgstr ""
+"Cando se cree un meta-contacto, o contacto predeterminado usarase para ter "
+"unha conversa con el ao premer du�as veces sobre el, este contacto tera� a "
+"presencia en liña ma�is alta."
 
-#: C/tomboy.xml:610(term)
-msgid "Font size"
-msgstr "Tamaño do tipo de letra"
+#: C/link-contacts.page:91(title)
+#| msgid "Creating Notes"
+msgid "Separating contacts"
+msgstr "Separar contactos"
 
-#: C/tomboy.xml:615(guilabel) C/tomboy.xml:625(guilabel)
-msgid "Small"
-msgstr "Pequeno"
+#: C/link-contacts.page:94(p)
+msgid ""
+"From the <gui>Contact List</gui>, right-click the contact to separate, and "
+"select <gui style=\"menuitem\">Link Contacts...</gui>."
+msgstr ""
+"Desde a <gui>Lista de contactos</gui>, prema co boto�n dereito para contactar "
+"con el de forma separada, e seleccione <gui style=\"menuitem\">Ligar "
+"contactos...</gui>."
 
-#: C/tomboy.xml:617(guilabel) C/tomboy.xml:627(guilabel)
-msgid "Normal"
-msgstr "Normal"
+#: C/link-contacts.page:100(p)
+msgid "Click <gui style=\"button\">Unlink</gui>."
+msgstr "Prema <gui style=\"button\">Desligar</gui>."
 
-#: C/tomboy.xml:619(guilabel) C/tomboy.xml:629(guilabel)
-msgid "Large"
-msgstr "Grande"
+#: C/license.page:8(desc)
+msgid "Legal information."
+msgstr "Informacio�n legal."
 
-#: C/tomboy.xml:621(guilabel) C/tomboy.xml:631(guilabel)
-msgid "Huge"
-msgstr "Enorme"
+#: C/license.page:11(title)
+msgid "License"
+msgstr "Licenza"
 
-#: C/tomboy.xml:613(para)
+#: C/license.page:12(p)
 msgid ""
-"There are actually four options in this part of the menu: <placeholder-1/>. "
-"Each one of these options represents a font size to use for the selected "
-"text in the note. To modify the font size, select the text and then select "
-"one of <placeholder-2/> options from the <guibutton>Text</guibutton> menu."
+"This work is distributed under a CreativeCommons Attribution-Share Alike 3.0 "
+"Unported license."
 msgstr ""
+"Este traballo esta� licenciado baixo una Licenza Creative Commons Atribucio�n "
+"- Compartir igual 3.0 sen asistencia."
+
+#: C/license.page:20(p)
+msgid "You are free:"
+msgstr "E� libre de:"
+
+#: C/license.page:25(em)
+msgid "To share"
+msgstr "Compartir"
+
+#: C/license.page:26(p)
+msgid "To copy, distribute and transmit the work."
+msgstr "Copiar, distribui�r e comunicar publicamente a obra"
 
-#: C/tomboy.xml:638(term)
-msgid "Bullets"
-msgstr "Viñetas"
+#: C/license.page:29(em)
+msgid "To remix"
+msgstr "Facer obras derivadas"
 
-#: C/tomboy.xml:646(guilabel)
-msgid "Increase Indent"
-msgstr "Aumentar sangri�a"
+#: C/license.page:30(p)
+msgid "To adapt the work."
+msgstr "Adaptar o traballo."
 
-#: C/tomboy.xml:648(guilabel)
-msgid "Decrease Indent"
-msgstr "Diminui�r sangri�a"
+#: C/license.page:33(p)
+msgid "Under the following conditions:"
+msgstr "Baixo as seguintes condicio�ns:"
 
-#: C/tomboy.xml:641(para)
+#: C/license.page:38(em)
+#| msgid "Introduction"
+msgid "Attribution"
+msgstr "Atribucio�n"
+
+#: C/license.page:39(p)
 msgid ""
-"Select the <menuchoice><guimenuitem>Bullets</guimenuitem></menuchoice> "
-"option from the <guibutton>Text</guibutton> menu to begin or end a bulleted "
-"list. If the cursor is inside a bulleted list, the <placeholder-1/> options "
-"will be enabled."
+"You must attribute the work in the manner specified by the author or "
+"licensor (but not in any way that suggests that they endorse you or your use "
+"of the work)."
 msgstr ""
+"Debe recoñecer os cre�ditos da obra da maneira especificada polo autor ou o "
+"licenciatario (pero non dunha maneira que suxira que ten o seu apoio ou "
+"apoian o uso que fai da su�a obra)."
+
+#: C/license.page:46(em)
+msgid "Share Alike"
+msgstr "Compartir igual"
 
-#: C/tomboy.xml:651(para)
+#: C/license.page:47(p)
 msgid ""
-"With the cursor on a bulleted list line, select the "
-"<menuchoice><guimenuitem>Increase Indent</guimenuitem></menuchoice> option "
-"to shift the current line to the right or the "
-"<menuchoice><guimenuitem>Decrease Indent</guimenuitem></menuchoice> option "
-"to shift the current line to the left."
+"If you alter, transform, or build upon this work, you may distribute the "
+"resulting work only under the same, similar or a compatible license."
 msgstr ""
+"Se modifica, transforma ou constru�e sobre este traballo debe distribui�r o "
+"traballo resultando baixo unha licenza igual, similar ou compati�bel."
 
-#: C/tomboy.xml:660(para)
-msgid "For more information on bullets, see <xref linkend=\"bullets\"/>."
+#: C/license.page:53(p)
+msgid ""
+"For the full text of the license, see the <link href=\"http://"
+"creativecommons.org/licenses/by-sa/3.0/legalcode\">CreativeCommons website</"
+"link>, or read the full <link href=\"http://creativecommons.org/licenses/by-"
+"sa/3.0/\">Commons Deed</link>."
 msgstr ""
+"Pode encontrar o texto completo da licenza vexa o <link href=\"http://"
+"creativecommons.org/licenses/by-sa/3.0/legalcode\">sitio web de "
+"CreativeCommons</link>, ou lea o <link href=\"http://creativecommons.org/"
+"licenses/by-sa/3.0/\">Escrito de Commons</link> completo."
 
-#: C/tomboy.xml:666(term)
-msgid "Find in This Note"
-msgstr "Buscar nesta nota"
+#: C/irc-start-conversation.page:8(desc)
+msgid "Start a conversation with an IRC contact."
+msgstr "Iniciar unha conversa con un contacto do IRC."
 
-#: C/tomboy.xml:669(para)
+#: C/irc-start-conversation.page:30(title)
+msgid "Chat with somebody on IRC"
+msgstr "Conversar con algue�n no IRC"
+
+#: C/irc-start-conversation.page:32(p)
 msgid ""
-"Use this to search for text within the current note. A small find bar will "
-"open up at the bottom of the note. To open the find bar using the keyboard, "
-"use the standard keybinding, <keycombo><keycap>Ctrl</keycap><keycap>F</"
-"keycap></keycombo>."
+"You can hold private conversations with other IRC users, outside of the "
+"public IRC chat rooms. To start a conversation with another IRC user:"
 msgstr ""
+"Pode manter conversas privadas con outros usuarios do IRC, fora das salas "
+"pu�blicas do IRC. Para iniciar unha conversa con outro usuario do IRC:"
 
-#: C/tomboy.xml:677(para)
+#: C/irc-start-conversation.page:37(p)
 msgid ""
-"Enter text to find. After entering text, the matches will be highlighted. "
-"Click <guibutton>Find Next</guibutton> to highlight the next match and place "
-"the cursor there. Click <guibutton>Previous</guibutton> to move to the "
-"previous match."
+"In the contact list for an IRC chat room, double click the name of the user "
+"you want to chat with. Alternatively, right click the name of the user and "
+"choose <gui>Chat</gui>."
 msgstr ""
+"Na lista de contactos para a sala de chat do IRC, prema du�as veces no nome "
+"do usuario co que quere falar. De forma alternativa, prema co boto�n dereito "
+"sobre o nome de usuario e elixa <gui>Conversa</gui>."
 
-#: C/tomboy.xml:683(para)
+#: C/irc-start-conversation.page:45(p)
 msgid ""
-"To close the find bar, click <guibutton>X</guibutton> (Close Button) on the "
-"far left or press the <keycap>Escape</keycap> key."
+"The IRC room contact list is not the same as <app>Empathy</app> contact "
+"list. It contains a list of users in the IRC chat room you joined. Different "
+"rooms can have different contacts listed."
 msgstr ""
-"Para pechar a barra de busca, prema <guibutton>X</guibutton> (botón de "
-"pechar) na parte esquerda ou prema a tecla <keycap>Escape</keycap>."
+"A lista de contactos da sala IRC non e� igual que a lista de contactos de "
+"<app>Empathy</app>. Conte�n unha lista de usuarios na sala de chat do IRC a� "
+"que se uniu. Salas diferentes poden ter diferentes listados de contactos."
 
-#: C/tomboy.xml:692(title)
-msgid "Tools (gear icon)"
+#: C/irc-start-conversation.page:52(p)
+msgid ""
+"The IRC room contact list is usually on the right side of the IRC room "
+"window. If you do not see it, choose <guiseq><gui>Conversation</"
+"gui><gui>Show Contact List</gui></guiseq>."
 msgstr ""
+"A lista de contactos dunha sala de IRC xeralmente esta� na parte dereita da "
+"xanela da sala de IRC. Se non a ve elixa <guiseq><gui>Conversa</"
+"gui><gui>Mostrar a lista de contactos</gui></guiseq>."
 
-#: C/tomboy.xml:694(para)
+#: C/irc-send-file.page:9(desc)
+msgid "<app>Empathy</app> does not currently support sending files using IRC."
+msgstr "Actualmente non e� posi�bel enviar ficheiros mediante o IRC."
+
+#: C/irc-send-file.page:31(title)
+msgid "Send files over IRC"
+msgstr "Enviar ficheiros mediante o IRC"
+
+#: C/irc-send-file.page:33(p)
+msgid "It is not currently possible to send files using IRC."
+msgstr "Actualmente non e� posi�bel enviar ficheiros mediante o IRC."
+
+#: C/irc-nick-password.page:10(desc)
+msgid "Protect your nickname to prevent other IRC users from using it."
+msgstr "Protexa o seu alcume para previr que outros usuarios do IRC o usen."
+
+#: C/irc-nick-password.page:33(title)
+msgid "Use a nickname password on IRC"
+msgstr "Usar un contrasinal para un alcume no IRC"
+
+#: C/irc-nick-password.page:35(p)
 msgid ""
-"The <guibutton>Tools</guibutton> button is represented by the <inlinegraphic "
-"fileref=\"figures/tomboy-tools.png\"/> icon. When you click the "
-"<guiicon>Tools</guiicon> icon on the toolbar present on your note, a menu "
-"will appear with the following items:"
+"On some IRC networks, you can register your nickname with a service called "
+"NickServ. By sending special messages to NickServ, you can set your password "
+"and identify yourself. Some IRC chat rooms may not allow you to join without "
+"a registered nickname."
 msgstr ""
+"Nalgunhas redes IRC pode rexistrar o seu alcume con un servizo chamado "
+"NickServ. Enviando mensaxes especiais a NickServ pode configurar o seu "
+"contrasinal e identificarse. Pode que algunhas salas de conversa IRC non lle "
+"permitan unirse sen un nome rexistrado."
+
+#: C/irc-nick-password.page:40(p)
+msgid ""
+"<app>Empathy</app> does not currently support nickname registration. Some "
+"IRC networks, however, will automatically forward a <em>server password</em> "
+"to NickServ. On these networks, you can use the IRC password in "
+"<app>Empathy</app> to identify yourself to NickServ. The popular freenode "
+"network is known to have this feature."
+msgstr ""
+"Actualmente <app>Empathy</app> non e� compati�bel co rexistro de alcumes. "
+"Pore�n algu�ns servidores de IRC reenviara�n automaticamente un <em>contrasinal "
+"de servidor</em> a NickServ. Nesas redes podera� usar contrasinais de IRC en "
+"<app>Empathy</app> para identificarse contra NickServ. E� coñecido que a "
+"popular rede freenode dispo�n desta caracteri�stica."
+
+#: C/irc-nick-password.page:46(p)
+msgid "To set an IRC server password:"
+msgstr "Para estabelecer un contrasinal de servidor de IRC:"
 
-#: C/tomboy.xml:701(term)
-msgid "Synchronize Notes"
-msgstr "Sincronizar notas"
+#: C/irc-nick-password.page:54(p)
+msgid "Select the IRC account from the list on the left of the dialog."
+msgstr "Seleccione a conta de IRC da lista na parte esquerda do dia�logo."
 
-#: C/tomboy.xml:704(para)
+#: C/irc-nick-password.page:57(p)
 msgid ""
-"Select this option to synchronize your notes with a central server. For more "
-"information on note synchronization, see <xref linkend=\"synchronization\"/>."
+"In the <gui>Password</gui> field, type the password you used to register "
+"your nikcname."
 msgstr ""
+"Na caixa de texto <gui>Contrasinal</gui> escriba o contrasinal que quere "
+"usar para rexistrar o seu alcume."
 
-#: C/tomboy.xml:710(term)
-msgid "What links here?"
-msgstr "Que liga aqui�?"
+#: C/irc-nick-password.page:63(p) C/import-account.page:61(p)
+msgid "Click <gui style=\"button\">Apply</gui>."
+msgstr "Prema <gui style=\"button\">Aplicar</gui>."
 
-#: C/tomboy.xml:713(para)
+#: C/irc-nick-password.page:69(p)
 msgid ""
-"This option allows you to quickly see what other notes link to the current "
-"note. This feature is provided by the Backlinks Add-in. For more information "
-"on add-ins, see <xref linkend=\"plugins\"/>."
+"These instructions only allow you to use a password-protected nickname on "
+"certain IRC networks. It is not currently possible to register an IRC "
+"nickname or change your nickname password using <app>Empathy</app>."
 msgstr ""
+"Estas instrucio�ns so� lle permiten usar un alcume protexido por contrasinal "
+"en certas redes IRC. Actualmente non e� posi�bel rexistrar un alcume IRC ou "
+"cambiar o seu contrasinal de alcume usando <placeholder-1/>."
 
-#: C/tomboy.xml:721(term) C/tomboy.xml:1412(member) C/tomboy.xml:1479(term)
-msgid "Export to HTML"
-msgstr "Exportar a HTML"
+#: C/irc-manage.page:10(desc)
+msgid "How to use IRC with <app>Empathy</app>."
+msgstr "Como usar IRC con <placeholder-1/>."
 
-#: C/tomboy.xml:724(para)
+#: C/irc-manage.page:35(title)
+msgid "Internet Relay Chat (IRC)"
+msgstr "Internet Relay Chat (IRC)"
+
+#: C/irc-manage.page:38(p) C/account-irc.page:39(p)
 msgid ""
-"You can create an <acronym>HTML</acronym> (Hypertext Markup Language) "
-"document from one or more notes by selecting this option. For more "
-"information, please see <xref linkend=\"plugins\"/>."
+"You must have the <sys>telepathy-idle</sys> package installed to use IRC in "
+"<app>Empathy</app>."
 msgstr ""
+"Vostede debe ter instalado o paquete <placeholder-1/> para usar o IRC en "
+"<placeholder-2/>."
+
+#: C/irc-manage.page:42(link)
+msgid "Install telepathy-idle"
+msgstr "Instalar telepathy-idle"
+
+#: C/irc-manage.page:49(title)
+msgid "IRC Chat Rooms and Conversations"
+msgstr "Salas de chat e conversa no IRC."
+
+#: C/irc-manage.page:51(title)
+msgid "Chat Rooms and Conversations"
+msgstr "Salas de char e conversas"
+
+#: C/irc-manage.page:56(title)
+msgid "Common IRC Problems"
+msgstr "Problemas comu�ns no IRC"
 
-#: C/tomboy.xml:732(term)
-msgid "Print"
-msgstr "Imprimir"
+#: C/irc-manage.page:58(title) C/index.page:55(title)
+msgid "Common Problems"
+msgstr "Problemas comu�ns."
 
-#: C/tomboy.xml:735(para) C/tomboy.xml:1538(para)
+#: C/irc-join-room.page:8(desc)
+msgid "Join an IRC channel."
+msgstr "Entrar nunha canle IRC."
+
+#: C/irc-join-room.page:31(title)
+msgid "Join an IRC chat room"
+msgstr "Unirse a unha sala de conversa IRC"
+
+#: C/irc-join-room.page:33(p)
 msgid ""
-"Select this option to print the current note. You will be presented with the "
-"standard GNOME print dialog."
+"You can join IRC chat rooms (also known as IRC channels) on any IRC network "
+"you’re connected to. To connect to an IRC network, see <link xref=\"add-"
+"account\"/> and <link xref=\"account-irc\"/>."
 msgstr ""
-"Seleccione esta opción para imprimir a nota actual. Mostraráselle o diálogo "
-"estándar de impresión de GNOME."
+"Pode unirse a salas de chat IRC (tame�n coñecidas como canles de IRC) en "
+"calquera rede de IRC a� que estea conectado. Para conectarse a unha rede de "
+"IRC consulte a <link xref=\"add-account\"/> e a <link xref=\"account-irc\"/>."
 
-#: C/tomboy.xml:742(para)
+#: C/irc-join-room.page:39(p) C/group-conversations.page:58(p)
+#: C/group-conversations.page:122(p)
 msgid ""
-"Depending on the add-ins that you have installed for Tomboy, you may have "
-"more or less items available in the <guimenu>Tools</guimenu> menu."
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</"
+"gui><gui>Join</gui></guiseq>."
 msgstr ""
+"Desde a xanela <gui>Lista de contactos</gui> elixa <guiseq><gui>Sala</"
+"gui><gui>Unirse</gui></guiseq>."
 
-#: C/tomboy.xml:749(title)
-msgid "Delete"
-msgstr "Borrar"
+#: C/irc-join-room.page:45(p)
+msgid ""
+"From the <gui>Account</gui> drop-down list, select the IRC account that "
+"corresponds to the network you want to use."
+msgstr ""
+"Desde a lista desprega�bel <gui>Conta</gui> elixa a conta IRC que corresponda "
+"coa rede que quere usar."
 
-#: C/tomboy.xml:751(para)
+#: C/irc-join-room.page:51(p)
 msgid ""
-"The <guibutton>Delete</guibutton> button will pop up a dialog box asking if "
-"you want to permanently delete the note and its contents. Click the "
-"<guibutton>Delete</guibutton> button to discard the note permanently, or "
-"<guibutton>Cancel</guibutton> to abort the process. Links to this note from "
-"other notes will still exist, but will re-create the note upon activation."
+"In the <gui>Room</gui> text box, type the name of the channel you want to "
+"join. IRC channel names start with the hash character (<sys>#</sys>)."
 msgstr ""
+"Na caixa de texto <gui>Sala</gui>, escriba o nome da canle de IRC a� que "
+"quere unirse. Preceda o nome co cara�cter almohadilla (<sys>#</sys>)."
 
-#: C/tomboy.xml:763(title)
-msgid "Panel Menu"
-msgstr "Panel de menu�"
+#: C/irc-join-room.page:57(p)
+msgid "Click <gui>Join</gui> to enter the room."
+msgstr "Prema <gui>Unirse</gui> para entrar na sala."
 
-#: C/tomboy.xml:765(para)
+#: C/irc-join-room.page:64(p)
 msgid ""
-"Tomboy keeps the most recently used notes quickly available to you in a menu "
-"that appears when you click on the Tomboy Icon in the GNOME Panel, the "
-"taskbar in Microsoft Windows, or the dock in Mac OS X."
+"To join multiple rooms, you need to repeat the steps above for each room."
 msgstr ""
+"Para entrar en varias salas, debe repetir os pasos anteriores para cada sala."
+
+#: C/irc-join-pwd.page:9(desc)
+msgid "Enter password-protected IRC chat rooms."
+msgstr "Introduza o contrasinal para as salas de char IRC protexidas."
 
-#: C/tomboy.xml:770(title)
-msgid "Note Pinning"
+#: C/irc-join-pwd.page:25(title)
+msgid "Join a protected IRC chat room"
+msgstr "Unirse a unha sala de chat IRC protexida"
+
+#: C/irc-join-pwd.page:27(p)
+msgid ""
+"On some IRC networks, private IRC rooms may be protected with a password. If "
+"you know the password, use the following steps to join:"
 msgstr ""
+"Nalgunhas redes IRC as salas privadas de IRC poden estar protexidas por "
+"contrasinal. Se sabe o contrasinal, realice os seguintes pasos para unirse:"
+
+#: C/irc-join-pwd.page:33(p)
+msgid "<link xref=\"irc-join-room\">Join the room</link> as normal."
+msgstr "<link xref=\"irc-join-room\">Unirse a� sala</link> de forma normal."
 
-#: C/tomboy.xml:772(para)
+#: C/irc-join-pwd.page:38(p)
 msgid ""
-"To force a note to always be in the panel menu regardless of when you last "
-"accessed it, click the thumbtack icon to \"pin\" it to the menu. Notes that "
-"are pinned to the panel menu will have a thumbtack icons that look like "
-"this: <inlinegraphic fileref=\"figures/tomboy-pindown.png\"/>. Notes that "
-"are not pinned to the panel menu will have thumbtack icons that look like "
-"this: <inlinegraphic fileref=\"figures/tomboy-pinup.png\"/>."
+"Empathy will prompt you for a password. Enter the password for the IRC chat "
+"room and click <gui style=\"button\">Join</gui>."
 msgstr ""
+"Empathy preguntaralle o contrasinal. Introduza o contrasinal para a sala de "
+"conversa IRC e prema <gui style=\"button\">Unirse</gui>."
 
-#: C/tomboy.xml:781(title)
-msgid "Tomboy Panel Menu"
-msgstr "Menú do panel de Tomboy"
+#: C/irc-commands.page:7(desc)
+msgid "The supported IRC commands."
+msgstr "As ordes de IRC admitidas."
 
-#: C/tomboy.xml:798(title)
-msgid "Begin a bulleted list"
-msgstr "Iniciar unha lista con viñetas"
+#: C/irc-commands.page:18(title)
+msgid "Supported IRC commands"
+msgstr "Ordes IRC admitidas"
 
-#: C/tomboy.xml:800(para)
-msgid "You may begin a bulleted list by using one of the following methods:"
+#: C/irc-commands.page:19(p)
+msgid ""
+"To see the list of the supported IRC commands, in a chat room type <input>/"
+"help</input> and press <key>Enter</key>."
 msgstr ""
+"Para ver unha lista de ordes de IRC admitidos, nunha sala de conversa "
+"escriba <input>/help</input> e prema <key>Intro</key>."
 
-#: C/tomboy.xml:805(para) C/tomboy.xml:826(para)
+#: C/irc-commands.page:24(p)
+msgid "All commands available have a small description on their usage."
+msgstr ""
+"Todos as ordes dispoñi�beis teñen unha pequena descricio�n sobre o se uso."
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/introduction.page:41(None)
+#| msgid ""
+#| "@@image: 'figures/tomboy-main-menu.png'; "
+#| "md5=420af676a38a074abd5431e7a07d1fec"
 msgid ""
-"Select <menuchoice><guimenuitem>Bullets</guimenuitem></menuchoice> from the "
-"<guibutton>Text</guibutton> menu."
+"@@image: 'figures/empathy-main-window.png'; "
+"md5=54908dcb2588beddb15ef0968d2c2582"
 msgstr ""
+"@@image: 'figures/empathy-main-window.png'; "
+"md5=54908dcb2588beddb15ef0968d2c2582"
+
+#: C/introduction.page:9(desc)
+msgid "Introduction to the <app>Empathy</app> instant messenger."
+msgstr "Introducio�n ao programa de mensaxari�a instanta�nea <app>Empathy</app>."
 
-#: C/tomboy.xml:812(para)
+#: C/introduction.page:21(title)
+msgid "Introduction"
+msgstr "Introduccio�n"
+
+#: C/introduction.page:23(p)
 msgid ""
-"Begin a line with a single dash character (-), type some text immediately "
-"following the dash, and press <keycap>Enter</keycap>."
+"<app>Empathy</app> is an instant messaging application for the GNOME "
+"Desktop. It supports text messaging, voice &amp; video calls, file "
+"transfers, and all the most used messaging systems such as MSN and Google "
+"Talk."
 msgstr ""
+"<app>Empathy</app> e� un aplicativo de mensaxari�a instanta�nea para o "
+"Escritorio GNOME. E� compati�bel con mensaxes de texto, chamas de voz e "
+"vi�deochamadas, transferencia de ficheiro e os sistemas de mensaxari�a ma�is "
+"populares como MSN e Google Talk."
 
-#: C/tomboy.xml:820(title)
-msgid "End a bulleted list"
-msgstr "Rematar unha lista con viñetas"
+#: C/introduction.page:28(p)
+msgid ""
+"<app>Empathy</app> includes features that help you better collaborate while "
+"at work, and that let you easily keep in touch with your friends."
+msgstr ""
+"<app>Empathy</app> inclu�e caracteri�sticas que lle axudara�n a colaborar "
+"mellor no traballo e permitiranlle manterse en contacto cos seus amigos de "
+"forma sinxela."
 
-#: C/tomboy.xml:822(para)
-msgid "End a bulleted list by doing one of the following:"
+#: C/introduction.page:32(p)
+msgid ""
+"Using <app>Empathy</app>, you can group all the conversations in a single "
+"window, have multiple windows for different kind of conversations, easily "
+"search through your previous conversations, and share your desktop in just "
+"two clicks."
 msgstr ""
+"Usando <app>Empathy</app> pode agrupar as conversas nunha u�nica xanela ou "
+"ter mu�ltiples xanelas para os diferentes tipos de conversas; busca sinxela "
+"das su�as conversas anteriores e comparticio�n do seu escritorio con un so� un "
+"par de clics de rato."
 
-#: C/tomboy.xml:833(para)
-msgid "Press <keycap>Enter</keycap> on a blank bulleted line."
+#: C/introduction.page:39(title)
+msgid "<gui>Contact List</gui> window"
+msgstr "Xanela de <gui>Lista de contactos</gui>"
+
+#: C/introduction.page:40(desc)
+msgid "<app>Empathy</app> main window"
+msgstr "Xanela principal de <app>Empathy</app>"
+
+#: C/introduction.page:42(p)
+msgid "<app>Empathy</app> main window."
+msgstr "Xanela principal de <app>Empathy</app>."
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/index.page:28(None)
+#| msgid ""
+#| "@@image: 'figures/delete-notebook.png'; "
+#| "md5=f1b41a9034715d6314ee36b66389c897"
+msgid ""
+"@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2"
 msgstr ""
+"@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2"
+
+#: C/index.page:7(title) C/index.page:8(title)
+msgid "Empathy Internet Messenger"
+msgstr "Mensaxaría da Internet Empathy"
 
-#: C/tomboy.xml:837(para)
+#: C/index.page:27(title)
 msgid ""
-"Select <menuchoice><guimenuitem>Decrease Indent</guimenuitem></menuchoice> "
-"from the <guibutton>Text</guibutton> menu in succession until the current "
-"line is no longer part of the bulleted list."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> "
+"Empathy Internet Messenger logo </media> Empathy Internet Messenger"
 msgstr ""
+"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png"
+"\">Logotipo da mensaxari�a instanta�nea Empathy</media>Mensaxeiro da Internet "
+"Empathy"
+
+#: C/index.page:35(title)
+msgid "Account Management"
+msgstr "Xestio�n da cona"
+
+#: C/index.page:39(title)
+msgid "Contact Management"
+msgstr "Xestio�n de contactos"
+
+#: C/index.page:43(title)
+msgid "Text Conversations"
+msgstr "Conversas de texto"
+
+#: C/index.page:47(title)
+msgid "Audio and Video Conversations"
+msgstr "Conversas de son e vi�deo"
+
+#: C/index.page:51(title)
+msgid "Advanced Actions"
+msgstr "Accio�ns avanzadas"
+
+#: C/import-account.page:10(desc)
+msgid "Import an account from another instant messaging application."
+msgstr "Importar unha conta de outro aplicativo de mensaxari�a instanta�nea."
+
+#: C/import-account.page:19(name)
+msgid "Peter Haslam"
+msgstr "Peter Haslam"
 
-#: C/tomboy.xml:845(para)
+#: C/import-account.page:20(email)
+msgid "peter.haslam@freenet.de"
+msgstr "peter.haslam@freenet.de"
+
+#: C/import-account.page:42(title)
+msgid "Import an existing account"
+msgstr "Importar unha conta existente"
+
+#: C/import-account.page:44(p)
 msgid ""
-"Using the key combination <keycombo><keycap>Shift</keycap><keycap>Tab</"
-"keycap></keycombo> in succession until the current line is no longer part of "
-"the bulleted list."
+"The first time you run <app>Empathy</app>, it will offer to import your "
+"accounts from other instant messaging applications. Currently, the only "
+"supported application is <app>Pidgin</app>."
 msgstr ""
+"A primeira vez que executa <app>Empathy</app> ofrecera�selle importar as su�as "
+"contas de outros aplicativos de mensaxari�a instanta�nea. Actualmente a u�nica "
+"aplicacio�n compati�bel e� <app>Pidgin</app>."
 
-#: C/tomboy.xml:856(title)
-msgid "Increase Indentation"
-msgstr "Aumentar a sangri�a"
+#: C/import-account.page:50(p)
+msgid ""
+"Run <app>Empathy</app> for the first time. An assistant will offer you a "
+"number of options to create new accounts."
+msgstr ""
+"Execute <app>Empathy</app> por primeira vez. Aparecera� un asistente que lle "
+"permitira� crear novas contas de distintos servizos."
 
-#: C/tomboy.xml:858(para)
-msgid "To increase the line indentation in a bulleted list with the mouse:"
-msgstr "Para incrementar a sangri�a da liña nunha lista de viñetas co rato:"
+#: C/import-account.page:54(p)
+msgid ""
+"Select <gui>Yes, import my account details from</gui> and click "
+"<gui>Forward</gui>."
+msgstr ""
+"Seleccione <gui>Si, importar os detalles da miña conta desde </gui>e prema "
+"en <gui>Seguinte</gui>."
+
+#: C/import-account.page:58(p)
+msgid "Select the check box next to each account you wish to import."
+msgstr "Marque a caixa de verificacio�n xunto a cada conta que queira importar"
 
-#: C/tomboy.xml:863(para)
+#: C/import-account.page:66(p)
 msgid ""
-"Select <menuchoice><guimenuitem>Increase Indent</guimenuitem></menuchoice> "
-"from the <guibutton>Text</guibutton> menu."
+"It is not currently possible to import accounts after you have completed the "
+"first-run assistant."
 msgstr ""
-"Seleccione <menuchoice><guimenuitem>Incrementar sangría</guimenuitem></"
-"menuchoice> desde o menú <guibutton>Texto</guibutton>."
+"Actualmente non e� posi�bel importar contas despois de ter completado o "
+"asistente de primeira execucio�n."
 
-#: C/tomboy.xml:870(para)
-msgid "To increase the line indentation in a bulleted list with the keyboard:"
-msgstr "Para incrementar a sangri�a da liña nunha lista de viñetas co rato:"
+#: C/hide-contacts.page:8(desc)
+msgid "Hide the offline contacts from your <gui>Contact List</gui>."
+msgstr ""
+"Ocultar os contactos desconectados da su�a <gui>Lista de contactos</gui>."
 
-#: C/tomboy.xml:875(para)
-msgid "Press the <keycap>Tab</keycap> key."
-msgstr "Prema a tecla <keycap>Tab</keycap>."
+#: C/hide-contacts.page:19(title)
+msgid "Hide offline contacts"
+msgstr "Ocultar os contactos desconectados"
 
-#: C/tomboy.xml:881(title)
-msgid "Decrease Indentation"
-msgstr "Diminuír a sangri�a"
+#: C/hide-contacts.page:21(p)
+msgid ""
+"Normally, <app>Empathy</app> shows all your contacts: those that are online, "
+"with which you can have a conversation, and also those that are offline."
+msgstr ""
+"Normalmente <app>Empathy</app> mostra todos os contactos: os que esta�n "
+"conectados, cos que pode estabelecer unha conversa, e tame�n os que esta�n "
+"desconectados."
 
-#: C/tomboy.xml:883(para)
-msgid "To decrease the line indentation in a bulleted list with the mouse:"
-msgstr "Para reducir a sangría da liña nunha lista de viñetas co rato:"
+#: C/hide-contacts.page:25(p)
+msgid "To hide the contacts that are offline:"
+msgstr "Para agochar os contactos desconectados."
 
-#: C/tomboy.xml:888(para)
+#: C/hide-contacts.page:31(p)
 msgid ""
-"Select <menuchoice><guimenuitem>Decrease Indent</guimenuitem></menuchoice> "
-"from the <guibutton>Text</guibutton> menu."
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>View</"
+"gui><gui>Offline Contacts</gui></guiseq>, or press <keyseq><key>Ctrl</"
+"key><key>H</key></keyseq>."
 msgstr ""
+"Desde a xanela <gui>Lista de contactos</gui> elixa <guiseq><gui>Ver</"
+"gui><gui>Contactos desconectados</gui></guiseq> ou prema <keyseq><key>Ctrl</"
+"key><key>H</key></keyseq>."
 
-#: C/tomboy.xml:895(para)
-msgid "To decrease the line indentation in a bulleted list with the keyboard:"
+#: C/hide-contacts.page:36(p)
+msgid "To show the offline contacts again, repeat the same procedure above."
 msgstr ""
+"Para mostrar os contactos desconectados de novo, repita o mesmo proceso."
+
+#: C/group-conversations.page:8(desc)
+msgid "Start or join a group conversation with your contacts."
+msgstr "Iniciar ou unirse a un grupo de conversa cos seus contactos."
+
+#: C/group-conversations.page:34(title)
+msgid "Group conversations"
+msgstr "Conversas en grupo"
 
-#: C/tomboy.xml:900(para)
+#: C/group-conversations.page:36(p)
 msgid ""
-"Press the key combination <keycombo><keycap>Shift</keycap><keycap>Tab</"
-"keycap></keycombo>."
+"Group conversations permits you to have text conversations with more than "
+"one contact at the same time."
 msgstr ""
+"As conversas en grupo permi�tenlle manter conversas de texto con ma�is dun "
+"contacto ao mesmo tempo."
 
-#: C/tomboy.xml:913(title)
-msgid "Working with Notebooks"
-msgstr "Traballar con cadernos"
+#: C/group-conversations.page:40(p)
+msgid ""
+"To have a group conversation you need to have a registered account with "
+"either Jabber or Google Talk, or a People Nearby account."
+msgstr ""
+"Para ter unha conversa en grupo debe ter rexistrado unha conta en Jabber ou "
+"Google Talk, ou en Persoas pro�ximas."
 
-#: C/tomboy.xml:915(para)
+#: C/group-conversations.page:46(p)
 msgid ""
-"Notebooks allow you to group related notes together. You can add a note to a "
-"notebook in the Search All Notes window or directly inside of a Note."
+"You can have a group conversation only with the contacts that are using the "
+"same service as yours."
 msgstr ""
-"Os cadernos de notas permi�tenlle agrupar notas relacionadas. Pode engadir "
-"unha nota a un caderno de notas na xanela Buscar en todas as notas ou "
-"directamente dentro dunha nota."
+"Pode ter conversas en grupo so� cos contactos que usan o mesmo servizo que o "
+"seu."
 
-#: C/tomboy.xml:919(title)
-msgid "Creating Notebooks"
-msgstr "Crear cadernos"
+#: C/group-conversations.page:54(title)
+msgid "Start a group conversation"
+msgstr "Iniciar unha conversa en grupo"
 
-#: C/tomboy.xml:921(para)
-msgid "You can create new notebooks using one of the following methods:"
-msgstr "Pode crear novos cadernos usando un dos seguintes métodos:"
+#: C/group-conversations.page:63(p)
+msgid ""
+"From the <gui>Account</gui> drop-down list, select the account you want to "
+"use for the group conversation."
+msgstr ""
+"Desde a lista desprega�bel <gui>Conta</gui> seleccione a conta que queira "
+"usar para a conversa en grupo."
 
-#: C/tomboy.xml:925(para)
+#: C/group-conversations.page:69(p)
 msgid ""
-"Click on the Tomboy note icon present in the GNOME Panel, the taskbar in "
-"Microsoft Windows, or the dock in Mac OS X. A menu will appear"
+"In the <gui>Server</gui> text box, type the name of server in which the "
+"conversation will be hosted."
 msgstr ""
+"Na caixa de texto <gui>Servidor</gui> escriba o nome do servidor no que se "
+"hospedara� a conversa."
 
-#: C/tomboy.xml:929(para)
+#: C/group-conversations.page:73(p)
+msgid "Leave it empty if it will be on the current server."
+msgstr "De�ixeo baleiro se sera� no servidor actual."
+
+#: C/group-conversations.page:78(p)
 msgid ""
-"Select <menuchoice><guimenuitem>Notebooks</guimenuitem><guimenuitem>New "
-"Notebook</guimenuitem></menuchoice>."
+"In the <gui>Room</gui> text box, type the name you want to give to the "
+"conversation."
 msgstr ""
+"Na caixa de texto <gui>Sala</gui> escriba o nome que quere darlle a� conversa."
 
-#: C/tomboy.xml:932(para) C/tomboy.xml:961(para) C/tomboy.xml:969(para)
-msgid "Enter a name for the new notebook."
-msgstr "Escriba un nome para o novo caderno."
+#: C/group-conversations.page:82(p)
+msgid ""
+"This will be the name of the room you are going to have a conversation. This "
+"name will be publicly available for other people to join. It is not possible "
+"to create a private room."
+msgstr ""
+"Este sera� o nome da sala na que vai ter unha conversa. Este nome estara� "
+"publicamente dispoñi�bel para que outras persoas poidan unirse. Non e� posi�bel "
+"crear unha sala privada."
 
-#: C/tomboy.xml:937(title)
+#: C/group-conversations.page:90(p)
 msgid ""
-"Create a new notebook from the Tomboy note icon on the GNOME Panel, the "
-"taskbar in Microsoft Windows, or the dock in Mac OS X"
+"To invite other contacts to join the group conversation, from the "
+"<gui>Contact List</gui> window, select the contact you want to invite, and "
+"perform one of the following:"
 msgstr ""
+"Para invitar a outros contactos a unirse a� conversa en grupo, desde a xanela "
+"<gui>Lista de contactos</gui> seleccione o contacto que quere invitar e "
+"realice unha das seguintes accio�ns:"
 
-#: C/tomboy.xml:946(para)
-msgid "To create a new notebook from the Search All Notes dialog:"
-msgstr "Para crear un novo caderno desde o diálogo Buscar en tódalas notas:"
+#: C/group-conversations.page:97(p)
+msgid "Right-click on the contact and choose <gui>Invite to chatroom</gui>."
+msgstr ""
+"Prema co boto�n dereito do rato sobre o contacto e elixa <gui>Invitar a� sala "
+"de conversa</gui>."
 
-#: C/tomboy.xml:950(para) C/tomboy.xml:996(para) C/tomboy.xml:1033(para)
-#: C/tomboy.xml:1077(para)
+#: C/group-conversations.page:102(p)
 msgid ""
-"Open <menuchoice><guimenuitem>Search All Notes</guimenuitem></menuchoice> by "
-"choosing it from the Tomboy icon on the GNOME Panel, the taskbar in "
-"Microsoft Windows, or the dock in Mac OS X, or click on Search from an open "
-"note."
+"Choose <guiseq><gui>Edit</gui><gui>Contact</gui><gui>Invite to chatroom</"
+"gui></guiseq>."
 msgstr ""
+"Seleccione <guiseq><gui>Editar</gui><gui>Contacto</gui><gui>Invitar a� sala "
+"de conversa</gui></guiseq>."
 
-#: C/tomboy.xml:956(para)
+#: C/group-conversations.page:107(p)
 msgid ""
-"Using your mouse, right click in the left hand box and choose "
-"<menuchoice><guimenuitem>New Notebook</guimenuitem></menuchoice>."
+"If you have more than one group conversation open, select the one you want "
+"to invite your contacts."
+msgstr ""
+"Se ten ma�is dunha conversa en grupo aberta seleccione na que quere invitar "
+"aos seus contactos."
+
+#: C/group-conversations.page:118(title)
+msgid "Join a group conversation"
+msgstr "Unirse a unha conversa en grupo"
+
+#: C/group-conversations.page:128(p)
+msgid "Expand the <gui>Room List</gui> section to see all the existing rooms."
 msgstr ""
+"Expanda a seccio�n <gui>Lista de salas</gui> para ver todas as salas "
+"existentes."
 
-#: C/tomboy.xml:964(para)
+#: C/group-conversations.page:133(p)
+#| msgid "Double-click on a note."
+msgid "Double-click on the name of a room to join it."
+msgstr "Prema du�as veces sobre o nome dunha sala a� que queira unirse."
+
+#: C/group-conversations.page:139(p)
 msgid ""
-"With <guilabel>Search All Notes</guilabel> open, choose "
-"<menuchoice><guimenuitem>File</guimenuitem><guimenuitem>Notebooks</"
-"guimenuitem><guimenuitem>New Notebook</guimenuitem></menuchoice>."
+"It is not possible to join all existing rooms. Some of the rooms might "
+"require a password, or might be invitation only. <app>Empathy</app> does not "
+"support these kind of rooms."
 msgstr ""
+"Non e� posi�bel unirse a todas as salas existentes. Algunhas salas poden "
+"requirir un contrasinal ou poden ser de so� invitacio�n. <app>Empathy</app> "
+"non e� compati�bel este tipo de salas."
 
-#: C/tomboy.xml:975(title)
-msgid "Create a new notebook from Search All Notes"
-msgstr "Crear un novo caderno desde Buscar en tódalas notas"
+#: C/geolocation-what-is.page:9(desc)
+msgid "Understanding geolocation."
+msgstr "Entender a xeolocalizacio�n."
 
-#: C/tomboy.xml:987(title)
-msgid "Adding Notes to a Notebook"
-msgstr "Engadir notas a un caderno"
+#: C/geolocation-what-is.page:33(title)
+msgid "What is geolocation"
+msgstr "Que e� a xeolocalizacio�n"
 
-#: C/tomboy.xml:989(para)
+#: C/geolocation-what-is.page:35(p)
 msgid ""
-"To add notes to a notebook, you can add a note from the <guilabel>Search All "
-"Notes</guilabel> dialog or directly within a note."
+"Geolocation allows you to identify the real geographical location of a "
+"computer or a device connected to the Internet."
 msgstr ""
-"Para engadir notas a un caderno, pode engadir unha nota desde o diálogo "
-"<guilabel>Buscar en tódalas notas</guilabel> ou directamente na mesma nota."
+"A xeolocalizacio�n permi�telle identificar a localizacio�n xeogra�fica real dun "
+"equipo ou un dispositivo conectado a Internet."
+
+#: C/geolocation-what-is.page:37(p)
+msgid "With geolocation in <app>Empathy</app> you can:"
+msgstr "Coa xeolocalizacio�n en <app>Empathy</app> vostede pode:"
+
+#: C/geolocation-what-is.page:42(p)
+msgid "Publish your geographical location to your contacts."
+msgstr "Publicar a su�a informacio�n xeogra�fica aos seus contactos."
 
-#: C/tomboy.xml:992(para)
-msgid "To move an existing note from the Search All Notes dialog:"
+#: C/geolocation-what-is.page:47(p)
+msgid "See your contacts’ geographical location and quickly contact them."
 msgstr ""
-"Para mover unha nova existente desde o diálogo Buscar en tódalas notas:"
+"Vexa a localizacio�n xeogra�fica dos seus contactos e contacte con eles "
+"rapidamente."
 
-#: C/tomboy.xml:1001(para)
-msgid "Using your mouse, drag the note(s) onto a notebook on the left."
-msgstr "Usando o seu rato, arrastre a(s) nota(s) sobre o caderno na esquerda."
+#: C/geolocation-what-is.page:52(p)
+msgid ""
+"Set the accuracy of your location and the device used to discover your "
+"location."
+msgstr ""
+"Estabeleza a precisio�n da su�a localizacio�n e o dispositivo que usar para "
+"descubrir a su�a localizacio�n."
 
-#: C/tomboy.xml:1006(para)
+#: C/geolocation-what-is.page:60(p)
 msgid ""
-"As you type a note, you can add the note directly to an existing notebook "
-"using the <guimenu>Notebook</guimenu> button. The <guimenu>Notebook</"
-"guimenu> button is represented by the <inlinegraphic fileref=\"figures/"
-"notebook-icon.png\"/> icon."
+"In order to see your contacts’ geographical locations, they need to use a "
+"service and an application that supports geolocation."
 msgstr ""
+"Para poder ver as localizacio�ns xeogra�ficas dos seus contactos, estes deben "
+"usan un servizo e un aplicativo que admita a xeolocalizacio�n."
 
-#: C/tomboy.xml:1012(title)
-msgid "Adding a note to a notebook"
-msgstr "Engadir unha nota a un caderno"
+#: C/geolocation-turn.page:9(desc)
+msgid "How to activate and deactivate geolocation in <app>Empathy</app>."
+msgstr "Como activar e desactivar a xeolocalizacio�n en <placeholder-1/>."
 
-#: C/tomboy.xml:1025(title)
-msgid "Creating Notebook Templates"
-msgstr "Crear plantillas de caderno"
+#: C/geolocation-turn.page:33(title)
+msgid "Activate/Deactivate geolocation"
+msgstr "Activar e desactivar a xeolocalizacio�n"
 
-#: C/tomboy.xml:1027(para)
+#: C/geolocation-turn.page:37(p)
+msgid "Choose <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>."
+msgstr "Elixa <guiseq><gui>Editar</gui><gui>Preferencias</gui></guiseq>."
+
+#: C/geolocation-turn.page:42(p)
+msgid "Select the <gui>Location</gui> tab."
+msgstr "Seleccione o separador <gui>Localizacio�n</gui>."
+
+#: C/geolocation-turn.page:47(p)
 msgid ""
-"After you create a notebook, you can create a template for each new note "
-"that you create in a specific notebook."
+"Select <gui>Publish location to my contacts</gui> to activate geolocation."
 msgstr ""
+"Seleccione <gui>Publicar a miña localizacio�n aos meus contactos</gui> para "
+"activar a xeolocalizacio�n."
+
+#: C/geolocation-turn.page:50(p)
+msgid "To deactivate geolocation, deselect it."
+msgstr "Para desactivar a xeolocalizacio�n, deseleccio�nea."
 
-#: C/tomboy.xml:1038(para)
+#: C/geolocation-turn.page:55(p)
 msgid ""
-"Using your mouse, right click on a Notebook that you have created and choose "
-"<menuchoice><guimenuitem>Open Template Note</guimenuitem></menuchoice>."
+"To increase the accuracy of your position, deselect <gui>Reduce location "
+"accuracy</gui>."
 msgstr ""
+"Para aumentar a precisio�n da su�a posicio�n, deseleccione <gui>Reducir a "
+"precisio�n da localizacio�n</gui>."
 
-#: C/tomboy.xml:1043(para)
+#: C/geolocation-turn.page:61(p)
 msgid ""
-"This will open a new note that will be used as the template. Any text typed "
-"in this note will appear in all notes created in this Notebook. Create a new "
-"note in the notebook by using your mouse, right click on a notebook and "
-"select <menuchoice><guimenuitem>New Note</guimenuitem></menuchoice>."
+"If you have an external device like a GPS or want to send a more accurate "
+"position, select the appropriate option in the <gui>Location sources</gui> "
+"section."
 msgstr ""
+"Se ten un dispositivo externo como un GPS e quere enviar unha posicio�n ma�is "
+"exacta, seleccione a opcio�n axeitada na seccio�n <gui>Orixes das "
+"localizacio�ns</gui>."
 
-#: C/tomboy.xml:1052(title)
-msgid "Creating a Notebook Template"
-msgstr "Crear unha plantilla de caderno"
+#: C/geolocation-supported.page:7(desc)
+msgid "Services that supports geolocation and compatibility."
+msgstr "Servizos que admiten xeolocalizacio�n e compatibilidade."
 
-#: C/tomboy.xml:1065(title) C/tomboy.xml:1088(title)
-msgid "Deleting a Notebook"
-msgstr "Eliminar un caderno"
+#: C/geolocation-supported.page:31(title)
+msgid "Supported services"
+msgstr "Servizos admitidos"
 
-#: C/tomboy.xml:1066(para)
+#: C/geolocation-supported.page:33(p)
 msgid ""
-"Deleting a notebook will not delete any of the notes which are currently "
-"inside the notebook. After deleting a notebook, the notes will not be "
-"associated with any notebook and can be seen by highlighting "
-"<menuchoice><guimenuitem>Unfiled Notes</guimenuitem></menuchoice> in the "
-"<menuchoice><guimenuitem>Search All Notes</guimenuitem></menuchoice> window."
+"The geolocation feature at the moment is compatible only with the Jabber "
+"service. In order to use it, you and your contacts need to have a Jabber "
+"account."
 msgstr ""
+"Polo momento a opcio�n de xeolocalizacio�n so�'e� compati�bel co servizo Jabber. "
+"Para poder usala, vostede e os seus contactos deben ter unha conta de Jabber."
 
-#: C/tomboy.xml:1072(para)
-msgid "You can delete a notebook you have created by one of two methods:"
+#: C/geolocation-supported.page:39(p)
+msgid ""
+"It is necessary that also the server you are using supports the geolocation "
+"feature. Most of the Jabber servers support it. See your service website "
+"documentation for more information."
 msgstr ""
+"Tame�n e� necesario que o servidor que esta� usando sexa compati�bel coa opcio�n "
+"de xeolocalizacio�n. A maiori�a dos servidores teñen compatibilidade. Vexa a "
+"pa�xina web de documentacio�n do seu servizo para obter ma�is informacio�n."
 
-#: C/tomboy.xml:1074(para)
-msgid "To delete a notebook using your mouse:"
-msgstr "Para eliminar un caderno usando o seu rato:"
+#: C/geolocation-supported.page:47(title)
+msgid "Compatibility"
+msgstr "Compatibilidade"
 
-#: C/tomboy.xml:1082(para)
+#: C/geolocation-supported.page:49(p)
 msgid ""
-"Using your mouse, right click on a Notebook that you have created and choose "
-"<menuchoice><guimenuitem>Delete Notebook</guimenuitem></menuchoice>."
+"<app>Empathy</app> geolocation feature is not compatible with other "
+"geographical position services such as <em>Google Latitude</em>, <em>Yahoo "
+"Fire Eagle</em> or <em>Brightkite</em>."
 msgstr ""
-"Usando o seu rato, prema co botón dereito sobre un caderno que teña creado e "
-"seleccione <menuchoice><guimenuitem>Eliminar caderno</guimenuitem></"
-"menuchoice>."
+"A caracteri�stica de xeolocalizacio�n de <app>Empathy</app> non e� compati�bel "
+"con outros servizos de posicio�n xeogra�fica tales como <em>Google Latitude</"
+"em>, <em>Yahoo Fire Eagle</em> ou <em>Brightkite</em>."
+
+#: C/geolocation-privacy.page:8(desc)
+msgid "What information are sent and to who."
+msgstr "Que informacio�n se envi�a e a que�n."
 
-#: C/tomboy.xml:1097(para)
+#: C/geolocation-privacy.page:32(title)
+msgid "Geolocation Privacy"
+msgstr "Privacidade na xeolocalizacio�n"
+
+#: C/geolocation-privacy.page:35(title)
+msgid "What information is sent"
+msgstr "Que informacio�n se envi�a"
+
+#: C/geolocation-privacy.page:36(p)
 msgid ""
-"To delete a Notebook from the <menuchoice><guimenuitem>Search All Notes</"
-"guimenuitem></menuchoice> menu, open <menuchoice><guimenuitem>Search All "
-"Notes</guimenuitem></menuchoice> by choosing it from the Tomboy icon on the "
-"GNOME Panel, the taskbar in Microsoft Windows, or the dock in Mac OS X."
+"What is possible to send is: your country, region, locality, area, street, "
+"building, floor, room, and postal code, longitude, latitude and altitude, "
+"speed and bearing."
 msgstr ""
+"E� posi�bel enviar: o seu pai�s, rexio�n, localidade, a�rea, calle, edificio, "
+"planta, habitacio�n, co�digo postal, lonxitude e latitude, velocidade e "
+"orientacio�n."
 
-#: C/tomboy.xml:1103(para)
-msgid "Using your mouse, left click on the Notebook you want to delete."
+#: C/geolocation-privacy.page:40(p)
+msgid ""
+"The accuracy and the quantity of information about your geographical "
+"position are based on the software or on the infrastructure used to discover "
+"your position."
 msgstr ""
-"Usando o rato, prema co botón esquerdo sobre o caderno que quere eliminar."
+"A precisio�n e cantidade de informacio�n sobre a su�a posicio�n xeogra�fica "
+"basease no software ou na infraestrutura usada para descubrir a su�a posicio�n."
 
-#: C/tomboy.xml:1107(para)
+#: C/geolocation-privacy.page:44(p)
 msgid ""
-"From the menu, choose <menuchoice><guimenuitem>Edit</"
-"guimenuitem><guimenuitem>Delete Notebook</guimenuitem></menuchoice>"
+"Different kind of networks may have different accuracy settings, and may "
+"send different information. The use of external devices such as GPS or "
+"mobile phone will increase the accuracy of the information sent."
 msgstr ""
-"Desde o menú, seleccione <menuchoice><guimenuitem>Editar</"
-"guimenuitem><guimenuitem>Eliminar caderno</guimenuitem></menuchoice>"
+"Diferentes tipos de redes poden ter diferentes axustes de precisio�n e poden "
+"enviar informacio�n diferente. O uso de dispositivos externos tales como un "
+"GPS ou tele�fono mo�bil pode incrementar a precisio�n da informacio�n enviada."
 
-#: C/tomboy.xml:1121(title)
-msgid "Note Synchronization"
-msgstr "Sincronización de notas"
+#: C/geolocation-privacy.page:49(p)
+msgid ""
+"When the privacy mode is enabled, nothing more precise than your city will "
+"be sent, even if you are using an external device."
+msgstr ""
+"Cando o modo de privacidade esta� activo non se enviara� nada ma�is preciso que "
+"a su�a cidade, incluso se esta� usando un dispositivo externo."
+
+#: C/geolocation-privacy.page:56(title)
+msgid "Who can see the information sent"
+msgstr "Quen pode ver a informacio�n enviada"
+
+#: C/geolocation-privacy.page:57(p)
+msgid "Only your contacts can see your geographical position."
+msgstr "So� os seus contactos poden ver a su�a posicio�n xeogra�fica."
 
-#: C/tomboy.xml:1123(para)
+#: C/geolocation-privacy.page:63(title)
+#| msgid "What links here?"
+msgid "What is the privacy mode"
+msgstr "Que e� o modo de privacidade"
+
+#: C/geolocation-privacy.page:64(p)
 msgid ""
-"Tomboy can now keep your notes synchronized between multiple computers by "
-"relying on a central server."
+"The privacy mode, enabled by default, is a reduced accuracy mode that will "
+"decrease the accuracy of the geographical position sent to your contacts."
 msgstr ""
-"Tomboy pode manter as súas notas sincronizadas entre varios computadores "
-"mediante un servidor central."
+"O modo de privacidade, activado por omisio�n, e� un modo de precisio�n reducida "
+"da informacio�n de posicio�n xeogra�fica enviada aos seus contactos."
+
+#: C/geolocation-privacy.page:71(title)
+msgid "Privacy overview"
+msgstr "Vista previa da privacidade"
+
+#: C/geolocation-privacy.page:72(p)
+msgid ""
+"Overview of the various geolocation privacy settings in <app>Empathy</app>."
+msgstr ""
+"Visio�n xeral dos axustes de privacidade na xeolocalizacio�n de <app>Empathy</"
+"app>."
+
+#: C/geolocation-privacy.page:77(p)
+msgid "Geolocation is not enabled by default."
+msgstr "De forma predefinida a xeolocalizacio�n non esta� activada."
 
-#: C/tomboy.xml:1127(title)
-msgid "Configure note synchronization"
-msgstr "Configurar a sincronización de notas"
+#: C/geolocation-privacy.page:82(p)
+msgid "Privacy mode is enabled by default."
+msgstr "De forma predefinida o modo de privacidade esta� activado."
 
-#: C/tomboy.xml:1129(para)
+#: C/geolocation-privacy.page:87(p)
 msgid ""
-"You can configure your note synchronization preferences in the "
-"<guilabel>Synchronization</guilabel> tab of the <interface>Tomboy "
-"Preferences</interface> dialog. Default conflict handling behavior can be "
-"configured by selecting the <guibutton>Advanced...</guibutton> button."
+"Privacy mode prevails even when using external and more precise devices."
 msgstr ""
+"O modo de privacidade prevalece incluso cando se esta� usando dispositivos "
+"externos ma�is precisos."
 
-#: C/tomboy.xml:1135(title)
-msgid "Tomboy Synchronization Preferences"
-msgstr "Preferencias de sincronización de Tomboy"
+#: C/geolocation-privacy.page:92(p)
+msgid "Only your contacts can see your position."
+msgstr "So� os seus contactos poden ver a su�a posicio�n."
 
-#: C/tomboy.xml:1145(title)
-msgid "Configure note synchronization service (WebDAV)"
-msgstr "Configurar o servizo de sincronización de notas (WebDAV)"
+#: C/geolocation-not-showing.page:8(desc)
+msgid "<app>Empathy</app> does not publish my geographical position."
+msgstr "<app>Empathy</app> non publica a miña posicio�n xeogra�fica."
 
-#: C/tomboy.xml:1147(para)
+#: C/geolocation-not-showing.page:32(title)
+msgid "Geographical position not published"
+msgstr "Posicio�n xeogra�fica non publicada"
+
+#: C/geolocation-not-showing.page:34(p)
 msgid ""
-"In order to synchronize your notes with a WebDAV server, you will need the "
-"wdfs FUSE file system installed. Follow the documentation for your operating "
-"system to set up FUSE for your user. You will also need the GNOME Keyring "
-"installed."
+"If your contacts cannot see your location, <app>Empathy</app> might not be "
+"able to discover with a good margin of precision your geographical position."
 msgstr ""
+"Se os contactos non poden ver a su�a posicio�n, <app>Empathy</app> pode non "
+"ser capaz de descubrir a su�a posicio�n xeogra�fica con unha boa marxe de "
+"precisio�n."
 
-#: C/tomboy.xml:1151(para)
+#: C/geolocation-not-showing.page:38(p)
 msgid ""
-"Choose <guimenuitem>WebDAV</guimenuitem> from the <guilabel>Service</"
-"guilabel> drop-down list. Fill in the connection information for your "
-"server, and then select the <guibutton>Save</guibutton> button. You are now "
-"ready to synchronize your notes."
+"In this case, your position will not be published, but you are still able to "
+"see the location of your contacts."
 msgstr ""
+"Neste caso non se publicara� a su�a posicio�n pero ai�nda asi� podera� ver a "
+"posicio�n dos seus contactos."
 
-#: C/tomboy.xml:1157(title)
-msgid "Configure note synchronization service (SSH)"
-msgstr "Configurar o servizo de sincronizacio�n de notas (SSH)"
+#: C/geolocation-not-showing.page:42(p)
+msgid ""
+"If you want to publish your geographical position, you can try to use an "
+"external device such as a GPS."
+msgstr ""
+"Se quere publicar a su�a posicio�n xeogra�fica pode intentar usar un "
+"dispositivo externo tal como un GPS."
 
-#: C/tomboy.xml:1159(para)
+#: C/geolocation-not-showing.page:48(p)
 msgid ""
-"In order to synchronize your notes with an SSH server, you will need the "
-"sshfs FUSE file system installed. Follow the documentation for your "
-"operating system to set up FUSE for your user. You will also need an SSH key "
-"for your SSH server account, which should be added to a running SSH daemon. "
-"This can be done using the GNOME <application>Seahorse</application> "
-"application, which is also known as <application>Passwords and Encryption "
-"Keys</application>."
+"In order to publish your geographical location, your Jabber server needs to "
+"support the Personal Eventing Protocal (PEP). A list of <link href=\"http://"
+"coccinella.im/servers/servers_by_pubsub_pep.html\">servers which support "
+"PEP</link> is maintained online. Google Talk does not support this feature "
+"at this time."
 msgstr ""
+"Para publicar a su�a localizacio�n xeogra�fica o seu servidor Jabber debe ser "
+"compati�bel co protocolo de eventos persoais (PEP). Mantense en liña unha "
+"lista dos <link href=\"http://coccinella.im/servers/servers_by_pubsub_pep."
+"html\">servidores que admiten PEP</link>. Polo momento Google Talk non e� "
+"compati�bel con esta caracteri�stica."
+
+#: C/geolocation.page:8(desc)
+msgid "Use and understand geolocation in <app>Empathy</app>."
+msgstr "Usar e entender a xeolocalizaco�n en <app>Empathy</app>."
+
+#: C/geolocation.page:32(title)
+msgid "Geographical position"
+msgstr "Posicio�n xeogra�fica"
+
+#: C/geolocation.page:35(title)
+msgid "Geolocation"
+msgstr "Xeolocalizacio�n"
+
+#: C/geolocation.page:39(title)
+msgid "Fix common problems"
+msgstr "Solucionar problemas comu�ns"
+
+#: C/favorite-rooms.page:10(desc)
+msgid "Set, join and manage favorite rooms."
+msgstr "Configurar, unirse e xestionar salas favoritas."
+
+#: C/favorite-rooms.page:29(title)
+msgid "Favorite rooms"
+msgstr "Salas favoritas"
 
-#: C/tomboy.xml:1166(para)
+#: C/favorite-rooms.page:32(title)
+msgid "Set a room as a favorite"
+msgstr "Estabelecer unha sala como favorita"
+
+#: C/favorite-rooms.page:35(p)
+msgid "Join a room."
+msgstr "Unirse a unha sala."
+
+#: C/favorite-rooms.page:40(p)
 msgid ""
-"It is recommended to use a third computer or server as the remote computer "
-"to store the syncronized notes that are to be synced between multiple "
-"computers."
+"See <link xref=\"irc-join-room\"/> for more information on how to join an "
+"IRC room."
 msgstr ""
+"Para obter ma�is informacio�n sobre como unirse a unha sala de chat IRC, "
+"consulte a <link xref=\"irc-join-room\"/>."
 
-#: C/tomboy.xml:1169(para)
+#: C/favorite-rooms.page:46(p)
 msgid ""
-"Open <application>Passwords and Encryption Keys</application> by choosing "
-"<menuchoice><guimenu>Applications</guimenu><guimenu>Accessories</"
-"guimenu><guimenu>Passwords and Encryption Keys</guimenu></menuchoice>. Click "
-"on your key, and from the menu choose <menuchoice><guimenu>Remote</"
-"guimenu><guimenu>Configure Key for Secure Shell...</guimenu></menuchoice> "
-"and enter the domain name or IP address of the computer you want to sync to "
-"in <guimenu>Computer Name</guimenu>. Enter the username of the remote "
-"computer in <guimenu>Computer Name:</guimenu> and click <guimenu>Set Up</"
-"guimenu>. When prompted, enter the password, and setting up your key will be "
-"completed."
+"See <link xref=\"group-conversations\"/> for more information on how to "
+"start or join a group conversation."
 msgstr ""
+"Para obter ma�is informacio�n sobre como unirse a unha conversa en grupo, "
+"consulte a <link xref=\"group-conversations\"/>."
 
-#: C/tomboy.xml:1178(para)
+#: C/favorite-rooms.page:54(p)
 msgid ""
-"In <application>Tomboy</application>, choose <guimenuitem>SSH</guimenuitem> "
-"from the <guilabel>Service</guilabel> drop-down list. Fill in the connection "
-"information for your server, and then select the <guibutton>Save</guibutton> "
-"button. The <guimenuitem>Folder Path</guimenuitem>, while optional, should "
-"point at an empty folder. You are now ready to synchronize your notes."
+"From the conversation window, choose <guiseq><gui>Conversation</"
+"gui><gui>Favorite Chat Room</gui></guiseq>."
 msgstr ""
+"Desde a xanela de conversa, elixa <guiseq><gui>Conversa</gui><gui>Sala de "
+"chat favorita</gui></guiseq>."
+
+#: C/favorite-rooms.page:63(title)
+msgid "Join favorite rooms"
+msgstr "Unirse a�s salas favoritas"
 
-#: C/tomboy.xml:1185(title)
-msgid "Configure note synchronization service (Local Folder)"
-msgstr "Configurar o servizo de sincronización de notas (Cartafol local)"
+#: C/favorite-rooms.page:71(p)
+#| msgid "Press the <keycap>Tab</keycap> key."
+msgid "Press <key>F5</key>."
+msgstr "Prema <key>F5</key>."
 
-#: C/tomboy.xml:1187(para)
+#: C/favorite-rooms.page:76(p)
 msgid ""
-"You may want to synchronize your notes to a local folder if that folder is "
-"available to your other systems, or if that folder represents a local mount "
-"of a remote server."
+"Choose <guiseq><gui>Room</gui><gui>Join Favorites</gui></guiseq>, to join "
+"all your favorite rooms."
 msgstr ""
+"Seleccione <guiseq><gui>Salas</gui><gui>Unirse a�s favoritas</gui></guiseq> "
+"para unirse a todas as su�as salas favoritas."
 
-#: C/tomboy.xml:1191(para)
+#: C/favorite-rooms.page:82(p)
+msgid "Choose <gui>Room</gui>, and select the favorite room you want to join."
+msgstr "Seleccione a sala favorita que quere xestionar:"
+
+#: C/favorite-rooms.page:90(p)
 msgid ""
-"Choose <guimenuitem>Local Folder</guimenuitem> from the <guilabel>Service</"
-"guilabel> drop-down list. Choose the desired synchronization "
-"<guilabel>Folder Path</guilabel>, and then select the <guibutton>Save</"
-"guibutton> button. You are now ready to synchronize your notes."
+"To join a favorite room, you need to be connected to the Internet and to "
+"your account."
 msgstr ""
+"Para unirse a unha sala favorita debe estar conectado a Internet e coa conta."
+
+#: C/favorite-rooms.page:98(title)
+msgid "Manage favorite rooms"
+msgstr "Xestionar as salas favoritas"
 
-#: C/tomboy.xml:1198(title)
-msgid "Synchronize your notes"
-msgstr "Sincronizar as súas notas"
+#: C/favorite-rooms.page:101(p)
+msgid ""
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</"
+"gui><gui>Manage Favorites</gui></guiseq>."
+msgstr ""
+"Dese a xanela <gui>Lista de contactos</gui> elixa <guiseq><gui>Sala</"
+"gui><gui>Xestionar salas favoritas</gui></guiseq>."
 
-#: C/tomboy.xml:1200(para)
+#: C/favorite-rooms.page:107(p)
 msgid ""
-"You can synchronize your notes at any time by selecting "
-"<menuchoice><guimenu>Tools</guimenu><guimenuitem>Synchronize Notes</"
-"guimenuitem></menuchoice> from any note or from the <interface>Search All "
-"Notes</interface> dialog."
+"From the <gui>Account</gui> drop-down list, select the account you want to "
+"manage the favorite rooms of."
 msgstr ""
+"Desde a lista desprega�bel <gui>Conta</gui> seleccione a conta da que quere "
+"xestionar as salas favoritas."
+
+#: C/favorite-rooms.page:111(p)
+msgid "Select <gui>All</gui> to see all you favorite rooms."
+msgstr "Seleccione <placeholder-1/> para ver todas as su�as salas favoritas."
 
-#: C/tomboy.xml:1210(title)
-msgid "Handling synchronization conflicts"
-msgstr "Xestionar conflitos de sincronización"
+#: C/favorite-rooms.page:116(p)
+msgid "Select the favorite room you want to manage:"
+msgstr "Seleccione a sala favorita que quere xestionar:"
 
-#: C/tomboy.xml:1212(para)
+#: C/favorite-rooms.page:121(p)
 msgid ""
-"When synchronizing notes between multiple computers, conflicts may occur. "
-"Usually this is the result of not synchronizing regularly when switching "
-"between systems. Tomboy will detect conflicts in the content of your notes "
-"and help you to avoid loss of important data."
+"Select the <gui>Auto-Connect</gui> check-box in order to automatically join "
+"that room when you connect to your account."
 msgstr ""
+"Seleccione a caixa de verificacio�n <gui>Autoconectar</gui> para unirse a esa "
+"sala automaticamente ao conectarse coa conta."
+
+#: C/favorite-rooms.page:127(p)
+msgid "Click on <gui>Remove</gui> to remove the room from your favorites."
+msgstr "Prema <gui>Eliminar</gui> para elimianr a sala das su�as favoritas."
+
+#: C/favorite-rooms.page:134(p)
+msgid "When done, click <gui>Close</gui>."
+msgstr "Cando remate prema <placeholder-1/>."
 
-#: C/tomboy.xml:1217(para)
+#: C/disable-account.page:9(desc)
+msgid "Prevent <app>Empathy</app> from automatically logging in to an account."
+msgstr "Evitar que <app>Empathy</app> inicie sesio�n automaticamente na conta."
+
+#: C/disable-account.page:39(title)
+msgid "Disable an account"
+msgstr "Desactivar unha conta"
+
+#: C/disable-account.page:41(p)
 msgid ""
-"If a conflict is detected during note synchronization, the <interface>Note "
-"Conflict</interface> dialog will appear. If you do not need the changes you "
-"made in your local note, you can select <guilabel>Overwrite local note</"
-"guilabel>. If you would like to keep your local changes in a new note, "
-"select <guilabel>Rename local note</guilabel>."
+"You can disable an account to prevent <app>Empathy</app> from logging in to "
+"it without removing the account entirely. You may wish to disable and re-"
+"enable an account if you only want to be logged in to the account at certain "
+"times, but you still want to use <app>Empathy</app> for other accounts."
 msgstr ""
+"Pode desactivar unha conta para evitar que <app>Empathy</app> inicie sesio�n "
+"nela, sen ter que quitar a conta completamente. Pode querer desactivar unha "
+"conta e reactivala se so� quere iniciar sesio�n na conta de vez en cando, pero "
+"segue querendo usar <app>Empathy</app> para outras contas."
 
-#: C/tomboy.xml:1226(title)
-msgid "Preferences"
-msgstr "Preferencias"
+#: C/disable-account.page:52(p)
+msgid ""
+"Select the account you wish to disable from the accounts list on the left "
+"side of the window."
+msgstr ""
+"Seleccione a conta que quere desactivar desde a lista de contas na parte "
+"esquerda da xanela."
 
-#: C/tomboy.xml:1228(para)
+#: C/disable-account.page:56(p)
 msgid ""
-"To set preferences for Tomboy, right-click on the icon in the panel, and "
-"select <menuchoice><guimenuitem>Preferences</guimenuitem></menuchoice> from "
-"the menu. You will see a dialog similar to the one displayed in <xref "
-"linkend=\"pref-editing\"/>. There are two categories of preferences, "
-"<guilabel>Editing</guilabel> and <guilabel>Hotkeys</guilabel>. Preferences "
-"for each tab will be described below."
+"Deselect <gui style=\"checkbox\">Enabled</gui> on the right side of the "
+"window."
 msgstr ""
+"Deseleccione <gui style=\"checkbox\">Activada</gui> na parte dereita da "
+"xanela."
 
-#: C/tomboy.xml:1238(title)
-msgid "Editing"
-msgstr "Editar"
+#: C/disable-account.page:62(p)
+msgid ""
+"To re-enable the account, simply select <gui style=\"checkbox\">Enabled</"
+"gui>."
+msgstr "Para reactivar a conta simplemente seleccione <placeholder-1/>."
 
-#: C/tomboy.xml:1240(para)
+#: C/create-account.page:9(desc)
+msgid "Register for an account with one of the supported messaging services."
+msgstr "Rexistre unha conta con un dos servizos de mensaxeri�a admitidos."
+
+#: C/create-account.page:34(title)
+msgid "Register for a new account"
+msgstr "Rexistrar unha nova conta"
+
+#: C/create-account.page:36(p)
 msgid ""
-"The editing tab will allow you to set preferences related to editing notes. "
-"There are three checkboxes on this tab, which can either be turned on or off."
+"Most account types require you to create an account with a account provider "
+"before you can connect using instant messaging applications like "
+"<app>Empathy</app>. With some account providers, you can use <app>Empathy</"
+"app> to register for a new account, using the same steps as you would to "
+"<link xref=\"add-account\">add an account</link>."
 msgstr ""
+"Moitos tipos de conta requiren que cree unha conta cun fornecedor de contas "
+"antes de poder conectarse e usar aplicativos de mensaxari�a instanta�nea como "
+"<app>Empathy</app>. Con algu�ns fornecedores de contas pode usar "
+"<app>Empathy</app> para rexistrar una nova conta, usando os mesmos pasos que "
+"seguiri�a en <link xref=\"add-account\">engadir unha conta</link>."
 
-#: C/tomboy.xml:1246(term)
-msgid "Spellcheck While Typing"
-msgstr "Comprobar ortografía mentres se escribe"
+#: C/create-account.page:42(p)
+msgid ""
+"This page provides information on creating a new account for various types "
+"of accounts. Your account provider should give you a login ID and a "
+"password, as well as any additional information you need to connect using "
+"<app>Empathy</app>."
+msgstr ""
+"Esta pa�xina fornece informacio�n sobre crear unha nova conta para varios "
+"tipos de conta. O seu fornecedor de contas deberi�a fornecerlle un ID de "
+"inicio de sesio�n e un contrasinal, asi� como outra informacio�n adicional que "
+"pode necesitar para conectarse con <app>Empathy</app>."
 
-#: C/tomboy.xml:1249(para)
+#: C/create-account.page:47(title)
+msgid "Facebook"
+msgstr "Facebook"
+
+#: C/create-account.page:48(p)
 msgid ""
-"Enable this checkbox to underline misspellings in red, and provide "
-"suggestions in the right click context menu. Enable or disable the checkbox "
-"using the mouse or the key combination <keycombo><keycap>Alt</"
-"keycap><keycap>S</keycap></keycombo>."
+"Facebook is one of the most-used social networks. It allows users to create "
+"their own profile and to communicate with their friends."
 msgstr ""
+"Facebook e� unha das redes sociais ma�is usadas. Permite aos usuarios crear o "
+"seu propio perfil e comunicarse cos seus amigos."
 
-#: C/tomboy.xml:1259(para)
+#: C/create-account.page:52(p)
 msgid ""
-"The spellcheck option is only available if you have the "
-"<application>GtkSpell</application> package installed."
+"To use Facebook to communicate with your friends, you will need to create a "
+"new account from the website: <link href=\"http://www.facebook.com\">www."
+"facebook.com</link>."
 msgstr ""
-"A opción de comprobación ortográfica só está dispoñíbel se ten o paquete "
-"<application>GtkSpell</application> instalado."
+"Para usar Facebook para comunicarse cos seus amigos necesita crear unha nova "
+"conta desde o sitio web: <link href=\"http://www.facebook.com\">www.facebook."
+"com</link>."
 
-#: C/tomboy.xml:1266(term)
-msgid "Highlight WikiWords"
-msgstr "Realzar as palabras wiki"
+#: C/create-account.page:60(title) C/audio-video.page:170(p)
+msgid "Jabber"
+msgstr "Jabber"
 
-#: C/tomboy.xml:1269(para)
+#: C/create-account.page:62(p)
 msgid ""
-"Enable this checkbox to create links for phrases <literal>ThatLookLikeThis</"
-"literal>. Clicking on the link will create a new note with the title "
-"corresponding to the link text. Enable or disable this checkbox using the "
-"mouse or the key combination <keycombo><keycap>Alt</keycap><keycap>W</"
-"keycap></keycombo>."
+"Jabber is an open instant messaging system. Like email, Jabber allows you to "
+"choose your account provider and communicate with all other Jabber users, "
+"regardless of their account provider."
 msgstr ""
+"Jabber e� un sistema de mensaxari�a instanta�nea abeto. Como o correo "
+"electro�nico, Jabber permi�telle seleccionar o seu fornecedor de conta e "
+"comunicarse cos ouros usuarios de Jabber, independentemente do fornecedor da "
+"conta."
 
-#: C/tomboy.xml:1282(term)
-msgid "Use Custom Font"
-msgstr "Usar un tipo de letra personalizado"
+#: C/create-account.page:66(p)
+msgid ""
+"You will need to create a new account with a Jabber provider. There are many "
+"free providers; one popular provider is <link href=\"http://register.jabber."
+"org/\">Jabber.org</link>."
+msgstr ""
+"Debera� crear unha nova conta con un fornecedor Jabber. Existen moitos "
+"fornecedores libres; un fornecedor popular e� <link href=\"http://register."
+"jabber.org/\">Jabber.org</link>."
 
-#: C/tomboy.xml:1285(para)
+#: C/create-account.page:71(p)
 msgid ""
-"Enable this checkbox to set a custom font to be used in your notes. If this "
-"option is disabled, the default system font will be used. Enable or disable "
-"this checkbox using the mouse or the key combination <keycombo><keycap>Alt</"
-"keycap><keycap>F</keycap></keycombo>."
+"If you use Google Mail or Google Talk, you already have a Jabber account. "
+"Google Talk is a Jabber service. Simply use your Google Mail address and "
+"password in <app>Empathy</app> to connect."
 msgstr ""
+"Se usa Google Mail ou Google Talk xa ten unha conta Jabber. Talk e� un "
+"servizo Jabber. Simplemente use o seu enderezo de Google Mail e o seu "
+"contrasinal para conectarse."
 
-#: C/tomboy.xml:1298(title)
-msgid "Tomboy Editing Preferences"
-msgstr "Preferencias de edición de Tomboy"
+#: C/create-account.page:78(title) C/audio-video.page:190(p)
+msgid "People Nearby"
+msgstr "Persoas pro�ximas"
 
-#: C/tomboy.xml:1309(title)
-msgid "Hotkeys"
-msgstr "Teclas ra�pidas"
+#: C/create-account.page:80(p)
+msgid ""
+"You do not need to create an account with a service provider to use this "
+"feature. This service works whenever you are connected to a local network, "
+"such as a wireless hotspot. It automatically finds all other users on the "
+"network who are also using this service."
+msgstr ""
+"Para usar esta caracteri�stica non precisa crear unha conta con un fornecedor "
+"de servizos. Este servizo funciona sempre que este� conectado a unha rede "
+"local, tal como un punto sen fi�os. Automaticamente encontra outros usuarios "
+"na rede que estean usando este servizo."
 
-#: C/tomboy.xml:1311(para)
+#: C/create-account.page:85(p)
+msgid "For more information, see <link xref=\"salut-protocol\"/>."
+msgstr ""
+"Para obter ma�is informacio�n consulte a <link xref=\"salut-protocol\"/>."
+
+#: C/create-account.page:89(title) C/audio-video.page:205(p)
+msgid "SIP"
+msgstr "SIP"
+
+#: C/create-account.page:91(p)
 msgid ""
-"The hotkeys tab allows you to set global key combinations to perform "
-"different functions in Tomboy. In order to set key combinations, you must "
-"have the <guibutton>Listen for Hotkeys</guibutton> checkbox enabled. Use "
-"<keycombo><keycap>Alt</keycap><keycap>H</keycap></keycombo> to toggle this "
-"option."
+"SIP is an open system which allows users to have audio and video "
+"conversations over the Internet. You need to create an account with a SIP "
+"provider. You can communicate with all other SIP users, regardless of which "
+"SIP provider they use."
 msgstr ""
+"SIP e� un sistema aberto que permite aos usuarios realizar conversas de son e "
+"vi�deo en Internet. Debe crear unha conta cun fornecedor SIP. Pode "
+"comunicarse con to�dolos usuarios SIP, independentemente do fornecedor SIP "
+"que usen."
 
-#: C/tomboy.xml:1322(term)
-msgid "Show notes menu"
-msgstr "Mostrar o menu� de notas"
+#: C/create-account.page:97(p)
+msgid ""
+"Due to technical differences, the free <link href=\"https://www.ekiga.net/"
+"index.php?page=register\">Ekiga.net</link> service does not currently work "
+"with <app>Empathy</app>."
+msgstr ""
+"Debido a algunhas diferencias te�cnicas, actualmente o servizo libre <link "
+"href=\"https://www.ekiga.net/index.php?page=register\">Ekiga.net</link> non "
+"funciona con <app>Empathy</app>."
 
-#: C/tomboy.xml:1325(para)
-msgid "Enter the key combination to open the notes menu."
-msgstr "Prema a combinación de teclas para abrir o menú de notas."
+#: C/create-account.page:102(p)
+msgid ""
+"Some SIP providers allow you to call normal phones from your computer. "
+"Generally, you will need to subscribe to a paid service for this feature."
+msgstr ""
+"Algu�ns fornecedores SIP permi�tenlle chamar a tele�fonos normais desde o seu "
+"equipo. Xeralmente debera� subscribirse a un servizo de pago para usar esta "
+"caracteri�stica."
 
-#: C/tomboy.xml:1330(term)
-msgid "Open \"Start Here\""
-msgstr "Abrir \"Comezar aqui�\""
+#: C/create-account.page:107(title) C/audio-video.page:165(p)
+msgid "IRC"
+msgstr "IRC"
 
-#: C/tomboy.xml:1333(para)
+#: C/create-account.page:109(p)
 msgid ""
-"Enter the key combination to open the <quote>Start Here</quote> note, which "
-"is preinstalled with Tomboy."
+"You do not need to register for an account to use IRC. Although you specify "
+"a nickname when you add an IRC account to <app>Empathy</app>, this nickname "
+"is only established each time you connect. If another user is using the "
+"nickname, you will need to choose a new nickname."
 msgstr ""
+"Non necesita rexistrar unha conta para usar o IRC. Ai�nda que especifique un "
+"alcume ao engadir unha conta IRC en <app>Empathy</app>, este alcume so� se "
+"estabelece cada vez que se conecta. Se outro usuario esta� usando o nome, "
+"debera� elixir un alcume novo."
 
-#: C/tomboy.xml:1339(term)
-msgid "Create new note"
-msgstr "Crear unha nova nota"
+#: C/create-account.page:114(p)
+msgid ""
+"Some IRC networks use a service called NickServ to allow users to protect "
+"their nicknames. See <link xref=\"irc-nick-password\"/> for more information."
+msgstr ""
+"Algunhas redes IRC usan un servizo chamado NickServ para permitir aos "
+"usuarios protexer os seus alcumes. Para obter ma�is informacio�n consulte a "
+"<link xref=\"irc-nick-password\"/>."
 
-#: C/tomboy.xml:1342(para)
-msgid "Enter the key combination to create a new note."
+#: C/create-account.page:117(p)
+msgid ""
+"Some IRC servers are password protected. You will need to know the password "
+"to connect to these servers. Generally, these are private IRC networks."
 msgstr ""
+"Algu�ns servidores de IRC esta�n protexidos con contrasinal. Necesitara� "
+"coñecer o contrasinal para conectarse a eses servidores. Xeralmente son "
+"redes de IRC privadas."
 
-#: C/tomboy.xml:1347(term)
-msgid "Search notes"
-msgstr "Buscar notas"
+#: C/create-account.page:122(title)
+msgid "Proprietary Services"
+msgstr "Servizos privativos"
 
-#: C/tomboy.xml:1350(para)
+#: C/create-account.page:124(p)
 msgid ""
-"Enter the key combination to open the <interface>Search All Notes</"
-"interface> dialog."
+"There are many proprietary instant messaging services that have been "
+"developed by different companies or organizations. <app>Empathy</app> allows "
+"you to connect to an existing account for most popular services. To create a "
+"new account with one of these services, you will need to visit the service’s "
+"web site and agree to its terms of use."
 msgstr ""
+"Existen moitos servizos privativos de mensaxari�a instanta�nea desenvolvidos "
+"por diferentes empresas e organizacio�ns, <app>Empathy</app> permi�telle "
+"conectarse a unha conta existente dos servizos ma�is populares. Para crear "
+"unha nova conta con un destes servizos, debe visitar a pa�xina web do servizo "
+"e aceptar os termos de uso."
+
+#: C/create-account.page:133(link) C/audio-video.page:135(p)
+msgid "AIM"
+msgstr "AIM"
 
-#: C/tomboy.xml:1357(title)
-msgid "Tomboy Hotkey Preferences"
-msgstr "Preferencias das teclas rápidas de Tomboy"
+#: C/create-account.page:138(link) C/audio-video.page:160(p)
+msgid "ICQ"
+msgstr "ICQ"
 
-#: C/tomboy.xml:1368(title)
-msgid "Synchronization"
-msgstr "Sincronizacio�n"
+#: C/create-account.page:143(link) C/audio-video.page:175(p)
+msgid "MSN"
+msgstr "MSN"
 
-#: C/tomboy.xml:1370(para)
-msgid "Please see <xref linkend=\"synchronization\"/> for more details."
+#: C/create-account.page:148(link) C/audio-video.page:210(p)
+msgid "Yahoo!"
+msgstr "Yahoo!"
+
+#: C/change-status.page:9(desc)
+msgid "Change your status to advertise your availability to your contacts."
 msgstr ""
+"Cambie o seu estado para avisar da su�a dispoñibilidade aos seus contactos."
 
-#: C/tomboy.xml:1375(title) C/tomboy.xml:1402(title)
-msgid "Add-ins"
-msgstr "Engadidos"
+#: C/change-status.page:34(title)
+msgid "Change your status"
+msgstr "Cambiar o seu estado"
 
-#: C/tomboy.xml:1377(para)
-msgid "The add-ins tab allows you to enable and configure Tomboy Add-ins."
+#: C/change-status.page:36(p)
+msgid ""
+"You can set your status to indicate your availability to your contacts. "
+"<app>Empathy</app> allows you to select from a list of defined statuses."
 msgstr ""
+"Pode estabelecer o seu estado para indicar a su�a dispoñibilidade aos seus "
+"contactos <app>Empathy</app> permi�telle seleccionar unha lista de estados "
+"predefinidos."
 
-#: C/tomboy.xml:1380(para)
+#: C/change-status.page:41(p)
 msgid ""
-"The list of installed add-ins shows on the left. An add-in is enabled by "
-"selecting it from the list and then selecting <guibutton>Enable</guibutton>. "
-"Disable an add-in by selecting it from the list and then selecting "
-"<guibutton>Disable</guibutton>."
+"Click on the drop-down list at the top of the <gui>Contact List</gui> window."
 msgstr ""
+"Prema na lista desprega�bel na parte superior da xanela da <gui>Lista de "
+"contactos</gui>."
 
-#: C/tomboy.xml:1386(para)
+#: C/change-status.page:46(p)
+msgid "Select a status from the list."
+msgstr "Seleccione o estado desde a lista."
+
+#: C/change-status.page:52(p)
 msgid ""
-"Please see <xref linkend=\"plugins\"/> for more information about the add-"
-"ins that are installed with Tomboy."
+"See <link xref=\"status-icons\"/> for a list of the built-in statuses and "
+"what they mean. You can also <link xref=\"set-custom-message\">add custom "
+"status messages</link> to provide more information about your availability "
+"to your contacts."
 msgstr ""
+"Consulte a <link xref=\"status-icons\"/> para obter unha lista de estados "
+"predefinidos e o que significan. Tame�n pode <link xref=\"set-custom-message"
+"\"> engadir mensaxes de estado personalizados</link> para fornecerlle aos "
+"seus contactos ma�is informacio�n sobre a su�a dispoñibilidade."
 
-#: C/tomboy.xml:1390(title)
-msgid "Tomboy Add-in Preferences"
+#: C/change-status.page:58(p)
+msgid ""
+"If you do not use your computer for a while, or if the screensaver is on, "
+"the status will be automatically set to Away."
+msgstr ""
+"Se non usa o seu equipo durante un tempo ou se se activa o protector de "
+"pantallas, o estado cambiarase automaticamente a Ausente."
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/audio-video.page:58(None)
+msgid ""
+"@@image: 'figures/audio-input-microphone.png'; "
+"md5=8d89026b66a263a3bc5b1f0665948567"
 msgstr ""
+"@@image: 'figures/audio-input-microphone.png'; "
+"md5=8d89026b66a263a3bc5b1f0665948567"
 
-#: C/tomboy.xml:1406(member)
-msgid "Backlinks"
-msgstr "Retroligazo�ns"
+#: C/audio-video.page:8(desc)
+msgid ""
+"Information on when it is possible to have an audio or video conversation."
+msgstr "Informacio�n sobre cando e� posi�bel ter unha conversa de vi�deo ou son."
 
-#: C/tomboy.xml:1408(member) C/tomboy.xml:1445(term)
-msgid "Bugzilla URL Drop"
+#: C/audio-video.page:32(title)
+msgid "Audio and video support"
+msgstr "Compatibilidade de son e vi�deo"
+
+#: C/audio-video.page:34(p)
+msgid ""
+"You can only have audio and video conversation with contacts who are using "
+"an application which also supports this feature. When your contacts support "
+"audio or video conversations, you will see the following icons next to their "
+"names in the contact list:"
 msgstr ""
+"So� pode ter conversas de son e vi�deo con contactos que estean usando un "
+"aplicativo que tame�n admita esta caracteri�stica. Cando os aplicativos dos "
+"seus contactos admitan conversas de son ou vi�deo podera� velo mediante unha "
+"icona xunto aos seus nomes, na lista de contactos:"
 
-#: C/tomboy.xml:1410(member) C/tomboy.xml:1468(term)
-msgid "Evolution Mail Drop"
+#: C/audio-video.page:43(p)
+msgid "Icon"
+msgstr "Icona"
+
+#: C/audio-video.page:48(p)
+msgid "Description"
+msgstr "Descricio�n"
+
+#: C/audio-video.page:58(media)
+msgid "Icon for audio conversation"
+msgstr "Icona para a conversa de son"
+
+#: C/audio-video.page:64(p)
+msgid "The contact is able to have an audio conversation."
+msgstr "O contacto pode ter conversas de son."
+
+#: C/audio-video.page:70(media)
+msgid "Icon for video conversation"
+msgstr "Icona para a conversa de vi�deo"
+
+#: C/audio-video.page:76(p)
+msgid "The contact is able to have a video conversation."
+msgstr "O contacto pode ter conversas de vi�deo."
+
+#: C/audio-video.page:83(p)
+msgid ""
+"In order to have an audio conversation, you need to have a sound card that "
+"is supported by your operating system, and a working microphone."
 msgstr ""
+"Para poder ter unha conversa de son debe ter unha tarxeta de son admitida "
+"polo sistema operativo e un micro�fono que funcione."
 
-#: C/tomboy.xml:1416(member) C/tomboy.xml:1510(term)
-msgid "Note of the Day"
+#: C/audio-video.page:87(p)
+msgid ""
+"In order to have a video conversation, you need to have a webcam that is "
+"supported by your operating system, and a working microphone."
 msgstr ""
+"Para poder ter unha conversa de vi�deo debe ter unha ca�mara web compati�bel "
+"polo sistema operativo e un micro�fono que funcione."
 
-#: C/tomboy.xml:1418(member) C/tomboy.xml:1531(term)
-msgid "Print Notes"
-msgstr "Imprimir notas"
+#: C/audio-video.page:95(title)
+msgid "Supported Account Types"
+msgstr "Tipos de contas admitidas"
 
-#: C/tomboy.xml:1420(member)
-msgid "and Sticky Notes Import."
-msgstr "e importar notas adhesivas."
+#: C/audio-video.page:97(p)
+msgid ""
+"You can only have audio and video conversations using accounts on certain "
+"supported services. The following table lists whether audio and video is "
+"supported for each type of account."
+msgstr ""
+"So� pode ter conversas de son e vi�deo usando contas en certos servizos "
+"compati�beis. A seguinte ta�boa mostra se o son ou vi�deo esta�n admitidos para "
+"cada tipo de conta."
 
-#: C/tomboy.xml:1404(para)
+#: C/audio-video.page:102(p)
 msgid ""
-"By default, Tomboy comes with several pre-installed add-ins: <placeholder-1/"
-"> Since these are preinstalled, they are ready to use and are automatically "
-"loaded into the Tomboy interface."
+"Account types are provided by plugins. Your system may not have all of the "
+"following types available, or it may have types not listed here. Updated "
+"plugins may make audio or video conversations possible on account types that "
+"are listed as unsupported here."
 msgstr ""
+"Os tipos de contas son fornecidos por engadidos. Pode que o seu sistema non "
+"teña dispoñi�bel todos os seguintes tipos, ou pode ter tipos non mostrados "
+"aqui�. As actualizacio�ns de engadidos pode facer posi�bel conversas de son ou "
+"vi�deo en tipos de contas que aqui� mo�stranse como non compati�beis."
 
-#: C/tomboy.xml:1425(para)
-msgid "Some add-ins exist that are not installed by default."
+#: C/audio-video.page:110(p)
+msgid ""
+"I'd like to do tables like this using nothing for No and ✔ for Yes, but we "
+"need to look at the accessibility impact. I've <link href=\"http://mail."
+"gnome.org/archives/gnome-doc-list/2009-September/msg00006.html\">asked the "
+"accessibility team</link> for input."
 msgstr ""
+"Gustariame poñer ta�boas como e�sta sen usar nada para Non e ✔ para Si�, pero "
+"de�bese tener en conta o impacto na accesibilidade. Xa <link href=\"http://"
+"mail.gnome.org/archives/gnome-doc-list/2009-September/msg00006.html"
+"\">preguntei ao equipo de accesibilidade</link>."
+
+#: C/audio-video.page:118(p)
+msgid ""
+"There's recent work on telepathy-butterfly and papyon to support audio and "
+"video for MSN. It might be released in time for 2.28, but since it doesn't "
+"follow the Gnome release schedule, I can't be sure. If it looks like it's "
+"going to ship, let's mark it Yes."
+msgstr ""
+"Existe traballo recente en telepathy-butterfly e papyon para admitir son e "
+"vi�deo para MSN. Pode que se publique a tempo para 2.28 pero xa non serve a "
+"planificacio�n de publicacio�ns de GNOME non se pode estar seguro. Se parece "
+"que vai dar tempo incluirase."
+
+#: C/audio-video.page:128(p)
+#| msgid "Search"
+msgid "Service"
+msgstr "Servizo"
+
+#: C/audio-video.page:129(p)
+msgid "Audio"
+msgstr "Audio"
+
+#: C/audio-video.page:130(p)
+msgid "Video"
+msgstr "V_i�deo"
+
+#: C/audio-video.page:136(p) C/audio-video.page:137(p)
+#: C/audio-video.page:141(p) C/audio-video.page:142(p)
+#: C/audio-video.page:146(p) C/audio-video.page:147(p)
+#: C/audio-video.page:156(p) C/audio-video.page:157(p)
+#: C/audio-video.page:161(p) C/audio-video.page:162(p)
+#: C/audio-video.page:166(p) C/audio-video.page:167(p)
+#: C/audio-video.page:181(p) C/audio-video.page:182(p)
+#: C/audio-video.page:186(p) C/audio-video.page:187(p)
+#: C/audio-video.page:191(p) C/audio-video.page:192(p)
+#: C/audio-video.page:196(p) C/audio-video.page:197(p)
+#: C/audio-video.page:201(p) C/audio-video.page:202(p)
+#: C/audio-video.page:211(p) C/audio-video.page:212(p)
+#: C/audio-video.page:216(p) C/audio-video.page:217(p)
+msgid "No"
+msgstr "No"
+
+#: C/audio-video.page:140(p)
+msgid "Facebook Chat"
+msgstr "Chat de Facebook"
+
+#: C/audio-video.page:145(p)
+msgid "gadugadu"
+msgstr "gadugadu"
+
+#: C/audio-video.page:150(p)
+msgid "Google Talk"
+msgstr "Google Talk"
 
-#: C/tomboy.xml:1430(term)
-msgid "Backlinks (What links here?)"
-msgstr "Retroligazóns (Que liga aquí?)"
+#: C/audio-video.page:151(p) C/audio-video.page:152(p)
+#: C/audio-video.page:171(p) C/audio-video.page:172(p)
+#: C/audio-video.page:176(p) C/audio-video.page:177(p)
+#: C/audio-video.page:206(p) C/audio-video.page:207(p)
+msgid "Yes"
+msgstr "Si"
 
-#: C/tomboy.xml:1433(para)
+#: C/audio-video.page:155(p)
+msgid "Groupwise"
+msgstr "Groupwise"
+
+#: C/audio-video.page:180(p)
+msgid "myspace"
+msgstr "myspace"
+
+#: C/audio-video.page:185(p)
+msgid "qq"
+msgstr "qq"
+
+#: C/audio-video.page:195(p)
+msgid "sametime"
+msgstr "sametime"
+
+#: C/audio-video.page:200(p)
+msgid "silc"
+msgstr "silc"
+
+#: C/audio-video.page:215(p)
+msgid "zephyr"
+msgstr "zephyr"
+
+#: C/audio-call.page:9(desc)
+msgid "Call your contacts over the Internet."
+msgstr "Chamar aos seus contactos a trave�s de Internet."
+
+#: C/audio-call.page:27(title)
+msgid "Start an audio conversation"
+msgstr "Comezar unha conversa de son"
+
+#: C/audio-call.page:29(p)
 msgid ""
-"This add-in allows you to know which notes link to the note you are "
-"currently editing. It makes it easier to keep track of the relationships "
-"between notes. If this add-in is enabled, the <link linkend=\"tools\">Tools</"
-"link> menu will have a <guimenuitem>What links here?</guimenuitem> option. "
-"When you select this option, it will list all the notes which link to the "
-"current note in a submenu. Select a note in the submenu to open it."
+"You can call your contacts and have an audio conversation with them. This "
+"features only works with certain types of accounts, and it requires the "
+"other person to have an application that supports audio calls."
 msgstr ""
+"Pode chamar aos seus contactos e ter conversas de son con eles. Esta "
+"caracteri�stica so� funciona con certo tipo de contas e require que a outra "
+"persoa teña un aplicativo que admita chamadas de son."
 
-#: C/tomboy.xml:1448(para)
+#: C/audio-call.page:34(p)
 msgid ""
-"Allows you to drag a Bugzilla URL from your browser directly into a Tomboy "
-"note. The bug number is inserted as a link with a small bug icon next to it. "
-"Once the Bugzilla link has been inserted into the note, click on it to open "
-"the URL in your web browser."
+"From the <gui>Contact List</gui> window, click the <media type=\"image\" "
+"mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon "
+"next to the name of the contact you wish to call and choose <gui style="
+"\"menuitem\">Audio Call</gui>."
 msgstr ""
+"Desde a xanela <gui>Lista de contactos</gui>, prema a icona <media type="
+"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">chamada de "
+"vi�deo</media> ao lado do nome do contacto ao que quere chamar e seleccione "
+"<gui style=\"menuitem\">Chamada de son</gui>."
 
-#: C/tomboy.xml:1454(para)
+#: C/audio-call.page:55(p)
 msgid ""
-"Customize the icons that are used by editing the add-in preferences in the "
-"<link linkend=\"prefs-plugins\">Preferences Dialog</link>. After "
-"highlighting the Bugzilla Add-in, click <guibutton>Preferences</guibutton> "
-"to open the <interface>Bugzilla Add-in Settings</interface> dialog. To add a "
-"new icon, click <guibutton>Add</guibutton>, select an icon on your computer, "
-"provide a Bugzilla host name (e.g., bugzilla.gnome.org), and click "
-"<guibutton>Open</guibutton>. Any Bugzilla URL that is dragged and dropped "
-"from one of these custom host names will now use the icon you specified."
+"To turn an audio conversation into a video conversation, choose <guiseq><gui "
+"style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</gui></guiseq>."
 msgstr ""
+"Para trocar unha conversa de vi�deo nunha conversa de son, seleccione "
+"<guiseq><gui style=\"menu\">Vi�deo</gui><gui style=\"menuitem\">Vi�deo "
+"activado</gui></guiseq>."
+
+#: C/audio-call.page:63(title)
+msgid "Start an audio conversation with a meta-contact"
+msgstr "Comezar unha conversa de son con un metacontacto."
 
-#: C/tomboy.xml:1471(para)
+#: C/audio-call.page:71(p)
 msgid ""
-"This add-in allows you to drag and drag an e-mail message from the "
-"<application>Evolution</application> mail application to one of your Tomboy "
-"notes. Clicking on the mail icon in the note will then open the "
-"corresponding e-mail message in Evolution."
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Audio Call</gui>."
 msgstr ""
+"Seleccione o contacto co que desexe ter unha conversa e desde o menu� "
+"seleccione <gui style=\"menuitem\">Audiochamada</gui>."
 
-#: C/tomboy.xml:1482(para)
+#: C/add-contact.page:9(desc)
+msgid "Add someone to the contact list."
+msgstr "Engadir a algue�n a� lista de contactos."
+
+#: C/add-contact.page:33(title)
+msgid "Add someone to your list of contacts"
+msgstr "Engadir a algue�n a� su�a lista de contactos."
+
+#: C/add-contact.page:37(p)
+msgid "Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>."
+msgstr ""
+"Seleccione<guiseq><gui>Conversa</gui><gui>Engadir contacto</gui></guiseq>."
+
+#: C/add-contact.page:40(p)
 msgid ""
-"When this add-in is installed, the <link linkend=\"tools\">Tools</link> menu "
-"will have the <guimenuitem>Export to HTML</guimenuitem> option available."
+"From the <gui>Account</gui> drop-down list, select the account you wish to "
+"use to connect to your contact. Your contact will need to be using the same "
+"service as the account you select."
 msgstr ""
+"Desde a lista desprega�bel <gui>Conta</gui> seleccione a conta que quere usar "
+"par conectar co seu contacto. O seu contacto debera� usar o mesmo servizo que "
+"a conta que estea seleccionando."
 
-#: C/tomboy.xml:1486(para)
+#: C/add-contact.page:45(p)
 msgid ""
-"After selecting this option, you will be presented with a dialog that allows "
-"you to choose where to save the <acronym>HTML</acronym> file. Enter the "
-"destination filename and click <guibutton>OK</guibutton> to save the file, "
-"or <guibutton>Cancel</guibutton> to abort the operation."
+"In the <gui>Identifier</gui> field, enter your contact’s login ID, username, "
+"screen name, or other appropriate identifier for the service type."
 msgstr ""
+"No campo <gui>Identificador</gui> introduza o ID de inicio de sesio�n do seu "
+"contacto, o seu nome en pantalla ou outro identificador axeitado para o tipo "
+"de servizo."
 
-#: C/tomboy.xml:1492(para)
+#: C/add-contact.page:49(p)
 msgid ""
-"To export any notes for which a link exists in the current note, select the "
-"<guibutton>Export linked notes</guibutton> button."
+"In the <gui>Alias</gui> field, type your contact’s name as you would like it "
+"to appear in your contact list."
+msgstr ""
+"No campo <gui>Alcume</gui>escriba o nome do seu contacto tal e como lle "
+"gustari�a que aparecese na su�a lista de contactos."
+
+#: C/add-contact.page:53(p)
+msgid "Click <gui>Add</gui> to add the person to your list of contacts."
 msgstr ""
+"Prema <gui>Engadir</gui> para engadir a persoa a� su�a lista de contactos."
 
-#: C/tomboy.xml:1502(para)
+#: C/add-contact.page:61(p)
 msgid ""
-"Allows you to use a fixed-width font when creating/editing notes. If this "
-"add-in is enabled, the <link linkend=\"text\">Text</link> menu will have a "
-"<guimenuitem>Fixed Width</guimenuitem> option."
+"To add a new person to your list of contacts, you need to be connected to "
+"the Internet and to your account."
 msgstr ""
+"Par engadir unha nova persoa a� su�a lista de contactos necesita estar "
+"conectado a Internet e a� su�a conta."
+
+#: C/add-account.page:9(desc)
+msgid "Add a new account to <app>Empathy</app>."
+msgstr "Engadir unha nova conta en <app>Empathy</app>."
+
+#: C/add-account.page:39(title)
+msgid "Add a new account"
+msgstr "Engadir unha nova conta"
 
-#: C/tomboy.xml:1513(para)
+#: C/add-account.page:41(p)
 msgid ""
-"This add-in automatically creates a \"Today\" note for jotting daily "
-"thoughts down. The current date is used as a basis for the title of the "
-"note. As an example, the title of a \"Today\" note created on February 28, "
-"2007, would be, \"Today: Wednesday, February 28 2007\""
+"You can add instant messaging accounts from any supported service to "
+"communicate with all of your contacts in <app>Empathy</app>. For some "
+"account providers, these steps will also allow you to register for a new "
+"account. For more details, see <link xref=\"create-account\"/>."
 msgstr ""
+"Pode engadir contas de mensaxari�a instanta�nea de calquera servizo admitido "
+"para comunicarse con todos os seus contactos no <app>Empathy</app>. Para "
+"algu�ns fornecedores de contas estes pasos permitiranlle rexistrar unha nova "
+"conta. Para obter ma�is informacio�n consulte a <link xref=\"create-account\"/"
+">."
 
-#: C/tomboy.xml:1519(para)
+#: C/add-account.page:52(p)
+msgid "Click <gui style=\"button\">Add</gui>."
+msgstr "Prema <gui style=\"button\">Engadir</gui>."
+
+#: C/add-account.page:57(p)
 msgid ""
-"If you leave a \"Today\" note unmodified, the Note of the Day Add-in will "
-"automatically delete the note."
+"From the <gui>Protocol</gui> drop-down list, select the type of account you "
+"wish to add."
 msgstr ""
+"Desde a lista desprega�bel <gui>Protocolo</gui>seleccione o tipo de conta que "
+"quere engadir."
 
-#: C/tomboy.xml:1522(para)
+#: C/add-account.page:61(p)
 msgid ""
-"To customize the content of the default \"Today\" note, create a new note "
-"and change the title of the note to be, \"Today: Template\". Change the "
-"content of the template note to whatever you like. When new \"Today\" notes "
-"are created, it will then use the content of your \"Today: Template\" note."
+"If you do not already have a registered account, select <gui>Create a new "
+"account on the server</gui>. This feature is not available for all account "
+"types, and may not work with some account providers. See <link xref=\"create-"
+"account\"/> for more information."
 msgstr ""
+"Se ai�nda non ten unha conta rexistrada seleccione <gui>Crear unha nova conta "
+"no servidor</gui>. Esta caracteri�stica non esta� dispoñi�bel para todos os "
+"tipos de contas e pode non funcionar con algu�ns fornecedores de contas. Para "
+"obter ma�is informacio�n consulte a <link xref=\"create-account\"/>."
 
-#: C/tomboy.xml:1534(para)
+#: C/add-account.page:66(p)
 msgid ""
-"When this add-in is installed, the <link linkend=\"tools\">Tools</link> menu "
-"will have the <guimenuitem>Print</guimenuitem> option available."
+"Enter the required information. For most accounts, you will only need a "
+"login ID and a password. Some accounts may require additional information. "
+"See <link xref=\"accounts-window#details\"/> for more information."
 msgstr ""
+"Introduza a informacio�n requirida. Para a maiori�a das contas so� necesitara� "
+"un ID de inicio de sesio�n e un contrasinal. Algunhas contas poden requirir "
+"informacio�n adicional. Para obter ma�is informacio�n consulte a <link xref="
+"\"accounts-window#details\"/>."
 
-#: C/tomboy.xml:1544(term)
-msgid "Sticky Notes Import"
-msgstr "Importar notas adhesivas"
+#: C/add-account.page:71(p)
+msgid "Click <gui style=\"button\">Log in</gui>."
+msgstr "Prema <gui style=\"button\">Iniciar sesio�n</gui>."
 
-#: C/tomboy.xml:1547(para)
+#: C/add-account.page:78(p)
 msgid ""
-"When this add-in is installed, the <link linkend=\"tools\">Tools</link> menu "
-"will have the <guimenuitem>Import from Sticky Notes</guimenuitem> option "
-"available."
+"To change the name that identifies the account in the <gui>Accounts</gui> "
+"window, select the account from the list on the left and either click on the "
+"name or press the space bar. Edit the account name and press <key>Enter</"
+"key> when you’re finished."
+msgstr ""
+"Para cambiar o nome que identifica a conta na xanela <gui>Contas</gui>, "
+"seleccione a conta da lista a� esquerda e prema no nome ou a barra "
+"espaciadora. Edite o nome da conta e prema <key>Intro</key> cando remate."
+
+#: C/accounts-window.page:11(desc)
+msgid "Add, modify, and delete accounts."
+msgstr "Engadir, modificar e borrar contas."
+
+#: C/accounts-window.page:33(title)
+msgid "Accounts Window"
+msgstr "Xanela de contas"
+
+#: C/accounts-window.page:35(p)
+msgid ""
+"The <gui>Accounts</gui> window allows you to add, modify, and delete "
+"accounts."
+msgstr ""
+"A xanela <gui>Contas</gui> permi�telle engadir, modificar e eliminar contas."
+
+#: C/accounts-window.page:43(title)
+msgid "Account Details"
+msgstr "Detalles da conta"
+
+#: C/accounts-window.page:44(p)
+msgid ""
+"For most types of accounts, you can simply enter a login ID and a password. "
+"Certain accounts or account types, however, may require additional "
+"information."
 msgstr ""
-"Cando este engadido está instalado, o menú <link linkend=\"tools"
-"\">Ferramentas</link> terá unha nova opción dispoñíbel <guimenuitem>Importar "
-"desde notas adhesivas</guimenuitem>."
+"Para a maiori�a dos tipos de conta pode, simplemente, introducir un ID de "
+"inicio de sesio�n e un contrasinal. Pore�n, algu�ns tipos de conta poden "
+"requirir informacio�n adicional."
+
+#: C/account-jabber.page:7(desc)
+msgid "Advanced options for Jabber and Google Talk accounts."
+msgstr "Opcio�ns avanzadas para contas Jabber e Google Talk."
+
+#: C/account-jabber.page:29(title)
+msgid "Jabber account details"
+msgstr "Detalles da conta Jabber"
+
+#: C/account-jabber.page:31(p)
+msgid ""
+"Most Jabber accounts will require only a login ID and a password to connect. "
+"For some accounts or on certain types of networks, you may need to enter "
+"additional information in the <gui>Advanced</gui> section. Normally, you "
+"will not need to use the advanced options below. For general instructions on "
+"adding an account, see <link xref=\"add-account\"/>."
+msgstr ""
+"A maiori�a das contas Jabber, para conectarse, so� requiren un ID de inicio de "
+"sesio�n e un contrasinal. Para algunhas contas en certo tipo de redes, pode "
+"necesitar introducir informacio�n adicional na seccio�n <gui>Avanzadas</gui>. "
+"Xeralmente non necesita usar as opcio�ns avanzadas de embaixo. Consulte a "
+"<link xref=\"add-account\"/> para obter instrucio�ns xerais para engadir unha "
+"conta."
+
+#: C/account-jabber.page:39(p)
+msgid ""
+"Google Talk is a type of Jabber account. These instructions hold for Google "
+"Talk accounts as well."
+msgstr ""
+"Google Talk e� un tipo de conta Jabber. Estas instrucio�ns tame�n funcionan "
+"para contas de Google Talk."
+
+#: C/account-jabber.page:45(gui)
+msgid "Encryption required (TLS/SSL)"
+msgstr "Requi�rese cifrado (TLS/SSL)"
+
+#: C/account-jabber.page:46(gui)
+msgid "Ignore SSL certificate errors"
+msgstr "Ignorar os erros de certificados SSL"
+
+#: C/account-jabber.page:47(p)
+msgid ""
+"Whenever possible, communication between <app>Empathy</app> and the Jabber "
+"server is encrypted. If encrypted communication is not possible, messages "
+"may be sent unencrypted. Select <gui>Encryption required</gui> to prevent "
+"<app>Empathy</app> from communicating with the Jabber server when encryption "
+"is not possible."
+msgstr ""
+"Sempre que sexa posi�bel, a comunicacio�n entre <app>Empathy</app> e o "
+"servidor Jabber esta� cifrada. Se a comunicacio�n cifrada non e� posi�bel, pode "
+"que as mensaxes se envi�en sen cifrar. Seleccione <gui>Require cifrado</gui> "
+"para evitar que <app>Empathy</app> se comunique co servidor Jabber cando non "
+"e� posi�bel cifrar a comunicacio�n."
+
+#: C/account-jabber.page:52(p)
+msgid ""
+"Some Jabber servers may encrypt data using invalid certificates, or using "
+"certificates from unknown authorities. If you trust the server you are "
+"connecting to, you can select <gui>Ignore SSL certificate errors</gui> to "
+"allow encrypted communication with invalid certificates."
+msgstr ""
+"Algu�ns servidores Jabber poden cifrar datos usando certificados non va�lidos "
+"ou usando certificados de autoridades descoñecidas. Se confi�a no servidor ao "
+"que se esta� conectando pode seleccionar <gui>Ignorar os erros de "
+"certificados SSL</gui> para permitir comunicacio�ns cifradas con certificados "
+"non va�lidos."
+
+#: C/account-jabber.page:59(gui)
+msgid "Resource"
+msgstr "Recurso"
+
+#: C/account-jabber.page:60(gui)
+#| msgid "Print"
+msgid "Priority"
+msgstr "Prioridad"
 
-#: C/tomboy.xml:1551(para)
+#: C/account-jabber.page:61(p)
 msgid ""
-"Use this option to import notes from the <application>Sticky Notes</"
-"application> application that is available in prior releases of GNOME. This "
-"option has been included in Tomboy to provide an upgrade path for users who "
-"would like to migrate from <application>Sticky Notes</application> to Tomboy "
-"for their note taking purposes."
+"If you have multiple applications (for instance, on separate computers) "
+"connected to your account at the same time, you can set a resource to "
+"uniquely identify each one. By default, <app>Empathy</app> will use "
+"<input>Telepathy</input> as the resource."
 msgstr ""
+"Se ten mu�ltiples aplicativos (en equipos diferentes, por exemplo) conectados "
+"a� su�a conta ao mesmo tempo, pode configurar un recurso para identificar "
+"univocamente cada unha. De forma predefinida <app>Empathy</app> usara� "
+"<input>Telepathy</input> como recurso."
+
+#: C/account-jabber.page:65(p)
+msgid ""
+"You can set the priority to specify which application should receive "
+"incoming messages from your contacts. New messages will be sent to the "
+"application with the highest priority."
+msgstr ""
+"Pode estabelecer a prioridade para especificar que aplicativo deberi�a "
+"recibir mensaxes entrantes dos seus contactos. As mensaxes novas enviaranse "
+"ao aplicativo coa prioridade ma�is alta."
+
+#: C/account-jabber.page:70(gui)
+msgid "Override server settings"
+msgstr "Ignorar as configuracio�ns do servidor"
+
+#: C/account-jabber.page:71(p)
+msgid ""
+"<app>Empathy</app> will use default settings to connect to the Jabber server "
+"based on your login ID. For some Jabber servers, you will need to enter "
+"custom server settings manually. These settings should be provided for you "
+"by your Jabber provider."
+msgstr ""
+"<app>Empathy</app> usara� a configuracio�n predeterminada para conectarse ao "
+"servidor Jabber en funcio�n do seu ID de inicio de sesio�n. Para algu�ns "
+"servidores Jabber precisara� introducir manualmente os axustes do servidor. O "
+"seu fornecedor de Jabber deberi�alle fornecer ditos axustes."
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/account-irc.page:106(None)
+#| msgid ""
+#| "@@image: 'figures/add-to-notebook.png'; "
+#| "md5=03469ddb5137f525ac4f8318caed5532"
+msgid "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
+msgstr "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: C/account-irc.page:112(None)
+#| msgid ""
+#| "@@image: 'figures/new-notebook.png'; md5=b5645185d7fed6183b550c0dab7b72cb"
+msgid "@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
+msgstr ""
+"@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
+
+#: C/account-irc.page:8(desc)
+msgid "Additional information necessary for connecting to IRC networks."
+msgstr "Informacio�n adicional necesaria para conectarse a redes IRC."
+
+#: C/account-irc.page:31(title)
+msgid "IRC account details"
+msgstr "Detalles da conta IRC"
+
+#: C/account-irc.page:33(p)
+msgid ""
+"IRC accounts require different information than many other types of "
+"accounts. To create an IRC account, you must specify at least an IRC network "
+"and a nickname. This page details the information you can provide for an IRC "
+"account."
+msgstr ""
+"As contas de IRC requiren informacio�n diferente que outros tipos de contas. "
+"Para crear unha conta IRC debe especificar cando menos a rede IRC e o "
+"alcume. Esta pa�xina detalla a informacio�n que pode fornecer para unha conta "
+"de IRC."
+
+#: C/account-irc.page:45(gui) C/account-irc.page:120(gui)
+msgid "Network"
+msgstr "Rede"
+
+#: C/account-irc.page:46(p)
+msgid ""
+"IRC is an open system that allows people to run separate IRC networks. Each "
+"network is distinct and has its own users and chat rooms. <app>Empathy</app> "
+"lists the most popular networks in the <gui>Network</gui> drop-down list. "
+"You can add additional networks. See <link xref=\"#networks\"/> below."
+msgstr ""
+"IRC e� un sistema aberto que permite a� xente estar en diferentes redes IRC. "
+"Cada rede e� distinta e ten os seus propios usuarios e salas de chat. "
+"<app>Empathy</app> lista as redes ma�is populares na lista desprega�bel "
+"<gui>Rede</gui>. Ai�nda asi� engadir ma�is redes. Consulte embaixo a <link xref="
+"\"#networks\"/>."
+
+#: C/account-irc.page:53(gui)
+msgid "Nickname"
+msgstr "Alcume"
+
+#: C/account-irc.page:54(p)
+msgid ""
+"Your nickname is your unique name on the IRC network. Only one person on a "
+"network may use a given nickname. If you get an error message that says "
+"<link xref=\"prob-conn-name\" role=\"error-msg\"/> you will need to change "
+"your nickname."
+msgstr ""
+"O seu alcume e� un nome u�nico na rede IRC. So� unha persoa nunha rede pode "
+"usar certo alcume. Se obte�n unha mensaxe que di� <link xref=\"prob-conn-name"
+"\" role=\"error-msg\"/> debera� cambiar o seu alcume."
+
+#: C/account-irc.page:60(gui)
+msgid "Password"
+msgstr "Contrasinal"
+
+#: C/account-irc.page:61(p)
+msgid ""
+"Some servers, particularly those on private networks, require a password to "
+"connect. If you are authorized to use the network, the network "
+"administrators should provide you with a password."
+msgstr ""
+"Algu�ns servidores, particularmente aqueles en redes privadas, requiren un "
+"contrasinal para a conexio�n. Se esta� autorizado a usar a rede, os "
+"administradores da rede forneceranlle un contrasinal."
+
+#: C/account-irc.page:65(title)
+msgid "NickServ Passwords"
+msgstr "Contrasinais NickServ"
+
+#: C/account-irc.page:66(p)
+msgid ""
+"On some networks, nicknames can be registered using a service known as "
+"NickServ. <app>Empathy</app> does not directly support nickname passwords. "
+"On some networks, including the popular freenode network, server passwords "
+"are automatically forwarded to NickServ, allowing you to set this field to "
+"identify yourself with NickServ. See <link xref=\"irc-nick-password\"/> for "
+"more details."
+msgstr ""
+"Nalgunhas redes pode rexistrar os alcumes con un servizo coñecido como "
+"«NickServ». <app>Empathy</app> non admite directamente contrasinais para "
+"alcumes. Nalgunhas redes, inclui�ndo a popular rede freenode, os contrasinais "
+"do servidor redireccio�nanse automaticamente a NickServ, permiti�ndolle usar "
+"este campo para identificarse con NickServ. Para obter ma�is informacio�n "
+"contacte a <link xref=\"irc-nick-password\"/>."
+
+#: C/account-irc.page:76(gui)
+msgid "Real name"
+msgstr "Nome real"
+
+#: C/account-irc.page:77(p)
+msgid ""
+"You can provide your real name in addition to your nickname. Other users "
+"will be able to see this when they view your information."
+msgstr ""
+"Pode fornecer o seu nome real ademais do seu alcume. Outros usuarios podera�n "
+"velo ao ver a su�a informacio�n."
+
+#: C/account-irc.page:81(gui)
+msgid "Quit message"
+msgstr "Mensaxe de sai�da"
+
+#: C/account-irc.page:82(p)
+msgid ""
+"When you go offline, a quit message is sent to all the chat rooms you’re in "
+"and to all the users you’re having a private conversation with. Use this "
+"field to provide a custom quit message."
+msgstr ""
+"Cando se desconecta enviase unha mensaxe de sai�da todas as salas de conversa "
+"nas que esta� e a todos os usuarios cos que ten unha conversa privada. Use "
+"este campo para fornecer unha mensaxe personalizada."
+
+#: C/account-irc.page:94(title)
+msgid "IRC Networks"
+msgstr "Redes IRC"
+
+#: C/account-irc.page:97(title)
+msgid "Networks"
+msgstr "Redes"
+
+#: C/account-irc.page:99(p)
+msgid ""
+"<app>Empathy</app> includes a list of popular IRC networks. If you wish to "
+"another IRC network, you can add it to the list. You can also modify "
+"networks and remove them from the list."
+msgstr ""
+"<app>Empathy</app> inclu�e unha lista de redes IRC populares. Se quere usar "
+"outra rede IRC pode engadila a� lista. Tame�n pode modificar e eliminar redes "
+"da lista."
+
+#: C/account-irc.page:104(p)
+msgid ""
+"To add a network to the list, click <media type=\"image\" mime=\"image/png\" "
+"src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Add</media>."
+msgstr ""
+"Para engadir unha rede a� lista prema <media type=\"image\" mime=\"image/png"
+"\" src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Engadir</media>."
+
+#: C/account-irc.page:107(p)
+msgid ""
+"To modify a network in the list, select the network and click <media type="
+"\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" "
+"height=\"16\">Edit</media>."
+msgstr ""
+"Para modificar unha rede da lista seleccione a rede e prema <media type="
+"\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" "
+"height=\"16\">Editar</media>."
+
+#: C/account-irc.page:110(p)
+msgid ""
+"To remove a network from the list, select the network and click <media type="
+"\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" "
+"height=\"16\">Remove</media>."
+msgstr ""
+"Para eliminar unha rede da lista seleccione e prema <media type=\"image\" "
+"mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" height="
+"\"16\">Eliminar</media>."
+
+#: C/account-irc.page:115(p)
+msgid ""
+"When adding or modifying a network, you can enter the following information:"
+msgstr ""
+"Ao engadir ou modificar unha rede pode introducir a seguinte informacio�n:"
+
+#: C/account-irc.page:121(p)
+msgid ""
+"This is the name of the network as you want it to appear in the list of "
+"networks."
+msgstr "Este e� o nome da rede como quere que apareza na lista de redes."
+
+#: C/account-irc.page:125(gui)
+msgid "Charset"
+msgstr "Conxunto de caracteres"
+
+#: C/account-irc.page:126(p)
+msgid ""
+"This specifies the character encoding that is typically used on this "
+"network. A character encoding is a specific way of recording characters "
+"internally in a computer. There are many character encodings, and you need "
+"to use the same character encoding as other users to see their messages "
+"correctly."
+msgstr ""
+"Isto especifica a codificacio�n de caracteres usada xeralmente nesta rede. "
+"Unha codificacio�n de caracteres e� unha forma especi�fica de gravar os "
+"caracteres internamente nun computador. Existen moitas configuracio�ns de "
+"caracteres e debe usar a mesma configuracio�n de caracteres que o resto de "
+"usuarios para poder ver as su�as mensaxes correctamente."
+
+#. Translators: Recommend character encodings that are common
+#.             for your language.
+#: C/account-irc.page:135(p)
+msgid ""
+"By default, <app>Empathy</app> uses UTF-8, a modern character encoding that "
+"can handle text from most of the world's languages. Another common encoding "
+"for English and some other Western languages is ISO-8859-1."
+msgstr ""
+"De forma predefinida <app>Empathy</app> usa UTF-8, unha codificacio�n de "
+"caracteres moderna que pode xestionar texto na maiori�a dos idiomas do mundo. "
+"Outra configuracio�n de caracteres comu�n para ingle�s e outros idiomas "
+"occidentais e� ISO-8859-1."
+
+#: C/account-irc.page:141(gui)
+msgid "Servers"
+msgstr "Servidores"
+
+#: C/account-irc.page:142(p)
+msgid ""
+"An IRC network may have many servers you can connect to. When you are "
+"connected to a server on a particular network, you can communicate with all "
+"users on all other servers on that network. You can add and remove servers "
+"for this network using the <gui>Add</gui> and <gui>Remove</gui> buttons."
+msgstr ""
+"Unha rede IRC pode ter moitos servidores aos que se pode conectar. Cando "
+"esta� conectado a un servidor nunha rede en particular, pode comunicarse con "
+"todos os usuarios en todos os servidores desa rede. Pode engadir e quitar "
+"servidores para esa rede usando os boto�ns <gui>Engadir</gui> e "
+"<gui>Eliminar</gui>."
+
+#: C/account-irc.page:147(p)
+msgid ""
+"When a server is selected, click the field under <gui>Server</gui> or "
+"<gui>Port</gui> to edit it. Alternatively, use the left and right arrow keys "
+"to focus the field, and press the space bar to begin editing."
+msgstr ""
+"Cando un servidor estea seleccionado prema o campo baixo <gui>Servidor</gui> "
+"ou <gui>Porto</gui> para editalo. De forma alternativa, use as frechas "
+"esquerda e dereita para dar o foco ao campo e prema a barra espazadora para "
+"comezar a editalo."
+
+#: C/account-irc.page:151(p)
+msgid ""
+"Select the check box in the <gui>SSL</gui> column to encrypt all "
+"communication with a server. Note that this does not prevent other users on "
+"the network from seeing what you write on public chat rooms."
+msgstr ""
+"Seleccione a caixa de verificacio�n na columna <gui>SSL</gui> para cifrar "
+"toda a comunicacio�n co servidor. Note que isto non preve�n que outros "
+"usuarios na rede vexan o que escribe en salas de conversa pu�blicas."
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
-#: C/tomboy.xml:0(None)
+#: C/index.page:0(None)
 msgid "translator-credits"
 msgstr "Fran Dieguez <frandieguez@gnome.org>, 2011."
+
+#~ msgid ""
+#~ "@@image: 'figures/tomboy-new-note.png'; "
+#~ "md5=ba337ad3ae256f3fdf79afeef82d7883"
+#~ msgstr ""
+#~ "@@image: 'figures/tomboy-new-note.png'; "
+#~ "md5=ba337ad3ae256f3fdf79afeef82d7883"
+
+#~ msgid ""
+#~ "@@image: 'figures/add-notebook-search.png'; "
+#~ "md5=8a98d72edc3c4351a632889c5edbb81f"
+#~ msgstr ""
+#~ "@@image: 'figures/add-notebook-search.png'; "
+#~ "md5=8a98d72edc3c4351a632889c5edbb81f"
+
+#~ msgid ""
+#~ "@@image: 'figures/tomboy-preferences-synchronization.png'; "
+#~ "md5=68e7a980720d8e9e1384cab9960a7adc"
+#~ msgstr ""
+#~ "@@image: 'figures/tomboy-preferences-synchronization.png'; "
+#~ "md5=68e7a980720d8e9e1384cab9960a7adc"
+
+#~ msgid ""
+#~ "@@image: 'figures/tomboy-preferences-editing.png'; "
+#~ "md5=288184a8d9645881eaf3173892583d73"
+#~ msgstr ""
+#~ "@@image: 'figures/tomboy-preferences-editing.png'; "
+#~ "md5=288184a8d9645881eaf3173892583d73"
+
+#~ msgid ""
+#~ "@@image: 'figures/tomboy-preferences-hotkeys.png'; "
+#~ "md5=57510249057a144dbb81ae35e15c694c"
+#~ msgstr ""
+#~ "@@image: 'figures/tomboy-preferences-hotkeys.png'; "
+#~ "md5=57510249057a144dbb81ae35e15c694c"
+
+#~ msgid ""
+#~ "@@image: 'figures/tomboy-preferences-add-ins.png'; "
+#~ "md5=bb3114a219b8bfdf31549fced9618245"
+#~ msgstr ""
+#~ "@@image: 'figures/tomboy-preferences-add-ins.png'; "
+#~ "md5=bb3114a219b8bfdf31549fced9618245"
+
+#~ msgid "Tomboy Notes Manual"
+#~ msgstr "Manual de Notas de Tomboy"
+
+#~ msgid ""
+#~ "Tomboy is a simple desktop note-taking application, with many features "
+#~ "designed to help organize ideas, such as spell checking, highlighting, "
+#~ "auto-linking URLs, lists, font stylizing, quick access with a table of "
+#~ "contents for notes, and add-ins to extend Tomboy's capabilities. ."
+#~ msgstr ""
+#~ "Tomboy é un aplicativo de escritorio sinxelo de creación de notas, con "
+#~ "algunhas funcionalidades deseñadas para axudarlle a organizar ideas, como "
+#~ "a corrección ortográfica, realzado, autoligado de URL, listas, estilos de "
+#~ "tipos de letra, acceso rápido  con unha táboa de contidos para as notas e "
+#~ "engadidos para extender as capacidades de Tomboy."
+
+#~ msgid "2009"
+#~ msgstr "2009"
+
+#~ msgid "Alex Graveley"
+#~ msgstr "Alex Graveley"
+
+#~ msgid "Brent Smith"
+#~ msgstr "Brent Smith"
+
+#~ msgid "Free Software Foundation"
+#~ msgstr "Free Software Foundation"
+
+#~ msgid "Boyd Timothy"
+#~ msgstr "Boyd Timothy"
+
+#~ msgid "Sandy Armstrong"
+#~ msgstr "Sandy Armstrong"
+
+#~ msgid "Paul Cutler"
+#~ msgstr "Paul Cutler"
+
+#~ msgid "GNOME Documentation Project"
+#~ msgstr "Proxecto de documentacio�n de GNOME"
+
+#~ msgid "Alex"
+#~ msgstr "Alex"
+
+#~ msgid "Graveley"
+#~ msgstr "Agraveley"
+
+#~ msgid "alex@beatniksoftware.com"
+#~ msgstr "alex@beatniksoftware.com"
+
+#~ msgid "Brent"
+#~ msgstr "Brent"
+
+#~ msgid "Smith"
+#~ msgstr "Smith"
+
+#~ msgid "gnome@nextreality.net"
+#~ msgstr "gnome@nextreality.net"
+
+#~ msgid "Boyd"
+#~ msgstr "Boyd"
+
+#~ msgid "Timothy"
+#~ msgstr "Timothy"
+
+#~ msgid "Sandy"
+#~ msgstr "Sandy"
+
+#~ msgid "Armstrong"
+#~ msgstr "Armstrong"
+
+#~ msgid "sanfordarmstrong@gmail.com"
+#~ msgstr "sanfordarmstrong@gmail.com"
+
+#~ msgid "Paul"
+#~ msgstr "Paul"
+
+#~ msgid "Cutler"
+#~ msgstr "Cutler"
+
+#~ msgid "pcutler@foresightlinux.org"
+#~ msgstr "pcutler@foresightlinux.org"
+
+#~ msgid "Tomboy Manual 2.1"
+#~ msgstr "Manual de Tomboy 2.1"
+
+#~ msgid "2009-03-23"
+#~ msgstr "23-03-2009"
+
+#~ msgid "Tomboy Manual 4.0"
+#~ msgstr "Manual de Tomboy 4.0"
+
+#~ msgid "2008-03-07"
+#~ msgstr "07-03-2008"
+
+#~ msgid "Tomboy Manual 3.0"
+#~ msgstr "Manual de Tomboy 3.0"
+
+#~ msgid "2007-09-13"
+#~ msgstr "13-09-2007"
+
+#~ msgid "Tomboy Manual 2.0"
+#~ msgstr "Manual de Tomboy 2.0"
+
+#~ msgid "2007-02-28"
+#~ msgstr "28-02-2007"
+
+#~ msgid "This manual describes version 0.14.0 of Tomboy"
+#~ msgstr "Este manual describe a versión 0.14.0 de Tomboy"
+
+#~ msgid "Feedback"
+#~ msgstr "Comentarios e suxestio�ns"
+
+#~ msgid ""
+#~ "To report a bug or make a suggestion regarding the Tomboy application or "
+#~ "this manual, follow the directions in the <ulink type=\"help\" url="
+#~ "\"ghelp:gnome-feedback\">GNOME Feedback Page</ulink>."
+#~ msgstr ""
+#~ "Para informar dun erro ou facer unha suxestio�n sobre o aplicativo "
+#~ "<application>Brasero</application> ou este manual, siga os consellos da "
+#~ "<ulink url=\"ghelp:gnome-feedback\" type=\"help\">Pa�xina de Feedback de "
+#~ "GNOME</ulink>."
+
+#~ msgid "Tomboy Notes"
+#~ msgstr "Notas de Tomboy"
+
+#~ msgid "Tomboy"
+#~ msgstr "Tomboy"
+
+#~ msgid "notes"
+#~ msgstr "notas"
+
+#~ msgid "Notes Application"
+#~ msgstr "Notas do aplicativo"
+
+#~ msgid ""
+#~ "Tomboy is a desktop note-taking application for GNOME, Microsoft Windows, "
+#~ "and Mac OS X. It is simple and easy to use, and allows you to organize "
+#~ "the ideas and information you deal with every day. Tomboy has some very "
+#~ "useful editing features to help you customize your notes, including:"
+#~ msgstr ""
+#~ "Tomboy é un aplicativo de creación de notas para o escritorio GNOME, "
+#~ "Microsoft Windows e Mac OS X. É moi sinxelo e doado de usar e permítelle "
+#~ "organizar as súas ideas e información que xestiona cada día. Tomoby ten "
+#~ "algunhas características de edición moi útiles para axudarlle a "
+#~ "personalizar as súas notas, incluíndo:"
+
+#~ msgid "Highlighting Search Text"
+#~ msgstr "Busca de texto con realce"
+
+#~ msgid "Inline Spell Checking"
+#~ msgstr "Comprobación ortográfica en liña"
+
+#~ msgid "Auto-linking Web &amp; Email Addresses"
+#~ msgstr "Autoligado de enderezos web e correo electrónico"
+
+#~ msgid "Undo/Redo Support"
+#~ msgstr "Compatibilidade para desfacer/refacer"
+
+#~ msgid "Font Styling &amp; Sizing"
+#~ msgstr "Estilos de tipo de letra e tamaño"
+
+#~ msgid ""
+#~ "Tomboy is accessed through the GNOME panel, the taskbar in Microsoft "
+#~ "Windows, or the dock in Mac OS X. To startup Tomboy automatically when "
+#~ "you log into GNOME, see <xref linkend=\"add-to-panel\"/>."
+#~ msgstr ""
+#~ "Pode acceder a Tomboy dese o panel de GNOME, a barra de tarefas de "
+#~ "Microsoft Windows ou o Dock en Mac OS X. Para iniciar automaticamente "
+#~ "Tomboy ao iniciar sesión en GNOME vexa <xref linkend=\"add-to-panel\"/>."
+
+#~ msgid "Getting Started"
+#~ msgstr "Comezando"
+
+#~ msgid "Adding Tomboy to the GNOME Panel"
+#~ msgstr "Engadir Tomboy ao panel de GNOME"
+
+#~ msgid "To create a new note using the mouse:"
+#~ msgstr "Para crear unha nova usando o rato:"
+
+#~ msgid ""
+#~ "Click on the Tomboy note icon present in the GNOME Panel or Windows "
+#~ "taskbar. A menu will appear."
+#~ msgstr ""
+#~ "Prema na icona de nota de Tomboy presente no panel de GNOME ou na barra "
+#~ "de tarefas de Windows e aparecerá un menú."
+
+#~ msgid ""
+#~ "Select the <menuchoice><guimenuitem>Create New Note</guimenuitem></"
+#~ "menuchoice> option in the menu."
+#~ msgstr ""
+#~ "Seleccione a opción <menuchoice><guimenuitem>Crear nova nota</"
+#~ "guimenuitem></menuchoice> desde o menú."
+
+#~ msgid "To create a new note using the keyboard:"
+#~ msgstr "Para crear unha nota usando o teclado:"
+
+#~ msgid ""
+#~ "Open the Tomboy menu using the key combination <keycombo><keycap>Alt</"
+#~ "keycap><keycap>F12</keycap></keycombo>."
+#~ msgstr ""
+#~ "Abra o menú de Tomboy usando a combinación de teclas "
+#~ "<keycombo><keycap>Alt</keycap><keycap>F12</keycap></keycombo>."
+
+#~ msgid ""
+#~ "Use the <keycap>N</keycap> key to select the menu option "
+#~ "<menuchoice><guimenuitem>Create New Note</guimenuitem></menuchoice>."
+#~ msgstr ""
+#~ "Use a tecla <keycap>N</keycap> para seleccionar a opción de menú "
+#~ "<menuchoice><guimenuitem>Crear nova nota</guimenuitem></menuchoice>."
+
+#~ msgid "Editing Notes"
+#~ msgstr "Editar notas"
+
+#~ msgid ""
+#~ "After creating a new note, a new window will appear with the title "
+#~ "<literal>New Note <replaceable>N</replaceable></literal>. At the top of "
+#~ "the note is a toolbar with several buttons and text. Directly below this "
+#~ "toolbar is the content area of the note. This is illustrated in <xref "
+#~ "linkend=\"new-note\"/>."
+#~ msgstr ""
+#~ "Logo de crear unha nova nota, aparecerá unha nova xanela co título "
+#~ "<literal>Nova nota <replaceable>N</replaceable></literal>. Na parte "
+#~ "superior da nota está a barra de ferramentas con varios botóns e texto. "
+#~ "Xusto embaixo da barra de ferramentas está a área de contido da nota. "
+#~ "Isto está ilustrado en <xref linkend=\"new-note\"/>."
+
+#~ msgid "The default window for a New Note"
+#~ msgstr "A xanela predeterminada para a Nova nota"
+
+#~ msgid "Table of Contents"
+#~ msgstr "Táboa de contidos"
+
+#~ msgid "Working With Notes"
+#~ msgstr "Traballar con notas"
+
+#~ msgid "Link"
+#~ msgstr "Ligazón"
+
+#~ msgid "Text"
+#~ msgstr "Texto"
+
+#~ msgid "Undo"
+#~ msgstr "Desfacer"
+
+#~ msgid "Redo"
+#~ msgstr "Refacer"
+
+#~ msgid "Bold"
+#~ msgstr "Negra"
+
+#~ msgid "Italic"
+#~ msgstr "Cursiva"
+
+#~ msgid "Strikeout"
+#~ msgstr "Riscado"
+
+#~ msgid "Highlight"
+#~ msgstr "Realzar"
+
+#~ msgid "Fixed Width"
+#~ msgstr "Largura fixa"
+
+#~ msgid "Font size"
+#~ msgstr "Tamaño do tipo de letra"
+
+#~ msgid "Small"
+#~ msgstr "Pequeno"
+
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#~ msgid "Large"
+#~ msgstr "Grande"
+
+#~ msgid "Huge"
+#~ msgstr "Enorme"
+
+#~ msgid "Bullets"
+#~ msgstr "Viñetas"
+
+#~ msgid "Increase Indent"
+#~ msgstr "Aumentar sangri�a"
+
+#~ msgid "Decrease Indent"
+#~ msgstr "Diminui�r sangri�a"
+
+#~ msgid "Find in This Note"
+#~ msgstr "Buscar nesta nota"
+
+#~ msgid ""
+#~ "To close the find bar, click <guibutton>X</guibutton> (Close Button) on "
+#~ "the far left or press the <keycap>Escape</keycap> key."
+#~ msgstr ""
+#~ "Para pechar a barra de busca, prema <guibutton>X</guibutton> (botón de "
+#~ "pechar) na parte esquerda ou prema a tecla <keycap>Escape</keycap>."
+
+#~ msgid "Synchronize Notes"
+#~ msgstr "Sincronizar notas"
+
+#~ msgid "Export to HTML"
+#~ msgstr "Exportar a HTML"
+
+#~ msgid ""
+#~ "Select this option to print the current note. You will be presented with "
+#~ "the standard GNOME print dialog."
+#~ msgstr ""
+#~ "Seleccione esta opción para imprimir a nota actual. Mostraráselle o "
+#~ "diálogo estándar de impresión de GNOME."
+
+#~ msgid "Delete"
+#~ msgstr "Borrar"
+
+#~ msgid "Panel Menu"
+#~ msgstr "Panel de menu�"
+
+#~ msgid "Tomboy Panel Menu"
+#~ msgstr "Menú do panel de Tomboy"
+
+#~ msgid "Begin a bulleted list"
+#~ msgstr "Iniciar unha lista con viñetas"
+
+#~ msgid "End a bulleted list"
+#~ msgstr "Rematar unha lista con viñetas"
+
+#~ msgid "Increase Indentation"
+#~ msgstr "Aumentar a sangri�a"
+
+#~ msgid "To increase the line indentation in a bulleted list with the mouse:"
+#~ msgstr "Para incrementar a sangri�a da liña nunha lista de viñetas co rato:"
+
+#~ msgid ""
+#~ "Select <menuchoice><guimenuitem>Increase Indent</guimenuitem></"
+#~ "menuchoice> from the <guibutton>Text</guibutton> menu."
+#~ msgstr ""
+#~ "Seleccione <menuchoice><guimenuitem>Incrementar sangría</guimenuitem></"
+#~ "menuchoice> desde o menú <guibutton>Texto</guibutton>."
+
+#~ msgid ""
+#~ "To increase the line indentation in a bulleted list with the keyboard:"
+#~ msgstr "Para incrementar a sangri�a da liña nunha lista de viñetas co rato:"
+
+#~ msgid "Decrease Indentation"
+#~ msgstr "Diminuír a sangri�a"
+
+#~ msgid "To decrease the line indentation in a bulleted list with the mouse:"
+#~ msgstr "Para reducir a sangría da liña nunha lista de viñetas co rato:"
+
+#~ msgid "Working with Notebooks"
+#~ msgstr "Traballar con cadernos"
+
+#~ msgid ""
+#~ "Notebooks allow you to group related notes together. You can add a note "
+#~ "to a notebook in the Search All Notes window or directly inside of a Note."
+#~ msgstr ""
+#~ "Os cadernos de notas permi�tenlle agrupar notas relacionadas. Pode engadir "
+#~ "unha nota a un caderno de notas na xanela Buscar en todas as notas ou "
+#~ "directamente dentro dunha nota."
+
+#~ msgid "Creating Notebooks"
+#~ msgstr "Crear cadernos"
+
+#~ msgid "You can create new notebooks using one of the following methods:"
+#~ msgstr "Pode crear novos cadernos usando un dos seguintes métodos:"
+
+#~ msgid "Enter a name for the new notebook."
+#~ msgstr "Escriba un nome para o novo caderno."
+
+#~ msgid "To create a new notebook from the Search All Notes dialog:"
+#~ msgstr "Para crear un novo caderno desde o diálogo Buscar en tódalas notas:"
+
+#~ msgid "Create a new notebook from Search All Notes"
+#~ msgstr "Crear un novo caderno desde Buscar en tódalas notas"
+
+#~ msgid "Adding Notes to a Notebook"
+#~ msgstr "Engadir notas a un caderno"
+
+#~ msgid ""
+#~ "To add notes to a notebook, you can add a note from the <guilabel>Search "
+#~ "All Notes</guilabel> dialog or directly within a note."
+#~ msgstr ""
+#~ "Para engadir notas a un caderno, pode engadir unha nota desde o diálogo "
+#~ "<guilabel>Buscar en tódalas notas</guilabel> ou directamente na mesma "
+#~ "nota."
+
+#~ msgid "To move an existing note from the Search All Notes dialog:"
+#~ msgstr ""
+#~ "Para mover unha nova existente desde o diálogo Buscar en tódalas notas:"
+
+#~ msgid "Using your mouse, drag the note(s) onto a notebook on the left."
+#~ msgstr ""
+#~ "Usando o seu rato, arrastre a(s) nota(s) sobre o caderno na esquerda."
+
+#~ msgid "Adding a note to a notebook"
+#~ msgstr "Engadir unha nota a un caderno"
+
+#~ msgid "Creating Notebook Templates"
+#~ msgstr "Crear plantillas de caderno"
+
+#~ msgid "Creating a Notebook Template"
+#~ msgstr "Crear unha plantilla de caderno"
+
+#~ msgid "Deleting a Notebook"
+#~ msgstr "Eliminar un caderno"
+
+#~ msgid "To delete a notebook using your mouse:"
+#~ msgstr "Para eliminar un caderno usando o seu rato:"
+
+#~ msgid ""
+#~ "Using your mouse, right click on a Notebook that you have created and "
+#~ "choose <menuchoice><guimenuitem>Delete Notebook</guimenuitem></"
+#~ "menuchoice>."
+#~ msgstr ""
+#~ "Usando o seu rato, prema co botón dereito sobre un caderno que teña "
+#~ "creado e seleccione <menuchoice><guimenuitem>Eliminar caderno</"
+#~ "guimenuitem></menuchoice>."
+
+#~ msgid "Using your mouse, left click on the Notebook you want to delete."
+#~ msgstr ""
+#~ "Usando o rato, prema co botón esquerdo sobre o caderno que quere eliminar."
+
+#~ msgid ""
+#~ "From the menu, choose <menuchoice><guimenuitem>Edit</"
+#~ "guimenuitem><guimenuitem>Delete Notebook</guimenuitem></menuchoice>"
+#~ msgstr ""
+#~ "Desde o menú, seleccione <menuchoice><guimenuitem>Editar</"
+#~ "guimenuitem><guimenuitem>Eliminar caderno</guimenuitem></menuchoice>"
+
+#~ msgid "Note Synchronization"
+#~ msgstr "Sincronización de notas"
+
+#~ msgid ""
+#~ "Tomboy can now keep your notes synchronized between multiple computers by "
+#~ "relying on a central server."
+#~ msgstr ""
+#~ "Tomboy pode manter as súas notas sincronizadas entre varios computadores "
+#~ "mediante un servidor central."
+
+#~ msgid "Configure note synchronization"
+#~ msgstr "Configurar a sincronización de notas"
+
+#~ msgid "Tomboy Synchronization Preferences"
+#~ msgstr "Preferencias de sincronización de Tomboy"
+
+#~ msgid "Configure note synchronization service (WebDAV)"
+#~ msgstr "Configurar o servizo de sincronización de notas (WebDAV)"
+
+#~ msgid "Configure note synchronization service (SSH)"
+#~ msgstr "Configurar o servizo de sincronizacio�n de notas (SSH)"
+
+#~ msgid "Configure note synchronization service (Local Folder)"
+#~ msgstr "Configurar o servizo de sincronización de notas (Cartafol local)"
+
+#~ msgid "Handling synchronization conflicts"
+#~ msgstr "Xestionar conflitos de sincronización"
+
+#~ msgid "Preferences"
+#~ msgstr "Preferencias"
+
+#~ msgid "Editing"
+#~ msgstr "Editar"
+
+#~ msgid "Spellcheck While Typing"
+#~ msgstr "Comprobar ortografía mentres se escribe"
+
+#~ msgid ""
+#~ "The spellcheck option is only available if you have the "
+#~ "<application>GtkSpell</application> package installed."
+#~ msgstr ""
+#~ "A opción de comprobación ortográfica só está dispoñíbel se ten o paquete "
+#~ "<application>GtkSpell</application> instalado."
+
+#~ msgid "Highlight WikiWords"
+#~ msgstr "Realzar as palabras wiki"
+
+#~ msgid "Use Custom Font"
+#~ msgstr "Usar un tipo de letra personalizado"
+
+#~ msgid "Tomboy Editing Preferences"
+#~ msgstr "Preferencias de edición de Tomboy"
+
+#~ msgid "Hotkeys"
+#~ msgstr "Teclas ra�pidas"
+
+#~ msgid "Show notes menu"
+#~ msgstr "Mostrar o menu� de notas"
+
+#~ msgid "Enter the key combination to open the notes menu."
+#~ msgstr "Prema a combinación de teclas para abrir o menú de notas."
+
+#~ msgid "Open \"Start Here\""
+#~ msgstr "Abrir \"Comezar aqui�\""
+
+#~ msgid "Create new note"
+#~ msgstr "Crear unha nova nota"
+
+#~ msgid "Search notes"
+#~ msgstr "Buscar notas"
+
+#~ msgid "Tomboy Hotkey Preferences"
+#~ msgstr "Preferencias das teclas rápidas de Tomboy"
+
+#~ msgid "Synchronization"
+#~ msgstr "Sincronizacio�n"
+
+#~ msgid "Add-ins"
+#~ msgstr "Engadidos"
+
+#~ msgid "Backlinks"
+#~ msgstr "Retroligazo�ns"
+
+#~ msgid "Print Notes"
+#~ msgstr "Imprimir notas"
+
+#~ msgid "and Sticky Notes Import."
+#~ msgstr "e importar notas adhesivas."
+
+#~ msgid "Backlinks (What links here?)"
+#~ msgstr "Retroligazóns (Que liga aquí?)"
+
+#~ msgid "Sticky Notes Import"
+#~ msgstr "Importar notas adhesivas"
+
+#~ msgid ""
+#~ "When this add-in is installed, the <link linkend=\"tools\">Tools</link> "
+#~ "menu will have the <guimenuitem>Import from Sticky Notes</guimenuitem> "
+#~ "option available."
+#~ msgstr ""
+#~ "Cando este engadido está instalado, o menú <link linkend=\"tools"
+#~ "\">Ferramentas</link> terá unha nova opción dispoñíbel "
+#~ "<guimenuitem>Importar desde notas adhesivas</guimenuitem>."
diff --git a/help/hu/hu.po b/help/hu/hu.po
index 0b92fcf0c..8f99d7760 100644
--- a/help/hu/hu.po
+++ b/help/hu/hu.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy-docs master\n"
-"POT-Creation-Date: 2011-06-13 15:52+0000\n"
-"PO-Revision-Date: 2011-07-01 14:29+0200\n"
+"POT-Creation-Date: 2011-09-08 06:13+0000\n"
+"PO-Revision-Date: 2011-09-21 13:13+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
-"Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
+"Language-Team: Magyar <gnome-hu-list at gnome dot org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.0\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
@@ -21,21 +21,22 @@ msgstr ""
 #: C/video-call.page:38(None) C/audio-video.page:70(None)
 #: C/audio-call.page:36(None)
 msgid "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
-msgstr "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
+msgstr ""
+"@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
 
 #: C/video-call.page:10(desc)
 msgid "Start a video conversation with one of your contacts."
 msgstr "Videobeszélgetés kezdése egyik partnerével."
 
 #: C/video-call.page:21(name) C/status-icons.page:16(name)
-#: C/share-desktop.page:13(name) C/set-custom-status.page:19(name)
+#: C/share-desktop.page:14(name) C/set-custom-status.page:19(name)
 #: C/send-file.page:21(name) C/salut-protocol.page:18(name)
 #: C/remove-account.page:18(name) C/prob-conn-neterror.page:18(name)
 #: C/prob-conn-name.page:17(name) C/prob-conn-auth.page:21(name)
 #: C/prob-conn-acctdisabled.page:18(name) C/prev-conv.page:16(name)
 #: C/link-contacts.page:15(name) C/irc-start-conversation.page:15(name)
 #: C/irc-send-file.page:16(name) C/irc-nick-password.page:18(name)
-#: C/irc-manage.page:19(name) C/irc-join-room.page:16(name)
+#: C/irc-manage.page:20(name) C/irc-join-room.page:16(name)
 #: C/irc-join-pwd.page:17(name) C/irc-commands.page:10(name)
 #: C/introduction.page:13(name) C/index.page:19(name)
 #: C/import-account.page:23(name) C/hide-contacts.page:11(name)
@@ -50,14 +51,14 @@ msgid "Milo Casagrande"
 msgstr "Milo Casagrande"
 
 #: C/video-call.page:22(email) C/status-icons.page:17(email)
-#: C/share-desktop.page:14(email) C/set-custom-status.page:20(email)
+#: C/share-desktop.page:15(email) C/set-custom-status.page:20(email)
 #: C/send-file.page:22(email) C/salut-protocol.page:19(email)
 #: C/remove-account.page:19(email) C/prob-conn-neterror.page:19(email)
 #: C/prob-conn-name.page:18(email) C/prob-conn-auth.page:22(email)
 #: C/prob-conn-acctdisabled.page:19(email) C/prev-conv.page:17(email)
 #: C/link-contacts.page:16(email) C/irc-start-conversation.page:16(email)
 #: C/irc-send-file.page:17(email) C/irc-nick-password.page:19(email)
-#: C/irc-manage.page:20(email) C/irc-join-room.page:17(email)
+#: C/irc-manage.page:21(email) C/irc-join-room.page:17(email)
 #: C/irc-join-pwd.page:18(email) C/irc-commands.page:11(email)
 #: C/introduction.page:14(email) C/index.page:20(email)
 #: C/import-account.page:24(email) C/hide-contacts.page:12(email)
@@ -72,7 +73,7 @@ msgid "milo@ubuntu.com"
 msgstr "milo@ubuntu.com"
 
 #: C/video-call.page:25(p) C/status-icons.page:24(p)
-#: C/share-desktop.page:17(p) C/set-custom-status.page:23(p)
+#: C/share-desktop.page:22(p) C/set-custom-status.page:23(p)
 #: C/send-message.page:21(p) C/send-file.page:25(p)
 #: C/salut-protocol.page:22(p) C/remove-account.page:22(p)
 #: C/prob-conn.page:18(p) C/prob-conn-neterror.page:22(p)
@@ -80,7 +81,7 @@ msgstr "milo@ubuntu.com"
 #: C/prob-conn-acctdisabled.page:22(p) C/prev-conv.page:24(p)
 #: C/link-contacts.page:19(p) C/irc-start-conversation.page:19(p)
 #: C/irc-send-file.page:20(p) C/irc-nick-password.page:22(p)
-#: C/irc-manage.page:23(p) C/irc-join-room.page:20(p)
+#: C/irc-manage.page:24(p) C/irc-join-room.page:20(p)
 #: C/irc-join-pwd.page:21(p) C/irc-commands.page:14(p)
 #: C/introduction.page:17(p) C/index.page:23(p) C/import-account.page:31(p)
 #: C/hide-contacts.page:15(p) C/group-conversations.page:23(p)
@@ -108,8 +109,8 @@ msgid ""
 msgstr ""
 "Ha rendelkezik webkamerával, akkor felhívhatja partnereit, és "
 "videobeszélgetést folytathat velük. Ez a szolgáltatás csak bizonyos "
-"fióktípusokkal működik, és a másik félnek is rendelkeznie kell a "
-"videohívást támogató alkalmazással."
+"fióktípusokkal működik, és a másik félnek is rendelkeznie kell a videohívást "
+"támogató alkalmazással."
 
 #: C/video-call.page:37(p)
 msgid ""
@@ -153,7 +154,8 @@ msgid "Start a video conversation with a meta-contact"
 msgstr "Videobeszélgetés indítása metapartnerrel"
 
 #: C/video-call.page:63(p) C/send-message.page:53(p) C/audio-call.page:66(p)
-msgid "From the <gui>Contact List</gui> window, right-click on the meta-contact."
+msgid ""
+"From the <gui>Contact List</gui> window, right-click on the meta-contact."
 msgstr ""
 "A <gui>Partnerlista</gui> ablakban kattintson a jobb egérgombbal a "
 "metapartnerre."
@@ -180,29 +182,24 @@ msgstr ""
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/status-icons.page:39(None)
-#| msgid ""
-#| "@@image: 'figures/available.png'; md5=1952a8952efbe87e84b21e09e0587e71"
 msgid "@@image: 'figures/available.png'; md5=2196b2f0ad4ce26fdb7b9d48e75d1947"
 msgstr "@@image: 'figures/available.png'; md5=2196b2f0ad4ce26fdb7b9d48e75d1947"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/status-icons.page:45(None)
-#| msgid "@@image: 'figures/busy.png'; md5=6cab57171fb6d732a85ace48f11cf207"
 msgid "@@image: 'figures/busy.png'; md5=15eb2adff5faedf97b0cb9105d09410a"
 msgstr "@@image: 'figures/busy.png'; md5=15eb2adff5faedf97b0cb9105d09410a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/status-icons.page:53(None)
-#| msgid "@@image: 'figures/away.png'; md5=9a93ccca527af39cbe11db5c9d915ca0"
 msgid "@@image: 'figures/away.png'; md5=9c504d6ffa0cf1a9cc8933d16e1bea33"
 msgstr "@@image: 'figures/away.png'; md5=9c504d6ffa0cf1a9cc8933d16e1bea33"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/status-icons.page:62(None) C/status-icons.page:69(None)
-#| msgid "@@image: 'figures/offline.png'; md5=565ba82fbedd22e4eb5b810750199527"
 msgid "@@image: 'figures/offline.png'; md5=c5b0c21181cbd6e13f8909243c0fa964"
 msgstr "@@image: 'figures/offline.png'; md5=c5b0c21181cbd6e13f8909243c0fa964"
 
@@ -316,80 +313,110 @@ msgstr "Kilépett"
 msgid ""
 "Setting your status to <em>Offline</em> disconnects you from all of your "
 "accounts."
-msgstr "�llapotának <em>Kilépettre</em> állítása megszünteti kapcsolatát fiókjaihoz."
+msgstr ""
+"�llapotának <em>Kilépettre</em> állítása megszünteti kapcsolatát fiókjaihoz."
 
 #: C/share-desktop.page:7(desc)
-msgid "Share the desktop with your contacts."
-msgstr "Asztalának megosztása partnereivel."
+#| msgid "Share the desktop with your contacts."
+msgid "Show your desktop to your contacts."
+msgstr "Asztalának megmutatása partnereinek."
 
-#: C/share-desktop.page:28(title)
+#: C/share-desktop.page:18(name)
+msgid "Ekaterina Gerasimova"
+msgstr "Ekaterina Gerasimova"
+
+#: C/share-desktop.page:19(email)
+msgid "kittykat3756@gmail.com"
+msgstr "kittykat3756@gmail.com"
+
+#: C/share-desktop.page:33(title)
 msgid "Share your desktop"
 msgstr "Asztal megosztása"
 
-#: C/share-desktop.page:30(p)
+#: C/share-desktop.page:35(p)
+#| msgid ""
+#| "It is possible, with some of your contacts, to share your desktop with "
+#| "them, or to start using your contacts desktop. You can use this "
+#| "functionality to show your desktop to your contacts, to ask for help or "
+#| "to help your contacts resolve a problem."
 msgid ""
-"It is possible, with some of your contacts, to share your desktop with them, "
-"or to start using your contacts desktop. You can use this functionality to "
-"show your desktop to your contacts, to ask for help or to help your contacts "
-"resolve a problem."
+"It is possible to share your desktop with some of your contacts. You can use "
+"this functionality to show your desktop to your contacts to, for example, "
+"ask for help or help your contacts resolve a problem."
 msgstr ""
 "Egyes partnereivel megoszthatja asztalát, vagy elkezdheti használni az "
 "övéket. Ezt a funkciót asztala partnereinek való megmutatására használhatja, "
-"így segítséget kérhet vagy segíthet megoldani egy problémát."
+"így például segítséget kérhet, vagy segíthet nekik megoldani egy problémát."
 
-#: C/share-desktop.page:38(p)
+#: C/share-desktop.page:42(p)
 msgid ""
-"In order to be able to share your desktop or to remotely use your contacts "
-"desktop, it is necessary to have a remote desktop viewer application "
-"installed in your system."
+"To be able to share your desktop, you need to have a VNC server, which has "
+"support for the feature, installed on your system. <app>Vino</app>, the "
+"GNOME VNC server, has the required support."
 msgstr ""
-"Ahhoz, hogy megoszthassa asztalát, vagy távolról használhassa partnereiét, a "
-"távoliasztal-megjelenítő alkalmazásnak telepítve kell lennie rendszerén."
-
-#: C/share-desktop.page:46(p) C/send-file.page:40(p)
-#: C/favorite-rooms.page:66(p)
-msgid "From the <gui>Contact List</gui> window, perform one of the following:"
-msgstr "A <gui>Partnerlista</gui> ablakban hajtsa végre a következők egyikét:"
+"Asztalának megosztásához rendszerére telepítve kell lennie egy "
+"VNC-kiszolgálónak, amely támogatja ezt a szolgáltatást. A <app>Vino</app>, a "
+"GNOME VNC-kiszolgálója tartalmazza a szükséges támogatást."
 
 #: C/share-desktop.page:51(p)
+#| msgid ""
+#| "From the <gui>Contact List</gui> window, perform one of the following:"
+msgid "From the <gui>Contact List</gui> window, do one of the following:"
+msgstr "A <gui>Partnerlista</gui> ablakban tegye a következők egyikét:"
+
+#: C/share-desktop.page:56(p)
+#| msgid ""
+#| "Select the contact you want to share your desktop with, and choose "
+#| "<guiseq><gui>Edit</gui><gui>Contact</gui><gui>Share my desktop</gui></"
+#| "guiseq>."
 msgid ""
-"Select the contact you want to share your desktop with, and choose "
-"<guiseq><gui>Edit</gui><gui>Contact</gui><gui>Share my desktop</gui></"
+"Select the contact you want to share your desktop with and choose "
+"<guiseq><gui>Edit</gui><gui>Contact</gui><gui>Share My Desktop</gui></"
 "guiseq>."
 msgstr ""
 "Válassza ki a partnert, akivel meg szeretné osztani az asztalát, és válassza "
 "a <guiseq><gui>Szerkesztés</gui><gui>Partner</gui><gui>Az asztalom "
 "megosztása</gui></guiseq> menüpontot."
 
-#: C/share-desktop.page:57(p)
+#: C/share-desktop.page:63(p)
+#| msgid ""
+#| "Right-click on the name of the contact you want to share your desktop "
+#| "with, and select <gui>Share my desktop</gui>."
 msgid ""
-"Right-click on the name of the contact you want to share your desktop with, "
-"and select <gui>Share my desktop</gui>."
+"Right-click on the name of the contact you want to share your desktop with "
+"and select <gui>Share My Desktop</gui>."
 msgstr ""
 "Kattintson a jobb egérgombbal a partner nevére, akivel meg szeretné osztani "
-"az asztalát, és válassza a <gui>Az asztalom megosztása</gui> menüpontot."
+"az asztalát, és válassza <gui>Az asztalom megosztása</gui> menüpontot."
+
+#: C/share-desktop.page:71(p)
+msgid ""
+"An invitation to view your desktop will be sent to the contact you have "
+"selected. To view your desktop, they will need to accept it."
+msgstr ""
+"A kiválasztott partner kap egy meghívást az asztala megjelenítésére. Az "
+"asztal megjelenítéséhez ezt a partnernek el kell fogadnia."
 
-#: C/share-desktop.page:65(p)
+#: C/share-desktop.page:77(p)
 msgid ""
-"A request will be sent to the contact you want to share your desktop with. "
-"If they accept, the default remote desktop viewer application will be "
-"launched in order to permit you to disconnect the user that is controlling "
-"your desktop."
+"You can disconnect the contact from your computer using your desktop sharing "
+"application."
 msgstr ""
-"Elküldésre kerül egy kérés a partnerének, akivel meg szeretné osztani az "
-"asztalát. Ha elfogadja, elindul az alapértelmezett távoliasztal-megjelenítő, "
-"ezzel lehetővé téve az asztalát vezérlő felhasználó kapcsolatának "
-"megszakítását."
+"A partnerét az asztal megosztására használt alkalmazás segítségével "
+"választhatja le a számítógépéről."
 
-#: C/share-desktop.page:70(p)
+#: C/share-desktop.page:82(p)
+#| msgid ""
+#| "For more information about how to use the remote desktop viewer "
+#| "application, refer to its help."
 msgid ""
-"For more information about how to use the remote desktop viewer application, "
-"refer to its help."
+"For more information about how to use the remote desktop sharing "
+"application, refer to its help."
 msgstr ""
-"A távoliasztal-megjelenítő alkalmazás használatával kapcsolatos további "
+"A távoliasztal-megosztó alkalmazás használatával kapcsolatos további "
 "információkért nézze meg annak súgóját."
 
-#: C/share-desktop.page:77(p)
+#: C/share-desktop.page:90(p)
 msgid ""
 "When you share your desktop with someone else, it is possible to experience "
 "system performance slowdown and low Internet speed."
@@ -397,15 +424,21 @@ msgstr ""
 "Amikor megosztja asztalát, a rendszer teljesítményének romlását és az "
 "internetkapcsolat lassulását tapasztalhatja."
 
-#: C/share-desktop.page:83(p)
+#: C/share-desktop.page:96(p)
+#| msgid ""
+#| "Not all your contacts might be able to support this functionality. It is "
+#| "necessary for them to have at least the 2.28 version of <app>Empathy</"
+#| "app> and a remote desktop viewer application installed in their system."
 msgid ""
-"Not all your contacts might be able to support this functionality. It is "
-"necessary for them to have at least the 2.28 version of <app>Empathy</app> "
-"and a remote desktop viewer application installed in their system."
+"Some of your contacts may not be able to use this feature. It is necessary "
+"for them to have version 2.28, or newer, of <app>Empathy</app> and a "
+"compatible remote desktop viewer application installed in their system."
 msgstr ""
-"Nem minden partnere lehet képes ezt a funkciót használni. Ehhez a "
-"rendszerükre az <app>Empathy</app> és a távoliasztal-megjelenítő legalább "
-"2.28-as verziójának kell telepítve lennie."
+"Egyes partnerek lehet, hogy nem tudják ezt a szolgáltatást használni. Ehhez "
+"a "
+"rendszerükre az <app>Empathy</app> és egy kompatibilis "
+"távoliasztal-megjelenítő 2.28-as vagy újabb verziójának kell telepítve "
+"lennie."
 
 #: C/set-custom-status.page:9(desc)
 msgid "Add, edit or delete personal messages for your status."
@@ -443,7 +476,8 @@ msgstr ""
 msgid ""
 "From the <gui>Contact List</gui> window, click on the drop-down list at the "
 "top."
-msgstr "A <gui>Partnerlista</gui> ablakban kattintson a felső legördülő listára."
+msgstr ""
+"A <gui>Partnerlista</gui> ablakban kattintson a felső legördülő listára."
 
 #: C/set-custom-status.page:52(p)
 msgid ""
@@ -523,8 +557,10 @@ msgid "Click on the <gui>Remove</gui> button."
 msgstr "Kattintson az <gui>Eltávolítás</gui> gombra."
 
 #: C/set-custom-status.page:131(p)
-msgid "To add a new custom message, from the <gui>Add New Preset</gui> section:"
-msgstr "Egyéni üzenet hozzáadásához az <gui>Új érték hozzáadása</gui> szakaszban:"
+msgid ""
+"To add a new custom message, from the <gui>Add New Preset</gui> section:"
+msgstr ""
+"Egyéni üzenet hozzáadásához az <gui>Új érték hozzáadása</gui> szakaszban:"
 
 #: C/set-custom-status.page:136(p)
 msgid ""
@@ -616,6 +652,10 @@ msgstr "Fájl küldése a számítógépéről egy partnerének."
 msgid "Send files"
 msgstr "Fájlok küldése"
 
+#: C/send-file.page:40(p) C/favorite-rooms.page:66(p)
+msgid "From the <gui>Contact List</gui> window, perform one of the following:"
+msgstr "A <gui>Partnerlista</gui> ablakban hajtsa végre a következők egyikét:"
+
 #: C/send-file.page:45(p)
 msgid ""
 "Right click on the contact you want to send a file to, and choose <gui>Send "
@@ -655,7 +695,8 @@ msgstr ""
 msgid ""
 "Once the transfer is finished, it is possible to close the <gui>File "
 "Transfers</gui> window."
-msgstr "Az átvitel befejeződése után bezárhatja a <gui>Fájlátvitelek</gui> ablakot."
+msgstr ""
+"Az átvitel befejeződése után bezárhatja a <gui>Fájlátvitelek</gui> ablakot."
 
 #: C/send-file.page:80(p)
 msgid ""
@@ -763,7 +804,8 @@ msgstr ""
 msgid ""
 "Select the account you wish to remove from the accounts list on the left "
 "side of the window."
-msgstr "Az ablak bal oldalán válassza ki a fióklistából eltávolítani kívánt fiókot."
+msgstr ""
+"Az ablak bal oldalán válassza ki a fióklistából eltávolítani kívánt fiókot."
 
 #: C/remove-account.page:50(p)
 msgid "Click on <gui style=\"button\">Remove</gui>."
@@ -842,8 +884,10 @@ msgstr ""
 
 #: C/prob-conn-neterror.page:52(p) C/prob-conn-auth.page:45(p)
 #: C/prob-conn-acctdisabled.page:43(p)
-msgid "Make sure that you are connected to the Internet, or to a local area network."
-msgstr "Győződjön meg róla, hogy csatlakozik az internethez vagy helyi hálózathoz."
+msgid ""
+"Make sure that you are connected to the Internet, or to a local area network."
+msgstr ""
+"Győződjön meg róla, hogy csatlakozik az internethez vagy helyi hálózathoz."
 
 #: C/prob-conn-neterror.page:57(p) C/prob-conn-name.page:42(p)
 #: C/prob-conn-auth.page:57(p)
@@ -876,8 +920,10 @@ msgid "Proxy support"
 msgstr "Proxytámogatás"
 
 #: C/prob-conn-neterror.page:91(p)
-msgid "At the moment <app>Empathy</app> can not be configured to work with a proxy."
-msgstr "Jelenleg az <app>Empathy</app> nem állítható be proxyval való használatra."
+msgid ""
+"At the moment <app>Empathy</app> can not be configured to work with a proxy."
+msgstr ""
+"Jelenleg az <app>Empathy</app> nem állítható be proxyval való használatra."
 
 #: C/prob-conn-name.page:9(title)
 msgid "“Name in use�"
@@ -911,7 +957,10 @@ msgid ""
 "If you have registered that nickname within the network you are using, set "
 "the password for that nickname. For more information, see <link xref=\"irc-"
 "nick-password\"/>."
-msgstr "Ha regisztrálta a becenevet az éppen használt hálózaton, akkor adja meg a jelszót az adott becenévhez. További információkért lásd a <link xref=\"irc-nick-password\"/> részt."
+msgstr ""
+"Ha regisztrálta a becenevet az éppen használt hálózaton, akkor adja meg a "
+"jelszót az adott becenévhez. További információkért lásd a <link xref=\"irc-"
+"nick-password\"/> részt."
 
 #: C/prob-conn-name.page:64(p)
 msgid ""
@@ -926,7 +975,8 @@ msgstr ""
 msgid ""
 "An error message which says “<gui>Authentication failed</gui>� appears in "
 "the main window."
-msgstr "A főablakban az „<gui>A hitelesítés meghiúsult</gui>� üzenet jelenik meg."
+msgstr ""
+"A főablakban az „<gui>A hitelesítés meghiúsult</gui>� üzenet jelenik meg."
 
 #: C/prob-conn-auth.page:36(title)
 msgid "I get a message that says “Authentication failed�"
@@ -953,7 +1003,8 @@ msgstr ""
 "engedélyezi a csatlakozást."
 
 #: C/prob-conn-auth.page:63(p) C/prob-conn-acctdisabled.page:54(p)
-msgid "Type your username and password again to make sure that they are correct."
+msgid ""
+"Type your username and password again to make sure that they are correct."
 msgstr ""
 "�rja be újra felhasználónevét és jelszavát, így ellenőrizve hogy nem gépelte "
 "el azokat."
@@ -962,7 +1013,8 @@ msgstr ""
 msgid ""
 "The instant messaging account that you want to use is not enabled in the "
 "list of accounts."
-msgstr "A használni kívánt azonnaliüzenő-fiókja nincs engedélyezve a fióklistában."
+msgstr ""
+"A használni kívánt azonnaliüzenő-fiókja nincs engedélyezve a fióklistában."
 
 #: C/prob-conn-acctdisabled.page:33(title)
 msgid "My account is not enabled"
@@ -1082,7 +1134,9 @@ msgstr ""
 msgid ""
 "Click on a conversation to view it. <app>Empathy</app> will select the text "
 "in the conversation that matched your search terms."
-msgstr "Kattintson a társalgásra a megjelenítéséhez. Az <app>Empathy</app> kijelöli a keresőkifejezésre illeszkedő részt a társalgás szövegében."
+msgstr ""
+"Kattintson a társalgásra a megjelenítéséhez. Az <app>Empathy</app> kijelöli "
+"a keresőkifejezésre illeszkedő részt a társalgás szövegében."
 
 #: C/prev-conv.page:89(title)
 msgid "Browse previous conversations"
@@ -1162,8 +1216,8 @@ msgid ""
 "If one, or more, of your contacts has multiple accounts with different "
 "messaging services, you can combine these contacts into a single one."
 msgstr ""
-"Ha egy partnere több fiókkal is rendelkezik különböző szolgáltatóknál, "
-"akkor ezeket a partnerbejegyzéseket egyesítheti."
+"Ha egy partnere több fiókkal is rendelkezik különböző szolgáltatóknál, akkor "
+"ezeket a partnerbejegyzéseket egyesítheti."
 
 #: C/link-contacts.page:30(p)
 msgid ""
@@ -1325,9 +1379,9 @@ msgid ""
 "sa/3.0/\">Commons Deed</link>."
 msgstr ""
 "A licenc teljes szövegéért lásd a <link href=\"http://creativecommons.org/"
-"licenses/by-sa/3.0/legalcode\">CreativeCommons weboldalát</link>, vagy "
-"a teljes <link href=\"http://creativecommons.org/licenses/by-"
-"sa/3.0/\">Commons összefoglalót</link>."
+"licenses/by-sa/3.0/legalcode\">CreativeCommons weboldalát</link>, vagy a "
+"teljes <link href=\"http://creativecommons.org/licenses/by-sa/3.0/\">Commons "
+"összefoglalót</link>."
 
 #: C/irc-start-conversation.page:8(desc)
 msgid "Start a conversation with an IRC contact."
@@ -1353,8 +1407,8 @@ msgid ""
 "choose <gui>Chat</gui>."
 msgstr ""
 "Egy IRC-csevegőszoba partnerlistájában kattintson duplán a felhasználó "
-"nevére, akivel csevegni szeretne. Ezen kívül rákattinthat a jobb egérgombbal is "
-"a felhasználó nevére, és kiválaszthatja a <gui>Csevegés</gui> menüpontot."
+"nevére, akivel csevegni szeretne. Ezen kívül rákattinthat a jobb egérgombbal "
+"is a felhasználó nevére, és kiválaszthatja a <gui>Csevegés</gui> menüpontot."
 
 #: C/irc-start-conversation.page:45(p)
 msgid ""
@@ -1378,7 +1432,8 @@ msgstr ""
 
 #: C/irc-send-file.page:9(desc)
 msgid "<app>Empathy</app> does not currently support sending files using IRC."
-msgstr "Az <app>Empathy</app> jelenleg nem támogatja a fájlküldést IRC használatával."
+msgstr ""
+"Az <app>Empathy</app> jelenleg nem támogatja a fájlküldést IRC használatával."
 
 #: C/irc-send-file.page:31(title)
 msgid "Send files over IRC"
@@ -1452,15 +1507,15 @@ msgstr ""
 "védett becenév használatát. Jelenleg az <app>Empathy</app> használatával nem "
 "lehet IRC-becenevet regisztrálni, vagy a becenév jelszavát módosítani."
 
-#: C/irc-manage.page:9(desc)
+#: C/irc-manage.page:10(desc)
 msgid "How to use IRC with <app>Empathy</app>."
 msgstr "IRC használata az <app>Empathyval</app>."
 
-#: C/irc-manage.page:34(title)
+#: C/irc-manage.page:35(title)
 msgid "Internet Relay Chat (IRC)"
 msgstr "Interneten továbbított csevegés (IRC)"
 
-#: C/irc-manage.page:37(p) C/account-irc.page:39(p)
+#: C/irc-manage.page:38(p) C/account-irc.page:39(p)
 msgid ""
 "You must have the <sys>telepathy-idle</sys> package installed to use IRC in "
 "<app>Empathy</app>."
@@ -1468,19 +1523,23 @@ msgstr ""
 "Az IRC protokoll <app>Empathyban</app> való használatához telepíteni kell a "
 "<sys>telepathy-idle</sys> csomagot."
 
-#: C/irc-manage.page:43(title)
+#: C/irc-manage.page:42(link)
+msgid "Install telepathy-idle"
+msgstr "A telepathy-idle telepítése"
+
+#: C/irc-manage.page:49(title)
 msgid "IRC Chat Rooms and Conversations"
 msgstr "IRC-csevegőszobák és társalgások"
 
-#: C/irc-manage.page:45(title)
+#: C/irc-manage.page:51(title)
 msgid "Chat Rooms and Conversations"
 msgstr "Csevegőszobák és társalgások"
 
-#: C/irc-manage.page:50(title)
+#: C/irc-manage.page:56(title)
 msgid "Common IRC Problems"
 msgstr "Gyakori IRC-problémák"
 
-#: C/irc-manage.page:52(title) C/index.page:55(title)
+#: C/irc-manage.page:58(title) C/index.page:55(title)
 msgid "Common Problems"
 msgstr "Gyakori problémák"
 
@@ -1499,8 +1558,9 @@ msgid ""
 "account\"/> and <link xref=\"account-irc\"/>."
 msgstr ""
 "Az IRC-csevegőszobákba (IRC-csatornákra) bármely IRC-hálózaton beléphet, "
-"amelyhez csatlakozva van. Az IRC-hálózatokhoz való csatlakozással kapcsolatban "
-"lásd az <link xref=\"add-account\"/> és <link xref=\"account-irc\"/> témákat."
+"amelyhez csatlakozva van. Az IRC-hálózatokhoz való csatlakozással "
+"kapcsolatban lásd az <link xref=\"add-account\"/> és <link xref=\"account-irc"
+"\"/> témákat."
 
 #: C/irc-join-room.page:39(p) C/group-conversations.page:58(p)
 #: C/group-conversations.page:122(p)
@@ -1533,8 +1593,11 @@ msgid "Click <gui>Join</gui> to enter the room."
 msgstr "Nyomja meg a <gui>Csatlakozás</gui> gombot a szobába való belépéshez."
 
 #: C/irc-join-room.page:64(p)
-msgid "To join multiple rooms, you need to repeat the steps above for each room."
-msgstr "Több szobához is csatlakozhat, minden szobához megismételve a fenti lépéseket."
+msgid ""
+"To join multiple rooms, you need to repeat the steps above for each room."
+msgstr ""
+"Több szobához is csatlakozhat, minden szobához megismételve a fenti "
+"lépéseket."
 
 #: C/irc-join-pwd.page:9(desc)
 msgid "Enter password-protected IRC chat rooms."
@@ -1554,7 +1617,8 @@ msgstr ""
 
 #: C/irc-join-pwd.page:33(p)
 msgid "<link xref=\"irc-join-room\">Join the room</link> as normal."
-msgstr "<link xref=\"irc-join-room\">Csatlakozzon a szobához</link> a szokásos módon."
+msgstr ""
+"<link xref=\"irc-join-room\">Csatlakozzon a szobához</link> a szokásos módon."
 
 #: C/irc-join-pwd.page:38(p)
 msgid ""
@@ -1588,9 +1652,6 @@ msgstr "Minden elérhető parancshoz tartozik egy rövid használati utasítás.
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/introduction.page:41(None)
-#| msgid ""
-#| "@@image: 'figures/empathy-main-window.png'; "
-#| "md5=489ba00b0fc377aba4c691210b6e0650"
 msgid ""
 "@@image: 'figures/empathy-main-window.png'; "
 "md5=54908dcb2588beddb15ef0968d2c2582"
@@ -1653,10 +1714,10 @@ msgstr "Az <app>Empathy</app> főablaka."
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/index.page:28(None)
-#| msgid ""
-#| "@@image: 'figures/empathy-logo.png'; md5=14568248b11d2cfe7992c5edd7e157e8"
-msgid "@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2"
-msgstr "@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2"
+msgid ""
+"@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2"
+msgstr ""
+"@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2"
 
 #: C/index.page:7(title) C/index.page:8(title)
 msgid "Empathy Internet Messenger"
@@ -1721,8 +1782,8 @@ msgid ""
 "Run <app>Empathy</app> for the first time. An assistant will offer you a "
 "number of options to create new accounts."
 msgstr ""
-"Az <app>Empathy</app> első futtatásakor egy asszisztens számos "
-"lehetőséget kínál fel új felhasználói fiókok létrehozásához."
+"Az <app>Empathy</app> első futtatásakor egy asszisztens számos lehetőséget "
+"kínál fel új felhasználói fiókok létrehozásához."
 
 #: C/import-account.page:54(p)
 msgid ""
@@ -1734,7 +1795,8 @@ msgstr ""
 
 #: C/import-account.page:58(p)
 msgid "Select the check box next to each account you wish to import."
-msgstr "Válassza ki az egyes importálni kívánt fiókok melletti jelölőnégyzeteket."
+msgstr ""
+"Válassza ki az egyes importálni kívánt fiókok melletti jelölőnégyzeteket."
 
 #: C/import-account.page:66(p)
 msgid ""
@@ -1857,7 +1919,10 @@ msgid ""
 "To invite other contacts to join the group conversation, from the "
 "<gui>Contact List</gui> window, select the contact you want to invite, and "
 "perform one of the following:"
-msgstr "A <gui>Partnerlista</gui> ablakban válassza ki a meghívni kívánt partnert más partnerek meghívásához a csoportos társalgásba, és tegye a következők egyikét:"
+msgstr ""
+"A <gui>Partnerlista</gui> ablakban válassza ki a meghívni kívánt partnert "
+"más partnerek meghívásához a csoportos társalgásba, és tegye a következők "
+"egyikét:"
 
 #: C/group-conversations.page:97(p)
 msgid "Right-click on the contact and choose <gui>Invite to chatroom</gui>."
@@ -1968,7 +2033,8 @@ msgid "Select the <gui>Location</gui> tab."
 msgstr "Válassza a <gui>Hely</gui> lapot."
 
 #: C/geolocation-turn.page:47(p)
-msgid "Select <gui>Publish location to my contacts</gui> to activate geolocation."
+msgid ""
+"Select <gui>Publish location to my contacts</gui> to activate geolocation."
 msgstr ""
 "Jelölje be a <gui>Hely közzététele a partnereimnek</gui> négyzetet a "
 "helymeghatározás aktiválásához."
@@ -2112,7 +2178,8 @@ msgid "Privacy overview"
 msgstr "Adatvédelem áttekintése"
 
 #: C/geolocation-privacy.page:72(p)
-msgid "Overview of the various geolocation privacy settings in <app>Empathy</app>."
+msgid ""
+"Overview of the various geolocation privacy settings in <app>Empathy</app>."
 msgstr ""
 "Az <app>Empathy</app> helymeghatározással kapcsolatos adatvédelmi "
 "beállításainak áttekintése."
@@ -2126,7 +2193,8 @@ msgid "Privacy mode is enabled by default."
 msgstr "Az adatvédelmi mód alapértelmezésben be van kapcsolva."
 
 #: C/geolocation-privacy.page:87(p)
-msgid "Privacy mode prevails even when using external and more precise devices."
+msgid ""
+"Privacy mode prevails even when using external and more precise devices."
 msgstr ""
 "Az adatvédelmi mód külső és pontosabb eszközök használata esetén is "
 "bekapcsolva marad."
@@ -2317,7 +2385,8 @@ msgstr "Ha befejezte, nyomja meg a <gui>Bezárás</gui> gombot."
 
 #: C/disable-account.page:9(desc)
 msgid "Prevent <app>Empathy</app> from automatically logging in to an account."
-msgstr "A fiókba való automatikus bejelentkezés megtiltása az <app>Empathynak</app>."
+msgstr ""
+"A fiókba való automatikus bejelentkezés megtiltása az <app>Empathynak</app>."
 
 #: C/disable-account.page:39(title)
 msgid "Disable an account"
@@ -2340,7 +2409,8 @@ msgstr ""
 msgid ""
 "Select the account you wish to disable from the accounts list on the left "
 "side of the window."
-msgstr "Az ablak bal oldalán lévő fióklistában válassza ki a letiltani kívánt fiókot."
+msgstr ""
+"Az ablak bal oldalán lévő fióklistában válassza ki a letiltani kívánt fiókot."
 
 #: C/disable-account.page:56(p)
 msgid ""
@@ -2410,9 +2480,8 @@ msgid ""
 "new account from the website: <link href=\"http://www.facebook.com\">www."
 "facebook.com</link>."
 msgstr ""
-"A Facebook használatához a <link href="
-"\"http://www.facebook.com\">www.facebook.com</link> weboldalon kell "
-"létrehoznia egy új fiókot."
+"A Facebook használatához a <link href=\"http://www.facebook.com\">www."
+"facebook.com</link> weboldalon kell létrehoznia egy új fiókot."
 
 #: C/create-account.page:60(title) C/audio-video.page:170(p)
 msgid "Jabber"
@@ -2549,7 +2618,9 @@ msgid ""
 msgstr ""
 "Számos zárt azonnaliüzenő-szolgáltatást fejlesztettek különböző cégek és "
 "szervezetek. Az <app>Empathy</app> lehetővé teszi a kapcsolódást meglévő "
-"fiókjával a legnépszerűbb szolgáltatásokhoz. Új fiók létrehozásához fel kell keresnie a szolgáltató weboldalát, és el kell fogadnia a felhasználási feltételeket."
+"fiókjával a legnépszerűbb szolgáltatásokhoz. Új fiók létrehozásához fel kell "
+"keresnie a szolgáltató weboldalát, és el kell fogadnia a felhasználási "
+"feltételeket."
 
 #: C/create-account.page:133(link) C/audio-video.page:135(p)
 msgid "AIM"
@@ -2569,7 +2640,8 @@ msgstr "Yahoo!"
 
 #: C/change-status.page:9(desc)
 msgid "Change your status to advertise your availability to your contacts."
-msgstr "Módosítsa állapotát elérhetőségének közzétételéhez a partnerei számára."
+msgstr ""
+"Módosítsa állapotát elérhetőségének közzétételéhez a partnerei számára."
 
 #: C/change-status.page:34(title)
 msgid "Change your status"
@@ -2585,8 +2657,10 @@ msgstr ""
 "kiválasztását."
 
 #: C/change-status.page:41(p)
-msgid "Click on the drop-down list at the top of the <gui>Contact List</gui> window."
-msgstr "Kattintson a <gui>Partnerlista</gui> ablak tetején lévő legördülő listára."
+msgid ""
+"Click on the drop-down list at the top of the <gui>Contact List</gui> window."
+msgstr ""
+"Kattintson a <gui>Partnerlista</gui> ablak tetején lévő legördülő listára."
 
 #: C/change-status.page:46(p)
 msgid "Select a status from the list."
@@ -2623,7 +2697,8 @@ msgstr ""
 "md5=8d89026b66a263a3bc5b1f0665948567"
 
 #: C/audio-video.page:8(desc)
-msgid "Information on when it is possible to have an audio or video conversation."
+msgid ""
+"Information on when it is possible to have an audio or video conversation."
 msgstr "Információk arról, hogy mikor kezdhet hang- vagy videohívást."
 
 #: C/audio-video.page:32(title)
@@ -2638,9 +2713,9 @@ msgid ""
 "names in the contact list:"
 msgstr ""
 "Csak olyan partnerekkel folytathat hang- és videohívást, akik maguk is ezt a "
-"szolgáltatást támogató klienst használnak. Ha a partner kliense támogatja a hang- "
-"vagy videohívást, akkor a partnerlistában a neve mellett a következő ikont "
-"láthatja:"
+"szolgáltatást támogató klienst használnak. Ha a partner kliense támogatja a "
+"hang- vagy videohívást, akkor a partnerlistában a neve mellett a következő "
+"ikont láthatja:"
 
 #: C/audio-video.page:43(p)
 msgid "Icon"
@@ -2872,7 +2947,10 @@ msgid ""
 "From the <gui>Account</gui> drop-down list, select the account you wish to "
 "use to connect to your contact. Your contact will need to be using the same "
 "service as the account you select."
-msgstr "A <gui>Felhasználói fiók</gui> legördülő listából válassza ki a csatlakozáshoz használandó fiókot. A partnerének az itt kiválasztott fiókéval egyező szolgáltatást kell használnia."
+msgstr ""
+"A <gui>Felhasználói fiók</gui> legördülő listából válassza ki a "
+"csatlakozáshoz használandó fiókot. A partnerének az itt kiválasztott "
+"fiókéval egyező szolgáltatást kell használnia."
 
 #: C/add-contact.page:45(p)
 msgid ""
@@ -2893,7 +2971,9 @@ msgstr ""
 
 #: C/add-contact.page:53(p)
 msgid "Click <gui>Add</gui> to add the person to your list of contacts."
-msgstr "Kattintson a <gui>Hozzáadás</gui> gombra a személy felvételéhez a partnerlistájára."
+msgstr ""
+"Kattintson a <gui>Hozzáadás</gui> gombra a személy felvételéhez a "
+"partnerlistájára."
 
 #: C/add-contact.page:61(p)
 msgid ""
@@ -3126,7 +3206,8 @@ msgstr "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/account-irc.page:112(None)
 msgid "@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
-msgstr "@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
+msgstr ""
+"@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
 
 #: C/account-irc.page:8(desc)
 msgid "Additional information necessary for connecting to IRC networks."
@@ -3274,9 +3355,9 @@ msgid ""
 "\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" "
 "height=\"16\">Edit</media>."
 msgstr ""
-"A módosításhoz válassza ki a hálózatot, és nyomja meg "
-"a <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" "
-"width=\"16\" height=\"16\">Szerkesztés</media> gombot."
+"A módosításhoz válassza ki a hálózatot, és nyomja meg a <media type=\"image"
+"\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" height=\"16"
+"\">Szerkesztés</media> gombot."
 
 #: C/account-irc.page:110(p)
 msgid ""
@@ -3284,12 +3365,13 @@ msgid ""
 "\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" "
 "height=\"16\">Remove</media>."
 msgstr ""
-"Az eltávolításhoz válassza ki a hálózatot, és nyomja "
-"meg a <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png"
-"\" width=\"16\" height=\"16\">z Eltávolítás</media> gombot."
+"Az eltávolításhoz válassza ki a hálózatot, és nyomja meg a <media type="
+"\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" "
+"height=\"16\">z Eltávolítás</media> gombot."
 
 #: C/account-irc.page:115(p)
-msgid "When adding or modifying a network, you can enter the following information:"
+msgid ""
+"When adding or modifying a network, you can enter the following information:"
 msgstr ""
 "Hálózat hozzáadásakor vagy módosításakor a következő információkat adhatja "
 "meg:"
@@ -3298,7 +3380,8 @@ msgstr ""
 msgid ""
 "This is the name of the network as you want it to appear in the list of "
 "networks."
-msgstr "Ez a hálózat neve, ahogyan a hálózatok listájában meg szeretné jeleníteni."
+msgstr ""
+"Ez a hálózat neve, ahogyan a hálózatok listájában meg szeretné jeleníteni."
 
 #: C/account-irc.page:125(gui)
 msgid "Charset"
@@ -3326,8 +3409,8 @@ msgid ""
 "for English and some other Western languages is ISO-8859-1."
 msgstr ""
 "Alapértelmezésben az <app>Empathy</app> az UTF-8-at használja, ez a modern "
-"karakterkódolás képes a világ sok nyelvének kezelésére, így a "
-"magyaréra is. A magyar nyelv gyakori kódolása még az ISO-8859-2."
+"karakterkódolás képes a világ sok nyelvének kezelésére, így a magyaréra is. "
+"A magyar nyelv gyakori kódolása még az ISO-8859-2."
 
 #: C/account-irc.page:141(gui)
 msgid "Servers"
@@ -3342,8 +3425,9 @@ msgid ""
 msgstr ""
 "Az IRC-hálózat több kiszolgálóval rendelkezhet. Ha egy adott hálózat egy "
 "kiszolgálójához csatlakozik, a hálózat többi kiszolgálójához csatlakozó "
-"összes felhasználóval is képes kommunikálni. A hálózathoz a "
-"<gui>Hozzáadás</gui> gombbal vehet fel kiszolgálókat, és az <gui>Eltávolítás</gui> gombbal törölheti azokat."
+"összes felhasználóval is képes kommunikálni. A hálózathoz a <gui>Hozzáadás</"
+"gui> gombbal vehet fel kiszolgálókat, és az <gui>Eltávolítás</gui> gombbal "
+"törölheti azokat."
 
 #: C/account-irc.page:147(p)
 msgid ""
@@ -3372,3 +3456,22 @@ msgstr ""
 msgid "translator-credits"
 msgstr "Kelemen Gábor <kelemeng at gnome dot hu>"
 
+#~ msgid ""
+#~ "In order to be able to share your desktop or to remotely use your "
+#~ "contacts desktop, it is necessary to have a remote desktop viewer "
+#~ "application installed in your system."
+#~ msgstr ""
+#~ "Ahhoz, hogy megoszthassa asztalát, vagy távolról használhassa "
+#~ "partnereiét, a távoliasztal-megjelenítő alkalmazásnak telepítve kell "
+#~ "lennie rendszerén."
+
+#~ msgid ""
+#~ "A request will be sent to the contact you want to share your desktop "
+#~ "with. If they accept, the default remote desktop viewer application will "
+#~ "be launched in order to permit you to disconnect the user that is "
+#~ "controlling your desktop."
+#~ msgstr ""
+#~ "Elküldésre kerül egy kérés a partnerének, akivel meg szeretné osztani az "
+#~ "asztalát. Ha elfogadja, elindul az alapértelmezett távoliasztal-"
+#~ "megjelenítő, ezzel lehetővé téve az asztalát vezérlő felhasználó "
+#~ "kapcsolatának megszakítását."
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index 31e0ec8cc..cac2fe6f1 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -19,9 +19,6 @@ AM_CPPFLAGS =                                           \
 	$(DISABLE_DEPRECATED)
 
 BUILT_SOURCES = 					\
-	empathy-gtk-marshal.h				\
-	empathy-gtk-marshal.c				\
-	empathy-gtk-marshal.list			\
 	empathy-gtk-enum-types.h			\
 	empathy-gtk-enum-types.c
 
@@ -52,7 +49,6 @@ libempathy_gtk_handwritten_source =            	\
 	empathy-linking-dialog.c		\
 	empathy-live-search.c			\
 	empathy-contact-search-dialog.c		\
-	empathy-contact-selector.c		\
 	empathy-contact-selector-dialog.c \
 	empathy-contact-widget.c		\
 	empathy-geometry.c			\
@@ -119,7 +115,6 @@ libempathy_gtk_headers =			\
 	empathy-linking-dialog.h		\
 	empathy-live-search.h			\
 	empathy-contact-search-dialog.h		\
-	empathy-contact-selector.h		\
 	empathy-contact-selector-dialog.h \
 	empathy-contact-widget.h		\
 	empathy-geometry.h			\
@@ -216,24 +211,6 @@ ui_DATA = 					\
 	empathy-search-bar.ui			\
 	empathy-individual-widget.ui
 
-empathy-gtk-marshal.list: $(libempathy_gtk_la_SOURCES) Makefile.am
-	$(AM_V_GEN)( cd $(srcdir) && \
-	sed -n -e 's/.*empathy_gtk_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
-	$(libempathy_gtk_la_SOURCES) ) \
-	| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
-	@if cmp -s $@.tmp $@; then \
-		rm $@.tmp; \
-	else \
-		mv $@.tmp $@; \
-	fi
-
-%-marshal.h: %-marshal.list Makefile
-	$(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=_$(subst -,_,$*)_marshal $< > $*-marshal.h
-
-%-marshal.c: %-marshal.list Makefile
-	$(AM_V_GEN)echo "#include \"empathy-gtk-marshal.h\"" > $@ && \
-	$(GLIB_GENMARSHAL) --body --prefix=_$(subst -,_,$*)_marshal $< >> $*-marshal.c
-
 empathy-gtk-enum-types.h: stamp-empathy-gtk-enum-types.h
 	$(AM_V_GEN)true
 stamp-empathy-gtk-enum-types.h: Makefile $(libempathy_gtk_headers)
diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c
index cb9028c31..863992871 100644
--- a/libempathy-gtk/empathy-account-chooser.c
+++ b/libempathy-gtk/empathy-account-chooser.c
@@ -205,7 +205,7 @@ empathy_account_chooser_class_init (EmpathyAccountChooserClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE,
 			      0);
 
@@ -428,6 +428,7 @@ empathy_account_chooser_set_account (EmpathyAccountChooser *chooser,
 
 	data.chooser = chooser;
 	data.account = account;
+	data.set = FALSE;
 
 	gtk_tree_model_foreach (model,
 				(GtkTreeModelForeachFunc) account_chooser_set_account_foreach,
@@ -569,7 +570,7 @@ account_manager_prepared_cb (GObject *source_object,
 	EmpathyAccountChooserPriv *priv = GET_PRIV (chooser);
 	GError *error = NULL;
 
-	if (!tp_account_manager_prepare_finish (manager, result, &error)) {
+	if (!tp_proxy_prepare_finish (manager, result, &error)) {
 		DEBUG ("Failed to prepare account manager: %s", error->message);
 		g_error_free (error);
 		return;
@@ -685,7 +686,7 @@ account_chooser_setup (EmpathyAccountChooser *chooser)
 					NULL);
 
 	/* Populate accounts */
-	tp_account_manager_prepare_async (priv->manager, NULL,
+	tp_proxy_prepare_async (priv->manager, NULL,
 					  account_manager_prepared_cb, chooser);
 
 	g_object_unref (store);
diff --git a/libempathy-gtk/empathy-account-widget-irc.c b/libempathy-gtk/empathy-account-widget-irc.c
index 8c47d661c..d7282b198 100644
--- a/libempathy-gtk/empathy-account-widget-irc.c
+++ b/libempathy-gtk/empathy-account-widget-irc.c
@@ -164,8 +164,8 @@ empathy_account_widget_irc_build (EmpathyAccountWidget *self,
   g_signal_connect (settings->network_chooser, "changed",
       G_CALLBACK (network_changed_cb), settings);
 
-  gtk_table_attach (GTK_TABLE (*table_common_settings),
-      settings->network_chooser, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
+  gtk_grid_attach (GTK_GRID (*table_common_settings),
+      settings->network_chooser, 1, 0, 1, 1);
 
   gtk_widget_show (settings->network_chooser);
 
diff --git a/libempathy-gtk/empathy-account-widget-irc.ui b/libempathy-gtk/empathy-account-widget-irc.ui
index 8e08a9d68..3e12c90d9 100644
--- a/libempathy-gtk/empathy-account-widget-irc.ui
+++ b/libempathy-gtk/empathy-account-widget-irc.ui
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkDialog" id="irc_network_dialog">
+    <property name="can_focus">False</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Network</property>
     <property name="window_position">center-on-parent</property>
@@ -13,6 +13,7 @@
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox10">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area10">
@@ -46,16 +47,19 @@
         <child>
           <object class="GtkFrame" id="frame14">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="label_xalign">0</property>
             <property name="shadow_type">none</property>
             <child>
               <object class="GtkAlignment" id="alignment28">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="top_padding">6</property>
                 <property name="left_padding">12</property>
                 <child>
                   <object class="GtkTable" id="table14">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="n_rows">2</property>
                     <property name="n_columns">2</property>
                     <property name="column_spacing">12</property>
@@ -63,6 +67,7 @@
                     <child>
                       <object class="GtkLabel" id="label_network">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">Network:</property>
                       </object>
@@ -74,6 +79,7 @@
                     <child>
                       <object class="GtkLabel" id="label_charset">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">Character set:</property>
                       </object>
@@ -98,6 +104,7 @@
                     <child>
                       <object class="GtkComboBox" id="combobox_charset">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -115,6 +122,7 @@
             <child type="label">
               <object class="GtkLabel" id="label_network1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Network</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -131,16 +139,19 @@
         <child>
           <object class="GtkFrame" id="frame15">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="label_xalign">0</property>
             <property name="shadow_type">none</property>
             <child>
               <object class="GtkAlignment" id="alignment29">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="top_padding">6</property>
                 <property name="left_padding">12</property>
                 <child>
                   <object class="GtkTable" id="table15">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="n_columns">2</property>
                     <property name="column_spacing">6</property>
                     <property name="row_spacing">6</property>
@@ -149,13 +160,15 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="hscrollbar_policy">never</property>
-                        <property name="vscrollbar_policy">automatic</property>
                         <property name="shadow_type">in</property>
                         <child>
                           <object class="GtkTreeView" id="treeview_servers">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="enable_search">False</property>
+                            <child internal-child="selection">
+                              <object class="GtkTreeSelection" id="treeview-selection1"/>
+                            </child>
                           </object>
                         </child>
                       </object>
@@ -166,6 +179,7 @@
                     <child>
                       <object class="GtkVButtonBox" id="vbuttonbox1">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="spacing">6</property>
                         <property name="layout_style">start</property>
                         <child>
@@ -175,6 +189,7 @@
                             <property name="can_focus">True</property>
                             <property name="can_default">True</property>
                             <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="use_stock">True</property>
                           </object>
                           <packing>
@@ -190,6 +205,7 @@
                             <property name="can_focus">True</property>
                             <property name="can_default">True</property>
                             <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="use_stock">True</property>
                           </object>
                           <packing>
@@ -205,6 +221,7 @@
                             <property name="can_focus">True</property>
                             <property name="can_default">True</property>
                             <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="use_stock">True</property>
                           </object>
                           <packing>
@@ -220,6 +237,7 @@
                             <property name="can_focus">True</property>
                             <property name="can_default">True</property>
                             <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="use_stock">True</property>
                           </object>
                           <packing>
@@ -242,6 +260,7 @@
             <child type="label">
               <object class="GtkLabel" id="label_servers">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Servers</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
@@ -261,25 +280,15 @@
       <action-widget response="-7">button_close</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkSizeGroup" id="sg_field_labels">
-    <widgets>
-      <widget name="label_network2"/>
-      <widget name="label_nick"/>
-      <widget name="label_password"/>
-      <widget name="label_username"/>
-      <widget name="label_fullname"/>
-      <widget name="label_quit_message"/>
-    </widgets>
-  </object>
   <object class="GtkVBox" id="vbox_irc">
     <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <child>
-      <object class="GtkTable" id="table_irc_settings">
+      <object class="GtkGrid" id="table_irc_settings">
         <property name="visible">True</property>
-        <property name="n_rows">5</property>
-        <property name="n_columns">2</property>
-        <property name="column_spacing">12</property>
+        <property name="can_focus">False</property>
         <property name="row_spacing">6</property>
+        <property name="column_spacing">12</property>
         <child>
           <object class="GtkEntry" id="entry_password">
             <property name="visible">True</property>
@@ -288,231 +297,239 @@
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="right_attach">2</property>
             <property name="top_attach">2</property>
-            <property name="bottom_attach">3</property>
-            <property name="y_options"></property>
+            <property name="width">1</property>
+            <property name="height">1</property>
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="label_password">
+          <object class="GtkEntry" id="entry_nick">
             <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Password:</property>
+            <property name="can_focus">True</property>
           </object>
           <packing>
-            <property name="top_attach">2</property>
-            <property name="bottom_attach">3</property>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options"></property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">1</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
           </packing>
         </child>
         <child>
-          <object class="GtkEntry" id="entry_nick">
+          <object class="GtkLabel" id="label_password_note">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="xalign">0</property>
+            <property name="yalign">0</property>
+            <property name="xpad">3</property>
+            <property name="label" translatable="yes">Most IRC servers don't need a password, so if you're not sure, don't enter a password.</property>
+            <property name="use_markup">True</property>
+            <property name="wrap">True</property>
+            <attributes>
+              <attribute name="scale" value="0.80000000000000004"/>
+            </attributes>
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="right_attach">2</property>
-            <property name="top_attach">1</property>
-            <property name="bottom_attach">2</property>
-            <property name="y_options"></property>
+            <property name="top_attach">3</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="label_network2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">Network:</property>
+            <property name="use_underline">True</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">0</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label_nick">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="xalign">0</property>
             <property name="label" translatable="yes">Nickname:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">entry_nick</property>
           </object>
           <packing>
+            <property name="left_attach">0</property>
             <property name="top_attach">1</property>
-            <property name="bottom_attach">2</property>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options"></property>
+            <property name="width">1</property>
+            <property name="height">1</property>
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="label_network2">
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <object class="GtkLabel" id="label_password">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">Network:</property>
-            <property name="use_underline">True</property>
+            <property name="label" translatable="yes">Password:</property>
           </object>
           <packing>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options"></property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">2</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
           </packing>
         </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">False</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkExpander" id="expander_advanced">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
         <child>
-          <object class="GtkExpander" id="expander_advanced">
+          <object class="GtkTable" id="table_irc_settings1">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="can_focus">False</property>
+            <property name="n_rows">3</property>
+            <property name="n_columns">2</property>
+            <property name="column_spacing">12</property>
+            <property name="row_spacing">6</property>
+            <child>
+              <object class="GtkEntry" id="entry_quit_message">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="invisible_char">•</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
             <child>
-              <object class="GtkTable" id="table_irc_settings1">
+              <object class="GtkLabel" id="label_quit_message">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="n_rows">3</property>
-                <property name="n_columns">2</property>
-                <property name="column_spacing">12</property>
-                <property name="row_spacing">6</property>
-                <child>
-                  <object class="GtkEntry" id="entry_quit_message">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label_quit_message">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Quit message:</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="entry_fullname">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="invisible_char">â—�</property>
-                    <property name="invisible_char_set">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label_fullname">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Real name:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">entry_nick</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label_username">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Username:</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="entry_username">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="invisible_char">â—�</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="y_options"></property>
-                  </packing>
-                </child>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Quit message:</property>
               </object>
+              <packing>
+                <property name="top_attach">2</property>
+                <property name="bottom_attach">3</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options"></property>
+              </packing>
             </child>
-            <child type="label">
-              <object class="GtkLabel" id="label_advanced">
+            <child>
+              <object class="GtkEntry" id="entry_fullname">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="invisible_char">â—�</property>
+                <property name="invisible_char_set">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label_fullname">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Advanced</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Real name:</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">entry_nick</property>
               </object>
+              <packing>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label_username">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Username:</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="x_options">GTK_FILL</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="entry_username">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="invisible_char">â—�</property>
+                <property name="invisible_char_set">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="y_options"></property>
+              </packing>
             </child>
           </object>
-          <packing>
-            <property name="right_attach">2</property>
-            <property name="top_attach">4</property>
-            <property name="bottom_attach">5</property>
-            <property name="y_options"></property>
-          </packing>
         </child>
-        <child>
-          <object class="GtkLabel" id="label_password_note">
+        <child type="label">
+          <object class="GtkLabel" id="label_advanced">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="xalign">0</property>
-            <property name="yalign">0</property>
-            <property name="xpad">3</property>
-            <property name="label" translatable="yes">Most IRC servers don't need a password, so if you're not sure, don't enter a password.</property>
-            <property name="use_markup">True</property>
-            <property name="wrap">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Advanced</property>
             <attributes>
-              <attribute name="scale" value="0.80000000000000004"/>
+              <attribute name="weight" value="bold"/>
             </attributes>
           </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="right_attach">2</property>
-            <property name="top_attach">3</property>
-            <property name="bottom_attach">4</property>
-            <property name="y_options"></property>
-          </packing>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
         </child>
       </object>
       <packing>
         <property name="expand">True</property>
         <property name="fill">True</property>
-        <property name="position">0</property>
+        <property name="position">1</property>
       </packing>
     </child>
   </object>
   <object class="GtkVBox" id="vbox_irc_simple">
     <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <child>
       <object class="GtkLabel" id="label_network_simple">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes">Which IRC network?</property>
       </object>
       <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
         <property name="position">0</property>
       </packing>
     </child>
     <child>
       <object class="GtkAlignment" id="alignment_network_simple">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="xalign">0</property>
         <property name="yalign">0</property>
         <property name="xscale">0.34999999403953552</property>
@@ -525,22 +542,28 @@
         </child>
       </object>
       <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
         <property name="position">1</property>
       </packing>
     </child>
     <child>
       <object class="GtkLabel" id="label_nick_simple">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes">What is your IRC nickname?</property>
       </object>
       <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
         <property name="position">2</property>
       </packing>
     </child>
     <child>
       <object class="GtkAlignment" id="alignment_nick_simple">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="xalign">0</property>
         <property name="yalign">0</property>
         <property name="xscale">0.34999999403953552</property>
@@ -552,13 +575,25 @@
           <object class="GtkEntry" id="entry_nick_simple">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="invisible_char">&#x2022;</property>
+            <property name="invisible_char">•</property>
           </object>
         </child>
       </object>
       <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
         <property name="position">3</property>
       </packing>
     </child>
   </object>
+  <object class="GtkSizeGroup" id="sg_field_labels">
+    <widgets>
+      <widget name="label_network2"/>
+      <widget name="label_nick"/>
+      <widget name="label_password"/>
+      <widget name="label_username"/>
+      <widget name="label_fullname"/>
+      <widget name="label_quit_message"/>
+    </widgets>
+  </object>
 </interface>
diff --git a/libempathy-gtk/empathy-account-widget-jabber.ui b/libempathy-gtk/empathy-account-widget-jabber.ui
index b50c496e7..c8aa1d494 100644
--- a/libempathy-gtk/empathy-account-widget-jabber.ui
+++ b/libempathy-gtk/empathy-account-widget-jabber.ui
@@ -1,7 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">-128</property>
     <property name="upper">127</property>
@@ -9,106 +8,305 @@
     <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment2">
-    <property name="value">5222</property>
     <property name="upper">65555</property>
+    <property name="value">5222</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkVBox" id="vbox_jabber_settings">
+  <object class="GtkVBox" id="vbox_fb_simple">
     <property name="visible">True</property>
-    <property name="orientation">vertical</property>
-    <property name="spacing">6</property>
+    <property name="can_focus">False</property>
     <child>
-      <object class="GtkTable" id="table_common_settings">
+      <object class="GtkLabel" id="label_id_fb_simple">
         <property name="visible">True</property>
-        <property name="n_rows">4</property>
-        <property name="n_columns">2</property>
-        <property name="column_spacing">12</property>
-        <property name="row_spacing">6</property>
+        <property name="can_focus">False</property>
+        <property name="xalign">0</property>
+        <property name="label" translatable="yes">What is your Facebook username?</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">False</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkVBox" id="vbox2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="margin_left">12</property>
         <child>
-          <object class="GtkEntry" id="entry_password">
+          <object class="GtkEntry" id="entry_id_fb_simple">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="visibility">False</property>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="right_attach">2</property>
-            <property name="top_attach">2</property>
-            <property name="bottom_attach">3</property>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <object class="GtkEntry" id="entry_id">
+          <object class="GtkLabel" id="label_fb_example">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_top">4</property>
+            <property name="xalign">0.10000000149011612</property>
+            <property name="label" translatable="yes">This is your username, not your normal Facebook login.
+If you are facebook.com/&lt;b&gt;badger&lt;/b&gt;, enter &lt;b&gt;badger&lt;/b&gt;.
+Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to choose a Facebook username if you don't have one.</property>
+            <property name="use_markup">True</property>
+            <attributes>
+              <attribute name="scale" value="0.80000000000000004"/>
+            </attributes>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">False</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel" id="label_password_fb_simple">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="xalign">0</property>
+        <property name="ypad">6</property>
+        <property name="label" translatable="yes">What is your Facebook password?</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">False</property>
+        <property name="position">2</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkEntry" id="entry_password_fb_simple">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="margin_left">12</property>
+        <property name="visibility">False</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">3</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkCheckButton" id="remember_password_fb_simple">
+        <property name="label" translatable="yes">Remember Password</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">False</property>
+        <property name="use_action_appearance">False</property>
+        <property name="xalign">0</property>
+        <property name="active">True</property>
+        <property name="draw_indicator">True</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">4</property>
+      </packing>
+    </child>
+  </object>
+  <object class="GtkVBox" id="vbox_gtalk_simple">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkLabel" id="label_id_g_simple">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="xalign">0</property>
+        <property name="label" translatable="yes">What is your Google ID?</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkVBox" id="vbox1b">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="margin_left">12</property>
+        <property name="spacing">4</property>
+        <child>
+          <object class="GtkEntry" id="entry_id_g_simple">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="right_attach">2</property>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="label_id">
+          <object class="GtkLabel" id="label_g_example">
             <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Login I_D:</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_id</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0.10000000149011612</property>
+            <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; user@gmail.com</property>
+            <property name="use_markup">True</property>
+            <attributes>
+              <attribute name="scale" value="0.80000000000000004"/>
+            </attributes>
           </object>
           <packing>
-            <property name="x_options">GTK_FILL</property>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
           </packing>
         </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel" id="label_password_g_simple">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="xalign">0</property>
+        <property name="ypad">6</property>
+        <property name="label" translatable="yes">What is your Google password?</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">2</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkEntry" id="entry_password_g_simple">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="margin_left">12</property>
+        <property name="visibility">False</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">3</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkCheckButton" id="remember_password_g_simple">
+        <property name="label" translatable="yes">Remember Password</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">False</property>
+        <property name="use_action_appearance">False</property>
+        <property name="active">True</property>
+        <property name="draw_indicator">True</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">4</property>
+      </packing>
+    </child>
+  </object>
+  <object class="GtkVBox" id="vbox_jabber_settings">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="spacing">6</property>
+    <child>
+      <object class="GtkGrid" id="table_common_settings">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
+        <property name="row_spacing">6</property>
+        <property name="column_spacing">12</property>
         <child>
-          <object class="GtkLabel" id="label_password">
+          <object class="GtkEntry" id="entry_password">
             <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Pass_word:</property>
-            <property name="use_underline">True</property>
-            <property name="justify">right</property>
-            <property name="mnemonic_widget">entry_password</property>
+            <property name="can_focus">True</property>
+            <property name="valign">start</property>
+            <property name="hexpand">True</property>
+            <property name="visibility">False</property>
           </object>
           <packing>
+            <property name="left_attach">1</property>
             <property name="top_attach">2</property>
-            <property name="bottom_attach">3</property>
-            <property name="x_options">GTK_FILL</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkEntry" id="entry_id">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hexpand">True</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">0</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="vbox1">
+          <object class="GtkGrid" id="vbox1">
             <property name="visible">True</property>
-            <property name="orientation">vertical</property>
+            <property name="can_focus">False</property>
+            <property name="valign">start</property>
             <child>
               <object class="GtkLabel" id="label_username_example">
+                <property name="can_focus">False</property>
+                <property name="valign">start</property>
+                <property name="hexpand">True</property>
                 <property name="xalign">0</property>
                 <property name="xpad">3</property>
                 <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; user@jabber.org</property>
                 <property name="use_markup">True</property>
                 <attributes>
-                  <attribute name="scale" value="0.800000"/>
+                  <attribute name="scale" value="0.80000000000000004"/>
                 </attributes>
               </object>
               <packing>
-                <property name="position">0</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label_username_g_example">
+                <property name="can_focus">False</property>
+                <property name="valign">start</property>
+                <property name="hexpand">True</property>
                 <property name="xalign">0</property>
                 <property name="xpad">3</property>
                 <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; user@gmail.com</property>
                 <property name="use_markup">True</property>
                 <attributes>
-                  <attribute name="scale" value="0.800000"/>
+                  <attribute name="scale" value="0.80000000000000004"/>
                 </attributes>
               </object>
               <packing>
-                <property name="position">1</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">1</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label_username_f_example">
+                <property name="can_focus">False</property>
+                <property name="valign">start</property>
+                <property name="hexpand">True</property>
                 <property name="xalign">0</property>
                 <property name="xpad">3</property>
                 <property name="label" translatable="yes" comments="This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.">This is your username, not your normal Facebook login.
@@ -117,19 +315,22 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
                 <property name="use_markup">True</property>
                 <property name="wrap">True</property>
                 <attributes>
-                  <attribute name="scale" value="0.800000"/>
+                  <attribute name="scale" value="0.80000000000000004"/>
                 </attributes>
               </object>
               <packing>
-                <property name="position">2</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">2</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="right_attach">2</property>
             <property name="top_attach">1</property>
-            <property name="bottom_attach">2</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -138,21 +339,50 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
+            <property name="hexpand">True</property>
+            <property name="use_action_appearance">False</property>
             <property name="active">True</property>
             <property name="draw_indicator">True</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="right_attach">2</property>
             <property name="top_attach">3</property>
-            <property name="bottom_attach">4</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
           </packing>
         </child>
         <child>
-          <placeholder/>
+          <object class="GtkLabel" id="label_id">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">Login I_D:</property>
+            <property name="use_underline">True</property>
+            <property name="mnemonic_widget">entry_id</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">0</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
         </child>
         <child>
-          <placeholder/>
+          <object class="GtkLabel" id="label_password">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">Pass_word:</property>
+            <property name="use_underline">True</property>
+            <property name="justify">right</property>
+            <property name="mnemonic_widget">entry_password</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">2</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
         </child>
       </object>
       <packing>
@@ -170,20 +400,20 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="hscrollbar_policy">never</property>
-            <property name="vscrollbar_policy">automatic</property>
             <child>
               <object class="GtkViewport" id="viewport1">
                 <property name="visible">True</property>
-                <property name="resize_mode">queue</property>
+                <property name="can_focus">False</property>
                 <property name="shadow_type">none</property>
                 <child>
                   <object class="GtkVBox" id="vbox_advanced">
                     <property name="visible">True</property>
-                    <property name="orientation">vertical</property>
+                    <property name="can_focus">False</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkTable" id="table_advanced_settings">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="n_rows">4</property>
                         <property name="n_columns">3</property>
                         <property name="column_spacing">12</property>
@@ -222,7 +452,9 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -236,6 +468,7 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
                         <child>
                           <object class="GtkLabel" id="label_priority">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">Priori_ty:</property>
                             <property name="use_underline">True</property>
@@ -251,6 +484,7 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
                         <child>
                           <object class="GtkLabel" id="label_resource">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">Reso_urce:</property>
                             <property name="use_underline">True</property>
@@ -269,7 +503,9 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
@@ -280,105 +516,109 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
                         </child>
                       </object>
                       <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkFrame" id="frame1">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label_xalign">0</property>
                         <property name="shadow_type">none</property>
                         <child>
-                          <object class="GtkAlignment" id="alignment_server_settings">
+                          <object class="GtkTable" id="table1">
                             <property name="visible">True</property>
-                            <property name="top_padding">6</property>
-                            <property name="left_padding">12</property>
+                            <property name="can_focus">False</property>
+                            <property name="margin_left">12</property>
+                            <property name="n_rows">3</property>
+                            <property name="n_columns">2</property>
+                            <property name="column_spacing">6</property>
+                            <property name="row_spacing">6</property>
                             <child>
-                              <object class="GtkTable" id="table1">
+                              <object class="GtkSpinButton" id="spinbutton_port">
                                 <property name="visible">True</property>
-                                <property name="n_rows">3</property>
-                                <property name="n_columns">2</property>
-                                <property name="column_spacing">6</property>
-                                <property name="row_spacing">6</property>
-                                <child>
-                                  <object class="GtkSpinButton" id="spinbutton_port">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="adjustment">adjustment2</property>
-                                    <property name="climb_rate">1</property>
-                                    <property name="numeric">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkEntry" id="entry_server">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkCheckButton" id="checkbutton_ssl">
-                                    <property name="label" translatable="yes">Use old SS_L</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>
-                                  </object>
-                                  <packing>
-                                    <property name="right_attach">2</property>
-                                    <property name="top_attach">2</property>
-                                    <property name="bottom_attach">3</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label_port">
-                                    <property name="visible">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Port:</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="mnemonic_widget">spinbutton_port</property>
-                                  </object>
-                                  <packing>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="label_server">
-                                    <property name="visible">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">_Server:</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="mnemonic_widget">entry_server</property>
-                                  </object>
-                                  <packing>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
+                                <property name="can_focus">True</property>
+                                <property name="adjustment">adjustment2</property>
+                                <property name="climb_rate">1</property>
+                                <property name="numeric">True</property>
                               </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="entry_server">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" id="checkbutton_ssl">
+                                <property name="label" translatable="yes">Use old SS_L</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">2</property>
+                                <property name="bottom_attach">3</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label_port">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">_Port:</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">spinbutton_port</property>
+                              </object>
+                              <packing>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label_server">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">_Server:</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">entry_server</property>
+                              </object>
+                              <packing>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options"></property>
+                              </packing>
                             </child>
                           </object>
                         </child>
                         <child type="label">
                           <object class="GtkLabel" id="label2">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">Override server settings</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
@@ -387,6 +627,8 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
                         </child>
                       </object>
                       <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -399,6 +641,7 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
         <child type="label">
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Advanced</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -407,115 +650,118 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
         </child>
       </object>
       <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
         <property name="position">1</property>
       </packing>
     </child>
   </object>
   <object class="GtkVBox" id="vbox_jabber_simple">
     <property name="visible">True</property>
-    <property name="orientation">vertical</property>
+    <property name="can_focus">False</property>
     <child>
       <object class="GtkLabel" id="label_id_simple">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes">What is your Jabber ID?</property>
       </object>
       <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
         <property name="position">0</property>
       </packing>
     </child>
     <child>
       <object class="GtkLabel" id="label_id_create">
+        <property name="can_focus">False</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes">What is your desired Jabber ID?</property>
       </object>
       <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
         <property name="position">1</property>
       </packing>
     </child>
     <child>
-      <object class="GtkAlignment" id="alignment_simple_jabber_id">
+      <object class="GtkVBox" id="vbox1a">
         <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.34999999403953552</property>
-        <property name="top_padding">6</property>
-        <property name="bottom_padding">3</property>
-        <property name="left_padding">12</property>
+        <property name="can_focus">False</property>
+        <property name="margin_left">12</property>
+        <property name="spacing">4</property>
         <child>
-          <object class="GtkVBox" id="vbox1a">
+          <object class="GtkEntry" id="entry_id_simple">
             <property name="visible">True</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">4</property>
-            <child>
-              <object class="GtkEntry" id="entry_id_simple">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_example">
-                <property name="visible">True</property>
-                <property name="xalign">0.10000000149011612</property>
-                <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; user@jabber.org</property>
-                <property name="use_markup">True</property>
-                <attributes>
-                  <attribute name="scale" value="0.800000"/>
-                </attributes>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
+            <property name="can_focus">True</property>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="label_example">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0.10000000149011612</property>
+            <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; user@jabber.org</property>
+            <property name="use_markup">True</property>
+            <attributes>
+              <attribute name="scale" value="0.80000000000000004"/>
+            </attributes>
           </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
         </child>
       </object>
       <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
         <property name="position">2</property>
       </packing>
     </child>
     <child>
       <object class="GtkLabel" id="label_password_simple">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="xalign">0</property>
         <property name="ypad">6</property>
         <property name="label" translatable="yes">What is your Jabber password?</property>
       </object>
       <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
         <property name="position">3</property>
       </packing>
     </child>
     <child>
       <object class="GtkLabel" id="label_password_create">
+        <property name="can_focus">False</property>
         <property name="xalign">0</property>
         <property name="ypad">6</property>
         <property name="label" translatable="yes">What is your desired Jabber password?</property>
       </object>
       <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
         <property name="position">4</property>
       </packing>
     </child>
     <child>
-      <object class="GtkAlignment" id="alignment2">
+      <object class="GtkEntry" id="entry_password_simple">
         <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.5</property>
-        <property name="left_padding">12</property>
-        <child>
-          <object class="GtkEntry" id="entry_password_simple">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="visibility">False</property>
-          </object>
-        </child>
+        <property name="can_focus">True</property>
+        <property name="margin_left">12</property>
+        <property name="visibility">False</property>
       </object>
       <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
         <property name="position">5</property>
       </packing>
     </child>
@@ -525,220 +771,15 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
+        <property name="use_action_appearance">False</property>
         <property name="active">True</property>
         <property name="draw_indicator">True</property>
       </object>
       <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
         <property name="position">6</property>
       </packing>
     </child>
   </object>
-  <object class="GtkVBox" id="vbox_gtalk_simple">
-    <property name="visible">True</property>
-    <property name="orientation">vertical</property>
-    <child>
-      <object class="GtkLabel" id="label_id_g_simple">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your Google ID?</property>
-      </object>
-      <packing>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkAlignment" id="alignment_simple_gtalk_id">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.34999999403953552</property>
-        <property name="top_padding">6</property>
-        <property name="bottom_padding">3</property>
-        <property name="left_padding">12</property>
-        <child>
-          <object class="GtkVBox" id="vbox1b">
-            <property name="visible">True</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">4</property>
-            <child>
-              <object class="GtkEntry" id="entry_id_g_simple">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_g_example">
-                <property name="visible">True</property>
-                <property name="xalign">0.10000000149011612</property>
-                <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; user@gmail.com</property>
-                <property name="use_markup">True</property>
-                <attributes>
-                  <attribute name="scale" value="0.800000"/>
-                </attributes>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="label_password_g_simple">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="ypad">6</property>
-        <property name="label" translatable="yes">What is your Google password?</property>
-      </object>
-      <packing>
-        <property name="position">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkAlignment" id="alignment2a">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.5</property>
-        <property name="left_padding">12</property>
-        <child>
-          <object class="GtkEntry" id="entry_password_g_simple">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="visibility">False</property>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="position">3</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkCheckButton" id="remember_password_g_simple">
-        <property name="label" translatable="yes">Remember Password</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
-        <property name="active">True</property>
-        <property name="draw_indicator">True</property>
-      </object>
-      <packing>
-        <property name="position">4</property>
-      </packing>
-    </child>
-  </object>
-  <object class="GtkVBox" id="vbox_fb_simple">
-    <property name="visible">True</property>
-    <property name="orientation">vertical</property>
-    <child>
-      <object class="GtkLabel" id="label_id_fb_simple">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your Facebook username?</property>
-      </object>
-      <packing>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkAlignment" id="alignment_simple_fb_id">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.34999999403953552</property>
-        <property name="top_padding">6</property>
-        <property name="bottom_padding">3</property>
-        <property name="left_padding">12</property>
-        <child>
-          <object class="GtkVBox" id="vbox2">
-            <property name="visible">True</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">4</property>
-            <child>
-              <object class="GtkEntry" id="entry_id_fb_simple">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_fb_example">
-                <property name="visible">True</property>
-                <property name="xalign">0.10000000149011612</property>
-                <property name="label" translatable="yes">This is your username, not your normal Facebook login.
-If you are facebook.com/&lt;b&gt;badger&lt;/b&gt;, enter &lt;b&gt;badger&lt;/b&gt;.
-Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to choose a Facebook username if you don't have one.</property>
-                <property name="use_markup">True</property>
-                <attributes>
-                  <attribute name="scale" value="0.800000"/>
-                </attributes>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="label_password_fb_simple">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="ypad">6</property>
-        <property name="label" translatable="yes">What is your Facebook password?</property>
-      </object>
-      <packing>
-        <property name="position">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkAlignment" id="alignment3">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.5</property>
-        <property name="left_padding">12</property>
-        <child>
-          <object class="GtkEntry" id="entry_password_fb_simple">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="visibility">False</property>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="position">3</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkCheckButton" id="remember_password_fb_simple">
-        <property name="label" translatable="yes">Remember Password</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
-        <property name="active">True</property>
-        <property name="draw_indicator">True</property>
-      </object>
-      <packing>
-        <property name="position">4</property>
-      </packing>
-    </child>
-  </object>
 </interface>
diff --git a/libempathy-gtk/empathy-account-widget-sip.ui b/libempathy-gtk/empathy-account-widget-sip.ui
index 488becaf1..5928d6077 100644
--- a/libempathy-gtk/empathy-account-widget-sip.ui
+++ b/libempathy-gtk/empathy-account-widget-sip.ui
@@ -125,11 +125,11 @@
         <child>
           <object class="GtkCheckButton" id="checkbutton_tel">
             <property name="label" translatable="yes">Use this account to call _landlines and mobile phones</property>
-            <property name="use_underline">True</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
             <property name="use_action_appearance">False</property>
+            <property name="use_underline">True</property>
             <property name="xalign">0</property>
             <property name="draw_indicator">True</property>
           </object>
@@ -137,6 +137,7 @@
             <property name="right_attach">2</property>
             <property name="top_attach">4</property>
             <property name="bottom_attach">5</property>
+            <property name="y_options"></property>
           </packing>
         </child>
         <child>
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index 8df91745d..f3a2a66ad 100644
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -1098,6 +1098,30 @@ static void
 account_widget_launch_external_clicked (GtkWidget *button,
     TpAccount *account)
 {
+  GdkAppLaunchContext *context = NULL;
+  GdkDisplay *display;
+  GAppInfo *app_info;
+  GError *error = NULL;
+
+  app_info = g_object_get_data (G_OBJECT (button), "app-info");
+
+  g_return_if_fail (G_IS_APP_INFO (app_info));
+
+  display = gdk_display_get_default ();
+  context = gdk_display_get_app_launch_context (display);
+
+  if (!g_app_info_launch (app_info, NULL, (GAppLaunchContext *) context,
+        &error))
+    {
+      g_critical ("Failed to bisho: %s", error->message);
+      g_clear_error (&error);
+    }
+}
+
+static void
+account_widget_launch_external_clicked_meego (GtkWidget *button,
+    TpAccount *account)
+{
   if (!tp_strdiff (tp_account_get_storage_provider (account),
         "com.meego.libsocialweb"))
     {
@@ -1155,17 +1179,35 @@ account_widget_build_external (EmpathyAccountWidget *self,
   TpAccount *account = empathy_account_settings_get_account (settings);
   GtkWidget *bar, *widget;
   gchar *str;
+  const gchar *provider, *name = NULL;
+  GDesktopAppInfo *desktop_info = NULL;
 
   self->ui_details->widget = gtk_vbox_new (FALSE, 6);
   priv->table_common_settings = gtk_table_new (1, 2, FALSE);
 
-  if (!tp_strdiff (tp_account_get_storage_provider (account),
-        "com.meego.libsocialweb"))
+  provider = tp_account_get_storage_provider (account);
+
+  if (!tp_strdiff (provider, "com.meego.libsocialweb"))
+    {
+      name = _("My Web Accounts");
+    }
+  else if (!tp_strdiff (provider, "org.gnome.OnlineAccounts"))
+    {
+      /* FIXME: we should publish the .desktop file in some general way */
+      desktop_info = g_desktop_app_info_new (
+          "gnome-online-accounts-panel.desktop");
+
+      if (desktop_info == NULL)
+        g_critical ("Could not locate 'gnome-online-accounts-panel.desktop'");
+      else
+        name = g_app_info_get_name (G_APP_INFO (desktop_info));
+    }
+
+  if (name != NULL)
     {
-      /* we know how to handle this external provider */
       str = g_strdup_printf (
-          _("The account %s is edited via My Web Accounts."),
-          empathy_account_settings_get_display_name (settings));
+          _("The account %s is edited via %s."),
+          empathy_account_settings_get_display_name (settings), name);
     }
   else
     {
@@ -1185,15 +1227,30 @@ account_widget_build_external (EmpathyAccountWidget *self,
       widget);
   gtk_container_set_border_width (GTK_CONTAINER (bar), 6);
 
-  if (!tp_strdiff (tp_account_get_storage_provider (account),
-        "com.meego.libsocialweb"))
+  if (!tp_strdiff (provider, "com.meego.libsocialweb"))
     {
       /* we know how to handle this external provider */
       widget = gtk_info_bar_add_button (GTK_INFO_BAR (bar),
           _("Launch My Web Accounts"), RESPONSE_LAUNCH);
 
       g_signal_connect (widget, "clicked",
+          G_CALLBACK (account_widget_launch_external_clicked_meego), account);
+    }
+  else if (desktop_info != NULL)
+    {
+      /* general handler */
+      str = g_strdup_printf (_("Edit %s"), name);
+
+      widget = gtk_info_bar_add_button (GTK_INFO_BAR (bar),
+          str, RESPONSE_LAUNCH);
+
+      g_object_set_data_full (G_OBJECT (widget), "app-info",
+          g_object_ref (desktop_info), g_object_unref);
+
+      g_signal_connect (widget, "clicked",
           G_CALLBACK (account_widget_launch_external_clicked), account);
+
+      g_free (str);
     }
 
   gtk_box_pack_start (GTK_BOX (self->ui_details->widget), bar,
@@ -1202,6 +1259,8 @@ account_widget_build_external (EmpathyAccountWidget *self,
       priv->table_common_settings, FALSE, TRUE, 0);
 
   gtk_widget_show_all (self->ui_details->widget);
+
+  tp_clear_object (&desktop_info);
 }
 
 static void
@@ -1902,7 +1961,7 @@ account_manager_ready_cb (GObject *source_object,
   GError *error = NULL;
   TpConnectionPresenceType state;
 
-  if (!tp_account_manager_prepare_finish (account_manager, result, &error))
+  if (!tp_proxy_prepare_finish (account_manager, result, &error))
     {
       DEBUG ("Failed to prepare account manager: %s", error->message);
       g_error_free (error);
@@ -2133,7 +2192,7 @@ do_constructed (GObject *obj)
   priv->account_manager = tp_account_manager_dup ();
 
   g_object_ref (self);
-  tp_account_manager_prepare_async (priv->account_manager, NULL,
+  tp_proxy_prepare_async (priv->account_manager, NULL,
       account_manager_ready_cb, self);
 
   /* handle apply and cancel button */
@@ -2305,7 +2364,7 @@ empathy_account_widget_class_init (EmpathyAccountWidgetClass *klass)
   signals[HANDLE_APPLY] =
     g_signal_new ("handle-apply", G_TYPE_FROM_CLASS (klass),
         G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-        g_cclosure_marshal_VOID__BOOLEAN,
+        g_cclosure_marshal_generic,
         G_TYPE_NONE,
         1, G_TYPE_BOOLEAN);
 
@@ -2313,14 +2372,14 @@ empathy_account_widget_class_init (EmpathyAccountWidgetClass *klass)
   signals[ACCOUNT_CREATED] =
       g_signal_new ("account-created", G_TYPE_FROM_CLASS (klass),
           G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-          g_cclosure_marshal_VOID__OBJECT,
+          g_cclosure_marshal_generic,
           G_TYPE_NONE,
           1, G_TYPE_OBJECT);
 
   signals[CANCELLED] =
       g_signal_new ("cancelled", G_TYPE_FROM_CLASS (klass),
           G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-          g_cclosure_marshal_VOID__VOID,
+          g_cclosure_marshal_generic,
           G_TYPE_NONE,
           0);
 
diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c
index e1487d563..0a04fe0c0 100644
--- a/libempathy-gtk/empathy-avatar-chooser.c
+++ b/libempathy-gtk/empathy-avatar-chooser.c
@@ -28,6 +28,7 @@
 #include <gtk/gtk.h>
 #include <gio/gio.h>
 
+#include <libempathy/empathy-camera-monitor.h>
 #include <libempathy/empathy-gsettings.h>
 #include <libempathy/empathy-utils.h>
 
@@ -200,7 +201,7 @@ empathy_avatar_chooser_class_init (EmpathyAvatarChooserClass *klass)
             G_SIGNAL_RUN_LAST,
             0,
             NULL, NULL,
-            g_cclosure_marshal_VOID__VOID,
+            g_cclosure_marshal_generic,
             G_TYPE_NONE, 0);
 
   /**
@@ -923,6 +924,10 @@ avatar_chooser_clicked_cb (GtkWidget *button,
   const gchar *default_dir = DEFAULT_DIR;
   const gchar *pics_dir;
   GtkFileFilter *filter;
+#ifdef HAVE_CHEESE
+  GtkWidget *picture_button;
+  EmpathyCameraMonitor *monitor;
+#endif
 
   if (self->priv->chooser_dialog != NULL)
     {
@@ -934,17 +939,28 @@ avatar_chooser_clicked_cb (GtkWidget *button,
       gtk_file_chooser_dialog_new (_("Select Your Avatar Image"),
         empathy_get_toplevel_window (GTK_WIDGET (self)),
         GTK_FILE_CHOOSER_ACTION_OPEN,
-        #ifdef HAVE_CHEESE
-        _("Take a picture..."),
-        EMPATHY_AVATAR_CHOOSER_RESPONSE_WEBCAM,
-        #endif
-        _("No Image"),
-        EMPATHY_AVATAR_CHOOSER_RESPONSE_NO_IMAGE,
-        GTK_STOCK_CANCEL,
-        EMPATHY_AVATAR_CHOOSER_RESPONSE_CANCEL,
-        GTK_STOCK_OPEN,
-        EMPATHY_AVATAR_CHOOSER_RESPONSE_FILE,
-        NULL));
+        NULL, NULL));
+
+#ifdef HAVE_CHEESE
+  picture_button = gtk_dialog_add_button (
+      GTK_DIALOG (self->priv->chooser_dialog),
+      _("Take a picture..."), EMPATHY_AVATAR_CHOOSER_RESPONSE_WEBCAM);
+
+  /* Button is sensitive only if there is one camera connected */
+  monitor = empathy_camera_monitor_dup_singleton ();
+
+  g_object_set_data_full (G_OBJECT (picture_button),
+      "monitor", monitor, g_object_unref);
+
+  g_object_bind_property (monitor, "available", picture_button, "sensitive",
+      G_BINDING_SYNC_CREATE);
+#endif
+
+  gtk_dialog_add_buttons (GTK_DIALOG (self->priv->chooser_dialog),
+      _("No Image"), EMPATHY_AVATAR_CHOOSER_RESPONSE_NO_IMAGE,
+      GTK_STOCK_CANCEL, EMPATHY_AVATAR_CHOOSER_RESPONSE_CANCEL,
+      GTK_STOCK_OPEN, EMPATHY_AVATAR_CHOOSER_RESPONSE_FILE,
+      NULL);
 
   chooser_dialog = self->priv->chooser_dialog;
   gtk_window_set_destroy_with_parent (GTK_WINDOW (chooser_dialog), TRUE);
diff --git a/libempathy-gtk/empathy-call-utils.c b/libempathy-gtk/empathy-call-utils.c
index eb01fe25b..adf4987ba 100644
--- a/libempathy-gtk/empathy-call-utils.c
+++ b/libempathy-gtk/empathy-call-utils.c
@@ -55,6 +55,8 @@ get_error_display_message (GError *error)
         return _("The specified contact is not valid");
       case TP_ERROR_EMERGENCY_CALLS_NOT_SUPPORTED:
         return _("Emergency calls are not supported on this protocol");
+      case TP_ERROR_INSUFFICIENT_BALANCE:
+        return _("You don't have enough credit in order to place this call");
     }
 
   return _("There was an error starting the call");
@@ -132,6 +134,7 @@ create_streamed_media_channel_cb (GObject *source,
     }
 }
 
+#ifdef HAVE_CALL
 static void
 create_call_channel_cb (GObject *source,
     GAsyncResult *result,
@@ -163,8 +166,9 @@ create_call_channel_cb (GObject *source,
       NULL);
 }
 
-void
-empathy_call_new_with_streams (const gchar *contact,
+/* Try to request a Call channel and fallback to StreamedMedia if that fails */
+static void
+call_new_with_streams (const gchar *contact,
     TpAccount *account,
     gboolean initial_audio,
     gboolean initial_video,
@@ -173,28 +177,78 @@ empathy_call_new_with_streams (const gchar *contact,
   GHashTable *call_request, *streamed_media_request;
   TpAccountChannelRequest *call_req, *streamed_media_req;
 
+  /* Call */
   call_request = empathy_call_create_call_request (contact,
       initial_audio,
       initial_video);
 
+  call_req = tp_account_channel_request_new (account, call_request, timestamp);
+
+  g_hash_table_unref (call_request);
+
+  /* StreamedMedia */
   streamed_media_request = empathy_call_create_streamed_media_request (
       contact, initial_audio, initial_video);
 
-  call_req = tp_account_channel_request_new (account, call_request, timestamp);
   streamed_media_req = tp_account_channel_request_new (account,
       streamed_media_request,
       timestamp);
 
+  g_hash_table_unref (streamed_media_request);
+
   tp_account_channel_request_create_channel_async (call_req,
       EMPATHY_CALL_BUS_NAME, NULL,
       create_call_channel_cb,
       streamed_media_req);
 
-  g_hash_table_unref (call_request);
-  g_hash_table_unref (streamed_media_request);
   g_object_unref (call_req);
 }
 
+#else /* HAVE_CALL */
+
+static void
+sm_new_with_streams (const gchar *contact,
+    TpAccount *account,
+    gboolean initial_audio,
+    gboolean initial_video,
+    gint64 timestamp)
+{
+  GHashTable *streamed_media_request;
+  TpAccountChannelRequest *streamed_media_req;
+
+  /* StreamedMedia */
+  streamed_media_request = empathy_call_create_streamed_media_request (
+      contact, initial_audio, initial_video);
+
+  streamed_media_req = tp_account_channel_request_new (account,
+      streamed_media_request,
+      timestamp);
+
+  g_hash_table_unref (streamed_media_request);
+
+  tp_account_channel_request_create_channel_async (streamed_media_req,
+      EMPATHY_AV_BUS_NAME, NULL, create_streamed_media_channel_cb, NULL);
+
+  g_object_unref (streamed_media_req);
+}
+#endif /* HAVE_CALL */
+
+void
+empathy_call_new_with_streams (const gchar *contact,
+    TpAccount *account,
+    gboolean initial_audio,
+    gboolean initial_video,
+    gint64 timestamp)
+{
+#ifdef HAVE_CALL
+  call_new_with_streams (contact, account, initial_audio, initial_video,
+      timestamp);
+#else
+  sm_new_with_streams (contact, account, initial_audio, initial_video,
+      timestamp);
+#endif
+}
+
 void
 empathy_call_set_stream_properties (GstElement *element)
 {
diff --git a/libempathy-gtk/empathy-cell-renderer-activatable.c b/libempathy-gtk/empathy-cell-renderer-activatable.c
index 9c1a6e53b..c2325adec 100644
--- a/libempathy-gtk/empathy-cell-renderer-activatable.c
+++ b/libempathy-gtk/empathy-cell-renderer-activatable.c
@@ -183,7 +183,7 @@ empathy_cell_renderer_activatable_class_init (
         G_SIGNAL_RUN_LAST,
         0,
         NULL, NULL,
-        g_cclosure_marshal_VOID__STRING,
+        g_cclosure_marshal_generic,
         G_TYPE_NONE,
         1, G_TYPE_STRING);
 
diff --git a/libempathy-gtk/empathy-chat-view.c b/libempathy-gtk/empathy-chat-view.c
index 49c384489..088b12084 100644
--- a/libempathy-gtk/empathy-chat-view.c
+++ b/libempathy-gtk/empathy-chat-view.c
@@ -84,6 +84,22 @@ empathy_chat_view_append_event (EmpathyChatView *view,
 }
 
 void
+empathy_chat_view_append_event_markup (EmpathyChatView *view,
+				       const gchar     *markup_text,
+				       const gchar     *fallback_text)
+{
+	g_return_if_fail (EMPATHY_IS_CHAT_VIEW (view));
+
+	if (EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->append_event_markup) {
+		EMPATHY_TYPE_CHAT_VIEW_GET_IFACE (view)->append_event_markup (view,
+									      markup_text,
+									      fallback_text);
+	} else {
+		empathy_chat_view_append_event (view, fallback_text);
+	}
+}
+
+void
 empathy_chat_view_edit_message (EmpathyChatView *view,
 				EmpathyMessage  *message)
 {
diff --git a/libempathy-gtk/empathy-chat-view.h b/libempathy-gtk/empathy-chat-view.h
index 1fa44450a..bc9e91761 100644
--- a/libempathy-gtk/empathy-chat-view.h
+++ b/libempathy-gtk/empathy-chat-view.h
@@ -46,6 +46,9 @@ struct _EmpathyChatViewIface {
 						  EmpathyMessage  *msg);
 	void             (*append_event)         (EmpathyChatView *view,
 						  const gchar     *str);
+	void             (*append_event_markup)  (EmpathyChatView *view,
+						  const gchar     *markup_text,
+						  const gchar     *fallback_text);
 	void             (*edit_message)         (EmpathyChatView *view,
 						  EmpathyMessage  *message);
 	void             (*scroll)               (EmpathyChatView *view,
@@ -81,6 +84,9 @@ void             empathy_chat_view_append_message       (EmpathyChatView *view,
 							 EmpathyMessage  *msg);
 void             empathy_chat_view_append_event         (EmpathyChatView *view,
 							 const gchar     *str);
+void             empathy_chat_view_append_event_markup  (EmpathyChatView *view,
+							 const gchar     *markup_text,
+							 const gchar     *fallback_text);
 void             empathy_chat_view_edit_message         (EmpathyChatView *view,
 							 EmpathyMessage  *message);
 void             empathy_chat_view_scroll               (EmpathyChatView *view,
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 032dd2464..b1d469f3f 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -52,10 +52,10 @@
 #include "empathy-contact-list-store.h"
 #include "empathy-contact-list-view.h"
 #include "empathy-contact-menu.h"
-#include "empathy-gtk-marshal.h"
 #include "empathy-input-text-view.h"
 #include "empathy-search-bar.h"
 #include "empathy-theme-manager.h"
+#include "empathy-theme-adium.h"
 #include "empathy-smiley-manager.h"
 #include "empathy-ui-utils.h"
 #include "empathy-string-parser.h"
@@ -106,6 +106,8 @@ struct _EmpathyChatPriv {
 	guint              update_misspelled_words_id;
 	/* Source func ID for save_paned_pos_timeout () */
 	guint              save_paned_pos_id;
+	/* Source func ID for chat_contacts_visible_timeout_cb () */
+	guint              contacts_visible_id;
 
 	GtkWidget         *widget;
 	GtkWidget         *hpaned;
@@ -275,11 +277,13 @@ account_reconnected (EmpathyChat *chat,
 			if (priv->sms_channel)
 				empathy_sms_contact_id (
 					account, priv->id,
-					TP_USER_ACTION_TIME_NOT_USER_ACTION);
+					TP_USER_ACTION_TIME_NOT_USER_ACTION,
+					NULL, NULL);
 			else
 				empathy_chat_with_contact_id (
 					account, priv->id,
-					TP_USER_ACTION_TIME_NOT_USER_ACTION);
+					TP_USER_ACTION_TIME_NOT_USER_ACTION,
+					NULL, NULL);
 			break;
 		case TP_HANDLE_TYPE_ROOM:
 			empathy_join_muc (account, priv->id,
@@ -1012,6 +1016,44 @@ chat_command_whois (EmpathyChat *chat,
 		whois_got_contact_cb, NULL, NULL, G_OBJECT (chat));
 }
 
+static void
+chat_command_whale (EmpathyChat *chat,
+		    GStrv        strv)
+{
+	EmpathyChatPriv *priv = GET_PRIV (chat);
+	TpMessage *message;
+
+	message = tp_client_message_new_text (TP_CHANNEL_TEXT_MESSAGE_TYPE_NORMAL,
+		"\n\n\n"
+		"•_______________•");
+	empathy_tp_chat_send (priv->tp_chat, message);
+	g_object_unref (message);
+}
+
+static void
+chat_command_babywhale (EmpathyChat *chat,
+			GStrv        strv)
+{
+	EmpathyChatPriv *priv = GET_PRIV (chat);
+	TpMessage *message;
+
+	message = tp_client_message_new_text (TP_CHANNEL_TEXT_MESSAGE_TYPE_NORMAL,
+		"\n"
+		"•_____•");
+	empathy_tp_chat_send (priv->tp_chat, message);
+	g_object_unref (message);
+}
+
+static void
+chat_command_inspector (EmpathyChat *chat,
+		    GStrv        strv)
+{
+	if (EMPATHY_IS_THEME_ADIUM (chat->view)) {
+		empathy_theme_adium_show_inspector (
+			EMPATHY_THEME_ADIUM (chat->view));
+	}
+}
+
 static void chat_command_help (EmpathyChat *chat, GStrv strv);
 
 typedef void (*ChatCommandFunc) (EmpathyChat *chat, GStrv strv);
@@ -1066,6 +1108,11 @@ static ChatCommandItem commands[] = {
 	{"help", 1, 2, chat_command_help, NULL,
 	 N_("/help [<command>]: show all supported commands. "
 	    "If <command> is defined, show its usage.")},
+
+	{"inspector", 1, 1, chat_command_inspector, NULL, NULL},
+
+	{"whale", 1, 1, chat_command_whale, NULL, NULL},
+	{"babywhale", 1, 1, chat_command_babywhale, NULL, NULL},
 };
 
 static void
@@ -1074,6 +1121,10 @@ chat_command_show_help (EmpathyChat     *chat,
 {
 	gchar *str;
 
+	if (item->help == NULL) {
+		return;
+	}
+
 	str = g_strdup_printf (_("Usage: %s"), _(item->help));
 	empathy_chat_view_append_event (chat->view, str);
 	g_free (str);
@@ -1094,8 +1145,11 @@ chat_command_help (EmpathyChat *chat,
 					continue;
 				}
 			}
-		    empathy_chat_view_append_event (chat->view,
-			    _(commands[i].help));
+			if (commands[i].help == NULL) {
+				continue;
+			}
+			empathy_chat_view_append_event (chat->view,
+				_(commands[i].help));
 		}
 		return;
 	}
@@ -1107,6 +1161,9 @@ chat_command_help (EmpathyChat *chat,
 					break;
 				}
 			}
+			if (commands[i].help == NULL) {
+				break;
+			}
 			chat_command_show_help (chat, &commands[i]);
 			return;
 		}
@@ -1397,6 +1454,51 @@ chat_message_acknowledged_cb (EmpathyTpChat  *tp_chat,
 }
 
 static void
+append_balance_error (EmpathyChat *chat,
+		      const gchar *message_body)
+{
+	EmpathyChatPriv *priv = GET_PRIV (chat);
+	TpConnection *conn = tp_channel_borrow_connection (TP_CHANNEL (priv->tp_chat));
+	const gchar *uri = tp_connection_get_balance_uri (conn);
+	const gchar *error = _("insufficient balance to send message");
+	gchar *str, *str_markup = NULL;
+
+	if (message_body != NULL) {
+		str = g_strdup_printf (_("Error sending message '%s': %s"), message_body, error);
+	} else {
+		str = g_strdup_printf (_("Error sending message: %s"), error);
+	}
+
+	if (!tp_str_empty (uri)) {
+		/* translators: error used when user doesn't have enough credit on his
+		 * account to send the message. */
+		gchar *markup_error = g_strdup_printf (_("insufficient balance to send message."
+							 " <a href='%s'>Top up</a>."), uri);
+
+		if (message_body != NULL) {
+			gchar *escaped_body = g_markup_escape_text (message_body, -1);
+
+			str_markup = g_strdup_printf (_("Error sending message '%s': %s"),
+				escaped_body, markup_error);
+
+			g_free (escaped_body);
+		} else {
+			str_markup = g_strdup_printf (_("Error sending message: %s"), markup_error);
+		}
+
+		g_free (markup_error);
+	}
+
+	if (str_markup != NULL)
+		empathy_chat_view_append_event_markup (chat->view, str_markup, str);
+	else
+		empathy_chat_view_append_event (chat->view, str);
+
+	g_free (str);
+	g_free (str_markup);
+}
+
+static void
 chat_send_error_cb (EmpathyTpChat          *tp_chat,
 		    const gchar            *message_body,
 		    TpChannelTextSendError  error_code,
@@ -1407,9 +1509,8 @@ chat_send_error_cb (EmpathyTpChat          *tp_chat,
 	gchar       *str;
 
 	if (!tp_strdiff (dbus_error, TP_ERROR_STR_INSUFFICIENT_BALANCE)) {
-		/* translators: error used when user doesn't have enough credit on his
-		 * account to send the message. */
-		error = _("insufficient balance to send message");
+		append_balance_error (chat, message_body);
+		return;
 	} else if (!tp_strdiff (dbus_error, TP_ERROR_STR_NOT_CAPABLE)) {
 		error = _("not capable");
 	}
@@ -2595,9 +2696,22 @@ chat_member_renamed_cb (EmpathyTpChat  *tp_chat,
 }
 
 static gboolean
-chat_reset_size_request (gpointer widget)
+chat_contacts_visible_timeout_cb (gpointer chat)
 {
-	gtk_widget_set_size_request (widget, -1, -1);
+	EmpathyChatPriv *priv = GET_PRIV (chat);
+
+	/* Relax the size request */
+	gtk_widget_set_size_request (priv->vbox_left, -1, -1);
+
+	/* Set the position of the slider. This must be done here because
+	 * GtkPaned need to know its size allocation and it will be settled only
+	 * after the gtk_window_resize () tough effect. */
+	if (priv->contacts_width > 0) {
+		gtk_paned_set_position (GTK_PANED (priv->hpaned),
+					priv->contacts_width);
+	}
+
+	priv->contacts_visible_id = 0;
 
 	return FALSE;
 }
@@ -2607,7 +2721,6 @@ chat_update_contacts_visibility (EmpathyChat *chat,
 			 gboolean show)
 {
 	EmpathyChatPriv *priv = GET_PRIV (chat);
-	GtkAllocation allocation;
 
 	if (!priv->scrolled_window_contacts) {
 		return;
@@ -2620,6 +2733,7 @@ chat_update_contacts_visibility (EmpathyChat *chat,
 	if (show && priv->contact_list_view == NULL) {
 		EmpathyContactListStore *store;
 		gint                     min_width;
+		GtkAllocation            allocation;
 
 		/* We are adding the contact list to the chat, we don't want the
 		 * chat view to become too small. If the chat view is already
@@ -2630,12 +2744,13 @@ chat_update_contacts_visibility (EmpathyChat *chat,
 		gtk_widget_get_allocation (priv->vbox_left, &allocation);
 		min_width = MIN (allocation.width, 250);
 		gtk_widget_set_size_request (priv->vbox_left, min_width, -1);
-		g_idle_add (chat_reset_size_request, priv->vbox_left);
 
-		if (priv->contacts_width > 0) {
-			gtk_paned_set_position (GTK_PANED (priv->hpaned),
-						priv->contacts_width);
-		}
+		/* There is no way to know when the window resize will happen
+		 * since it is WM's decision. Let's hope it won't be longer. */
+		if (priv->contacts_visible_id != 0)
+			g_source_remove (priv->contacts_visible_id);
+		priv->contacts_visible_id = g_timeout_add (500,
+			chat_contacts_visible_timeout_cb, chat);
 
 		store = empathy_contact_list_store_new (
 				EMPATHY_CONTACT_LIST (priv->tp_chat));
@@ -2877,7 +2992,6 @@ chat_create_ui (EmpathyChat *chat)
  	GList           *list = NULL;
 	gchar           *filename;
 	GtkTextBuffer   *buffer;
-	gint              paned_pos;
 	EmpathyThemeManager *theme_mgr;
 
 	filename = empathy_file_lookup ("empathy-chat.ui",
@@ -2963,12 +3077,6 @@ chat_create_ui (EmpathyChat *chat)
 			  G_CALLBACK (chat_hpaned_pos_changed_cb),
 			  chat);
 
-        /* Load the paned position */
-	paned_pos = g_settings_get_int (priv->gsettings_ui,
-			EMPATHY_PREFS_UI_CHAT_WINDOW_PANED_POS);
-	if (paned_pos != 0)
-		gtk_paned_set_position (GTK_PANED(priv->hpaned), paned_pos);
-
 	/* Set widget focus order */
 	list = g_list_append (NULL, priv->search_bar);
 	list = g_list_append (list, priv->scrolled_window_input);
@@ -3007,6 +3115,9 @@ chat_finalize (GObject *object)
 	if (priv->save_paned_pos_id != 0)
 		g_source_remove (priv->save_paned_pos_id);
 
+	if (priv->contacts_visible_id != 0)
+		g_source_remove (priv->contacts_visible_id);
+
 	g_object_unref (priv->gsettings_chat);
 	g_object_unref (priv->gsettings_ui);
 
@@ -3175,7 +3286,7 @@ empathy_chat_class_init (EmpathyChatClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      g_cclosure_marshal_VOID__BOOLEAN,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE,
 			      1, G_TYPE_BOOLEAN);
 
@@ -3185,7 +3296,7 @@ empathy_chat_class_init (EmpathyChatClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      _empathy_gtk_marshal_VOID__OBJECT_BOOLEAN,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE,
 			      2, EMPATHY_TYPE_MESSAGE, G_TYPE_BOOLEAN);
 
@@ -3195,7 +3306,7 @@ empathy_chat_class_init (EmpathyChatClass *klass)
 				  G_SIGNAL_RUN_LAST,
 				  0,
 				  NULL, NULL,
-				  g_cclosure_marshal_VOID__POINTER,
+				  g_cclosure_marshal_generic,
 				  G_TYPE_NONE,
 				  1, G_TYPE_STRV);
 
@@ -3222,7 +3333,7 @@ account_manager_prepared_cb (GObject *source_object,
 	EmpathyChat *chat = user_data;
 	GError *error = NULL;
 
-	if (!tp_account_manager_prepare_finish (account_manager, result, &error)) {
+	if (!tp_proxy_prepare_finish (account_manager, result, &error)) {
 		DEBUG ("Failed to prepare the account manager: %s", error->message);
 		g_error_free (error);
 		return;
@@ -3251,12 +3362,13 @@ empathy_chat_init (EmpathyChat *chat)
 	priv->gsettings_chat = g_settings_new (EMPATHY_PREFS_CHAT_SCHEMA);
 	priv->gsettings_ui = g_settings_new (EMPATHY_PREFS_UI_SCHEMA);
 
-	priv->contacts_width = -1;
+	priv->contacts_width = g_settings_get_int (priv->gsettings_ui,
+		EMPATHY_PREFS_UI_CHAT_WINDOW_PANED_POS);
 	priv->input_history = NULL;
 	priv->input_history_current = NULL;
 	priv->account_manager = tp_account_manager_dup ();
 
-	tp_account_manager_prepare_async (priv->account_manager, NULL,
+	tp_proxy_prepare_async (priv->account_manager, NULL,
 					  account_manager_prepared_cb, chat);
 
 	priv->show_contacts = g_settings_get_boolean (priv->gsettings_chat,
diff --git a/libempathy-gtk/empathy-contact-blocking-dialog.c b/libempathy-gtk/empathy-contact-blocking-dialog.c
index 404dab172..64ab590d5 100644
--- a/libempathy-gtk/empathy-contact-blocking-dialog.c
+++ b/libempathy-gtk/empathy-contact-blocking-dialog.c
@@ -236,7 +236,8 @@ contact_blocking_dialog_deny_channel_members_changed (TpChannel *channel,
             EMPATHY_ACCOUNT_CHOOSER (self->priv->account_chooser)))))
     return;
 
-  DEBUG ("deny list changed: %u added, %u removed", added->len, removed->len);
+  DEBUG ("deny list changed on %s: %u added, %u removed",
+      get_pretty_conn_name (conn), added->len, removed->len);
 
   /* add contacts */
   contact_blocking_dialog_add_contacts_to_list (self, conn, added);
@@ -317,7 +318,8 @@ contact_blocking_dialog_connection_prepared (GObject *conn,
 
   if (!tp_proxy_prepare_finish (conn, result, &error))
     {
-      DEBUG ("Failed to prepare connection: %s", error->message);
+      DEBUG ("Failed to prepare connection %s: %s",
+          get_pretty_conn_name ((TpConnection *) conn), error->message);
       g_error_free (error);
       return;
     }
@@ -366,7 +368,8 @@ contact_blocking_dialog_got_deny_channel (TpConnection *conn,
 
   if (in_error != NULL)
     {
-      DEBUG ("Failed to get 'deny' channel: %s", in_error->message);
+      DEBUG ("Failed to get 'deny' channel on %s: %s",
+          get_pretty_conn_name (conn), in_error->message);
       return;
     }
 
@@ -374,7 +377,8 @@ contact_blocking_dialog_got_deny_channel (TpConnection *conn,
 
   if (error != NULL)
     {
-      DEBUG ("Failed to create channel proxy: %s", error->message);
+      DEBUG ("Failed to create channel proxy on %s: %s",
+          get_pretty_conn_name (conn), in_error->message);
       g_error_free (error);
       return;
     }
@@ -394,14 +398,16 @@ contact_blocking_dialog_deny_channel_prepared (GObject *channel,
 
   if (!tp_proxy_prepare_finish (channel, result, &error))
     {
-      DEBUG ("Failed to prepare channel: %s", error->message);
+      DEBUG ("Failed to prepare channel %s: %s",
+          tp_proxy_get_object_path (channel), error->message);
       g_error_free (error);
       return;
     }
 
   conn = tp_channel_borrow_connection (TP_CHANNEL (channel));
 
-  DEBUG ("Channel prepared for connection %s", get_pretty_conn_name (conn));
+  DEBUG ("Channel %s prepared for connection %s",
+      tp_proxy_get_object_path (channel), get_pretty_conn_name (conn));
 
   g_hash_table_insert (self->priv->channels,
       g_object_ref (conn), channel);
@@ -451,7 +457,8 @@ contact_blocking_dialog_add_contact (GtkWidget *widget,
   identifiers[0] = gtk_entry_get_text (
       GTK_ENTRY (self->priv->add_contact_entry));
 
-  DEBUG ("Looking up handle for '%s'", identifiers[0]);
+  DEBUG ("Looking up handle for '%s' on %s",
+      identifiers[0], get_pretty_conn_name (conn));
 
   tp_cli_connection_call_request_handles (conn, -1,
       TP_HANDLE_TYPE_CONTACT, identifiers,
@@ -478,7 +485,8 @@ contact_blocking_dialog_add_contact_got_handle (TpConnection *conn,
 
   if (in_error != NULL)
     {
-      DEBUG ("Error getting handle: %s", in_error->message);
+      DEBUG ("Error getting handle on %s: %s",
+          get_pretty_conn_name (conn), in_error->message);
 
       contact_blocking_dialog_set_error (
           EMPATHY_CONTACT_BLOCKING_DIALOG (self), in_error);
@@ -488,8 +496,8 @@ contact_blocking_dialog_add_contact_got_handle (TpConnection *conn,
 
   g_return_if_fail (handles->len == 1);
 
-  DEBUG ("Adding handle %u to deny channel",
-      g_array_index (handles, TpHandle, 0));
+  DEBUG ("Adding handle %u to deny channel on %s",
+      g_array_index (handles, TpHandle, 0), get_pretty_conn_name (conn));
 
   tp_cli_channel_interface_group_call_add_members (channel, -1,
       handles, "",
@@ -504,7 +512,8 @@ contact_blocking_dialog_added_contact (TpChannel *channel,
 {
   if (in_error != NULL)
     {
-      DEBUG ("Error adding contact to deny list: %s", in_error->message);
+      DEBUG ("Error adding contact to deny list %s: %s",
+          tp_proxy_get_object_path (channel), in_error->message);
 
       contact_blocking_dialog_set_error (
           EMPATHY_CONTACT_BLOCKING_DIALOG (self), in_error);
@@ -512,7 +521,7 @@ contact_blocking_dialog_added_contact (TpChannel *channel,
       return;
     }
 
-  DEBUG ("Contact added");
+  DEBUG ("Contact added to %s", tp_proxy_get_object_path (channel));
 }
 
 static void
diff --git a/libempathy-gtk/empathy-contact-chooser.c b/libempathy-gtk/empathy-contact-chooser.c
index 7faee3e09..10a3757a3 100644
--- a/libempathy-gtk/empathy-contact-chooser.c
+++ b/libempathy-gtk/empathy-contact-chooser.c
@@ -35,6 +35,7 @@ struct _EmpathyContactChooserPrivate
 
   EmpathyIndividualStore *store;
   EmpathyIndividualView *view;
+  GtkWidget *search_entry;
 
   GPtrArray *search_words;
   gchar *search_str;
@@ -118,7 +119,7 @@ empathy_contact_chooser_class_init (
             G_SIGNAL_RUN_LAST,
             0,
             NULL, NULL,
-            g_cclosure_marshal_VOID__OBJECT,
+            g_cclosure_marshal_generic,
             G_TYPE_NONE,
             1, FOLKS_TYPE_INDIVIDUAL);
 }
@@ -285,7 +286,6 @@ empathy_contact_chooser_init (EmpathyContactChooser *self)
   EmpathyIndividualManager *mgr;
   GtkTreeSelection *selection;
   GtkWidget *scroll;
-  GtkWidget *search_entry;
   GQuark features[] = { TP_ACCOUNT_MANAGER_FEATURE_CORE, 0 };
 
   self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, EMPATHY_TYPE_CONTACT_CHOOSER,
@@ -300,11 +300,11 @@ empathy_contact_chooser_init (EmpathyContactChooser *self)
   tp_proxy_prepare_async (self->priv->account_mgr, features, NULL, NULL);
 
   /* Search entry */
-  search_entry = gtk_entry_new ();
-  gtk_box_pack_start (GTK_BOX (self), search_entry, FALSE, TRUE, 6);
-  gtk_widget_show (search_entry);
+  self->priv->search_entry = gtk_entry_new ();
+  gtk_box_pack_start (GTK_BOX (self), self->priv->search_entry, FALSE, TRUE, 6);
+  gtk_widget_show (self->priv->search_entry);
 
-  g_signal_connect (search_entry, "changed",
+  g_signal_connect (self->priv->search_entry, "changed",
       G_CALLBACK (search_text_changed), self);
 
   /* Add the treeview */
@@ -358,3 +358,10 @@ empathy_contact_chooser_set_filter_func (EmpathyContactChooser *self,
   self->priv->filter_func = func;
   self->priv->filter_data = user_data;
 }
+
+void
+empathy_contact_chooser_show_search_entry (EmpathyContactChooser *self,
+    gboolean show)
+{
+  gtk_widget_set_visible (self->priv->search_entry, show);
+}
diff --git a/libempathy-gtk/empathy-contact-chooser.h b/libempathy-gtk/empathy-contact-chooser.h
index ba95bcfbe..87466beb8 100644
--- a/libempathy-gtk/empathy-contact-chooser.h
+++ b/libempathy-gtk/empathy-contact-chooser.h
@@ -61,6 +61,9 @@ void empathy_contact_chooser_set_filter_func (EmpathyContactChooser *self,
     EmpathyContactChooserFilterFunc func,
     gpointer user_data);
 
+void empathy_contact_chooser_show_search_entry (EmpathyContactChooser *self,
+    gboolean show);
+
 G_END_DECLS
 
 #endif
diff --git a/libempathy-gtk/empathy-contact-list-store.c b/libempathy-gtk/empathy-contact-list-store.c
index 189df5dc5..80fc572d2 100644
--- a/libempathy-gtk/empathy-contact-list-store.c
+++ b/libempathy-gtk/empathy-contact-list-store.c
@@ -70,9 +70,9 @@ typedef struct {
 	guint                       setup_idle_id;
 	gboolean                    dispose_has_run;
 	GHashTable                  *status_icons;
-	/* Hash: EmpathyContact* -> GQueue (GtkTreeRowReference) */
+	/* Hash: EmpathyContact* -> GQueue (GtkTreeIter *) */
 	GHashTable                  *empathy_contact_cache;
-	/* Hash: char *groupname -> GtkTreeRowReference *row */
+	/* Hash: char *groupname -> GtkTreeIter * */
 	GHashTable                  *empathy_group_cache;
 } EmpathyContactListStorePriv;
 
@@ -322,10 +322,10 @@ empathy_contact_list_store_class_init (EmpathyContactListStoreClass *klass)
 }
 
 static void
-g_queue_free_full_row_ref (gpointer data)
+g_queue_free_full_iter (gpointer data)
 {
 	GQueue *queue = (GQueue *) data;
-	g_queue_foreach (queue, (GFunc) gtk_tree_row_reference_free, NULL);
+	g_queue_foreach (queue, (GFunc) gtk_tree_iter_free, NULL);
 	g_queue_free (queue);
 }
 
@@ -345,10 +345,10 @@ empathy_contact_list_store_init (EmpathyContactListStore *store)
 						      store);
 	priv->status_icons = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
 	priv->empathy_contact_cache = g_hash_table_new_full (NULL, NULL, NULL,
-		g_queue_free_full_row_ref);
+		g_queue_free_full_iter);
 	priv->empathy_group_cache = g_hash_table_new_full (g_str_hash,
 		g_str_equal, g_free,
-		(GDestroyNotify) gtk_tree_row_reference_free);
+		(GDestroyNotify) gtk_tree_iter_free);
 	contact_list_store_setup (store);
 }
 
@@ -1007,8 +1007,6 @@ add_contact_to_store (GtkTreeStore *store,
 		      EmpathyContactListFlags flags)
 {
 	EmpathyContactListStorePriv *priv = GET_PRIV (store);
-	GtkTreeRowReference *row_ref;
-	GtkTreePath *path;
 	GQueue *queue;
 
 	gtk_tree_store_insert_with_values (store, iter, parent, 0,
@@ -1025,18 +1023,15 @@ add_contact_to_store (GtkTreeStore *store,
 			    EMPATHY_CONTACT_LIST_STORE_COL_FLAGS, flags,
 			    -1);
 
-	path = gtk_tree_model_get_path (GTK_TREE_MODEL (store), iter);
-	row_ref = gtk_tree_row_reference_new (GTK_TREE_MODEL (store), path);
 	queue = g_hash_table_lookup (priv->empathy_contact_cache, contact);
 	if (queue) {
-		g_queue_push_tail (queue, row_ref);
+		g_queue_push_tail (queue, gtk_tree_iter_copy (iter));
 	} else {
 		queue = g_queue_new ();
-		g_queue_push_tail (queue, row_ref);
+		g_queue_push_tail (queue, gtk_tree_iter_copy (iter));
 		g_hash_table_insert (priv->empathy_contact_cache, contact,
 			queue);
 	}
-	gtk_tree_path_free (path);
 }
 
 static void
@@ -1136,22 +1131,14 @@ contact_list_store_remove_contact (EmpathyContactListStore *store,
 	model = GTK_TREE_MODEL (store);
 
 	for (l = g_queue_peek_head_link (row_refs); l; l = l->next) {
-		GtkTreePath *path = gtk_tree_row_reference_get_path (l->data);
-		GtkTreeIter iter;
+		GtkTreeIter *iter = l->data;
 		GtkTreeIter parent;
 
-		if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (store), &iter,
-			path)) {
-			gtk_tree_path_free (path);
-			continue;
-		}
-		gtk_tree_path_free (path);
-
 		/* NOTE: it is only <= 2 here because we have
 		 * separators after the group name, otherwise it
 		 * should be 1.
 		 */
-		if (gtk_tree_model_iter_parent (model, &parent, &iter) &&
+		if (gtk_tree_model_iter_parent (model, &parent, iter) &&
 		    gtk_tree_model_iter_n_children (model, &parent) <= 2) {
 			gchar *group_name;
 			gtk_tree_model_get (model, &parent,
@@ -1161,7 +1148,7 @@ contact_list_store_remove_contact (EmpathyContactListStore *store,
 				group_name);
 			gtk_tree_store_remove (GTK_TREE_STORE (store), &parent);
 		} else {
-			gtk_tree_store_remove (GTK_TREE_STORE (store), &iter);
+			gtk_tree_store_remove (GTK_TREE_STORE (store), iter);
 		}
 	}
 
@@ -1441,14 +1428,12 @@ contact_list_store_get_group (EmpathyContactListStore *store,
 	GtkTreeModel                *model;
 	GtkTreeIter                  iter_group;
 	GtkTreeIter                  iter_separator;
-	GtkTreeRowReference         *row_ref;
+	GtkTreeIter                 *iter;
 
 	model = GTK_TREE_MODEL (store);
-	row_ref = g_hash_table_lookup (priv->empathy_group_cache, name);
-
-	if (row_ref == NULL) {
-		GtkTreePath *path;
+	iter = g_hash_table_lookup (priv->empathy_group_cache, name);
 
+	if (iter == NULL) {
 		if (created) {
 			*created = TRUE;
 		}
@@ -1462,11 +1447,8 @@ contact_list_store_get_group (EmpathyContactListStore *store,
 				    EMPATHY_CONTACT_LIST_STORE_COL_IS_FAKE_GROUP, is_fake_group,
 				    -1);
 
-		path = gtk_tree_model_get_path (GTK_TREE_MODEL (store), &iter_group);
-		row_ref = gtk_tree_row_reference_new (GTK_TREE_MODEL (store), path);
 		g_hash_table_insert (priv->empathy_group_cache,
-			g_strdup (name), row_ref);
-		gtk_tree_path_free (path);
+			g_strdup (name), gtk_tree_iter_copy (&iter_group));
 
 		if (iter_group_to_set) {
 			*iter_group_to_set = iter_group;
@@ -1480,24 +1462,15 @@ contact_list_store_get_group (EmpathyContactListStore *store,
 			*iter_separator_to_set = iter_separator;
 		}
 	} else {
-		GtkTreePath *path = gtk_tree_row_reference_get_path (row_ref);
-		GtkTreeIter iter;
-
-		if (!gtk_tree_model_get_iter (model, &iter, path)) {
-			gtk_tree_path_free (path);
-			return;
-		}
-		gtk_tree_path_free (path);
-
 		if (created) {
 			*created = FALSE;
 		}
 
 		if (iter_group_to_set) {
-			*iter_group_to_set = iter;
+			*iter_group_to_set = *iter;
 		}
 
-		iter_separator = iter;
+		iter_separator = *iter;
 
 		if (gtk_tree_model_iter_next (model, &iter_separator)) {
 			gboolean is_separator;
@@ -1744,27 +1717,20 @@ contact_list_store_find_contact (EmpathyContactListStore *store,
 				 EmpathyContact          *contact)
 {
 	EmpathyContactListStorePriv *priv = GET_PRIV (store);
-	GtkTreeModel              *model;
 	GQueue                    *row_refs_queue;
 	GList                     *i;
 	GList                     *iters_list = NULL;
 
-	model = GTK_TREE_MODEL (store);
 	row_refs_queue = g_hash_table_lookup (priv->empathy_contact_cache, contact);
 	if (!row_refs_queue)
 		return NULL;
 
 	for (i = g_queue_peek_head_link (row_refs_queue) ; i != NULL ;
 	     i = i->next) {
-		GtkTreePath *path = gtk_tree_row_reference_get_path (i->data);
-		GtkTreeIter iter;
-		if (!gtk_tree_model_get_iter (model, &iter, path)) {
-			gtk_tree_path_free (path);
-			continue;
-		}
-		gtk_tree_path_free (path);
+		GtkTreeIter *iter = i->data;
+
 		iters_list = g_list_prepend
-			(iters_list, gtk_tree_iter_copy (&iter));
+			(iters_list, gtk_tree_iter_copy (iter));
 	}
 
 	return iters_list;
diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index 277842ff5..f8c055c7e 100644
--- a/libempathy-gtk/empathy-contact-list-view.c
+++ b/libempathy-gtk/empathy-contact-list-view.c
@@ -49,7 +49,6 @@
 #include "empathy-cell-renderer-activatable.h"
 #include "empathy-ui-utils.h"
 #include "empathy-gtk-enum-types.h"
-#include "empathy-gtk-marshal.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #include <libempathy/empathy-debug.h>
@@ -1784,7 +1783,7 @@ empathy_contact_list_view_class_init (EmpathyContactListViewClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      _empathy_gtk_marshal_VOID__OBJECT_STRING_STRING,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE,
 			      3, EMPATHY_TYPE_CONTACT, G_TYPE_STRING, G_TYPE_STRING);
 
diff --git a/libempathy-gtk/empathy-contact-selector-dialog.c b/libempathy-gtk/empathy-contact-selector-dialog.c
index a4747b488..d436c3e0d 100644
--- a/libempathy-gtk/empathy-contact-selector-dialog.c
+++ b/libempathy-gtk/empathy-contact-selector-dialog.c
@@ -233,19 +233,6 @@ contact_selector_change_state_button_cb  (GtkEditable *editable,
 }
 
 static void
-entry_activate_cb (GtkEntry *entry,
-    gpointer self)
-{
-  const gchar *id;
-
-  id = gtk_entry_get_text (entry);
-  if (EMP_STR_EMPTY (id))
-    return;
-
-  gtk_dialog_response (GTK_DIALOG (self), GTK_RESPONSE_ACCEPT);
-}
-
-static void
 account_chooser_filter (TpAccount *account,
     EmpathyAccountChooserFilterResultCallback callback,
     gpointer callback_data,
@@ -295,7 +282,7 @@ empathy_contact_selector_dialog_init (EmpathyContactSelectorDialog *dialog)
   gchar *filename;
   GtkEntryCompletion *completion;
   GtkWidget *content_area;
-  GtkWidget *table_contact;
+  GtkWidget *table_grid;
 
   dialog->vbox = gtk_vbox_new (FALSE, 3);
 
@@ -305,19 +292,17 @@ empathy_contact_selector_dialog_init (EmpathyContactSelectorDialog *dialog)
   filename = empathy_file_lookup ("empathy-contact-selector-dialog.ui",
           "libempathy-gtk");
   gui = empathy_builder_get_file (filename,
-                "table_contact", &table_contact,
+                "table_grid", &table_grid,
                 "account_chooser_label", &priv->account_chooser_label,
                 "entry_id", &priv->entry_id,
                 NULL);
   g_free (filename);
 
-  empathy_builder_connect (gui, dialog,
-      "entry_id", "activate", entry_activate_cb,
-      NULL);
+  gtk_entry_set_activates_default (GTK_ENTRY (priv->entry_id), TRUE);
 
   content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
   gtk_container_add (GTK_CONTAINER (content_area), dialog->vbox);
-  gtk_box_pack_start (GTK_BOX (dialog->vbox), table_contact, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (dialog->vbox), table_grid, TRUE, TRUE, 0);
   gtk_widget_show (dialog->vbox);
 
   gtk_dialog_add_button (GTK_DIALOG (dialog),
@@ -356,9 +341,9 @@ empathy_contact_selector_dialog_init (EmpathyContactSelectorDialog *dialog)
   /* Create account chooser */
   priv->show_account_chooser = TRUE;
   priv->account_chooser = empathy_account_chooser_new ();
-  gtk_table_attach_defaults (GTK_TABLE (table_contact),
+  gtk_grid_attach (GTK_GRID (table_grid),
            priv->account_chooser,
-           1, 2, 0, 1);
+           1, 0, 1, 1);
   empathy_account_chooser_set_filter (
       EMPATHY_ACCOUNT_CHOOSER (priv->account_chooser),
       account_chooser_filter,
@@ -439,8 +424,12 @@ empathy_contact_selector_dialog_set_property (GObject *self,
 static void
 empathy_contact_selector_dialog_constructed (GObject *dialog)
 {
+  EmpathyContactSelectorDialog *self = EMPATHY_CONTACT_SELECTOR_DIALOG (dialog);
   EmpathyContactSelectorDialogPriv *priv = GET_PRIV (dialog);
 
+  gtk_widget_set_can_default (self->button_action, TRUE);
+  gtk_widget_grab_default (self->button_action);
+
   if (EMPATHY_CONTACT_SELECTOR_DIALOG_GET_CLASS (dialog)->contact_filter)
     {
       GtkEntryCompletion *completion;
diff --git a/libempathy-gtk/empathy-contact-selector-dialog.ui b/libempathy-gtk/empathy-contact-selector-dialog.ui
index e86466889..9b7f9219f 100644
--- a/libempathy-gtk/empathy-contact-selector-dialog.ui
+++ b/libempathy-gtk/empathy-contact-selector-dialog.ui
@@ -1,33 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 2.12 -->
-  <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkTable" id="table_contact">
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkGrid" id="table_grid">
     <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="can_focus">False</property>
     <property name="row_spacing">6</property>
+    <property name="column_spacing">6</property>
     <child>
       <object class="GtkLabel" id="account_chooser_label">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes">Account:</property>
       </object>
       <packing>
-        <property name="x_options"></property>
+        <property name="left_attach">0</property>
+        <property name="top_attach">0</property>
+        <property name="width">1</property>
+        <property name="height">1</property>
       </packing>
     </child>
     <child>
       <object class="GtkLabel" id="label2">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes">Contact ID:</property>
       </object>
       <packing>
+        <property name="left_attach">0</property>
         <property name="top_attach">1</property>
-        <property name="bottom_attach">2</property>
-        <property name="x_options"></property>
+        <property name="width">1</property>
+        <property name="height">1</property>
       </packing>
     </child>
     <child>
@@ -39,13 +43,10 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">1</property>
-        <property name="bottom_attach">2</property>
+        <property name="width">1</property>
+        <property name="height">1</property>
       </packing>
     </child>
-    <child>
-      <placeholder/>
-    </child>
   </object>
 </interface>
diff --git a/libempathy-gtk/empathy-contact-selector.c b/libempathy-gtk/empathy-contact-selector.c
deleted file mode 100644
index a77ed43e2..000000000
--- a/libempathy-gtk/empathy-contact-selector.c
+++ /dev/null
@@ -1,473 +0,0 @@
-/*
-*  Copyright (C) 2007 Marco Barisione <marco@barisione.org>
-*  Copyright (C) 2008 Collabora Ltd.
-*
-*  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.1 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*
-*  Authors: Marco Barisione <marco@barisione.org>
-*           Elliot Fairweather <elliot.fairweather@collabora.co.uk>
-*/
-
-#include "config.h"
-
-#include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-
-#include <libempathy/empathy-contact.h>
-#include <libempathy-gtk/empathy-contact-list-store.h>
-#include <libempathy/empathy-utils.h>
-
-#include "empathy-contact-selector.h"
-
-/**
- * SECTION:empathy-contact-selector
- * @title:EmpathyContactSelector
- * @short_description: A widget used to choose from a list of contacts.
- * @include: libempathy-gtk/empathy-contact-selector.h
- *
- * #EmpathyContactSelector is a widget which extends #GtkComboBox to provide
- * a chooser of available contacts.
- */
-
-/**
- * EmpathyContactSelector:
- * @parent: parent object
- *
- * Widget which extends #GtkComboBox to provide a chooser of available contacts.
- */
-
-G_DEFINE_TYPE (EmpathyContactSelector, empathy_contact_selector,
-    GTK_TYPE_COMBO_BOX)
-
-enum
-{
-  PROP_0,
-  PROP_CONTACT_LIST
-};
-
-#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyContactSelector)
-typedef struct
-{
-  EmpathyContactList *contact_list;
-  EmpathyContactListStore *store;
-  GtkTreeModel *model;
-  gboolean dispose_run;
-} EmpathyContactSelectorPriv;
-
-static void contact_selector_manage_blank_contact (
-    EmpathyContactSelector *selector);
-
-static guint
-contact_selector_get_number_online_contacts (GtkTreeModel *model)
-{
-  GtkTreeIter tmp_iter;
-  gboolean is_online;
-  guint number_online_contacts = 0;
-  gboolean ok;
-
-  for (ok = gtk_tree_model_get_iter_first (model, &tmp_iter);
-      ok; ok = gtk_tree_model_iter_next (model, &tmp_iter))
-    {
-      gtk_tree_model_get (model,
-          &tmp_iter, EMPATHY_CONTACT_LIST_STORE_COL_IS_ONLINE,
-          &is_online, -1);
-      if (is_online)
-        number_online_contacts++;
-    }
-
-  return number_online_contacts;
-}
-
-static gboolean
-contact_selector_get_iter_for_blank_contact (GtkTreeStore *model,
-                                             GtkTreeIter *blank_iter)
-{
-  GtkTreeIter tmp_iter;
-  EmpathyContact *tmp_contact;
-  gboolean is_present = FALSE;
-  gboolean ok;
-
-  for (ok = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &tmp_iter);
-      ok; ok = gtk_tree_model_iter_next (GTK_TREE_MODEL (model), &tmp_iter))
-    {
-      gtk_tree_model_get (GTK_TREE_MODEL (model),
-          &tmp_iter, EMPATHY_CONTACT_LIST_STORE_COL_CONTACT,
-          &tmp_contact, -1);
-      if (tmp_contact == NULL)
-        {
-          *blank_iter = tmp_iter;
-          is_present = TRUE;
-          break;
-        }
-      g_object_unref (tmp_contact);
-    }
-
-  return is_present;
-}
-
-static void
-contact_selector_add_blank_contact (EmpathyContactSelector *selector)
-{
-  EmpathyContactSelectorPriv *priv = GET_PRIV (selector);
-  GtkTreeIter blank_iter, iter;
-
-  gtk_tree_store_insert_with_values (
-      GTK_TREE_STORE (priv->store), &blank_iter, NULL, 0,
-      EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, NULL,
-      EMPATHY_CONTACT_LIST_STORE_COL_NAME, (_("Select a contact")),
-      EMPATHY_CONTACT_LIST_STORE_COL_IS_ONLINE, FALSE, -1);
-
-  /* look up blank_iter in the filter model */
-  g_return_if_fail (gtk_tree_model_filter_convert_child_iter_to_iter (
-      GTK_TREE_MODEL_FILTER (priv->model), &iter, &blank_iter));
-
-  g_signal_handlers_block_by_func (selector,
-      contact_selector_manage_blank_contact, selector);
-  gtk_combo_box_set_active_iter (GTK_COMBO_BOX (selector), &iter);
-  g_signal_handlers_unblock_by_func (selector,
-      contact_selector_manage_blank_contact, selector);
-}
-
-static void
-contact_selector_remove_blank_contact (EmpathyContactSelector *selector)
-{
-  EmpathyContactSelectorPriv *priv = GET_PRIV (selector);
-  GtkTreeIter blank_iter;
-
-  if (contact_selector_get_iter_for_blank_contact
-      (GTK_TREE_STORE (priv->store), &blank_iter))
-    gtk_tree_store_remove (GTK_TREE_STORE (priv->store), &blank_iter);
-}
-
-static void
-contact_selector_manage_sensitivity (EmpathyContactSelector *selector)
-{
-  EmpathyContactSelectorPriv *priv = GET_PRIV (selector);
-  guint number_online_contacts;
-
-  number_online_contacts = contact_selector_get_number_online_contacts (priv->model);
-
-  if (number_online_contacts != 0)
-    gtk_widget_set_sensitive (GTK_WIDGET (selector), TRUE);
-  else
-    gtk_widget_set_sensitive (GTK_WIDGET (selector), FALSE);
-}
-
-static void
-contact_selector_manage_blank_contact (EmpathyContactSelector *selector)
-{
-  gboolean is_popup_shown;
-
-  g_object_get (selector, "popup-shown", &is_popup_shown, NULL);
-
-  if (is_popup_shown)
-    {
-      contact_selector_remove_blank_contact (selector);
-    }
-  else
-    {
-      if (gtk_combo_box_get_active (GTK_COMBO_BOX (selector)) == -1)
-        {
-          contact_selector_add_blank_contact (selector);
-        }
-      else
-        {
-          contact_selector_remove_blank_contact (selector);
-        }
-    }
-
-  contact_selector_manage_sensitivity (selector);
-}
-
-static GObject *
-contact_selector_constructor (GType type,
-                              guint n_construct_params,
-                              GObjectConstructParam *construct_params)
-{
-  GObject *object;
-  EmpathyContactSelector *contact_selector;
-  EmpathyContactSelectorPriv *priv;
-  GtkCellLayout *cell_layout;
-  GtkCellRenderer *renderer;
-
-  object = G_OBJECT_CLASS (empathy_contact_selector_parent_class)->constructor
-    (type, n_construct_params, construct_params);
-  priv = GET_PRIV (object);
-  contact_selector = EMPATHY_CONTACT_SELECTOR (object);
-  cell_layout = GTK_CELL_LAYOUT (object);
-
-  priv->store = empathy_contact_list_store_new (priv->contact_list);
-
-  g_object_set (priv->store, "is-compact", TRUE, "show-avatars", FALSE,
-      "show-offline", FALSE, "show-groups", FALSE, "show-protocols", FALSE,
-      "sort-criterium", EMPATHY_CONTACT_LIST_STORE_SORT_NAME, NULL);
-
-  g_signal_connect_swapped (priv->store, "row-changed",
-      G_CALLBACK (contact_selector_manage_sensitivity),
-      contact_selector);
-  g_signal_connect_swapped (contact_selector, "changed",
-      G_CALLBACK (contact_selector_manage_blank_contact),
-      contact_selector);
-  g_signal_connect_swapped (contact_selector, "notify::popup-shown",
-      G_CALLBACK (contact_selector_manage_blank_contact),
-      contact_selector);
-
-  priv->model = gtk_tree_model_filter_new (GTK_TREE_MODEL (priv->store), NULL);
-
-  gtk_combo_box_set_model (GTK_COMBO_BOX (contact_selector), priv->model);
-  gtk_widget_set_sensitive (GTK_WIDGET (contact_selector), FALSE);
-
-  renderer = gtk_cell_renderer_pixbuf_new ();
-  gtk_cell_layout_pack_start (cell_layout, renderer, FALSE);
-  gtk_cell_layout_set_attributes (cell_layout, renderer,
-      "pixbuf", EMPATHY_CONTACT_LIST_STORE_COL_ICON_STATUS, NULL);
-
-  renderer = gtk_cell_renderer_text_new ();
-  gtk_cell_layout_pack_start (cell_layout, renderer, TRUE);
-  gtk_cell_layout_set_attributes (cell_layout, renderer,
-      "text", EMPATHY_CONTACT_LIST_STORE_COL_NAME, NULL);
-
-  contact_selector_manage_blank_contact (contact_selector);
-  contact_selector_manage_sensitivity (contact_selector);
-
-  return object;
-}
-
-static void
-empathy_contact_selector_init (EmpathyContactSelector *empathy_contact_selector)
-{
-  EmpathyContactSelectorPriv *priv =
-      G_TYPE_INSTANCE_GET_PRIVATE (empathy_contact_selector,
-      EMPATHY_TYPE_CONTACT_SELECTOR, EmpathyContactSelectorPriv);
-
-  empathy_contact_selector->priv = priv;
-
-  priv->dispose_run = FALSE;
-}
-
-static void
-contact_selector_set_property (GObject *object,
-                               guint prop_id,
-                               const GValue *value,
-                               GParamSpec *pspec)
-{
-  EmpathyContactSelectorPriv *priv = GET_PRIV (object);
-
-  switch (prop_id)
-    {
-      case PROP_CONTACT_LIST:
-        priv->contact_list = g_value_dup_object (value);
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-        break;
-    }
-}
-
-static void
-contact_selector_get_property (GObject *object,
-                               guint prop_id,
-                               GValue *value,
-                               GParamSpec *pspec)
-{
-  EmpathyContactSelectorPriv *priv = GET_PRIV (object);
-
-  switch (prop_id)
-    {
-      case PROP_CONTACT_LIST:
-        g_value_set_object (value, priv->contact_list);
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-        break;
-    }
-}
-
-static void
-contact_selector_dispose (GObject *object)
-{
-  EmpathyContactSelector *selector = EMPATHY_CONTACT_SELECTOR (object);
-  EmpathyContactSelectorPriv *priv = GET_PRIV (selector);
-
-  if (priv->dispose_run)
-    return;
-
-  priv->dispose_run = TRUE;
-
-  if (priv->contact_list)
-    {
-      g_object_unref (priv->contact_list);
-      priv->contact_list = NULL;
-    }
-
-  if (priv->model)
-    {
-      g_object_unref (priv->model);
-      priv->model = NULL;
-    }
-
-  if (priv->store)
-    {
-      g_object_unref (priv->store);
-      priv->store = NULL;
-    }
-
-  (G_OBJECT_CLASS (empathy_contact_selector_parent_class)->dispose) (object);
-}
-
-static void
-empathy_contact_selector_class_init (EmpathyContactSelectorClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  object_class->constructor = contact_selector_constructor;
-  object_class->dispose = contact_selector_dispose;
-  object_class->set_property = contact_selector_set_property;
-  object_class->get_property = contact_selector_get_property;
-  g_type_class_add_private (klass, sizeof (EmpathyContactSelectorPriv));
-
-  /**
-   * EmpathyContactSelector:contact-list:
-   *
-   * An #EmpathyContactList containing the contacts for the
-   * #EmpathyContactSelector.
-   */
-  g_object_class_install_property (object_class, PROP_CONTACT_LIST,
-      g_param_spec_object ("contact-list", "contact list", "contact list",
-      EMPATHY_TYPE_CONTACT_LIST, G_PARAM_CONSTRUCT_ONLY |
-      G_PARAM_READWRITE | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
-}
-
-/**
- * empathy_contact_selector_new:
- * @contact_list: an #EmpathyContactList containing the contacts to list in
- * the contact selector
- *
- * Creates a new #EmpathyContactSelector.
- *
- * Return value: A new #EmpathyContactSelector
- */
-GtkWidget *
-empathy_contact_selector_new (EmpathyContactList *contact_list)
-{
-  g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST (contact_list), NULL);
-
-  return GTK_WIDGET (g_object_new (EMPATHY_TYPE_CONTACT_SELECTOR,
-      "contact-list", contact_list, NULL));
-}
-
-/**
- * empathy_contact_selector_dup_selected:
- * @selector: An #EmpathyContactSelector
- *
- * Returns a new reference to the contact which is currently selected in
- * @selector, or %NULL if there is no contact selected. The returned contact
- * should be unrefed with g_object_unref() when finished with.
- *
- * Return value: A new reference to the contact currently selected, or %NULL
- */
-EmpathyContact *
-empathy_contact_selector_dup_selected (EmpathyContactSelector *selector)
-{
-  EmpathyContactSelectorPriv *priv = GET_PRIV (selector);
-  EmpathyContact *contact = NULL;
-  GtkTreeIter iter;
-
-  g_return_val_if_fail (EMPATHY_IS_CONTACT_SELECTOR (selector), NULL);
-
-  if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (selector), &iter))
-    return NULL;
-
-  gtk_tree_model_get (priv->model, &iter,
-      EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact, -1);
-
-  return contact;
-}
-
-typedef struct
-{
-  EmpathyContactSelectorFilterFunc func;
-  gpointer user_data;
-} FilterData;
-
-static void
-filter_data_free (gpointer data)
-{
-  g_slice_free (FilterData, data);
-}
-
-static gboolean
-contact_selector_filter_visible_func (GtkTreeModel *model,
-				      GtkTreeIter *iter,
-				      gpointer user_data)
-{
-  EmpathyContact *contact;
-  gboolean visible = TRUE;
-  FilterData *data = (FilterData *) user_data;
-
-  gtk_tree_model_get (model, iter,
-      EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact,
-      -1);
-
-  if (contact != NULL)
-    {
-      visible = data->func (contact, data->user_data);
-
-      g_object_unref (contact);
-    }
-
-  return visible;
-}
-
-/**
- * empathy_contact_selector_set_visible:
- * @selector: an #EmpathyContactSelector
- * @func: an #EmpathyContactSelectorFilterFunc to filter the contacts
- * @user_data: data to pass to @func or %NULL
- *
- * Sets a filter on the @selector so only contacts that return %TRUE
- * when passed into @func are visible.
- *
- * A typical usage for this function would be to only show contacts that
- * can send or receive files. In this case, one could use the
- * empathy_contact_can_send_files() function
- */
-void
-empathy_contact_selector_set_visible (EmpathyContactSelector *selector,
-                                      EmpathyContactSelectorFilterFunc func,
-                                      gpointer user_data)
-{
-  EmpathyContactSelectorPriv *priv = GET_PRIV (selector);
-  FilterData *data;
-
-  data = g_slice_new0 (FilterData);
-  data->func = func;
-  data->user_data = user_data;
-
-  gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (priv->model),
-      contact_selector_filter_visible_func, data, filter_data_free);
-
-  gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (priv->model));
-}
-
-/**
- * EmpathyContactSelectorFilterFunc:
- * @contact: an #EmpathyContact
- * @user_data: user data or %NULL
- *
- * A function which decides whether the contact indicated by @contact
- * is visible.
- *
- * Return value: whether @contact is visible
- */
diff --git a/libempathy-gtk/empathy-contact-selector.h b/libempathy-gtk/empathy-contact-selector.h
deleted file mode 100644
index 205b9e411..000000000
--- a/libempathy-gtk/empathy-contact-selector.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-*  Copyright (C) 2007 Marco Barisione <marco@barisione.org>
-*  Copyright (C) 2008 Collabora Ltd.
-*
-*  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.1 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*
-*  Authors: Marco Barisione <marco@barisione.org>
-*           Elliot Fairweather <elliot.fairweather@collabora.co.uk>
-*/
-
-#ifndef __EMPATHY_CONTACT_SELECTOR_H__
-#define __EMPATHY_CONTACT_SELECTOR_H__
-
-G_BEGIN_DECLS
-
-#include <glib-object.h>
-#include <gtk/gtk.h>
-
-#include <libempathy/empathy-contact.h>
-#include <libempathy-gtk/empathy-contact-list-store.h>
-
-#define EMPATHY_TYPE_CONTACT_SELECTOR (empathy_contact_selector_get_type ())
-#define EMPATHY_CONTACT_SELECTOR(object) (G_TYPE_CHECK_INSTANCE_CAST \
-        ((object), EMPATHY_TYPE_CONTACT_SELECTOR, EmpathyContactSelector))
-#define EMPATHY_CONTACT_SELECTOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), \
-        EMPATHY_TYPE_CONTACT_SELECTOR, EmpathyContactSelectorClass))
-#define EMPATHY_IS_CONTACT_SELECTOR(object) (G_TYPE_CHECK_INSTANCE_TYPE \
-    ((object), EMPATHY_TYPE_CONTACT_SELECTOR))
-#define EMPATHY_IS_CONTACT_SELECTOR_CLASS(klass) \
-    (G_TYPE_CHECK_CLASS_TYPE ((klass), EMPATHY_TYPE_CONTACT_SELECTOR))
-#define EMPATHY_CONTACT_SELECTOR_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS \
-    ((object), EMPATHY_TYPE_CONTACT_SELECTOR, EmpathyContactSelectorClass))
-
-typedef struct _EmpathyContactSelector EmpathyContactSelector;
-typedef struct _EmpathyContactSelectorClass EmpathyContactSelectorClass;
-
-struct _EmpathyContactSelector
-{
-  GtkComboBox parent;
-
-  /*<private>*/
-  gpointer priv;
-};
-
-struct _EmpathyContactSelectorClass
-{
-  GtkComboBoxClass parent_class;
-};
-
-GType empathy_contact_selector_get_type (void) G_GNUC_CONST;
-
-GtkWidget * empathy_contact_selector_new (EmpathyContactList *contact_list);
-
-EmpathyContact * empathy_contact_selector_dup_selected (EmpathyContactSelector *selector);
-
-typedef gboolean (*EmpathyContactSelectorFilterFunc) (EmpathyContact *contact, gpointer user_data);
-
-void empathy_contact_selector_set_visible (EmpathyContactSelector *selector,
-   EmpathyContactSelectorFilterFunc func, gpointer user_data);
-
-G_END_DECLS
-
-#endif /* __EMPATHY_CONTACT_SELECTOR_H__ */
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index b9c17687c..6c021c3ee 100644
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -1750,6 +1750,7 @@ contact_widget_contact_setup (EmpathyContactWidget *information)
                                 PANGO_WRAP_WORD_CHAR);
   gtk_label_set_line_wrap (GTK_LABEL (information->label_status),
                            TRUE);
+  gtk_misc_set_alignment (GTK_MISC (information->label_status), 0, 0.5);
 
   if (!(information->flags & EMPATHY_CONTACT_WIDGET_FOR_TOOLTIP))
     gtk_label_set_selectable (GTK_LABEL (information->label_status), TRUE);
diff --git a/libempathy-gtk/empathy-individual-linker.c b/libempathy-gtk/empathy-individual-linker.c
index 54663ef26..793c2827f 100644
--- a/libempathy-gtk/empathy-individual-linker.c
+++ b/libempathy-gtk/empathy-individual-linker.c
@@ -280,7 +280,7 @@ individual_view_drag_motion_cb (GtkWidget *widget,
 
   target = gtk_drag_dest_find_target (GTK_WIDGET (view), context, NULL);
 
-  if (target == gdk_atom_intern_static_string ("text/persona-id"))
+  if (target == gdk_atom_intern_static_string ("text/x-persona-id"))
     {
       GtkTreePath *path;
 
diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index 745474d84..2209e1538 100644
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -664,7 +664,7 @@ empathy_individual_menu_class_init (EmpathyIndividualMenuClass *klass)
   signals[SIGNAL_LINK_CONTACTS_ACTIVATED] =
       g_signal_new ("link-contacts-activated", G_OBJECT_CLASS_TYPE (klass),
           G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-          g_cclosure_marshal_VOID__OBJECT,
+          g_cclosure_marshal_generic,
           G_TYPE_NONE, 1, EMPATHY_TYPE_LINKING_DIALOG);
 
   g_type_class_add_private (object_class, sizeof (EmpathyIndividualMenuPriv));
@@ -786,7 +786,8 @@ empathy_individual_sms_menu_item_activated (GtkMenuItem *item,
   empathy_sms_contact_id (
       empathy_contact_get_account (contact),
       empathy_contact_get_id (contact),
-      empathy_get_current_action_time ());
+      empathy_get_current_action_time (),
+      NULL, NULL);
 }
 
 GtkWidget *
@@ -1131,8 +1132,9 @@ empathy_individual_edit_menu_item_new (FolksIndividual *individual)
       manager = empathy_individual_manager_dup_singleton ();
       connection = empathy_contact_get_connection (contact);
 
-      enable = (empathy_connection_can_alias_personas (connection) &&
-                empathy_connection_can_group_personas (connection));
+      enable = (empathy_connection_can_alias_personas (connection,
+						       individual) &&
+                empathy_connection_can_group_personas (connection, individual));
 
       g_object_unref (manager);
     }
diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c
index d21a9d50b..a499bf1cc 100644
--- a/libempathy-gtk/empathy-individual-store.c
+++ b/libempathy-gtk/empathy-individual-store.c
@@ -73,9 +73,9 @@ typedef struct
   GHashTable *status_icons;
   /* List of owned GCancellables for each pending avatar load operation */
   GList *avatar_cancellables;
-  /* Hash: FolksIndividual* -> GQueue (GtkTreeRowReference) */
+  /* Hash: FolksIndividual* -> GQueue (GtkTreeIter *) */
   GHashTable                  *folks_individual_cache;
-  /* Hash: char *groupname -> GtkTreeRowReference *row */
+  /* Hash: char *groupname -> GtkTreeIter * */
   GHashTable                  *empathy_group_cache;
 } EmpathyIndividualStorePriv;
 
@@ -205,8 +205,6 @@ add_individual_to_store (GtkTreeStore *self,
   EmpathyIndividualStorePriv *priv = GET_PRIV (self);
   gboolean can_audio_call, can_video_call;
   const gchar * const *types;
-  GtkTreeRowReference *row_ref;
-  GtkTreePath *path;
   GQueue *queue;
 
   individual_can_audio_video_call (individual, &can_audio_call,
@@ -225,21 +223,18 @@ add_individual_to_store (GtkTreeStore *self,
       EMPATHY_INDIVIDUAL_STORE_COL_CLIENT_TYPES, types,
       -1);
 
-  path = gtk_tree_model_get_path (GTK_TREE_MODEL (self), iter);
-  row_ref = gtk_tree_row_reference_new (GTK_TREE_MODEL (self), path);
   queue = g_hash_table_lookup (priv->folks_individual_cache, individual);
   if (queue)
     {
-      g_queue_push_tail (queue, row_ref);
+      g_queue_push_tail (queue, gtk_tree_iter_copy (iter));
     }
   else
     {
       queue = g_queue_new ();
-      g_queue_push_tail (queue, row_ref);
+      g_queue_push_tail (queue, gtk_tree_iter_copy (iter));
       g_hash_table_insert (priv->folks_individual_cache, individual,
           queue);
     }
-  gtk_tree_path_free (path);
 }
 
 static void
@@ -254,15 +249,13 @@ individual_store_get_group (EmpathyIndividualStore *self,
   GtkTreeModel *model;
   GtkTreeIter iter_group;
   GtkTreeIter iter_separator;
-  GtkTreeRowReference         *row_ref;
+  GtkTreeIter *iter;
 
   model = GTK_TREE_MODEL (self);
-  row_ref = g_hash_table_lookup (priv->empathy_group_cache, name);
+  iter = g_hash_table_lookup (priv->empathy_group_cache, name);
 
-  if (row_ref == NULL)
+  if (iter == NULL)
     {
-      GtkTreePath *path;
-
       if (created)
         *created = TRUE;
 
@@ -276,11 +269,8 @@ individual_store_get_group (EmpathyIndividualStore *self,
           EMPATHY_INDIVIDUAL_STORE_COL_IS_FAKE_GROUP, is_fake_group,
           -1);
 
-      path = gtk_tree_model_get_path (GTK_TREE_MODEL (self), &iter_group);
-      row_ref = gtk_tree_row_reference_new (GTK_TREE_MODEL (self), path);
-      g_hash_table_insert (priv->empathy_group_cache,
-      	g_strdup (name), row_ref);
-      gtk_tree_path_free (path);
+      g_hash_table_insert (priv->empathy_group_cache, g_strdup (name),
+          gtk_tree_iter_copy (&iter_group));
 
       if (iter_group_to_set)
         *iter_group_to_set = iter_group;
@@ -295,22 +285,13 @@ individual_store_get_group (EmpathyIndividualStore *self,
     }
   else
     {
-      GtkTreePath *path = gtk_tree_row_reference_get_path (row_ref);
-      GtkTreeIter iter;
-
-      if (!gtk_tree_model_get_iter (model, &iter, path)) {
-      	gtk_tree_path_free (path);
-      	return;
-      }
-      gtk_tree_path_free (path);
-
       if (created)
         *created = FALSE;
 
       if (iter_group_to_set)
-        *iter_group_to_set = iter;
+        *iter_group_to_set = *iter;
 
-      iter_separator = iter;
+      iter_separator = *iter;
 
       if (gtk_tree_model_iter_next (model, &iter_separator))
         {
@@ -330,12 +311,10 @@ individual_store_find_contact (EmpathyIndividualStore *self,
     FolksIndividual *individual)
 {
   EmpathyIndividualStorePriv *priv = GET_PRIV (self);
-  GtkTreeModel *model;
   GQueue *row_refs_queue;
   GList *i;
   GList *iters_list = NULL;
 
-  model = GTK_TREE_MODEL (self);
   row_refs_queue = g_hash_table_lookup (priv->folks_individual_cache,
       individual);
   if (!row_refs_queue)
@@ -343,16 +322,9 @@ individual_store_find_contact (EmpathyIndividualStore *self,
 
   for (i = g_queue_peek_head_link (row_refs_queue) ; i != NULL ; i = i->next)
     {
-      GtkTreePath *path = gtk_tree_row_reference_get_path (i->data);
-      GtkTreeIter iter;
-      if (!gtk_tree_model_get_iter (model, &iter, path))
-        {
-          gtk_tree_path_free (path);
-          continue;
-        }
-      gtk_tree_path_free (path);
-      iters_list = g_list_prepend
-          (iters_list, gtk_tree_iter_copy (&iter));
+      GtkTreeIter *iter = i->data;
+
+      iters_list = g_list_prepend (iters_list, gtk_tree_iter_copy (iter));
     }
 
   return iters_list;
@@ -383,23 +355,14 @@ individual_store_remove_individual (EmpathyIndividualStore *self,
 
   for (l = g_queue_peek_head_link (row_refs); l; l = l->next)
     {
-      GtkTreePath *path = gtk_tree_row_reference_get_path (l->data);
-      GtkTreeIter iter;
+      GtkTreeIter *iter = l->data;
       GtkTreeIter parent;
 
-      if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (self), &iter,
-                                    path))
-        {
-          gtk_tree_path_free (path);
-          continue;
-        }
-      gtk_tree_path_free (path);
-
       /* NOTE: it is only <= 2 here because we have
        * separators after the group name, otherwise it
        * should be 1.
        */
-      if (gtk_tree_model_iter_parent (model, &parent, &iter) &&
+      if (gtk_tree_model_iter_parent (model, &parent, iter) &&
           gtk_tree_model_iter_n_children (model, &parent) <= 2)
         {
           gchar *group_name;
@@ -412,7 +375,7 @@ individual_store_remove_individual (EmpathyIndividualStore *self,
         }
       else
         {
-          gtk_tree_store_remove (GTK_TREE_STORE (self), &iter);
+          gtk_tree_store_remove (GTK_TREE_STORE (self), iter);
         }
     }
 
@@ -954,6 +917,20 @@ individual_personas_changed_cb (FolksIndividual *individual,
   g_clear_object (&iter);
 }
 
+static void
+individual_store_favourites_changed_cb (FolksIndividual *individual,
+    GParamSpec *param,
+    EmpathyIndividualStore *self)
+{
+  DEBUG ("Individual %s is %s a favourite",
+      folks_individual_get_id (individual),
+      folks_favourite_details_get_is_favourite (
+        FOLKS_FAVOURITE_DETAILS (individual)) ? "now" : "no longer");
+
+  individual_store_remove_individual (self, individual);
+  individual_store_add_individual (self, individual);
+}
+
 void
 individual_store_add_individual_and_connect (EmpathyIndividualStore *self,
     FolksIndividual *individual)
@@ -972,6 +949,8 @@ individual_store_add_individual_and_connect (EmpathyIndividualStore *self,
       (GCallback) individual_store_individual_updated_cb, self);
   g_signal_connect (individual, "personas-changed",
       (GCallback) individual_personas_changed_cb, self);
+  g_signal_connect (individual, "notify::is-favourite",
+      (GCallback) individual_store_favourites_changed_cb, self);
 
   /* provide an empty set so the callback can assume non-NULL sets */
   individual_personas_changed_cb (individual,
@@ -994,6 +973,8 @@ individual_store_disconnect_individual (EmpathyIndividualStore *self,
       (GCallback) individual_store_individual_updated_cb, self);
   g_signal_handlers_disconnect_by_func (individual,
       (GCallback) individual_personas_changed_cb, self);
+  g_signal_handlers_disconnect_by_func (individual,
+      (GCallback) individual_store_favourites_changed_cb, self);
 }
 
 void
@@ -1031,20 +1012,6 @@ individual_store_members_changed_cb (EmpathyIndividualManager *manager,
 }
 
 static void
-individual_store_favourites_changed_cb (EmpathyIndividualManager *manager,
-    FolksIndividual *individual,
-    gboolean is_favourite,
-    EmpathyIndividualStore *self)
-{
-  DEBUG ("Individual %s is %s a favourite",
-      folks_individual_get_id (individual),
-      is_favourite ? "now" : "no longer");
-
-  individual_store_remove_individual (self, individual);
-  individual_store_add_individual (self, individual);
-}
-
-static void
 individual_store_groups_changed_cb (EmpathyIndividualManager *manager,
     FolksIndividual *individual,
     gchar *group,
@@ -1087,10 +1054,6 @@ individual_store_manager_setup (gpointer user_data)
       G_CALLBACK (individual_store_members_changed_cb), self);
 
   g_signal_connect (priv->manager,
-      "favourites-changed",
-      G_CALLBACK (individual_store_favourites_changed_cb), self);
-
-  g_signal_connect (priv->manager,
       "groups-changed",
       G_CALLBACK (individual_store_groups_changed_cb), self);
 
@@ -1169,8 +1132,6 @@ individual_store_dispose (GObject *object)
   g_signal_handlers_disconnect_by_func (priv->manager,
       G_CALLBACK (individual_store_members_changed_cb), object);
   g_signal_handlers_disconnect_by_func (priv->manager,
-      G_CALLBACK (individual_store_favourites_changed_cb), object);
-  g_signal_handlers_disconnect_by_func (priv->manager,
       G_CALLBACK (individual_store_groups_changed_cb), object);
   g_object_unref (priv->manager);
 
@@ -1624,10 +1585,10 @@ individual_store_inhibit_active_cb (EmpathyIndividualStore *self)
 }
 
 static void
-g_queue_free_full_row_ref (gpointer data)
+g_queue_free_full_iter (gpointer data)
 {
   GQueue *queue = (GQueue *) data;
-  g_queue_foreach (queue, (GFunc) gtk_tree_row_reference_free, NULL);
+  g_queue_foreach (queue, (GFunc) gtk_tree_iter_free, NULL);
   g_queue_free (queue);
 }
 
@@ -1647,10 +1608,9 @@ empathy_individual_store_init (EmpathyIndividualStore *self)
   priv->status_icons =
       g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
   priv->folks_individual_cache = g_hash_table_new_full (NULL, NULL, NULL,
-      g_queue_free_full_row_ref);
+      g_queue_free_full_iter);
   priv->empathy_group_cache = g_hash_table_new_full (g_str_hash,
-      g_str_equal, g_free,
-      (GDestroyNotify) gtk_tree_row_reference_free);
+      g_str_equal, g_free, (GDestroyNotify) gtk_tree_iter_free);
   individual_store_setup (self);
 }
 
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index 9d23027fc..51c9dfc29 100644
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -55,7 +55,6 @@
 #include "empathy-cell-renderer-activatable.h"
 #include "empathy-ui-utils.h"
 #include "empathy-gtk-enum-types.h"
-#include "empathy-gtk-marshal.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #include <libempathy/empathy-debug.h>
@@ -132,8 +131,8 @@ typedef enum
   { (gchar *) T, 0, I }
 
 static const GtkTargetEntry drag_types_dest[] = {
-  DRAG_TYPE ("text/individual-id", DND_DRAG_TYPE_INDIVIDUAL_ID),
-  DRAG_TYPE ("text/persona-id", DND_DRAG_TYPE_PERSONA_ID),
+  DRAG_TYPE ("text/x-individual-id", DND_DRAG_TYPE_INDIVIDUAL_ID),
+  DRAG_TYPE ("text/x-persona-id", DND_DRAG_TYPE_PERSONA_ID),
   DRAG_TYPE ("text/path-list", DND_DRAG_TYPE_URI_LIST),
   DRAG_TYPE ("text/uri-list", DND_DRAG_TYPE_URI_LIST),
   DRAG_TYPE ("text/plain", DND_DRAG_TYPE_STRING),
@@ -141,7 +140,7 @@ static const GtkTargetEntry drag_types_dest[] = {
 };
 
 static const GtkTargetEntry drag_types_source[] = {
-  DRAG_TYPE ("text/individual-id", DND_DRAG_TYPE_INDIVIDUAL_ID),
+  DRAG_TYPE ("text/x-individual-id", DND_DRAG_TYPE_INDIVIDUAL_ID),
 };
 
 #undef DRAG_TYPE
@@ -866,7 +865,7 @@ individual_view_drag_data_get (GtkWidget *widget,
   if (info == DND_DRAG_TYPE_INDIVIDUAL_ID)
     {
       gtk_selection_data_set (selection,
-          gdk_atom_intern ("text/individual-id", FALSE), 8,
+          gdk_atom_intern ("text/x-individual-id", FALSE), 8,
           (guchar *) individual_id, strlen (individual_id) + 1);
     }
 
@@ -2152,7 +2151,7 @@ empathy_individual_view_class_init (EmpathyIndividualViewClass *klass)
       G_SIGNAL_RUN_LAST,
       G_STRUCT_OFFSET (EmpathyIndividualViewClass, drag_individual_received),
       NULL, NULL,
-      _empathy_gtk_marshal_VOID__UINT_OBJECT_STRING_STRING,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE, 4, G_TYPE_UINT, FOLKS_TYPE_INDIVIDUAL,
       G_TYPE_STRING, G_TYPE_STRING);
 
@@ -2162,7 +2161,7 @@ empathy_individual_view_class_init (EmpathyIndividualViewClass *klass)
       G_SIGNAL_RUN_LAST,
       G_STRUCT_OFFSET (EmpathyIndividualViewClass, drag_persona_received),
       NULL, NULL,
-      _empathy_gtk_marshal_BOOLEAN__UINT_OBJECT_OBJECT,
+      g_cclosure_marshal_generic,
       G_TYPE_BOOLEAN, 3, G_TYPE_UINT, FOLKS_TYPE_PERSONA, FOLKS_TYPE_INDIVIDUAL);
 
   g_object_class_install_property (object_class,
diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c
index 0a3844aa2..9e0b9d3a2 100644
--- a/libempathy-gtk/empathy-individual-widget.c
+++ b/libempathy-gtk/empathy-individual-widget.c
@@ -80,10 +80,10 @@ typedef struct {
   /* weak pointer to the contact whose contact details we're displaying */
   TpContact *contact;
 
-  /* unowned Persona (borrowed from priv->individual) -> GtkTable child */
-  GHashTable *persona_tables;
+  /* unowned Persona (borrowed from priv->individual) -> GtkGrid child */
+  GHashTable *persona_grids;
   /* Table containing the information for the individual as whole, or NULL */
-  GtkTable *individual_table;
+  GtkGrid *individual_grid;
 
   /* Individual */
   GtkWidget *hbox_presence;
@@ -111,7 +111,7 @@ typedef struct {
 
   /* Details */
   GtkWidget *vbox_details;
-  GtkWidget *table_details;
+  GtkWidget *grid_details;
   GtkWidget *hbox_details_requested;
   GtkWidget *details_spinner;
   GCancellable *details_cancellable; /* owned */
@@ -297,8 +297,8 @@ details_update_show (EmpathyIndividualWidget *self,
 
       /* Add Title */
       w = gtk_label_new (_(field_data->title));
-      gtk_table_attach (GTK_TABLE (priv->table_details),
-          w, 0, 1, n_rows, n_rows + 1, GTK_FILL, 0, 0, 0);
+      gtk_grid_attach (GTK_GRID (priv->grid_details),
+          w, 0, n_rows, 1, 1);
       gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5);
       gtk_widget_show (w);
 
@@ -316,8 +316,8 @@ details_update_show (EmpathyIndividualWidget *self,
       gtk_label_set_selectable (GTK_LABEL (w),
           (priv->flags & EMPATHY_INDIVIDUAL_WIDGET_FOR_TOOLTIP) ? FALSE : TRUE);
 
-      gtk_table_attach_defaults (GTK_TABLE (priv->table_details),
-          w, 1, 2, n_rows, n_rows + 1);
+      gtk_grid_attach (GTK_GRID (priv->grid_details),
+          w, 1, n_rows, 1, 1);
       gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5);
       gtk_widget_show (w);
 
@@ -336,7 +336,7 @@ details_notify_cb (TpContact *contact,
   EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
   guint n_rows;
 
-  gtk_container_foreach (GTK_CONTAINER (priv->table_details),
+  gtk_container_foreach (GTK_CONTAINER (priv->grid_details),
       (GtkCallback) gtk_widget_destroy, NULL);
 
   n_rows = details_update_show (self, contact);
@@ -344,7 +344,7 @@ details_notify_cb (TpContact *contact,
   if (n_rows > 0)
     {
       gtk_widget_show (priv->vbox_details);
-      gtk_widget_show (priv->table_details);
+      gtk_widget_show (priv->grid_details);
     }
   else
     {
@@ -411,7 +411,7 @@ fetch_contact_information (EmpathyIndividualWidget *self)
   /* Request the Individual's info */
   gtk_widget_show (priv->vbox_details);
   gtk_widget_show (priv->hbox_details_requested);
-  gtk_widget_hide (priv->table_details);
+  gtk_widget_hide (priv->grid_details);
   gtk_spinner_start (GTK_SPINNER (priv->details_spinner));
 
   if (priv->details_cancellable == NULL)
@@ -1158,28 +1158,28 @@ notify_avatar_cb (gpointer folks_object,
 {
   EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
   EmpathyAvatar *avatar = NULL;
-  GObject *table;
+  GObject *grid;
   GtkWidget *avatar_widget;
 
   if (FOLKS_IS_INDIVIDUAL (folks_object))
     {
       avatar = individual_dup_avatar (FOLKS_INDIVIDUAL (folks_object));
-      table = G_OBJECT (priv->individual_table);
+      grid = G_OBJECT (priv->individual_grid);
     }
   else if (FOLKS_IS_PERSONA (folks_object))
     {
       avatar = persona_dup_avatar (FOLKS_PERSONA (folks_object));
-      table = g_hash_table_lookup (priv->persona_tables, folks_object);
+      grid = g_hash_table_lookup (priv->persona_grids, folks_object);
     }
   else
     {
       g_assert_not_reached ();
     }
 
-  if (table == NULL)
+  if (grid == NULL)
     return;
 
-  avatar_widget = g_object_get_data (table, "avatar-widget");
+  avatar_widget = g_object_get_data (grid, "avatar-widget");
   empathy_avatar_image_set (EMPATHY_AVATAR_IMAGE (avatar_widget), avatar);
 
   if (avatar != NULL)
@@ -1192,20 +1192,20 @@ notify_alias_cb (gpointer folks_object,
     EmpathyIndividualWidget *self)
 {
   EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
-  GObject *table;
+  GObject *grid;
   GtkWidget *alias_widget;
 
   if (FOLKS_IS_INDIVIDUAL (folks_object))
-    table = G_OBJECT (priv->individual_table);
+    grid = G_OBJECT (priv->individual_grid);
   else if (FOLKS_IS_PERSONA (folks_object))
-    table = g_hash_table_lookup (priv->persona_tables, folks_object);
+    grid = g_hash_table_lookup (priv->persona_grids, folks_object);
   else
     g_assert_not_reached ();
 
-  if (table == NULL)
+  if (grid == NULL)
     return;
 
-  alias_widget = g_object_get_data (table, "alias-widget");
+  alias_widget = g_object_get_data (grid, "alias-widget");
 
   if (GTK_IS_ENTRY (alias_widget))
     {
@@ -1225,23 +1225,23 @@ notify_presence_cb (gpointer folks_object,
     EmpathyIndividualWidget *self)
 {
   EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
-  GObject *table;
+  GObject *grid;
   GtkWidget *status_label, *state_image;
   const gchar *message;
   gchar *markup_text = NULL;
 
   if (FOLKS_IS_INDIVIDUAL (folks_object))
-    table = G_OBJECT (priv->individual_table);
+    grid = G_OBJECT (priv->individual_grid);
   else if (FOLKS_IS_PERSONA (folks_object))
-    table = g_hash_table_lookup (priv->persona_tables, folks_object);
+    grid = g_hash_table_lookup (priv->persona_grids, folks_object);
   else
     g_assert_not_reached ();
 
-  if (table == NULL)
+  if (grid == NULL)
     return;
 
-  status_label = g_object_get_data (table, "status-label");
-  state_image = g_object_get_data (table, "state-image");
+  status_label = g_object_get_data (grid, "status-label");
+  state_image = g_object_get_data (grid, "state-image");
 
   /* FIXME: Default messages should be moved into libfolks (bgo#627403) */
   message = folks_presence_details_get_presence_message (
@@ -1272,20 +1272,20 @@ notify_is_favourite_cb (gpointer folks_object,
     EmpathyIndividualWidget *self)
 {
   EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
-  GObject *table;
+  GObject *grid;
   GtkWidget *favourite_widget;
 
   if (FOLKS_IS_INDIVIDUAL (folks_object))
-    table = G_OBJECT (priv->individual_table);
+    grid = G_OBJECT (priv->individual_grid);
   else if (FOLKS_IS_PERSONA (folks_object))
-    table = g_hash_table_lookup (priv->persona_tables, folks_object);
+    grid = g_hash_table_lookup (priv->persona_grids, folks_object);
   else
     g_assert_not_reached ();
 
-  if (table == NULL)
+  if (grid == NULL)
     return;
 
-  favourite_widget = g_object_get_data (table, "favourite-widget");
+  favourite_widget = g_object_get_data (grid, "favourite-widget");
 
   if (GTK_IS_TOGGLE_BUTTON (favourite_widget))
     {
@@ -1297,18 +1297,17 @@ notify_is_favourite_cb (gpointer folks_object,
 
 static void
 alias_presence_avatar_favourite_set_up (EmpathyIndividualWidget *self,
-    GtkTable *table,
+    GtkGrid *grid,
     guint starting_row)
 {
   EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
-  GtkWidget *label, *alias, *image, *avatar, *alignment;
+  GtkWidget *label, *alias, *image, *avatar;
   guint current_row = starting_row;
 
   /* Alias */
   label = gtk_label_new (_("Alias:"));
   gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-  gtk_table_attach (table, label, 0, 1, current_row, current_row + 1, GTK_FILL,
-      GTK_FILL, 0, 0);
+  gtk_grid_attach (grid, label, 0, current_row, 1, 1);
   gtk_widget_show (label);
 
   /* Set up alias label/entry */
@@ -1330,9 +1329,9 @@ alias_presence_avatar_favourite_set_up (EmpathyIndividualWidget *self,
       gtk_misc_set_alignment (GTK_MISC (alias), 0.0, 0.5);
     }
 
-  g_object_set_data (G_OBJECT (table), "alias-widget", alias);
-  gtk_table_attach (table, alias, 1, 2, current_row, current_row + 1,
-      GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
+  g_object_set_data (G_OBJECT (grid), "alias-widget", alias);
+  gtk_grid_attach_next_to (grid, alias, label,
+                           GTK_POS_RIGHT, 1, 1);
   gtk_widget_show (alias);
 
   current_row++;
@@ -1343,7 +1342,7 @@ alias_presence_avatar_favourite_set_up (EmpathyIndividualWidget *self,
   /* Presence image */
   image = gtk_image_new_from_stock (GTK_STOCK_MISSING_IMAGE,
       GTK_ICON_SIZE_BUTTON);
-  g_object_set_data (G_OBJECT (table), "state-image", image);
+  g_object_set_data (G_OBJECT (grid), "state-image", image);
   gtk_box_pack_start (GTK_BOX (priv->hbox_presence), image, FALSE,
       FALSE, 0);
   gtk_widget_show (image);
@@ -1356,13 +1355,13 @@ alias_presence_avatar_favourite_set_up (EmpathyIndividualWidget *self,
   gtk_label_set_selectable (GTK_LABEL (label),
       (priv->flags & EMPATHY_INDIVIDUAL_WIDGET_FOR_TOOLTIP) ? FALSE : TRUE);
 
-  g_object_set_data (G_OBJECT (table), "status-label", label);
-  gtk_box_pack_start (GTK_BOX (priv->hbox_presence), label, TRUE,
-      TRUE, 0);
+  g_object_set_data (G_OBJECT (grid), "status-label", label);
+  gtk_box_pack_start (GTK_BOX (priv->hbox_presence), label, FALSE,
+      FALSE, 0);
   gtk_widget_show (label);
 
-  gtk_table_attach (table, priv->hbox_presence, 0, 2, current_row,
-      current_row + 1, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
+  gtk_grid_attach (grid, priv->hbox_presence,
+                   0, current_row, 2, 1);
   gtk_widget_show (priv->hbox_presence);
 
   current_row++;
@@ -1375,9 +1374,9 @@ alias_presence_avatar_favourite_set_up (EmpathyIndividualWidget *self,
       g_signal_connect (favourite, "toggled",
           (GCallback) favourite_toggled_cb, self);
 
-      g_object_set_data (G_OBJECT (table), "favourite-widget", favourite);
-      gtk_table_attach (table, favourite, 0, 2, current_row, current_row + 1,
-          GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
+      g_object_set_data (G_OBJECT (grid), "favourite-widget", favourite);
+      gtk_grid_attach (grid, favourite,
+                       0, current_row, 2, 1);
       gtk_widget_show (favourite);
 
       current_row++;
@@ -1394,15 +1393,18 @@ alias_presence_avatar_favourite_set_up (EmpathyIndividualWidget *self,
           (GCallback) avatar_widget_button_press_event_cb, self);
     }
 
-  g_object_set_data (G_OBJECT (table), "avatar-widget", avatar);
+  g_object_set_data (G_OBJECT (grid), "avatar-widget", avatar);
+  g_object_set (avatar,
+                "valign", GTK_ALIGN_START,
+                "margin-left", 6,
+                "margin-right", 6,
+                "margin-top", 6,
+                "margin-bottom", 6,
+                NULL);
 
-  alignment = gtk_alignment_new (1.0, 0.0, 0.0, 0.0);
-  gtk_container_add (GTK_CONTAINER (alignment), avatar);
+  gtk_grid_attach (grid, avatar,
+                   2, 0, 1, current_row);
   gtk_widget_show (avatar);
-
-  gtk_table_attach (table, alignment, 2, 3, 0, current_row,
-      GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 6, 6);
-  gtk_widget_show (alignment);
 }
 
 static void
@@ -1412,14 +1414,14 @@ update_persona (EmpathyIndividualWidget *self, FolksPersona *persona)
   TpContact *tp_contact;
   EmpathyContact *contact;
   TpAccount *account;
-  GtkTable *table;
+  GtkGrid *grid;
   GtkLabel *label;
   GtkImage *image;
   const gchar *id;
 
-  table = g_hash_table_lookup (priv->persona_tables, persona);
+  grid = g_hash_table_lookup (priv->persona_grids, persona);
 
-  g_assert (table != NULL);
+  g_assert (grid != NULL);
 
   tp_contact = tpf_persona_get_contact (TPF_PERSONA (persona));
   if (tp_contact == NULL)
@@ -1435,8 +1437,8 @@ update_persona (EmpathyIndividualWidget *self, FolksPersona *persona)
     {
       const gchar *name;
 
-      label = g_object_get_data (G_OBJECT (table), "account-label");
-      image = g_object_get_data (G_OBJECT (table), "account-image");
+      label = g_object_get_data (G_OBJECT (grid), "account-label");
+      image = g_object_get_data (G_OBJECT (grid), "account-image");
 
       name = tp_account_get_display_name (account);
       gtk_label_set_label (label, name);
@@ -1446,7 +1448,7 @@ update_persona (EmpathyIndividualWidget *self, FolksPersona *persona)
     }
 
   /* Update id widget */
-  label = g_object_get_data (G_OBJECT (table), "id-widget");
+  label = g_object_get_data (G_OBJECT (grid), "id-widget");
   id = folks_persona_get_display_id (persona);
   gtk_label_set_label (label, (id != NULL) ? id : "");
 
@@ -1467,7 +1469,7 @@ add_persona (EmpathyIndividualWidget *self,
 {
   EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
   GtkBox *hbox;
-  GtkTable *table;
+  GtkGrid *grid;
   GtkWidget *label, *account_label, *account_image, *separator;
   guint current_row = 0;
 
@@ -1475,17 +1477,18 @@ add_persona (EmpathyIndividualWidget *self,
     return;
 
   if (priv->flags & EMPATHY_INDIVIDUAL_WIDGET_EDIT_FAVOURITE)
-    table = GTK_TABLE (gtk_table_new (5, 3, FALSE));
+    grid = GTK_GRID (gtk_grid_new ());
   else
-    table = GTK_TABLE (gtk_table_new (4, 3, FALSE));
-  gtk_table_set_row_spacings (table, 6);
-  gtk_table_set_col_spacings (table, 6);
+    grid = GTK_GRID (gtk_grid_new ());
+
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (grid), GTK_ORIENTATION_VERTICAL);
+  gtk_grid_set_row_spacing (grid, 6);
+  gtk_grid_set_column_spacing (grid, 6);
 
   /* Account and Identifier */
   label = gtk_label_new (_("Account:"));
   gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-  gtk_table_attach (table, label, 0, 1, current_row, current_row + 1,
-      GTK_FILL, GTK_FILL, 0, 0);
+  gtk_grid_attach (grid, label, 0, current_row, 1, 1);
   gtk_widget_show (label);
 
   /* Pack the protocol icon with the account name in an hbox */
@@ -1503,10 +1506,9 @@ add_persona (EmpathyIndividualWidget *self,
   gtk_box_pack_start (hbox, account_image, FALSE, FALSE, 0);
   gtk_box_pack_start (hbox, account_label, FALSE, TRUE, 0);
 
-  g_object_set_data (G_OBJECT (table), "account-image", account_image);
-  g_object_set_data (G_OBJECT (table), "account-label", account_label);
-  gtk_table_attach (table, GTK_WIDGET (hbox), 1, 2, current_row,
-      current_row + 1, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
+  g_object_set_data (G_OBJECT (grid), "account-image", account_image);
+  g_object_set_data (G_OBJECT (grid), "account-label", account_label);
+  gtk_grid_attach_next_to (grid, GTK_WIDGET (hbox), label, GTK_POS_RIGHT, 1, 1);
   gtk_widget_show (GTK_WIDGET (hbox));
 
   current_row++;
@@ -1514,8 +1516,7 @@ add_persona (EmpathyIndividualWidget *self,
   /* Translators: Identifier to connect to Instant Messaging network */
   label = gtk_label_new (_("Identifier:"));
   gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-  gtk_table_attach (table, label, 0, 1, current_row, current_row + 1,
-      GTK_FILL, GTK_FILL, 0, 0);
+  gtk_grid_attach (grid, label, 0, current_row, 1, 1);
   gtk_widget_show (label);
 
   /* Set up ID label */
@@ -1524,16 +1525,15 @@ add_persona (EmpathyIndividualWidget *self,
       (priv->flags & EMPATHY_INDIVIDUAL_WIDGET_FOR_TOOLTIP) ? FALSE : TRUE);
   gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 
-  g_object_set_data (G_OBJECT (table), "id-widget", label);
-  gtk_table_attach (table, label, 1, 2, current_row, current_row + 1,
-      GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
+  g_object_set_data (G_OBJECT (grid), "id-widget", label);
+  gtk_grid_attach (grid, label, 1, current_row, 1, 1);
   gtk_widget_show (label);
 
   current_row++;
 
-  alias_presence_avatar_favourite_set_up (self, table, current_row);
+  alias_presence_avatar_favourite_set_up (self, grid, current_row);
 
-  /* Connect to signals and display the table */
+  /* Connect to signals and display the grid */
   g_signal_connect (persona, "notify::alias",
       (GCallback) notify_alias_cb, self);
   g_signal_connect (persona, "notify::avatar",
@@ -1550,17 +1550,17 @@ add_persona (EmpathyIndividualWidget *self,
     }
 
   gtk_box_pack_start (GTK_BOX (priv->vbox_individual),
-      GTK_WIDGET (table), FALSE, TRUE, 0);
-  gtk_widget_show (GTK_WIDGET (table));
+      GTK_WIDGET (grid), FALSE, TRUE, 0);
+  gtk_widget_show (GTK_WIDGET (grid));
 
-  /* Pack a separator after the table */
+  /* Pack a separator after the grid */
   separator = gtk_hseparator_new ();
-  g_object_set_data (G_OBJECT (table), "separator", separator);
+  g_object_set_data (G_OBJECT (grid), "separator", separator);
   gtk_box_pack_start (GTK_BOX (priv->vbox_individual), separator, FALSE, FALSE,
       0);
   gtk_widget_show (separator);
 
-  g_hash_table_replace (priv->persona_tables, persona, table);
+  g_hash_table_replace (priv->persona_grids, persona, grid);
 
   /* Update the new widgets */
   update_persona (self, persona);
@@ -1572,13 +1572,13 @@ remove_persona (EmpathyIndividualWidget *self,
 {
   EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
   GtkWidget *separator;
-  GtkTable *table;
+  GtkGrid *grid;
 
   if (!empathy_folks_persona_is_interesting (persona))
     return;
 
-  table = g_hash_table_lookup (priv->persona_tables, persona);
-  if (table == NULL)
+  grid = g_hash_table_lookup (priv->persona_grids, persona);
+  if (grid == NULL)
     return;
 
   g_signal_handlers_disconnect_by_func (persona, notify_alias_cb, self);
@@ -1592,19 +1592,19 @@ remove_persona (EmpathyIndividualWidget *self,
     }
 
   /* Remove the separator */
-  separator = g_object_get_data (G_OBJECT (table), "separator");
+  separator = g_object_get_data (G_OBJECT (grid), "separator");
   if (separator != NULL)
     gtk_container_remove (GTK_CONTAINER (priv->vbox_individual), separator);
 
   /* Remove the widget */
   gtk_container_remove (GTK_CONTAINER (priv->vbox_individual),
-      GTK_WIDGET (table));
+      GTK_WIDGET (grid));
 
-  g_hash_table_remove (priv->persona_tables, persona);
+  g_hash_table_remove (priv->persona_grids, persona);
 }
 
 static void
-update_individual_table (EmpathyIndividualWidget *self)
+update_individual_grid (EmpathyIndividualWidget *self)
 {
   EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
 
@@ -1617,22 +1617,16 @@ update_individual_table (EmpathyIndividualWidget *self)
 }
 
 static void
-individual_table_set_up (EmpathyIndividualWidget *self)
+individual_grid_set_up (EmpathyIndividualWidget *self)
 {
   EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
-  GtkTable *table;
   guint current_row = 0;
-  guint nb_rows = 2;
-
-  if (priv->flags & EMPATHY_INDIVIDUAL_WIDGET_EDIT_FAVOURITE)
-    nb_rows++;
-
-  if (priv->flags & EMPATHY_INDIVIDUAL_WIDGET_FOR_TOOLTIP)
-    nb_rows++;
+  GtkGrid *grid;
 
-  table = GTK_TABLE (gtk_table_new (nb_rows, 3, FALSE));
-  gtk_table_set_row_spacings (table, 6);
-  gtk_table_set_col_spacings (table, 6);
+  grid = GTK_GRID (gtk_grid_new ());
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (grid), GTK_ORIENTATION_VERTICAL);
+  gtk_grid_set_row_spacing (grid, 6);
+  gtk_grid_set_column_spacing (grid, 6);
 
   /* We only display the number of personas in tooltips */
   if (priv->flags & EMPATHY_INDIVIDUAL_WIDGET_FOR_TOOLTIP)
@@ -1666,37 +1660,36 @@ individual_table_set_up (EmpathyIndividualWidget *self)
       gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
       g_free (message);
 
-      gtk_table_attach (table, label, 0, 2, current_row, current_row + 1,
-          GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
+      gtk_grid_attach (grid, label, 0, current_row, 2, 1);
       gtk_widget_show (label);
 
       current_row++;
     }
 
-  alias_presence_avatar_favourite_set_up (self, table, current_row);
+  alias_presence_avatar_favourite_set_up (self, grid, current_row);
 
-  /* Display the table */
-  gtk_box_pack_start (GTK_BOX (priv->vbox_individual), GTK_WIDGET (table),
+  /* Display the grid */
+  gtk_box_pack_start (GTK_BOX (priv->vbox_individual), GTK_WIDGET (grid),
       FALSE, TRUE, 0);
-  gtk_widget_show (GTK_WIDGET (table));
+  gtk_widget_show (GTK_WIDGET (grid));
 
-  priv->individual_table = table;
+  priv->individual_grid = grid;
 
-  /* Update the table */
-  update_individual_table (self);
+  /* Update the grid */
+  update_individual_grid (self);
 }
 
 static void
-individual_table_destroy (EmpathyIndividualWidget *self)
+individual_grid_destroy (EmpathyIndividualWidget *self)
 {
   EmpathyIndividualWidgetPriv *priv = GET_PRIV (self);
 
-  if (priv->individual_table == NULL)
+  if (priv->individual_grid == NULL)
     return;
 
   gtk_container_remove (GTK_CONTAINER (priv->vbox_individual),
-      GTK_WIDGET (priv->individual_table));
-  priv->individual_table = NULL;
+      GTK_WIDGET (priv->individual_grid));
+  priv->individual_grid = NULL;
 }
 
 static void
@@ -1716,10 +1709,10 @@ personas_changed_cb (FolksIndividual *individual,
   /* we'll re-use this iterator throughout */
   iter = gee_iterable_iterator (GEE_ITERABLE (personas));
 
-  /* Note that old_num_personas is the number of persona tables we were
+  /* Note that old_num_personas is the number of persona gridss we were
    * displaying, not the number of Personas which were in the Individual
    * before. */
-  old_num_personas = g_hash_table_size (priv->persona_tables);
+  old_num_personas = g_hash_table_size (priv->persona_grids);
 
   while (gee_iterator_next (iter))
     {
@@ -1733,11 +1726,11 @@ personas_changed_cb (FolksIndividual *individual,
   /*
    * What we display for various conditions:
    *  - "Personas": display the alias, avatar, presence account and identifier
-   *                for each of the Individual's Personas. (i.e. One table per
+   *                for each of the Individual's Personas. (i.e. One grid per
    *                Persona.)
    *  - "Individual": display the alias, avatar and presence for the Individual,
    *                  and a label saying "Meta-contact containing x contacts".
-   *                  (i.e. One table in total.)
+   *                  (i.e. One grid in total.)
    *
    *              | SHOW_PERSONAS | !SHOW_PERSONAS
    * -------------+---------------+---------------
@@ -1750,7 +1743,7 @@ personas_changed_cb (FolksIndividual *individual,
   will_show_personas = show_personas || new_num_personas == 1;
 
   /* If both @added and @removed are NULL, we're being called manually, and we
-   * need to set up the tables for the first time. We do this simply by
+   * need to set up the gridss for the first time. We do this simply by
    * ensuring was_showing_personas and will_show_personas are different so that
    * the code resets the UI.
    */
@@ -1785,10 +1778,10 @@ personas_changed_cb (FolksIndividual *individual,
     {
       gboolean c;
 
-      /* Remove the old Individual table */
-      individual_table_destroy (self);
+      /* Remove the old Individual grid */
+      individual_grid_destroy (self);
 
-      /* Set up all the Persona tables instead */
+      /* Set up all the Persona grids instead */
       for (c = gee_iterator_first (iter); c; c = gee_iterator_next (iter))
         {
           FolksPersona *persona = gee_iterator_get (iter);
@@ -1822,8 +1815,8 @@ personas_changed_cb (FolksIndividual *individual,
           g_clear_object (&iter_changed);
         }
 
-      /* Set up the Individual table instead */
-      individual_table_set_up (self);
+      /* Set up the Individual grid instead */
+      individual_grid_set_up (self);
     }
   g_clear_object (&iter);
 
@@ -1887,7 +1880,7 @@ remove_individual (EmpathyIndividualWidget *self)
           g_clear_object (&persona);
         }
       g_clear_object (&iter);
-      individual_table_destroy (self);
+      individual_grid_destroy (self);
 
       if (priv->contact != NULL)
         remove_weak_contact (self);
@@ -1926,7 +1919,7 @@ individual_update (EmpathyIndividualWidget *self)
               (GCallback) notify_is_favourite_cb, self);
         }
 
-      /* Update individual table */
+      /* Update individual grid */
       personas_changed_cb (priv->individual, NULL, NULL, self);
     }
 
@@ -1934,10 +1927,10 @@ individual_update (EmpathyIndividualWidget *self)
     {
       gtk_widget_hide (priv->vbox_individual);
     }
-  else if (priv->individual_table != NULL)
+  else if (priv->individual_grid != NULL)
     {
       /* We only need to update the details for the Individual as a whole */
-      update_individual_table (self);
+      update_individual_grid (self);
       gtk_widget_show (priv->vbox_individual);
     }
   else
@@ -1992,7 +1985,7 @@ empathy_individual_widget_init (EmpathyIndividualWidget *self)
 #endif
       "groups_widget", &priv->groups_widget,
       "vbox_details", &priv->vbox_details,
-      "table_details", &priv->table_details,
+      "grid_details", &priv->grid_details,
       "hbox_details_requested", &priv->hbox_details_requested,
       "hbox_client_types", &priv->hbox_client_types,
       NULL);
@@ -2004,8 +1997,8 @@ empathy_individual_widget_init (EmpathyIndividualWidget *self)
       0);
   gtk_widget_show (priv->vbox_individual_widget);
 
-  priv->persona_tables = g_hash_table_new (NULL, NULL);
-  priv->individual_table = NULL;
+  priv->persona_grids = g_hash_table_new (NULL, NULL);
+  priv->individual_grid = NULL;
 
   /* Create widgets */
   details_set_up (self);
@@ -2109,7 +2102,7 @@ finalize (GObject *object)
 {
   EmpathyIndividualWidgetPriv *priv = GET_PRIV (object);
 
-  g_hash_table_destroy (priv->persona_tables);
+  g_hash_table_destroy (priv->persona_grids);
 
   G_OBJECT_CLASS (empathy_individual_widget_parent_class)->finalize (object);
 }
diff --git a/libempathy-gtk/empathy-individual-widget.ui b/libempathy-gtk/empathy-individual-widget.ui
index dcfc83a47..7e4d3f328 100644
--- a/libempathy-gtk/empathy-individual-widget.ui
+++ b/libempathy-gtk/empathy-individual-widget.ui
@@ -149,17 +149,10 @@
                 <property name="visible">True</property>
                 <property name="spacing">6</property>
                 <child>
-                  <object class="GtkTable" id="table_details">
+                  <object class="GtkGrid" id="grid_details">
                     <property name="visible">True</property>
-                    <property name="n_columns">2</property>
                     <property name="column_spacing">12</property>
                     <property name="row_spacing">6</property>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
                   </object>
                   <packing>
                     <property name="position">0</property>
diff --git a/libempathy-gtk/empathy-irc-network-chooser.c b/libempathy-gtk/empathy-irc-network-chooser.c
index 0fbd7b5fd..7a6bd7898 100644
--- a/libempathy-gtk/empathy-irc-network-chooser.c
+++ b/libempathy-gtk/empathy-irc-network-chooser.c
@@ -348,7 +348,7 @@ empathy_irc_network_chooser_class_init (EmpathyIrcNetworkChooserClass *klass)
       G_SIGNAL_RUN_LAST,
       0,
       NULL, NULL,
-      g_cclosure_marshal_VOID__VOID,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       0);
 
diff --git a/libempathy-gtk/empathy-live-search.c b/libempathy-gtk/empathy-live-search.c
index 422bfcb73..968adca77 100644
--- a/libempathy-gtk/empathy-live-search.c
+++ b/libempathy-gtk/empathy-live-search.c
@@ -30,7 +30,6 @@
 #include <libempathy/empathy-utils.h>
 
 #include "empathy-live-search.h"
-#include "empathy-gtk-marshal.h"
 
 G_DEFINE_TYPE (EmpathyLiveSearch, empathy_live_search, GTK_TYPE_HBOX)
 
@@ -546,7 +545,7 @@ empathy_live_search_class_init (EmpathyLiveSearchClass *klass)
       G_SIGNAL_RUN_LAST,
       0,
       NULL, NULL,
-      g_cclosure_marshal_VOID__VOID,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE, 0);
 
   signals[KEYNAV] = g_signal_new ("key-navigation",
@@ -554,7 +553,7 @@ empathy_live_search_class_init (EmpathyLiveSearchClass *klass)
       G_SIGNAL_RUN_LAST,
       0,
       g_signal_accumulator_true_handled, NULL,
-      _empathy_gtk_marshal_BOOLEAN__BOXED,
+      g_cclosure_marshal_generic,
       G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
 
   param_spec = g_param_spec_object ("hook-widget", "Live Search Hook Widget",
diff --git a/libempathy-gtk/empathy-location-manager.c b/libempathy-gtk/empathy-location-manager.c
index 03b97d03d..94df27835 100644
--- a/libempathy-gtk/empathy-location-manager.c
+++ b/libempathy-gtk/empathy-location-manager.c
@@ -182,7 +182,7 @@ publish_to_all_am_prepared_cb (GObject *source_object,
   GList *accounts, *l;
   GError *error = NULL;
 
-  if (!tp_account_manager_prepare_finish (manager, result, &error))
+  if (!tp_proxy_prepare_finish (manager, result, &error))
     {
       DEBUG ("Failed to prepare account manager: %s", error->message);
       g_error_free (error);
@@ -214,7 +214,7 @@ publish_to_all_connections (EmpathyLocationManager *self,
   data->self = g_object_ref (self);
   data->force_publication = force_publication;
 
-  tp_account_manager_prepare_async (self->priv->account_manager, NULL,
+  tp_proxy_prepare_async (self->priv->account_manager, NULL,
       publish_to_all_am_prepared_cb, data);
 }
 
@@ -609,7 +609,7 @@ account_manager_prepared_cb (GObject *source_object,
   EmpathyLocationManager *self = user_data;
   GError *error = NULL;
 
-  if (!tp_account_manager_prepare_finish (account_manager, result, &error))
+  if (!tp_proxy_prepare_finish (account_manager, result, &error))
     {
       DEBUG ("Failed to prepare account manager: %s", error->message);
       g_error_free (error);
@@ -641,7 +641,7 @@ empathy_location_manager_init (EmpathyLocationManager *self)
   /* Setup account status callbacks */
   priv->account_manager = tp_account_manager_dup ();
 
-  tp_account_manager_prepare_async (priv->account_manager, NULL,
+  tp_proxy_prepare_async (priv->account_manager, NULL,
       account_manager_prepared_cb, self);
 
   /* Setup settings status callbacks */
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index 5ea872e14..cc3a90614 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -182,6 +182,7 @@ enum
   COL_WHO_TYPE,
   COL_WHO_ICON,
   COL_WHO_NAME,
+  COL_WHO_NAME_SORT_KEY,
   COL_WHO_ID,
   COL_WHO_ACCOUNT,
   COL_WHO_TARGET,
@@ -678,6 +679,9 @@ empathy_log_window_init (EmpathyLogWindow *self)
       empathy_account_chooser_filter_has_logs, NULL);
   empathy_account_chooser_set_all (account_chooser);
 
+  gtk_style_context_add_class (gtk_widget_get_style_context (self->priv->account_chooser),
+                               GTK_STYLE_CLASS_RAISED);
+
   g_signal_connect (self->priv->account_chooser, "changed",
       G_CALLBACK (log_window_chats_accounts_changed_cb),
       self);
@@ -699,10 +703,10 @@ empathy_log_window_init (EmpathyLogWindow *self)
   vbox = gtk_vbox_new (FALSE, 3);
 
   self->priv->search_entry = gtk_entry_new ();
-  gtk_entry_set_icon_from_stock (GTK_ENTRY (self->priv->search_entry),
-      GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_FIND);
-  gtk_entry_set_icon_from_stock (GTK_ENTRY (self->priv->search_entry),
-      GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
+  gtk_entry_set_icon_from_icon_name (GTK_ENTRY (self->priv->search_entry),
+      GTK_ENTRY_ICON_SECONDARY, "edit-find-symbolic");
+  gtk_entry_set_icon_sensitive (GTK_ENTRY (self->priv->search_entry),
+                                GTK_ENTRY_ICON_SECONDARY, FALSE);
 
   label = gtk_label_new (_("Search"));
 
@@ -1367,13 +1371,24 @@ log_window_append_call (TplEvent *event,
   if (tpl_call_event_get_end_reason (call) != TPL_CALL_END_REASON_NO_ANSWER)
     {
       gchar *body;
+      gchar *tmp;
 
       span = tpl_call_event_get_duration (TPL_CALL_EVENT (event));
+
       if (span < 60)
-        duration = g_strdup_printf (_("%" G_GINT64_FORMAT " seconds"), span);
+        {
+          tmp = g_strdup_printf ("%" G_GINT64_FORMAT, span);
+          duration = g_strdup_printf (
+              ngettext ("%s second", "%s seconds", span), tmp);
+          g_free (tmp);
+        }
       else
-        duration = g_strdup_printf (_("%" G_GINT64_FORMAT " minutes"),
-            span / 60);
+        {
+          tmp = g_strdup_printf ("%" G_GINT64_FORMAT, span / 60);
+          duration = g_strdup_printf (
+              ngettext ("%s minute", "%s minutes", span / 60), tmp);
+          g_free (tmp);
+        }
 
       finished_date = g_date_time_add (started_date, -span);
       finished = g_date_time_format (finished_date, "%X");
@@ -1729,9 +1744,8 @@ format_date_for_display (GDate *date)
         text = g_date_time_format (dt, "%A");
       else
         text = g_date_time_format (dt,
-            C_("A date such as '23 May 2010', "
-               "%e is the day, %B the month and %Y the year",
-               "%e %B %Y"));
+            /* Translators: A date such as '23 May 2010' (strftime format) */
+            _("%e %B %Y"));
 
       g_date_time_unref (dt);
     }
@@ -1861,22 +1875,29 @@ populate_entities_from_search_hits (void)
         {
           TplEntityType type = tpl_entity_get_entity_type (hit->target);
           EmpathyContact *contact;
+          const gchar *name;
+          gchar *sort_key;
           gboolean room = type == TPL_ENTITY_ROOM;
 
           contact = empathy_contact_from_tpl_contact (hit->account,
               hit->target);
 
+          name = empathy_contact_get_alias (contact);
+          sort_key = g_utf8_collate_key (name, -1);
+
           gtk_list_store_append (store, &iter);
           gtk_list_store_set (store, &iter,
               COL_WHO_TYPE, COL_TYPE_NORMAL,
               COL_WHO_ICON, room ? EMPATHY_IMAGE_GROUP_MESSAGE
                                  : EMPATHY_IMAGE_AVATAR_DEFAULT,
-              COL_WHO_NAME, empathy_contact_get_alias (contact),
+              COL_WHO_NAME, name,
+              COL_WHO_NAME_SORT_KEY, sort_key,
               COL_WHO_ID, tpl_entity_get_identifier (hit->target),
               COL_WHO_ACCOUNT, hit->account,
               COL_WHO_TARGET, hit->target,
               -1);
 
+          g_free (sort_key);
           g_object_unref (contact);
         }
     }
@@ -2004,6 +2025,25 @@ static void
 log_window_search_entry_changed_cb (GtkWidget *entry,
     EmpathyLogWindow *self)
 {
+  const gchar *str;
+
+  str = gtk_entry_get_text (GTK_ENTRY (self->priv->search_entry));
+
+  if (!tp_str_empty (str))
+    {
+      gtk_entry_set_icon_from_icon_name (GTK_ENTRY (self->priv->search_entry),
+          GTK_ENTRY_ICON_SECONDARY, "edit-clear-symbolic");
+      gtk_entry_set_icon_sensitive (GTK_ENTRY (self->priv->search_entry),
+          GTK_ENTRY_ICON_SECONDARY, TRUE);
+    }
+  else
+    {
+      gtk_entry_set_icon_from_icon_name (GTK_ENTRY (self->priv->search_entry),
+          GTK_ENTRY_ICON_SECONDARY, "edit-find-symbolic");
+      gtk_entry_set_icon_sensitive (GTK_ENTRY (self->priv->search_entry),
+          GTK_ENTRY_ICON_SECONDARY, FALSE);
+    }
+
   if (self->priv->source != 0)
     g_source_remove (self->priv->source);
   self->priv->source = g_timeout_add (500, (GSourceFunc) start_find_search,
@@ -2279,21 +2319,28 @@ log_manager_got_entities_cb (GObject *manager,
       TplEntity *entity = TPL_ENTITY (l->data);
       TplEntityType type = tpl_entity_get_entity_type (entity);
       EmpathyContact *contact;
+      const gchar *name;
+      gchar *sort_key;
       gboolean room = type == TPL_ENTITY_ROOM;
 
       contact = empathy_contact_from_tpl_contact (ctx->account, entity);
 
+      name = empathy_contact_get_alias (contact);
+      sort_key = g_utf8_collate_key (name, -1);
+
       gtk_list_store_append (store, &iter);
       gtk_list_store_set (store, &iter,
           COL_WHO_TYPE, COL_TYPE_NORMAL,
           COL_WHO_ICON, room ? EMPATHY_IMAGE_GROUP_MESSAGE
                              : EMPATHY_IMAGE_AVATAR_DEFAULT,
-          COL_WHO_NAME, empathy_contact_get_alias (contact),
+          COL_WHO_NAME, name,
+          COL_WHO_NAME_SORT_KEY, sort_key,
           COL_WHO_ID, tpl_entity_get_identifier (entity),
           COL_WHO_ACCOUNT, ctx->account,
           COL_WHO_TARGET, entity,
           -1);
 
+      g_free (sort_key);
       g_object_unref (contact);
 
       if (ctx->self->priv->selected_account != NULL &&
@@ -2445,23 +2492,23 @@ log_window_who_populate (EmpathyLogWindow *self)
 }
 
 static gint
-sort_by_name (GtkTreeModel *model,
+sort_by_name_key (GtkTreeModel *model,
     GtkTreeIter *a,
     GtkTreeIter *b,
     gpointer user_data)
 {
-  gchar *name1, *name2;
+  gchar *key1, *key2;
   gint type1, type2;
   gint ret;
 
   gtk_tree_model_get (model, a,
       COL_WHO_TYPE, &type1,
-      COL_WHO_NAME, &name1,
+      COL_WHO_NAME_SORT_KEY, &key1,
       -1);
 
   gtk_tree_model_get (model, b,
       COL_WHO_TYPE, &type2,
-      COL_WHO_NAME, &name2,
+      COL_WHO_NAME_SORT_KEY, &key2,
       -1);
 
   if (type1 == COL_TYPE_ANY)
@@ -2473,10 +2520,10 @@ sort_by_name (GtkTreeModel *model,
   else if (type2 == COL_TYPE_SEPARATOR)
     ret = 1;
   else
-    ret = g_strcmp0 (name1, name2);
+    ret = g_strcmp0 (key1, key2);
 
-  g_free (name1);
-  g_free (name2);
+  g_free (key1);
+  g_free (key2);
 
   return ret;
 }
@@ -2623,6 +2670,7 @@ log_window_who_setup (EmpathyLogWindow *self)
       G_TYPE_INT,           /* type */
       G_TYPE_STRING,        /* icon */
       G_TYPE_STRING,        /* name */
+      G_TYPE_STRING,        /* name sort key */
       G_TYPE_STRING,        /* id */
       TP_TYPE_ACCOUNT,      /* account */
       TPL_TYPE_ENTITY);     /* target */
@@ -2657,10 +2705,10 @@ log_window_who_setup (EmpathyLogWindow *self)
       NULL, NULL);
 
   gtk_tree_sortable_set_sort_column_id (sortable,
-      COL_WHO_NAME,
+      COL_WHO_NAME_SORT_KEY,
       GTK_SORT_ASCENDING);
   gtk_tree_sortable_set_sort_func (sortable,
-      COL_WHO_NAME, sort_by_name,
+      COL_WHO_NAME_SORT_KEY, sort_by_name_key,
       NULL, NULL);
 
   gtk_tree_view_set_search_column (view, COL_WHO_NAME);
diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c
index 1c4bbaad5..027ef8721 100644
--- a/libempathy-gtk/empathy-new-message-dialog.c
+++ b/libempathy-gtk/empathy-new-message-dialog.c
@@ -63,6 +63,82 @@ enum
   EMP_NEW_MESSAGE_SMS,
 };
 
+static const gchar *
+get_error_display_message (GError *error)
+{
+  if (error->domain != TP_ERROR)
+    goto out;
+
+  switch (error->code)
+    {
+      case TP_ERROR_NETWORK_ERROR:
+        return _("Network error");
+      case TP_ERROR_OFFLINE:
+        return _("The contact is offline");
+      case TP_ERROR_INVALID_HANDLE:
+        return _("The specified contact is either invalid or unknown");
+      case TP_ERROR_NOT_CAPABLE:
+        return _("The contact does not support this kind of conversation");
+      case TP_ERROR_NOT_IMPLEMENTED:
+        return _("The requested functionality is not implemented "
+                 "for this protocol");
+      case TP_ERROR_INVALID_ARGUMENT:
+        /* Not very user friendly to say 'invalid arguments' */
+        break;
+      case TP_ERROR_NOT_AVAILABLE:
+        return _("Could not start a conversation with the given contact");
+      case TP_ERROR_CHANNEL_BANNED:
+        return _("You are banned from this channel");
+      case TP_ERROR_CHANNEL_FULL:
+        return _("This channel is full");
+      case TP_ERROR_CHANNEL_INVITE_ONLY:
+        return _("You must be invited to join this channel");
+      case TP_ERROR_DISCONNECTED:
+        return _("Can't proceed while disconnected");
+      case TP_ERROR_PERMISSION_DENIED:
+        return _("Permission denied");
+      default:
+        DEBUG ("Unhandled error code: %d", error->code);
+    }
+
+out:
+  return _("There was an error starting the conversation");
+}
+
+static void
+show_chat_error (GError *error,
+    GtkWindow *parent)
+{
+  GtkWidget *dialog;
+
+  dialog = gtk_message_dialog_new (parent, GTK_DIALOG_MODAL,
+      GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
+      "%s",
+      get_error_display_message (error));
+
+  g_signal_connect_swapped (dialog, "response",
+      G_CALLBACK (gtk_widget_destroy),
+      dialog);
+
+  gtk_widget_show (dialog);
+}
+
+static void
+ensure_text_channel_cb (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  GError *error = NULL;
+
+  if (!tp_account_channel_request_ensure_channel_finish (
+        TP_ACCOUNT_CHANNEL_REQUEST (source), result, &error))
+    {
+      DEBUG ("Failed to ensure text channel: %s", error->message);
+      show_chat_error (error, user_data);
+      g_error_free (error);
+    }
+}
+
 static void
 empathy_new_message_dialog_response (GtkDialog *dialog, int response_id)
 {
@@ -80,12 +156,16 @@ empathy_new_message_dialog_response (GtkDialog *dialog, int response_id)
     {
       case EMP_NEW_MESSAGE_TEXT:
         empathy_chat_with_contact_id (account, contact_id,
-            empathy_get_current_action_time ());
+            empathy_get_current_action_time (),
+            ensure_text_channel_cb,
+            gtk_widget_get_parent_window (GTK_WIDGET (dialog)));
         break;
 
       case EMP_NEW_MESSAGE_SMS:
         empathy_sms_contact_id (account, contact_id,
-            empathy_get_current_action_time ());
+            empathy_get_current_action_time (),
+            ensure_text_channel_cb,
+            gtk_widget_get_parent_window (GTK_WIDGET (dialog)));
         break;
 
       default:
diff --git a/libempathy-gtk/empathy-notify-manager.c b/libempathy-gtk/empathy-notify-manager.c
index 7a4374c48..3fcf9afb7 100644
--- a/libempathy-gtk/empathy-notify-manager.c
+++ b/libempathy-gtk/empathy-notify-manager.c
@@ -114,7 +114,7 @@ account_manager_prepared_cb (GObject *source_object,
   TpAccountManager *account_manager = TP_ACCOUNT_MANAGER (source_object);
   GError *error = NULL;
 
-  if (!tp_account_manager_prepare_finish (account_manager, result, &error))
+  if (!tp_proxy_prepare_finish (account_manager, result, &error))
     {
       DEBUG ("Failed to prepare account manager: %s", error->message);
       g_error_free (error);
@@ -150,7 +150,7 @@ empathy_notify_manager_init (EmpathyNotifyManager *self)
 
   priv->account_manager = tp_account_manager_dup ();
 
-  tp_account_manager_prepare_async (priv->account_manager, NULL,
+  tp_proxy_prepare_async (priv->account_manager, NULL,
       account_manager_prepared_cb, self);
 }
 
diff --git a/libempathy-gtk/empathy-persona-view.c b/libempathy-gtk/empathy-persona-view.c
index 5cb77c94b..7df94a630 100644
--- a/libempathy-gtk/empathy-persona-view.c
+++ b/libempathy-gtk/empathy-persona-view.c
@@ -46,7 +46,6 @@
 #include "empathy-cell-renderer-text.h"
 #include "empathy-cell-renderer-activatable.h"
 #include "empathy-gtk-enum-types.h"
-#include "empathy-gtk-marshal.h"
 #include "empathy-ui-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
@@ -96,13 +95,13 @@ typedef enum
   { (gchar *) T, 0, I }
 
 static const GtkTargetEntry drag_types_dest[] = {
-  DRAG_TYPE ("text/individual-id", DND_DRAG_TYPE_INDIVIDUAL_ID),
+  DRAG_TYPE ("text/x-individual-id", DND_DRAG_TYPE_INDIVIDUAL_ID),
   DRAG_TYPE ("text/plain", DND_DRAG_TYPE_STRING),
   DRAG_TYPE ("STRING", DND_DRAG_TYPE_STRING),
 };
 
 static const GtkTargetEntry drag_types_source[] = {
-  DRAG_TYPE ("text/persona-id", DND_DRAG_TYPE_PERSONA_ID),
+  DRAG_TYPE ("text/x-persona-id", DND_DRAG_TYPE_PERSONA_ID),
 };
 
 #undef DRAG_TYPE
@@ -477,7 +476,7 @@ drag_data_get (GtkWidget *widget,
 
   persona_uid = folks_persona_get_uid (persona);
   gtk_selection_data_set (selection,
-      gdk_atom_intern ("text/persona-id", FALSE), 8,
+      gdk_atom_intern ("text/x-persona-id", FALSE), 8,
       (guchar *) persona_uid, strlen (persona_uid) + 1);
 
   g_object_unref (persona);
@@ -715,7 +714,7 @@ empathy_persona_view_class_init (EmpathyPersonaViewClass *klass)
       G_SIGNAL_RUN_LAST,
       G_STRUCT_OFFSET (EmpathyPersonaViewClass, drag_individual_received),
       NULL, NULL,
-      _empathy_gtk_marshal_BOOLEAN__UINT_OBJECT,
+      g_cclosure_marshal_generic,
       G_TYPE_BOOLEAN, 2, G_TYPE_UINT, FOLKS_TYPE_INDIVIDUAL);
 
   /* We override the "model" property so that we can wrap it in a
diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c
index 66d516c40..65ec2f62f 100644
--- a/libempathy-gtk/empathy-presence-chooser.c
+++ b/libempathy-gtk/empathy-presence-chooser.c
@@ -742,7 +742,7 @@ update_sensitivity_am_prepared_cb (GObject *source_object,
 	GList *accounts, *l;
 	GError *error = NULL;
 
-	if (!tp_account_manager_prepare_finish (manager, result, &error)) {
+	if (!tp_proxy_prepare_finish (manager, result, &error)) {
 		DEBUG ("Failed to prepare account manager: %s", error->message);
 		g_error_free (error);
 		return;
@@ -774,7 +774,7 @@ presence_chooser_update_sensitivity (EmpathyPresenceChooser *chooser)
 {
 	EmpathyPresenceChooserPriv *priv = GET_PRIV (chooser);
 
-	tp_account_manager_prepare_async (priv->account_manager, NULL,
+	tp_proxy_prepare_async (priv->account_manager, NULL,
 					  update_sensitivity_am_prepared_cb,
 					  chooser);
 }
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index 4e32630d5..9c23d3517 100644
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -541,7 +541,8 @@ theme_adium_append_html (EmpathyThemeAdium *theme,
 		         const gchar       *service_name,
 		         const gchar       *message_classes,
 		         gint64             timestamp,
-		         gboolean           is_backlog)
+		         gboolean           is_backlog,
+		         gboolean           outgoing)
 {
 	EmpathyThemeAdiumPriv *priv = GET_PRIV (theme);
 	GString     *string;
@@ -571,7 +572,12 @@ theme_adium_append_html (EmpathyThemeAdium *theme,
 			 * Incoming/SenderColors.txt it will be used instead of
 			 * the default colors.
 			 */
-			if (contact_id != NULL) {
+
+			/* Ensure we always use the same color when sending messages
+			 * (bgo #658821) */
+			if (outgoing) {
+				replace = "inherit";
+			} else if (contact_id != NULL) {
 				guint hash = g_str_hash (contact_id);
 				replace = colors[hash % G_N_ELEMENTS (colors)];
 			}
@@ -687,7 +693,7 @@ theme_adium_append_event_escaped (EmpathyChatView *view,
 	theme_adium_append_html (theme, "appendMessage",
 				 priv->data->status_html, escaped, NULL, NULL, NULL,
 				 NULL, "event",
-				 empathy_time_get_current (), FALSE);
+				 empathy_time_get_current (), FALSE, FALSE);
 
 	/* There is no last contact */
 	if (priv->last_contact) {
@@ -944,7 +950,7 @@ theme_adium_append_message (EmpathyChatView *view,
 	theme_adium_append_html (theme, func, html, body_escaped,
 				 avatar_filename, name, contact_id,
 				 service_name, message_classes->str,
-				 timestamp, is_backlog);
+				 timestamp, is_backlog, empathy_contact_is_user (sender));
 
 	/* Keep the sender of the last displayed message */
 	if (priv->last_contact) {
@@ -976,6 +982,14 @@ theme_adium_append_event (EmpathyChatView *view,
 }
 
 static void
+theme_adium_append_event_markup (EmpathyChatView *view,
+				 const gchar     *markup_text,
+				 const gchar     *fallback_text)
+{
+	theme_adium_append_event_escaped (view, markup_text);
+}
+
+static void
 theme_adium_edit_message (EmpathyChatView *view,
 			  EmpathyMessage  *message)
 {
@@ -1291,6 +1305,7 @@ theme_adium_iface_init (EmpathyChatViewIface *iface)
 {
 	iface->append_message = theme_adium_append_message;
 	iface->append_event = theme_adium_append_event;
+	iface->append_event_markup = theme_adium_append_event_markup;
 	iface->edit_message = theme_adium_edit_message;
 	iface->scroll = theme_adium_scroll;
 	iface->scroll_down = theme_adium_scroll_down;
@@ -1648,6 +1663,20 @@ empathy_theme_adium_set_variant (EmpathyThemeAdium *theme,
 	g_object_notify (G_OBJECT (theme), "variant");
 }
 
+void
+empathy_theme_adium_show_inspector (EmpathyThemeAdium *theme)
+{
+	WebKitWebView      *web_view = WEBKIT_WEB_VIEW (theme);
+	WebKitWebInspector *inspector;
+
+	g_object_set (G_OBJECT (webkit_web_view_get_settings (web_view)),
+		      "enable-developer-extras", TRUE,
+		      NULL);
+
+	inspector = webkit_web_view_get_inspector (web_view);
+	webkit_web_inspector_show (inspector);
+}
+
 gboolean
 empathy_adium_path_is_valid (const gchar *path)
 {
@@ -1733,8 +1762,11 @@ adium_info_dup_path_for_variant (GHashTable *info,
 		return g_strdup ("main.css");
 	}
 
-	/* Verify the variant exists, fallback to the first one */
 	variants = empathy_adium_info_get_available_variants (info);
+	if (variants->len == 0)
+		return g_strdup ("main.css");
+
+	/* Verify the variant exists, fallback to the first one */
 	for (i = 0; i < variants->len; i++) {
 		if (!tp_strdiff (variant, g_ptr_array_index (variants, i))) {
 			break;
diff --git a/libempathy-gtk/empathy-theme-adium.h b/libempathy-gtk/empathy-theme-adium.h
index 1c01b7b37..6f7573b04 100644
--- a/libempathy-gtk/empathy-theme-adium.h
+++ b/libempathy-gtk/empathy-theme-adium.h
@@ -53,6 +53,7 @@ EmpathyThemeAdium *empathy_theme_adium_new      (EmpathyAdiumData *data,
 						 const gchar *variant);
 void               empathy_theme_adium_set_variant (EmpathyThemeAdium *theme,
 						    const gchar *variant);
+void               empathy_theme_adium_show_inspector (EmpathyThemeAdium *theme);
 
 gboolean           empathy_adium_path_is_valid (const gchar *path);
 
diff --git a/libempathy-gtk/empathy-theme-manager.c b/libempathy-gtk/empathy-theme-manager.c
index c771392b9..28cbbf3bc 100644
--- a/libempathy-gtk/empathy-theme-manager.c
+++ b/libempathy-gtk/empathy-theme-manager.c
@@ -590,7 +590,7 @@ empathy_theme_manager_class_init (EmpathyThemeManagerClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE,
 			      0);
 
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index d5f63c9e0..32ad451a1 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -947,6 +947,9 @@ empathy_filename_from_icon_name (const gchar *icon_name,
 	}
 
 	icon_info = gtk_icon_theme_lookup_icon (icon_theme, icon_name, size, 0);
+	if (icon_info == NULL)
+		return NULL;
+
 	ret = g_strdup (gtk_icon_info_get_filename (icon_info));
 	gtk_icon_info_free (icon_info);
 
@@ -1759,7 +1762,8 @@ empathy_send_file (EmpathyContact *contact, GFile *file)
 
 	factory = empathy_ft_factory_dup_singleton ();
 
-	empathy_ft_factory_new_transfer_outgoing (factory, contact, file);
+	empathy_ft_factory_new_transfer_outgoing (factory, contact, file,
+		empathy_get_current_action_time ());
 
 	uri = g_file_get_uri (file);
 	manager = gtk_recent_manager_get_default ();
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index 3cd971a5d..079b4736b 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -20,9 +20,6 @@ AM_CPPFLAGS =                                           \
 	$(DISABLE_DEPRECATED)
 
 BUILT_SOURCES = 					\
-	empathy-marshal.h				\
-	empathy-marshal.c				\
-	empathy-marshal.list				\
 	empathy-enum-types.h				\
 	empathy-enum-types.c
 
@@ -135,24 +132,6 @@ check_c_sources = \
 include $(top_srcdir)/tools/check-coding-style.mk
 check-local: check-coding-style
 
-empathy-marshal.list: $(libempathy_la_SOURCES) Makefile.am
-	$(AM_V_GEN)( cd $(srcdir) && \
-	sed -n -e 's/.*empathy_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
-	$(libempathy_la_SOURCES) ) \
-	| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
-	@if cmp -s $@.tmp $@; then \
-		rm $@.tmp; \
-	else \
-		mv $@.tmp $@; \
-	fi
-
-empathy-marshal.h: empathy-marshal.list Makefile
-	$(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=_empathy_marshal $< > empathy-marshal.h
-
-empathy-marshal.c: empathy-marshal.list Makefile
-	$(AM_V_GEN)echo "#include \"empathy-marshal.h\"" > $@ && \
-	$(GLIB_GENMARSHAL) --body --prefix=_empathy_marshal $< >> empathy-marshal.c
-
 empathy-enum-types.h: stamp-empathy-enum-types.h
 	$(AM_V_GEN)true
 stamp-empathy-enum-types.h: $(libempathy_headers) Makefile
@@ -203,7 +182,6 @@ ircnetworks_DATA =		\
 	irc-networks.xml
 
 EXTRA_DIST = 			\
-	empathy-marshal.list	\
 	$(dtd_DATA)		\
 	$(ircnetworks_DATA)
 
diff --git a/libempathy/cheese-camera-device-monitor.c b/libempathy/cheese-camera-device-monitor.c
index 85c6a0aa4..78b40fb70 100644
--- a/libempathy/cheese-camera-device-monitor.c
+++ b/libempathy/cheese-camera-device-monitor.c
@@ -43,7 +43,6 @@
 #endif
 
 #include "cheese-camera-device-monitor.h"
-#include "empathy-marshal.h"
 
 /**
  * SECTION:cheese-camera-device-monitor
@@ -360,7 +359,7 @@ cheese_camera_device_monitor_class_init (CheeseCameraDeviceMonitorClass *klass)
                                          G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                                          G_STRUCT_OFFSET (CheeseCameraDeviceMonitorClass, added),
                                          NULL, NULL,
-                                         _empathy_marshal_VOID__STRING_STRING_STRING_INT,
+                                         g_cclosure_marshal_generic,
                                          G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT);
 
   /**
@@ -375,7 +374,7 @@ cheese_camera_device_monitor_class_init (CheeseCameraDeviceMonitorClass *klass)
                                            G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                                            G_STRUCT_OFFSET (CheeseCameraDeviceMonitorClass, removed),
                                            NULL, NULL,
-                                           g_cclosure_marshal_VOID__STRING,
+                                           g_cclosure_marshal_generic,
                                            G_TYPE_NONE, 1, G_TYPE_STRING);
 
   g_type_class_add_private (klass, sizeof (CheeseCameraDeviceMonitorPrivate));
diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c
index 04fa789d5..cd6b69e8c 100644
--- a/libempathy/empathy-account-settings.c
+++ b/libempathy/empathy-account-settings.c
@@ -336,7 +336,7 @@ empathy_account_settings_class_init (
       g_signal_new ("password-retrieved",
           G_TYPE_FROM_CLASS (empathy_account_settings_class),
           G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-          g_cclosure_marshal_VOID__VOID,
+          g_cclosure_marshal_generic,
           G_TYPE_NONE, 0);
 }
 
@@ -1617,7 +1617,7 @@ empathy_account_settings_manager_ready_cb (GObject *source_object,
   TpAccountManager *account_manager = TP_ACCOUNT_MANAGER (source_object);
   GError *error = NULL;
 
-  if (!tp_account_manager_prepare_finish (account_manager, result, &error))
+  if (!tp_proxy_prepare_finish (account_manager, result, &error))
     {
       DEBUG ("Failed to prepare account manager: %s", error->message);
       g_error_free (error);
@@ -1652,7 +1652,7 @@ empathy_account_settings_apply_async (EmpathyAccountSettings *settings,
 
   if (priv->account == NULL)
     {
-      tp_account_manager_prepare_async (priv->account_manager, NULL,
+      tp_proxy_prepare_async (priv->account_manager, NULL,
           empathy_account_settings_manager_ready_cb, settings);
     }
   else
diff --git a/libempathy/empathy-auth-factory.c b/libempathy/empathy-auth-factory.c
index 56b3b73eb..6368b1d7d 100644
--- a/libempathy/empathy-auth-factory.c
+++ b/libempathy/empathy-auth-factory.c
@@ -20,9 +20,7 @@
 
 #include "empathy-auth-factory.h"
 
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/simple-handler.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_TLS
 #include "empathy-debug.h"
@@ -552,7 +550,7 @@ empathy_auth_factory_class_init (EmpathyAuthFactoryClass *klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0,
       NULL, NULL,
-      g_cclosure_marshal_VOID__OBJECT,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       1, EMPATHY_TYPE_SERVER_TLS_HANDLER);
 
@@ -561,7 +559,7 @@ empathy_auth_factory_class_init (EmpathyAuthFactoryClass *klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0,
       NULL, NULL,
-      g_cclosure_marshal_VOID__OBJECT,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       1, EMPATHY_TYPE_SERVER_SASL_HANDLER);
 }
diff --git a/libempathy/empathy-camera-monitor.c b/libempathy/empathy-camera-monitor.c
index 3b5221eb8..7d9d695e8 100644
--- a/libempathy/empathy-camera-monitor.c
+++ b/libempathy/empathy-camera-monitor.c
@@ -228,14 +228,14 @@ empathy_camera_monitor_class_init (EmpathyCameraMonitorClass *klass)
       g_signal_new ("added", G_OBJECT_CLASS_TYPE (klass),
           G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
           0, NULL, NULL,
-          g_cclosure_marshal_VOID__BOXED,
+          g_cclosure_marshal_generic,
           G_TYPE_NONE, 1, EMPATHY_TYPE_CAMERA);
 
   signals[CAMERA_REMOVED] =
       g_signal_new ("removed", G_OBJECT_CLASS_TYPE (klass),
           G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
           0, NULL, NULL,
-          g_cclosure_marshal_VOID__BOXED,
+          g_cclosure_marshal_generic,
           G_TYPE_NONE, 1, EMPATHY_TYPE_CAMERA);
 
   g_type_class_add_private (object_class,
diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c
index 043f8a829..9a9a7b250 100644
--- a/libempathy/empathy-chatroom-manager.c
+++ b/libempathy/empathy-chatroom-manager.c
@@ -518,7 +518,7 @@ account_manager_ready_cb (GObject *source_object,
   GError *error = NULL;
   GFile *file = NULL;
 
-  if (!tp_account_manager_prepare_finish (manager, result, &error))
+  if (!tp_proxy_prepare_finish (manager, result, &error))
     {
       DEBUG ("Failed to prepare account manager: %s", error->message);
       g_error_free (error);
@@ -575,7 +575,7 @@ empathy_chatroom_manager_constructor (GType type,
 
   priv->account_manager = tp_account_manager_dup ();
 
-  tp_account_manager_prepare_async (priv->account_manager, NULL,
+  tp_proxy_prepare_async (priv->account_manager, NULL,
       account_manager_ready_cb, g_object_ref (self));
 
   if (priv->file == NULL)
@@ -648,7 +648,7 @@ empathy_chatroom_manager_class_init (EmpathyChatroomManagerClass *klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST,
       0, NULL, NULL,
-      g_cclosure_marshal_VOID__OBJECT,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       1, EMPATHY_TYPE_CHATROOM);
 
@@ -656,7 +656,7 @@ empathy_chatroom_manager_class_init (EmpathyChatroomManagerClass *klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST,
       0, NULL, NULL,
-      g_cclosure_marshal_VOID__OBJECT,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       1, EMPATHY_TYPE_CHATROOM);
 
diff --git a/libempathy/empathy-client-factory.c b/libempathy/empathy-client-factory.c
index 3794ef60d..f7529bf2e 100644
--- a/libempathy/empathy-client-factory.c
+++ b/libempathy/empathy-client-factory.c
@@ -24,6 +24,7 @@
 #include "empathy-client-factory.h"
 
 #include "empathy-tp-chat.h"
+#include "empathy-tp-file.h"
 #include "empathy-utils.h"
 
 #include <telepathy-yell/telepathy-yell.h>
@@ -88,6 +89,11 @@ empathy_client_factory_create_channel (TpSimpleClientFactory *factory,
       return TP_CHANNEL (call_channel_new_with_factory (
             TP_SIMPLE_CLIENT_FACTORY (factory), conn, path, properties, error));
     }
+  else if (!tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER))
+    {
+      return TP_CHANNEL (empathy_tp_file_new (
+            TP_SIMPLE_CLIENT_FACTORY (factory), conn, path, properties, error));
+    }
 
   return chainup->create_channel (factory, conn, path, properties, error);
 }
diff --git a/libempathy/empathy-connection-managers.c b/libempathy/empathy-connection-managers.c
index 30a9b8471..a45731686 100644
--- a/libempathy/empathy-connection-managers.c
+++ b/libempathy/empathy-connection-managers.c
@@ -150,7 +150,7 @@ empathy_connection_managers_class_init (
     G_TYPE_FROM_CLASS (object_class),
     G_SIGNAL_RUN_LAST,
     0, NULL, NULL,
-    g_cclosure_marshal_VOID__VOID,
+    g_cclosure_marshal_generic,
     G_TYPE_NONE, 0);
 }
 
diff --git a/libempathy/empathy-connectivity.c b/libempathy/empathy-connectivity.c
index 3c9805c54..f84505f9b 100644
--- a/libempathy/empathy-connectivity.c
+++ b/libempathy/empathy-connectivity.c
@@ -33,7 +33,6 @@
 #include <telepathy-glib/util.h>
 
 #include "empathy-utils.h"
-#include "empathy-marshal.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONNECTIVITY
 #include "empathy-debug.h"
@@ -220,7 +219,7 @@ empathy_connectivity_init (EmpathyConnectivity *connectivity)
           "net.connman.Manager");
 
       dbus_g_object_register_marshaller (
-          _empathy_marshal_VOID__STRING,
+          g_cclosure_marshal_generic,
           G_TYPE_NONE, G_TYPE_STRING, G_TYPE_INVALID);
 
       dbus_g_proxy_add_signal (priv->proxy, "StateChanged",
@@ -364,7 +363,7 @@ empathy_connectivity_class_init (EmpathyConnectivityClass *klass)
         G_SIGNAL_RUN_LAST,
         0,
         NULL, NULL,
-        _empathy_marshal_VOID__BOOLEAN,
+        g_cclosure_marshal_generic,
         G_TYPE_NONE,
         1, G_TYPE_BOOLEAN, NULL);
 
diff --git a/libempathy/empathy-contact-list.c b/libempathy/empathy-contact-list.c
index d28866735..e532782d5 100644
--- a/libempathy/empathy-contact-list.c
+++ b/libempathy/empathy-contact-list.c
@@ -22,7 +22,6 @@
 #include "config.h"
 
 #include "empathy-contact-list.h"
-#include "empathy-marshal.h"
 
 static void contact_list_base_init (gpointer klass);
 
@@ -59,7 +58,7 @@ contact_list_base_init (gpointer klass)
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      _empathy_marshal_VOID__OBJECT_OBJECT_UINT_STRING,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE,
 			      4, EMPATHY_TYPE_CONTACT, EMPATHY_TYPE_CONTACT, G_TYPE_UINT, G_TYPE_STRING);
 
@@ -68,7 +67,7 @@ contact_list_base_init (gpointer klass)
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      _empathy_marshal_VOID__OBJECT_OBJECT_UINT_STRING_BOOLEAN,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE,
 			      5, EMPATHY_TYPE_CONTACT, EMPATHY_TYPE_CONTACT,
 			      G_TYPE_UINT, G_TYPE_STRING, G_TYPE_BOOLEAN);
@@ -78,7 +77,7 @@ contact_list_base_init (gpointer klass)
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      _empathy_marshal_VOID__OBJECT_BOOLEAN,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE,
 			      2, EMPATHY_TYPE_CONTACT, G_TYPE_BOOLEAN);
 
@@ -87,7 +86,7 @@ contact_list_base_init (gpointer klass)
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      _empathy_marshal_VOID__OBJECT_OBJECT_UINT_STRING_BOOLEAN,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE,
 			      5, EMPATHY_TYPE_CONTACT, EMPATHY_TYPE_CONTACT,
 			      G_TYPE_UINT, G_TYPE_STRING, G_TYPE_BOOLEAN);
@@ -97,7 +96,7 @@ contact_list_base_init (gpointer klass)
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      _empathy_marshal_VOID__OBJECT_STRING_BOOLEAN,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE,
 			      3, EMPATHY_TYPE_CONTACT, G_TYPE_STRING, G_TYPE_BOOLEAN);
 
diff --git a/libempathy/empathy-contact-manager.c b/libempathy/empathy-contact-manager.c
index b00f82477..8dbf6d3d5 100644
--- a/libempathy/empathy-contact-manager.c
+++ b/libempathy/empathy-contact-manager.c
@@ -436,7 +436,7 @@ account_manager_prepared_cb (GObject *source_object,
 	TpAccountManager *account_manager = TP_ACCOUNT_MANAGER (source_object);
 	GError *error = NULL;
 
-	if (!tp_account_manager_prepare_finish (account_manager, result, &error)) {
+	if (!tp_proxy_prepare_finish (account_manager, result, &error)) {
 		DEBUG ("Failed to prepare account manager: %s", error->message);
 		g_error_free (error);
 		return;
@@ -578,7 +578,7 @@ empathy_contact_manager_init (EmpathyContactManager *manager)
 
 	priv->account_manager = tp_account_manager_dup ();
 
-	tp_account_manager_prepare_async (priv->account_manager, NULL,
+	tp_proxy_prepare_async (priv->account_manager, NULL,
 	    account_manager_prepared_cb, manager);
 
 	bus = tp_dbus_daemon_dup (&error);
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index c6225c191..935afb556 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -44,7 +44,6 @@
 #include "empathy-individual-manager.h"
 #include "empathy-utils.h"
 #include "empathy-enum-types.h"
-#include "empathy-marshal.h"
 #include "empathy-location.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
@@ -405,7 +404,7 @@ empathy_contact_class_init (EmpathyContactClass *class)
                   G_SIGNAL_RUN_LAST,
                   0,
                   NULL, NULL,
-                  _empathy_marshal_VOID__UINT_UINT,
+                  g_cclosure_marshal_generic,
                   G_TYPE_NONE,
                   2, G_TYPE_UINT,
                   G_TYPE_UINT);
@@ -1663,7 +1662,8 @@ update_geocode (EmpathyContact *contact)
   GHashTable *location;
 
   location = empathy_contact_get_location (contact);
-  if (location == NULL)
+  if (location == NULL ||
+      g_hash_table_size (location) == 0)
     return;
 
   /* No need to search for position if contact published it */
diff --git a/libempathy/empathy-ft-factory.c b/libempathy/empathy-ft-factory.c
index 597bbaf51..fb2497a54 100644
--- a/libempathy/empathy-ft-factory.c
+++ b/libempathy/empathy-ft-factory.c
@@ -27,7 +27,6 @@
 
 #include "empathy-ft-factory.h"
 #include "empathy-ft-handler.h"
-#include "empathy-marshal.h"
 #include "empathy-request-util.h"
 #include "empathy-utils.h"
 
@@ -126,7 +125,7 @@ empathy_ft_factory_class_init (EmpathyFTFactoryClass *klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0,
       NULL, NULL,
-      _empathy_marshal_VOID__OBJECT_POINTER,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE, 2, EMPATHY_TYPE_FT_HANDLER, G_TYPE_POINTER);
 
   /**
@@ -149,7 +148,7 @@ empathy_ft_factory_class_init (EmpathyFTFactoryClass *klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0,
       NULL, NULL,
-      _empathy_marshal_VOID__OBJECT_POINTER,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE, 2, EMPATHY_TYPE_FT_HANDLER, G_TYPE_POINTER);
 }
 
@@ -179,22 +178,16 @@ handle_channels_cb (TpSimpleHandler *handler,
   for (l = channels; l != NULL; l = g_list_next (l))
     {
       TpChannel *channel = l->data;
-      EmpathyTpFile *tp_file;
 
       if (tp_proxy_get_invalidated (channel) != NULL)
         continue;
 
-      if (tp_channel_get_channel_type_id (channel) !=
-          TP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER)
+      if (!EMPATHY_IS_TP_FILE (channel))
         continue;
 
-      tp_file = empathy_tp_file_new (channel);
-
       /* We handle only incoming FT */
-      empathy_ft_handler_new_incoming (tp_file, ft_handler_incoming_ready_cb,
-          self);
-
-      g_object_unref (tp_file);
+      empathy_ft_handler_new_incoming ((EmpathyTpFile *) channel,
+          ft_handler_incoming_ready_cb, self);
     }
 
 
@@ -265,13 +258,14 @@ empathy_ft_factory_dup_singleton (void)
 void
 empathy_ft_factory_new_transfer_outgoing (EmpathyFTFactory *factory,
     EmpathyContact *contact,
-    GFile *source)
+    GFile *source,
+    gint64 action_time)
 {
   g_return_if_fail (EMPATHY_IS_FT_FACTORY (factory));
   g_return_if_fail (EMPATHY_IS_CONTACT (contact));
   g_return_if_fail (G_IS_FILE (source));
 
-  empathy_ft_handler_new_outgoing (contact, source,
+  empathy_ft_handler_new_outgoing (contact, source, action_time,
       ft_handler_outgoing_ready_cb, factory);
 }
 
diff --git a/libempathy/empathy-ft-factory.h b/libempathy/empathy-ft-factory.h
index f59ecc44c..dcbffe1e1 100644
--- a/libempathy/empathy-ft-factory.h
+++ b/libempathy/empathy-ft-factory.h
@@ -62,7 +62,8 @@ GType empathy_ft_factory_get_type (void);
 EmpathyFTFactory* empathy_ft_factory_dup_singleton (void);
 void empathy_ft_factory_new_transfer_outgoing (EmpathyFTFactory *factory,
     EmpathyContact *contact,
-    GFile *source);
+    GFile *source,
+    gint64 user_action_time);
 void empathy_ft_factory_set_destination_for_incoming_handler (
     EmpathyFTFactory *factory,
     EmpathyFTHandler *handler,
diff --git a/libempathy/empathy-ft-handler.c b/libempathy/empathy-ft-handler.c
index 99b6dc85f..facc49a3b 100644
--- a/libempathy/empathy-ft-handler.c
+++ b/libempathy/empathy-ft-handler.c
@@ -30,7 +30,6 @@
 
 #include "empathy-ft-handler.h"
 #include "empathy-tp-contact-factory.h"
-#include "empathy-marshal.h"
 #include "empathy-time.h"
 #include "empathy-utils.h"
 
@@ -85,7 +84,8 @@ enum {
   PROP_FILENAME,
   PROP_MODIFICATION_TIME,
   PROP_TOTAL_BYTES,
-  PROP_TRANSFERRED_BYTES
+  PROP_TRANSFERRED_BYTES,
+  PROP_USER_ACTION_TIME
 };
 
 enum {
@@ -138,6 +138,8 @@ typedef struct {
   gchar *content_hash;
   TpFileHashType content_hash_type;
 
+  gint64 user_action_time;
+
   /* time and speed */
   gdouble speed;
   guint remaining_time;
@@ -189,6 +191,9 @@ do_get_property (GObject *object,
       case PROP_TP_FILE:
         g_value_set_object (value, priv->tpfile);
         break;
+      case PROP_USER_ACTION_TIME:
+        g_value_set_int64 (value, priv->user_action_time);
+        break;
       default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
     }
@@ -231,6 +236,9 @@ do_set_property (GObject *object,
       case PROP_TP_FILE:
         priv->tpfile = g_value_dup_object (value);
         break;
+      case PROP_USER_ACTION_TIME:
+        priv->user_action_time = g_value_get_int64 (value);
+        break;
       default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
     }
@@ -412,6 +420,13 @@ empathy_ft_handler_class_init (EmpathyFTHandlerClass *klass)
     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY);
   g_object_class_install_property (object_class, PROP_TP_FILE, param_spec);
 
+  param_spec = g_param_spec_int64 ("user-action-time", "user action time",
+    "User action time",
+    0, G_MAXINT64, 0,
+    G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY);
+  g_object_class_install_property (object_class, PROP_USER_ACTION_TIME,
+      param_spec);
+
   /* signals */
 
   /**
@@ -424,7 +439,7 @@ empathy_ft_handler_class_init (EmpathyFTHandlerClass *klass)
   signals[TRANSFER_STARTED] =
     g_signal_new ("transfer-started", G_TYPE_FROM_CLASS (klass),
         G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-        g_cclosure_marshal_VOID__OBJECT,
+        g_cclosure_marshal_generic,
         G_TYPE_NONE,
         1, EMPATHY_TYPE_TP_FILE);
 
@@ -439,7 +454,7 @@ empathy_ft_handler_class_init (EmpathyFTHandlerClass *klass)
   signals[TRANSFER_DONE] =
     g_signal_new ("transfer-done", G_TYPE_FROM_CLASS (klass),
         G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-        g_cclosure_marshal_VOID__OBJECT,
+        g_cclosure_marshal_generic,
         G_TYPE_NONE,
         1, EMPATHY_TYPE_TP_FILE);
 
@@ -457,7 +472,7 @@ empathy_ft_handler_class_init (EmpathyFTHandlerClass *klass)
   signals[TRANSFER_ERROR] =
     g_signal_new ("transfer-error", G_TYPE_FROM_CLASS (klass),
         G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-        g_cclosure_marshal_VOID__POINTER,
+        g_cclosure_marshal_generic,
         G_TYPE_NONE,
         1, G_TYPE_POINTER);
 
@@ -476,7 +491,7 @@ empathy_ft_handler_class_init (EmpathyFTHandlerClass *klass)
   signals[TRANSFER_PROGRESS] =
     g_signal_new ("transfer-progress", G_TYPE_FROM_CLASS (klass),
         G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-        _empathy_marshal_VOID__UINT64_UINT64_UINT_DOUBLE,
+        g_cclosure_marshal_generic,
         G_TYPE_NONE,
         4, G_TYPE_UINT64, G_TYPE_UINT64, G_TYPE_UINT, G_TYPE_DOUBLE);
 
@@ -494,7 +509,7 @@ empathy_ft_handler_class_init (EmpathyFTHandlerClass *klass)
   signals[HASHING_STARTED] =
     g_signal_new ("hashing-started", G_TYPE_FROM_CLASS (klass),
         G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-        g_cclosure_marshal_VOID__VOID,
+        g_cclosure_marshal_generic,
         G_TYPE_NONE, 0);
 
   /**
@@ -509,7 +524,7 @@ empathy_ft_handler_class_init (EmpathyFTHandlerClass *klass)
   signals[HASHING_PROGRESS] =
     g_signal_new ("hashing-progress", G_TYPE_FROM_CLASS (klass),
         G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-        _empathy_marshal_VOID__UINT64_UINT64,
+        g_cclosure_marshal_generic,
         G_TYPE_NONE,
         2, G_TYPE_UINT64, G_TYPE_UINT64);
 
@@ -523,7 +538,7 @@ empathy_ft_handler_class_init (EmpathyFTHandlerClass *klass)
   signals[HASHING_DONE] =
     g_signal_new ("hashing-done", G_TYPE_FROM_CLASS (klass),
         G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-        g_cclosure_marshal_VOID__VOID,
+        g_cclosure_marshal_generic,
         G_TYPE_NONE, 0);
 }
 
@@ -709,7 +724,7 @@ ft_handler_create_channel_cb (GObject *source,
   EmpathyFTHandler *handler = user_data;
   EmpathyFTHandlerPriv *priv = GET_PRIV (handler);
   GError *error = NULL;
-  TpChannel *channel = NULL;
+  TpChannel *channel;
 
   DEBUG ("Dispatcher create channel CB");
 
@@ -725,18 +740,16 @@ ft_handler_create_channel_cb (GObject *source,
     {
       emit_error_signal (handler, error);
 
+      g_clear_object (&channel);
       g_error_free (error);
-      goto out;
+      return;
     }
 
-  priv->tpfile = empathy_tp_file_new (channel);
+  priv->tpfile = EMPATHY_TP_FILE (channel);
 
   empathy_tp_file_offer (priv->tpfile, priv->gfile, priv->cancellable,
       ft_transfer_progress_callback, handler,
       ft_transfer_operation_callback, handler);
-
-out:
-  tp_clear_object (&channel);
 }
 
 static void
@@ -751,7 +764,7 @@ ft_handler_push_to_dispatcher (EmpathyFTHandler *handler)
   account = empathy_contact_get_account (priv->contact);
 
   req = tp_account_channel_request_new (account, priv->request,
-      TP_USER_ACTION_TIME_NOT_USER_ACTION);
+      priv->user_action_time);
 
   tp_account_channel_request_create_and_handle_channel_async (req, NULL,
       ft_handler_create_channel_cb, handler);
@@ -1253,27 +1266,12 @@ channel_get_all_properties_cb (TpProxy *proxy,
       return;
     }
 
-  priv->total_bytes = g_value_get_uint64 (
-      g_hash_table_lookup (properties, "Size"));
-
-  priv->transferred_bytes = g_value_get_uint64 (
-      g_hash_table_lookup (properties, "TransferredBytes"));
-
-  priv->filename = g_value_dup_string (
-      g_hash_table_lookup (properties, "Filename"));
-
   priv->content_hash = g_value_dup_string (
       g_hash_table_lookup (properties, "ContentHash"));
 
   priv->content_hash_type = g_value_get_uint (
       g_hash_table_lookup (properties, "ContentHashType"));
 
-  priv->content_type = g_value_dup_string (
-      g_hash_table_lookup (properties, "ContentType"));
-
-  priv->description = g_value_dup_string (
-      g_hash_table_lookup (properties, "Description"));
-
   c_handle = tp_channel_get_handle (TP_CHANNEL (proxy), NULL);
   empathy_tp_contact_factory_get_from_handle (
       tp_channel_borrow_connection (TP_CHANNEL (proxy)), c_handle,
@@ -1295,6 +1293,7 @@ channel_get_all_properties_cb (TpProxy *proxy,
 void
 empathy_ft_handler_new_outgoing (EmpathyContact *contact,
     GFile *source,
+    gint64 action_time,
     EmpathyFTHandlerReadyCallback callback,
     gpointer user_data)
 {
@@ -1308,7 +1307,10 @@ empathy_ft_handler_new_outgoing (EmpathyContact *contact,
   g_return_if_fail (G_IS_FILE (source));
 
   handler = g_object_new (EMPATHY_TYPE_FT_HANDLER,
-      "contact", contact, "gfile", source, NULL);
+      "contact", contact,
+      "gfile", source,
+      "user-action-time", action_time,
+      NULL);
 
   priv = GET_PRIV (handler);
 
@@ -1345,22 +1347,36 @@ empathy_ft_handler_new_incoming (EmpathyTpFile *tp_file,
     gpointer user_data)
 {
   EmpathyFTHandler *handler;
-  TpChannel *channel;
   CallbacksData *data;
+  TpFileTransferChannel *ft_chan = (TpFileTransferChannel *) tp_file;
+  EmpathyFTHandlerPriv *priv;
 
   g_return_if_fail (EMPATHY_IS_TP_FILE (tp_file));
 
   handler = g_object_new (EMPATHY_TYPE_FT_HANDLER,
       "tp-file", tp_file, NULL);
 
-  g_object_get (tp_file, "channel", &channel, NULL);
+  priv = GET_PRIV (handler);
 
   data = g_slice_new0 (CallbacksData);
   data->callback = callback;
   data->user_data = user_data;
   data->handler = g_object_ref (handler);
 
-  tp_cli_dbus_properties_call_get_all (channel,
+  priv->total_bytes = tp_file_transfer_channel_get_size (ft_chan);
+
+  priv->transferred_bytes = tp_file_transfer_channel_get_transferred_bytes (
+      ft_chan);
+
+  priv->filename = g_strdup (tp_file_transfer_channel_get_filename (ft_chan));
+
+  priv->content_type = g_strdup (tp_file_transfer_channel_get_mime_type (
+      ft_chan));
+
+  priv->description = g_strdup (tp_file_transfer_channel_get_description (
+      ft_chan));
+
+  tp_cli_dbus_properties_call_get_all (tp_file,
       -1, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER,
       channel_get_all_properties_cb, data, NULL, G_OBJECT (handler));
 }
@@ -1574,7 +1590,7 @@ empathy_ft_handler_is_incoming (EmpathyFTHandler *handler)
   if (priv->tpfile == NULL)
     return FALSE;
 
-  return empathy_tp_file_is_incoming (priv->tpfile);
+  return !tp_channel_get_requested ((TpChannel *) priv->tpfile);
 }
 
 /**
diff --git a/libempathy/empathy-ft-handler.h b/libempathy/empathy-ft-handler.h
index 7d4153611..a4392b508 100644
--- a/libempathy/empathy-ft-handler.h
+++ b/libempathy/empathy-ft-handler.h
@@ -71,6 +71,7 @@ GType empathy_ft_handler_get_type (void);
 /* public methods */
 void empathy_ft_handler_new_outgoing (EmpathyContact *contact,
     GFile *source,
+    gint64 action_time,
     EmpathyFTHandlerReadyCallback callback,
     gpointer user_data);
 
diff --git a/libempathy/empathy-gsettings.h b/libempathy/empathy-gsettings.h
index d326981d4..fb44b5893 100644
--- a/libempathy/empathy-gsettings.h
+++ b/libempathy/empathy-gsettings.h
@@ -29,7 +29,6 @@ G_BEGIN_DECLS
 #define EMPATHY_PREFS_USE_CONN                     "use-conn"
 #define EMPATHY_PREFS_AUTOCONNECT                  "autoconnect"
 #define EMPATHY_PREFS_AUTOAWAY                     "autoaway"
-#define EMPATHY_PREFS_BUTTERFLY_LOGS_MIGRATED      "butterfly-logs-migrated"
 #define EMPATHY_PREFS_FILE_TRANSFER_DEFAULT_FOLDER "file-transfer-default-folder"
 
 #define EMPATHY_PREFS_NOTIFICATIONS_SCHEMA EMPATHY_PREFS_SCHEMA ".notifications"
@@ -67,6 +66,7 @@ G_BEGIN_DECLS
 #define EMPATHY_PREFS_CHAT_NICK_COMPLETION_CHAR    "nick-completion-char"
 #define EMPATHY_PREFS_CHAT_AVATAR_IN_ICON          "avatar-in-icon"
 #define EMPATHY_PREFS_CHAT_WEBKIT_DEVELOPER_TOOLS  "enable-webkit-developer-tools"
+#define EMPATHY_PREFS_CHAT_ROOM_LAST_ACCOUNT       "room-last-account"
 
 #define EMPATHY_PREFS_UI_SCHEMA EMPATHY_PREFS_SCHEMA ".ui"
 #define EMPATHY_PREFS_UI_SEPARATE_CHAT_WINDOWS     "separate-chat-windows"
diff --git a/libempathy/empathy-individual-manager.c b/libempathy/empathy-individual-manager.c
index 47a01cb8d..833a5692d 100644
--- a/libempathy/empathy-individual-manager.c
+++ b/libempathy/empathy-individual-manager.c
@@ -35,7 +35,6 @@
 #include <extensions/extensions.h>
 
 #include "empathy-individual-manager.h"
-#include "empathy-marshal.h"
 #include "empathy-utils.h"
 #include "empathy-contact-manager.h"
 
@@ -96,7 +95,7 @@ add_individual (EmpathyIndividualManager *self, FolksIndividual *individual)
   EmpathyIndividualManagerPriv *priv = GET_PRIV (self);
 
   g_hash_table_insert (priv->individuals,
-      (gpointer) folks_individual_get_id (individual),
+      g_strdup (folks_individual_get_id (individual)),
       g_object_ref (individual));
 
   g_signal_connect (individual, "group-changed",
@@ -162,16 +161,20 @@ individual_notify_personas_cb (FolksIndividual *individual,
 
 static void
 aggregator_individuals_changed_cb (FolksIndividualAggregator *aggregator,
-    GeeSet *added,
-    GeeSet *removed,
-    const char *message,
-    FolksPersona *actor,
-    guint reason,
+    GeeMultiMap *changes,
     EmpathyIndividualManager *self)
 {
   EmpathyIndividualManagerPriv *priv = GET_PRIV (self);
   GeeIterator *iter;
-  GList *added_filtered = NULL, *removed_list = NULL;
+  GeeSet *removed;
+  GeeCollection *added;
+  GList *added_set = NULL, *added_filtered = NULL, *removed_list = NULL;
+
+  /* We're not interested in the relationships between the added and removed
+   * individuals, so just extract collections of them. Note that the added
+   * collection may contain duplicates, while the removed set won't. */
+  removed = gee_multi_map_get_keys (changes);
+  added = gee_multi_map_get_values (changes);
 
   /* Handle the removals first, as one of the added Individuals might have the
    * same ID as one of the removed Individuals (due to linking). */
@@ -180,6 +183,9 @@ aggregator_individuals_changed_cb (FolksIndividualAggregator *aggregator,
     {
       FolksIndividual *ind = gee_iterator_get (iter);
 
+      if (ind == NULL)
+        continue;
+
       g_signal_handlers_disconnect_by_func (ind,
           individual_notify_personas_cb, self);
 
@@ -200,6 +206,11 @@ aggregator_individuals_changed_cb (FolksIndividualAggregator *aggregator,
     {
       FolksIndividual *ind = gee_iterator_get (iter);
 
+      /* Make sure we handle each added individual only once. */
+      if (ind == NULL || g_list_find (added_set, ind) != NULL)
+        continue;
+      added_set = g_list_prepend (added_set, ind);
+
       g_signal_connect (ind, "notify::personas",
           G_CALLBACK (individual_notify_personas_cb), self);
 
@@ -213,15 +224,20 @@ aggregator_individuals_changed_cb (FolksIndividualAggregator *aggregator,
     }
   g_clear_object (&iter);
 
+  g_list_free (added_set);
+
+  g_object_unref (added);
+  g_object_unref (removed);
+
   /* Bail if we have no individuals left */
   if (added_filtered == NULL && removed == NULL)
     return;
 
   added_filtered = g_list_reverse (added_filtered);
 
-  g_signal_emit (self, signals[MEMBERS_CHANGED], 0, message,
+  g_signal_emit (self, signals[MEMBERS_CHANGED], 0, NULL,
       added_filtered, removed_list,
-      tp_channel_group_change_reason_from_folks_groups_change_reason (reason),
+      TP_CHANNEL_GROUP_CHANGE_REASON_NONE,
       TRUE);
 
   g_list_free (added_filtered);
@@ -234,6 +250,9 @@ individual_manager_dispose (GObject *object)
   EmpathyIndividualManagerPriv *priv = GET_PRIV (object);
 
   g_hash_table_destroy (priv->individuals);
+
+  g_signal_handlers_disconnect_by_func (priv->aggregator,
+      aggregator_individuals_changed_cb, object);
   tp_clear_object (&priv->aggregator);
 
   G_OBJECT_CLASS (empathy_individual_manager_parent_class)->dispose (object);
@@ -294,7 +313,7 @@ empathy_individual_manager_class_init (EmpathyIndividualManagerClass *klass)
           G_SIGNAL_RUN_LAST,
           0,
           NULL, NULL,
-          _empathy_marshal_VOID__OBJECT_STRING_BOOLEAN,
+          g_cclosure_marshal_generic,
           G_TYPE_NONE, 3, FOLKS_TYPE_INDIVIDUAL, G_TYPE_STRING, G_TYPE_BOOLEAN);
 
   signals[FAVOURITES_CHANGED] =
@@ -303,7 +322,7 @@ empathy_individual_manager_class_init (EmpathyIndividualManagerClass *klass)
           G_SIGNAL_RUN_LAST,
           0,
           NULL, NULL,
-          _empathy_marshal_VOID__OBJECT_BOOLEAN,
+          g_cclosure_marshal_generic,
           G_TYPE_NONE, 2, FOLKS_TYPE_INDIVIDUAL, G_TYPE_BOOLEAN);
 
   signals[MEMBERS_CHANGED] =
@@ -312,7 +331,7 @@ empathy_individual_manager_class_init (EmpathyIndividualManagerClass *klass)
           G_SIGNAL_RUN_LAST,
           0,
           NULL, NULL,
-          _empathy_marshal_VOID__STRING_OBJECT_OBJECT_UINT,
+          g_cclosure_marshal_generic,
           G_TYPE_NONE,
           4, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_UINT);
 
@@ -328,10 +347,10 @@ empathy_individual_manager_init (EmpathyIndividualManager *self)
 
   self->priv = priv;
   priv->individuals = g_hash_table_new_full (g_str_hash, g_str_equal,
-      NULL, g_object_unref);
+      g_free, g_object_unref);
 
   priv->aggregator = folks_individual_aggregator_new ();
-  g_signal_connect (priv->aggregator, "individuals-changed",
+  g_signal_connect (priv->aggregator, "individuals-changed-detailed",
       G_CALLBACK (aggregator_individuals_changed_cb), self);
   folks_individual_aggregator_prepare (priv->aggregator, NULL, NULL);
 }
diff --git a/libempathy/empathy-irc-network.c b/libempathy/empathy-irc-network.c
index 68e071be8..ec0cfffb1 100644
--- a/libempathy/empathy-irc-network.c
+++ b/libempathy/empathy-irc-network.c
@@ -27,7 +27,6 @@
 
 #include <telepathy-glib/util.h>
 
-#include "empathy-marshal.h"
 #include "empathy-irc-network.h"
 #include "empathy-utils.h"
 
@@ -216,7 +215,7 @@ empathy_irc_network_class_init (EmpathyIrcNetworkClass *klass)
       G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
       0,
       NULL, NULL,
-      g_cclosure_marshal_VOID__VOID,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE, 0);
 }
 
diff --git a/libempathy/empathy-irc-server.c b/libempathy/empathy-irc-server.c
index 41da5385e..cb1fbfc2f 100644
--- a/libempathy/empathy-irc-server.c
+++ b/libempathy/empathy-irc-server.c
@@ -26,7 +26,6 @@
 
 #include <telepathy-glib/util.h>
 
-#include "empathy-marshal.h"
 #include "empathy-irc-server.h"
 #include "empathy-utils.h"
 
@@ -202,7 +201,7 @@ empathy_irc_server_class_init (EmpathyIrcServerClass *klass)
       G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
       0,
       NULL, NULL,
-      g_cclosure_marshal_VOID__VOID,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE, 0);
 }
 
diff --git a/libempathy/empathy-presence-manager.c b/libempathy/empathy-presence-manager.c
index c3eae6583..67867f96d 100644
--- a/libempathy/empathy-presence-manager.c
+++ b/libempathy/empathy-presence-manager.c
@@ -463,7 +463,7 @@ account_manager_ready_cb (GObject *source_object,
 
   self->priv->ready = TRUE;
 
-  if (!tp_account_manager_prepare_finish (account_manager, result, &error))
+  if (!tp_proxy_prepare_finish (account_manager, result, &error))
     {
       DEBUG ("Failed to prepare account manager: %s", error->message);
       g_error_free (error);
@@ -500,7 +500,7 @@ empathy_presence_manager_init (EmpathyPresenceManager *self)
 
   self->priv->manager = tp_account_manager_dup ();
 
-  tp_account_manager_prepare_async (self->priv->manager, NULL,
+  tp_proxy_prepare_async (self->priv->manager, NULL,
       account_manager_ready_cb, self);
 
   tp_g_signal_connect_object (self->priv->manager,
diff --git a/libempathy/empathy-request-util.c b/libempathy/empathy-request-util.c
index 409fdf54a..6b53dab9a 100644
--- a/libempathy/empathy-request-util.c
+++ b/libempathy/empathy-request-util.c
@@ -40,7 +40,7 @@ empathy_chat_with_contact (EmpathyContact *contact,
 {
   empathy_chat_with_contact_id (
       empathy_contact_get_account (contact), empathy_contact_get_id (contact),
-      timestamp);
+      timestamp, NULL, NULL);
 }
 
 static void
@@ -63,7 +63,9 @@ create_text_channel (TpAccount *account,
     TpHandleType target_handle_type,
     const gchar *target_id,
     gboolean sms_channel,
-    gint64 timestamp)
+    gint64 timestamp,
+    GAsyncReadyCallback callback,
+    gpointer user_data)
 {
   GHashTable *request;
   TpAccountChannelRequest *req;
@@ -83,19 +85,23 @@ create_text_channel (TpAccount *account,
   tp_account_channel_request_set_delegate_to_preferred_handler (req, TRUE);
 
   tp_account_channel_request_ensure_channel_async (req, EMPATHY_CHAT_BUS_NAME,
-      NULL, ensure_text_channel_cb, NULL);
+      NULL, callback ? callback : ensure_text_channel_cb, user_data);
 
   g_hash_table_unref (request);
   g_object_unref (req);
 }
 
+/* @callback is optional, but if it's provided, it should call the right
+ * _finish() func that we call in ensure_text_channel_cb() */
 void
 empathy_chat_with_contact_id (TpAccount *account,
     const gchar *contact_id,
-    gint64 timestamp)
+    gint64 timestamp,
+    GAsyncReadyCallback callback,
+    gpointer user_data)
 {
   create_text_channel (account, TP_HANDLE_TYPE_CONTACT,
-      contact_id, FALSE, timestamp);
+      contact_id, FALSE, timestamp, callback, user_data);
 }
 
 void
@@ -104,14 +110,18 @@ empathy_join_muc (TpAccount *account,
     gint64 timestamp)
 {
   create_text_channel (account, TP_HANDLE_TYPE_ROOM,
-      room_name, FALSE, timestamp);
+      room_name, FALSE, timestamp, NULL, NULL);
 }
 
+/* @callback is optional, but if it's provided, it should call the right
+ * _finish() func that we call in ensure_text_channel_cb() */
 void
 empathy_sms_contact_id (TpAccount *account,
     const gchar *contact_id,
-    gint64 timestamp)
+    gint64 timestamp,
+    GAsyncReadyCallback callback,
+    gpointer user_data)
 {
   create_text_channel (account, TP_HANDLE_TYPE_CONTACT,
-      contact_id, TRUE, timestamp);
+      contact_id, TRUE, timestamp, callback, user_data);
 }
diff --git a/libempathy/empathy-request-util.h b/libempathy/empathy-request-util.h
index 70a607e73..6781b72d4 100644
--- a/libempathy/empathy-request-util.h
+++ b/libempathy/empathy-request-util.h
@@ -45,9 +45,11 @@ G_BEGIN_DECLS
 /* Requesting 1 to 1 text channels */
 void empathy_chat_with_contact_id (TpAccount *account,
   const gchar *contact_id,
-  gint64 timestamp);
+  gint64 timestamp,
+  GAsyncReadyCallback callback,
+  gpointer user_data);
 
-void  empathy_chat_with_contact (EmpathyContact *contact,
+void empathy_chat_with_contact (EmpathyContact *contact,
   gint64 timestamp);
 
 /* Request a muc channel */
@@ -58,7 +60,9 @@ void empathy_join_muc (TpAccount *account,
 /* Request a sms channel */
 void empathy_sms_contact_id (TpAccount *account,
   const gchar *contact_id,
-  gint64 timestamp);
+  gint64 timestamp,
+  GAsyncReadyCallback callback,
+  gpointer user_data);
 
 G_END_DECLS
 
diff --git a/libempathy/empathy-server-sasl-handler.c b/libempathy/empathy-server-sasl-handler.c
index b06d7bf4c..d37851405 100644
--- a/libempathy/empathy-server-sasl-handler.c
+++ b/libempathy/empathy-server-sasl-handler.c
@@ -50,6 +50,7 @@ typedef struct {
   GSimpleAsyncResult *result;
 
   gchar *password;
+  gboolean save_password;
 
   GSimpleAsyncResult *async_init_res;
 } EmpathyServerSASLHandlerPriv;
@@ -71,6 +72,25 @@ static const gchar *sasl_statuses[] = {
 };
 
 static void
+empathy_server_sasl_handler_set_password_cb (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  GError *error = NULL;
+
+  if (!empathy_keyring_set_account_password_finish (TP_ACCOUNT (source), result,
+          &error))
+    {
+      DEBUG ("Failed to set password: %s", error->message);
+      g_clear_error (&error);
+    }
+  else
+    {
+      DEBUG ("Password set successfully.");
+    }
+}
+
+static void
 sasl_status_changed_cb (TpChannel *channel,
     TpSASLStatus status,
     const gchar *error,
@@ -91,6 +111,15 @@ sasl_status_changed_cb (TpChannel *channel,
 
   if (status == TP_SASL_STATUS_SERVER_SUCCEEDED)
     {
+      if (priv->save_password)
+        {
+          DEBUG ("Saving password in keyring");
+
+          empathy_keyring_set_account_password_async (priv->account,
+              priv->password, empathy_server_sasl_handler_set_password_cb,
+              NULL);
+        }
+
       DEBUG ("Calling AcceptSASL");
       tp_cli_channel_interface_sasl_authentication_call_accept_sasl (
           priv->channel, -1, NULL, NULL, NULL, NULL);
@@ -308,7 +337,7 @@ empathy_server_sasl_handler_class_init (EmpathyServerSASLHandlerClass *klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0,
       NULL, NULL,
-      g_cclosure_marshal_VOID__VOID,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE, 0);
 }
 
@@ -369,25 +398,6 @@ start_mechanism_with_data_cb (TpChannel *proxy,
   DEBUG ("Started mechanism successfully");
 }
 
-static void
-empathy_server_sasl_handler_set_password_cb (GObject *source,
-    GAsyncResult *result,
-    gpointer user_data)
-{
-  GError *error = NULL;
-
-  if (!empathy_keyring_set_account_password_finish (TP_ACCOUNT (source), result,
-          &error))
-    {
-      DEBUG ("Failed to set password: %s", error->message);
-      g_clear_error (&error);
-    }
-  else
-    {
-      DEBUG ("Password set successfully.");
-    }
-}
-
 void
 empathy_server_sasl_handler_provide_password (
     EmpathyServerSASLHandler *handler,
@@ -433,9 +443,11 @@ empathy_server_sasl_handler_provide_password (
     {
       if (may_save_response)
         {
-          DEBUG ("Saving password in keyring");
-          empathy_keyring_set_account_password_async (priv->account, password,
-              empathy_server_sasl_handler_set_password_cb, NULL);
+          g_free (priv->password);
+
+          /* We'll save the password if we manage to connect */
+          priv->password = g_strdup (password);
+          priv->save_password = TRUE;
         }
       else if (tp_proxy_has_interface_by_id (priv->channel,
             EMP_IFACE_QUARK_CHANNEL_INTERFACE_CREDENTIALS_STORAGE))
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index 27003561e..dcd6193ec 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -30,7 +30,6 @@
 #include "empathy-tp-chat.h"
 #include "empathy-tp-contact-factory.h"
 #include "empathy-contact-list.h"
-#include "empathy-marshal.h"
 #include "empathy-request-util.h"
 #include "empathy-time.h"
 #include "empathy-utils.h"
@@ -686,13 +685,13 @@ tp_chat_list_properties_cb (TpProxy         *proxy,
 	GArray            *ids;
 	guint              i;
 
-	self->priv->had_properties_list = TRUE;
-
 	if (error) {
 		DEBUG ("Error listing properties: %s", error->message);
 		return;
 	}
 
+	self->priv->had_properties_list = TRUE;
+
 	ids = g_array_sized_new (FALSE, FALSE, sizeof (guint), properties->len);
 	self->priv->properties = g_ptr_array_sized_new (properties->len);
 	for (i = 0; i < properties->len; i++) {
@@ -890,66 +889,6 @@ check_almost_ready (EmpathyTpChat *self)
 }
 
 static void
-tp_chat_update_remote_contact (EmpathyTpChat *self)
-{
-	TpChannel *channel = (TpChannel *) self;
-	EmpathyContact *contact = NULL;
-	TpHandle self_handle;
-	TpHandleType handle_type;
-	GList *l;
-
-	/* If this is a named chatroom, never pretend it is a private chat */
-	tp_channel_get_handle (channel, &handle_type);
-	if (handle_type == TP_HANDLE_TYPE_ROOM) {
-		return;
-	}
-
-	/* This is an MSN chat, but it's the new style where 1-1 chats don't
-	 * have the group interface. If it has the conference interface, then
-	 * it is indeed a MUC. */
-	if (tp_proxy_has_interface_by_id (self,
-					  TP_IFACE_QUARK_CHANNEL_INTERFACE_CONFERENCE)) {
-		return;
-	}
-
-	/* This is an MSN-like chat where anyone can join the chat at anytime.
-	 * If there is only one non-self contact member, we are in a private
-	 * chat and we set the "remote-contact" property to that contact. If
-	 * there are more, set the "remote-contact" property to NULL and the
-	 * UI will display a contact list. */
-	self_handle = tp_channel_group_get_self_handle (channel);
-	for (l = self->priv->members; l; l = l->next) {
-		/* Skip self contact if member */
-		if (empathy_contact_get_handle (l->data) == self_handle) {
-			continue;
-		}
-
-		/* We have more than one remote contact, break */
-		if (contact != NULL) {
-			contact = NULL;
-			break;
-		}
-
-		/* If we didn't find yet a remote contact, keep this one */
-		contact = l->data;
-	}
-
-	if (self->priv->remote_contact == contact) {
-		return;
-	}
-
-	DEBUG ("Changing remote contact from %p to %p",
-		self->priv->remote_contact, contact);
-
-	if (self->priv->remote_contact) {
-		g_object_unref (self->priv->remote_contact);
-	}
-
-	self->priv->remote_contact = contact ? g_object_ref (contact) : NULL;
-	g_object_notify (G_OBJECT (self), "remote-contact");
-}
-
-static void
 tp_chat_got_added_contacts_cb (TpConnection            *connection,
 			       guint                    n_contacts,
 			       EmpathyContact * const * contacts,
@@ -984,7 +923,6 @@ tp_chat_got_added_contacts_cb (TpConnection            *connection,
 		}
 	}
 
-	tp_chat_update_remote_contact (EMPATHY_TP_CHAT (chat));
 	check_almost_ready (EMPATHY_TP_CHAT (chat));
 }
 
@@ -1092,7 +1030,6 @@ tp_chat_got_renamed_contacts_cb (TpConnection            *connection,
 		self->priv->user = g_object_ref (new);
 	}
 
-	tp_chat_update_remote_contact (self);
 	check_almost_ready (self);
 }
 
@@ -1168,8 +1105,6 @@ tp_chat_group_members_changed_cb (TpChannel     *channel,
 			G_OBJECT (self));
 	}
 
-	tp_chat_update_remote_contact (self);
-
 	if (actor_contact != NULL) {
 		g_object_unref (actor_contact);
 	}
@@ -1331,7 +1266,7 @@ empathy_tp_chat_class_init (EmpathyTpChatClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      g_cclosure_marshal_VOID__OBJECT,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE,
 			      1, EMPATHY_TYPE_MESSAGE);
 
@@ -1341,7 +1276,7 @@ empathy_tp_chat_class_init (EmpathyTpChatClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      _empathy_marshal_VOID__STRING_UINT_STRING,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE,
 			      3, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_STRING);
 
@@ -1351,7 +1286,7 @@ empathy_tp_chat_class_init (EmpathyTpChatClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      _empathy_marshal_VOID__OBJECT_UINT,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE,
 			      2, EMPATHY_TYPE_CONTACT, G_TYPE_UINT);
 
@@ -1361,7 +1296,7 @@ empathy_tp_chat_class_init (EmpathyTpChatClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      _empathy_marshal_VOID__STRING_BOXED,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE,
 			      2, G_TYPE_STRING, G_TYPE_VALUE);
 
@@ -1371,7 +1306,7 @@ empathy_tp_chat_class_init (EmpathyTpChatClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      g_cclosure_marshal_VOID__OBJECT,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE,
 			      1, EMPATHY_TYPE_MESSAGE);
 
diff --git a/libempathy/empathy-tp-file.c b/libempathy/empathy-tp-file.c
index 3bb2dd49c..ff2099ee9 100644
--- a/libempathy/empathy-tp-file.c
+++ b/libempathy/empathy-tp-file.c
@@ -44,7 +44,6 @@
 #include <telepathy-glib/interfaces.h>
 
 #include "empathy-tp-file.h"
-#include "empathy-marshal.h"
 #include "empathy-time.h"
 #include "empathy-utils.h"
 
@@ -66,8 +65,6 @@
 /* EmpathyTpFile object */
 
 struct _EmpathyTpFilePrivate {
-  TpChannel *channel;
-
   GInputStream *in_stream;
   GOutputStream *out_stream;
 
@@ -78,7 +75,6 @@ struct _EmpathyTpFilePrivate {
   TpSocketAccessControl socket_access_control;
 
   /* transfer properties */
-  gboolean incoming;
   gint64 start_time;
   GArray *socket_address;
   guint port;
@@ -97,13 +93,7 @@ struct _EmpathyTpFilePrivate {
   gboolean is_closed;
 };
 
-enum {
-  PROP_0,
-  PROP_CHANNEL,
-  PROP_INCOMING
-};
-
-G_DEFINE_TYPE (EmpathyTpFile, empathy_tp_file, G_TYPE_OBJECT);
+G_DEFINE_TYPE (EmpathyTpFile, empathy_tp_file, TP_TYPE_FILE_TRANSFER_CHANNEL);
 
 /* private functions */
 
@@ -343,7 +333,7 @@ tp_file_start_transfer (EmpathyTpFile *self)
   if (self->priv->progress_callback != NULL)
     self->priv->progress_callback (self, 0, self->priv->progress_user_data);
 
-  if (self->priv->incoming)
+  if (!tp_channel_get_requested ((TpChannel *) self))
     {
       GInputStream *socket_stream;
 
@@ -429,7 +419,7 @@ tp_file_state_changed_cb (TpChannel *proxy,
       "old state = %u, state = %u, reason = %u\n"
       "\tincoming = %s, in_stream = %s, out_stream = %s",
       self->priv->state, state, reason,
-      self->priv->incoming ? "yes" : "no",
+      tp_channel_get_requested (proxy) ? "no" : "yes",
       self->priv->in_stream ? "present" : "not present",
       self->priv->out_stream ? "present" : "not present");
 
@@ -456,12 +446,13 @@ tp_file_state_changed_cb (TpChannel *proxy,
 }
 
 static void
-tp_file_transferred_bytes_changed_cb (TpChannel *proxy,
-    guint64 count,
-    gpointer user_data,
-    GObject *weak_object)
+tp_file_transferred_bytes_changed_cb (TpFileTransferChannel *channel,
+    GParamSpec *spec,
+    EmpathyTpFile *self)
 {
-  EmpathyTpFile *self = (EmpathyTpFile *) weak_object;
+  guint64 count;
+
+  count = tp_file_transfer_channel_get_transferred_bytes (channel);
 
   /* don't notify for 0 bytes count */
   if (count == 0)
@@ -469,8 +460,7 @@ tp_file_transferred_bytes_changed_cb (TpChannel *proxy,
 
   /* notify clients */
   if (self->priv->progress_callback != NULL)
-    self->priv->progress_callback (EMPATHY_TP_FILE (weak_object),
-        count, self->priv->progress_user_data);
+    self->priv->progress_callback (self, count, self->priv->progress_user_data);
 }
 
 static void
@@ -589,8 +579,7 @@ file_read_async_cb (GObject *source,
    */
   initialize_empty_ac_variant (self->priv->socket_access_control, &nothing);
 
-  tp_cli_channel_type_file_transfer_call_provide_file (
-      self->priv->channel, -1,
+  tp_cli_channel_type_file_transfer_call_provide_file ((TpChannel *) self, -1,
       self->priv->socket_address_type, self->priv->socket_access_control,
       &nothing, ft_operation_provide_or_accept_file_cb,
       NULL, NULL, G_OBJECT (self));
@@ -616,7 +605,7 @@ file_transfer_set_uri_cb (TpProxy *proxy,
    */
   initialize_empty_ac_variant (self->priv->socket_access_control, &nothing);
 
-  tp_cli_channel_type_file_transfer_call_accept_file (self->priv->channel,
+  tp_cli_channel_type_file_transfer_call_accept_file ((TpChannel *) self,
       -1, self->priv->socket_address_type, self->priv->socket_access_control,
       &nothing, self->priv->offset,
       ft_operation_provide_or_accept_file_cb, NULL, NULL, weak_object);
@@ -650,7 +639,7 @@ file_replace_async_cb (GObject *source,
   uri = g_file_get_uri (file);
   value = tp_g_value_slice_new_take_string (uri);
 
-  tp_cli_dbus_properties_call_set (self->priv->channel, -1,
+  tp_cli_dbus_properties_call_set ((TpChannel *) self, -1,
       TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "URI", value,
       file_transfer_set_uri_cb, NULL, NULL, G_OBJECT (self));
 
@@ -682,7 +671,7 @@ close_channel_internal (EmpathyTpFile *self,
 
   self->priv->is_closing = TRUE;
 
-  tp_cli_channel_call_close (self->priv->channel, -1,
+  tp_cli_channel_call_close ((TpChannel *) self, -1,
     channel_closed_cb, GINT_TO_POINTER (cancel), NULL, G_OBJECT (self));
 }
 
@@ -700,13 +689,6 @@ do_dispose (GObject *object)
 {
   EmpathyTpFile *self = (EmpathyTpFile *) object;
 
-  if (self->priv->channel != NULL)
-    {
-      g_signal_handlers_disconnect_by_func (self->priv->channel,
-          tp_file_invalidated_cb, object);
-      tp_clear_object (&self->priv->channel);
-    }
-
   tp_clear_object (&self->priv->in_stream);
   tp_clear_object (&self->priv->out_stream);
   tp_clear_object (&self->priv->cancellable);
@@ -731,73 +713,32 @@ do_finalize (GObject *object)
 }
 
 static void
-do_get_property (GObject *object,
-    guint param_id,
-    GValue *value,
-    GParamSpec *pspec)
-{
-  EmpathyTpFile *self = (EmpathyTpFile *) object;
-
-  switch (param_id)
-    {
-      case PROP_CHANNEL:
-        g_value_set_object (value, self->priv->channel);
-        break;
-      case PROP_INCOMING:
-        g_value_set_boolean (value, self->priv->incoming);
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-        break;
-    };
-}
-
-static void
-do_set_property (GObject *object,
-    guint param_id,
-    const GValue *value,
-    GParamSpec *pspec)
-{
-  EmpathyTpFile *self = (EmpathyTpFile *) object;
-
-  switch (param_id)
-    {
-      case PROP_CHANNEL:
-        self->priv->channel = g_object_ref (g_value_get_object (value));
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-        break;
-    };
-}
-
-static void
 do_constructed (GObject *object)
 {
   EmpathyTpFile *self = (EmpathyTpFile *) object;
+  TpChannel *channel = (TpChannel *) self;
 
-  g_signal_connect (self->priv->channel, "invalidated",
+  g_signal_connect (self, "invalidated",
     G_CALLBACK (tp_file_invalidated_cb), self);
 
-  self->priv->incoming = !tp_channel_get_requested (self->priv->channel);
-
   tp_cli_channel_type_file_transfer_connect_to_file_transfer_state_changed (
-      self->priv->channel, tp_file_state_changed_cb, NULL, NULL, object, NULL);
+      channel, tp_file_state_changed_cb, NULL, NULL, object, NULL);
 
-  tp_cli_channel_type_file_transfer_connect_to_transferred_bytes_changed (
-      self->priv->channel, tp_file_transferred_bytes_changed_cb,
-      NULL, NULL, object, NULL);
+  g_signal_connect (self, "notify::transferred-bytes",
+    G_CALLBACK (tp_file_transferred_bytes_changed_cb), self);
 
-  tp_cli_dbus_properties_call_get (self->priv->channel,
+  tp_cli_dbus_properties_call_get (channel,
       -1, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "State", tp_file_get_state_cb,
       NULL, NULL, object);
 
-  tp_cli_dbus_properties_call_get (self->priv->channel,
+  tp_cli_dbus_properties_call_get (channel,
       -1, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "AvailableSocketTypes",
       tp_file_get_available_socket_types_cb, NULL, NULL, object);
 
   self->priv->state_change_reason =
       TP_FILE_TRANSFER_STATE_CHANGE_REASON_NONE;
+
+  G_OBJECT_CLASS (empathy_tp_file_parent_class)->constructed (object);
 }
 
 static void
@@ -808,66 +749,32 @@ empathy_tp_file_class_init (EmpathyTpFileClass *klass)
   object_class->finalize = do_finalize;
   object_class->dispose = do_dispose;
   object_class->constructed = do_constructed;
-  object_class->get_property = do_get_property;
-  object_class->set_property = do_set_property;
-
-  /* Construct-only properties */
-
-  /**
-   * EmpathyTpFile:channel:
-   *
-   * The #TpChannel requested for the file transfer.
-   */
-  g_object_class_install_property (object_class,
-      PROP_CHANNEL,
-      g_param_spec_object ("channel",
-          "telepathy channel",
-          "The file transfer channel",
-          TP_TYPE_CHANNEL,
-          G_PARAM_READWRITE |
-          G_PARAM_CONSTRUCT_ONLY));
-
-  /**
-   * EmpathyTpFile:incoming:
-   *
-   * %TRUE if the transfer is incoming, %FALSE if it's outgoing.
-   */
-  g_object_class_install_property (object_class,
-      PROP_INCOMING,
-      g_param_spec_boolean ("incoming",
-          "direction of transfer",
-          "The direction of the file being transferred",
-          FALSE,
-          G_PARAM_READABLE));
 
   g_type_class_add_private (object_class, sizeof (EmpathyTpFilePrivate));
 }
 
 /* public methods */
 
-/**
- * empathy_tp_file_new:
- * @channel: a #TpChannel
- * @incoming: whether the file transfer is incoming or not
- *
- * Creates a new #EmpathyTpFile wrapping @channel.
- * The returned #EmpathyTpFile should be unrefed
- * with g_object_unref() when finished with.
- *
- * Return value: a new #EmpathyTpFile
- */
 EmpathyTpFile *
-empathy_tp_file_new (TpChannel *channel)
+empathy_tp_file_new (TpSimpleClientFactory *factory,
+    TpConnection *conn,
+    const gchar *object_path,
+    const GHashTable *immutable_properties,
+    GError **error)
 {
-  EmpathyTpFile *self;
-
-  g_return_val_if_fail (TP_IS_CHANNEL (channel), NULL);
-
-  self = g_object_new (EMPATHY_TYPE_TP_FILE,
-      "channel", channel,
-      NULL);
-
-  return self;
+  TpProxy *conn_proxy = (TpProxy *) conn;
+
+  g_return_val_if_fail (TP_IS_CONNECTION (conn), NULL);
+  g_return_val_if_fail (immutable_properties != NULL, NULL);
+
+  return g_object_new (EMPATHY_TYPE_TP_FILE,
+           "factory", factory,
+           "connection", conn,
+           "dbus-daemon", conn_proxy->dbus_daemon,
+           "bus-name", conn_proxy->bus_name,
+           "object-path", object_path,
+           "channel-properties", immutable_properties,
+           NULL);
 }
 
 /**
@@ -957,22 +864,6 @@ empathy_tp_file_offer (EmpathyTpFile *self,
 }
 
 /**
- * empathy_tp_file_is_incoming:
- * @self: an #EmpathyTpFile
- *
- * Returns whether @self is incoming.
- *
- * Return value: %TRUE if the @self is incoming, otherwise %FALSE
- */
-gboolean
-empathy_tp_file_is_incoming (EmpathyTpFile *self)
-{
-  g_return_val_if_fail (EMPATHY_IS_TP_FILE (self), FALSE);
-
-  return self->priv->incoming;
-}
-
-/**
  * empathy_tp_file_cancel:
  * @self: an #EmpathyTpFile
  *
diff --git a/libempathy/empathy-tp-file.h b/libempathy/empathy-tp-file.h
index aca8a0f89..6afb806df 100644
--- a/libempathy/empathy-tp-file.h
+++ b/libempathy/empathy-tp-file.h
@@ -27,7 +27,7 @@
 #include <gio/gio.h>
 #include <glib.h>
 
-#include <telepathy-glib/channel.h>
+#include <telepathy-glib/file-transfer-channel.h>
 
 G_BEGIN_DECLS
 
@@ -60,12 +60,12 @@ typedef struct _EmpathyTpFilePrivate EmpathyTpFilePrivate;
 typedef struct _EmpathyTpFileClass EmpathyTpFileClass;
 
 struct _EmpathyTpFile {
-  GObject  parent;
+  TpFileTransferChannel  parent;
   EmpathyTpFilePrivate *priv;
 };
 
 struct _EmpathyTpFileClass {
-  GObjectClass parent_class;
+  TpFileTransferChannelClass parent_class;
 };
 
 /* prototypes for operation callbacks */
@@ -96,7 +96,11 @@ GType empathy_tp_file_get_type (void) G_GNUC_CONST;
 
 /* public methods */
 
-EmpathyTpFile * empathy_tp_file_new (TpChannel *channel);
+EmpathyTpFile * empathy_tp_file_new (TpSimpleClientFactory *factory,
+    TpConnection *conn,
+    const gchar *object_path,
+    const GHashTable *immutable_properties,
+    GError **error);
 
 void empathy_tp_file_accept (EmpathyTpFile *tp_file,
     guint64 offset,
@@ -118,8 +122,6 @@ void empathy_tp_file_offer (EmpathyTpFile *tp_file,
 void empathy_tp_file_cancel (EmpathyTpFile *tp_file);
 void empathy_tp_file_close (EmpathyTpFile *tp_file);
 
-gboolean empathy_tp_file_is_incoming (EmpathyTpFile *tp_file);
-
 G_END_DECLS
 
 #endif /* __EMPATHY_TP_FILE_H__ */
diff --git a/libempathy/empathy-tp-roomlist.c b/libempathy/empathy-tp-roomlist.c
index d66bfc0f1..1e53facdc 100644
--- a/libempathy/empathy-tp-roomlist.c
+++ b/libempathy/empathy-tp-roomlist.c
@@ -275,7 +275,7 @@ tp_roomlist_create_channel_cb (GObject *source,
 	if (priv->channel == NULL) {
 		DEBUG ("Error creating channel: %s", error->message);
 		g_error_free (error);
-		return;
+		goto out;
 	}
 
 	g_signal_connect (priv->channel, "invalidated",
@@ -299,9 +299,12 @@ tp_roomlist_create_channel_cb (GObject *source,
 
 	if (priv->start_requested == TRUE) {
 		tp_cli_channel_type_room_list_call_list_rooms (priv->channel, -1,
-			call_list_rooms_cb, self, NULL, NULL);
+			call_list_rooms_cb, self, NULL, G_OBJECT (self));
 		priv->start_requested = FALSE;
 	}
+
+out:
+	g_object_unref (self);
 }
 
 static void
@@ -348,6 +351,9 @@ tp_roomlist_constructed (GObject *list)
 	req = tp_account_channel_request_new (priv->account, request,
 		TP_USER_ACTION_TIME_CURRENT_TIME);
 
+	/* Ensure we stay alive during the async call */
+	g_object_ref (list);
+
 	tp_account_channel_request_create_and_handle_channel_async (req, NULL,
 		tp_roomlist_create_channel_cb, list);
 
@@ -426,7 +432,7 @@ empathy_tp_roomlist_class_init (EmpathyTpRoomlistClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      g_cclosure_marshal_VOID__OBJECT,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE,
 			      1, EMPATHY_TYPE_CHATROOM);
 
@@ -436,7 +442,7 @@ empathy_tp_roomlist_class_init (EmpathyTpRoomlistClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE,
 			      0);
 
@@ -446,7 +452,7 @@ empathy_tp_roomlist_class_init (EmpathyTpRoomlistClass *klass)
 			      G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
 			      0,
 			      NULL, NULL,
-			      g_cclosure_marshal_VOID__POINTER,
+			      g_cclosure_marshal_generic,
 			      G_TYPE_NONE,
 			      1, G_TYPE_POINTER);
 
diff --git a/libempathy/empathy-tp-streamed-media.c b/libempathy/empathy-tp-streamed-media.c
index b79e4b6b5..87ca01db5 100644
--- a/libempathy/empathy-tp-streamed-media.c
+++ b/libempathy/empathy-tp-streamed-media.c
@@ -30,7 +30,6 @@
 #include "empathy-tp-streamed-media.h"
 #include "empathy-tp-contact-factory.h"
 #include "empathy-utils.h"
-#include "empathy-marshal.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include "empathy-debug.h"
@@ -566,7 +565,7 @@ empathy_tp_streamed_media_class_init (EmpathyTpStreamedMediaClass *klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0,
       NULL, NULL,
-      _empathy_marshal_VOID__UINT_STRING,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       2, G_TYPE_UINT, G_TYPE_STRING);
 
@@ -575,7 +574,7 @@ empathy_tp_streamed_media_class_init (EmpathyTpStreamedMediaClass *klass)
       G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0,
       NULL, NULL,
-      _empathy_marshal_VOID__UINT_STRING,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       2, G_TYPE_UINT, G_TYPE_STRING);
 }
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index a1047334d..9eec82e74 100644
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -80,6 +80,16 @@ static struct {
   { NULL, },
 };
 
+static gboolean
+properties_contains (gchar **list,
+		     gint length,
+		     const gchar *property);
+
+static gboolean
+check_writeable_property (TpConnection *connection,
+			  FolksIndividual *individual,
+			  gchar *property);
+
 void
 empathy_init (void)
 {
@@ -727,6 +737,12 @@ empathy_contact_dup_from_folks_individual (FolksIndividual *individual)
     }
   g_clear_object (&iter);
 
+  if (contact == NULL)
+    {
+      DEBUG ("Can't create an EmpathyContact for Individual %s",
+          folks_individual_get_id (individual));
+    }
+
   return contact;
 }
 
@@ -798,10 +814,10 @@ empathy_connection_can_add_personas (TpConnection *connection)
 }
 
 gboolean
-empathy_connection_can_alias_personas (TpConnection *connection)
+empathy_connection_can_alias_personas (TpConnection *connection,
+				       FolksIndividual *individual)
 {
   gboolean retval;
-  FolksPersonaStore *persona_store;
 
   g_return_val_if_fail (TP_IS_CONNECTION (connection), FALSE);
 
@@ -809,22 +825,16 @@ empathy_connection_can_alias_personas (TpConnection *connection)
           TP_CONNECTION_STATUS_CONNECTED)
       return FALSE;
 
-  persona_store = FOLKS_PERSONA_STORE (
-      empathy_dup_persona_store_for_connection (connection));
-
-  retval = (folks_persona_store_get_can_alias_personas (persona_store) ==
-      FOLKS_MAYBE_BOOL_TRUE);
-
-  g_clear_object (&persona_store);
+  retval = check_writeable_property (connection, individual, "alias");
 
   return retval;
 }
 
 gboolean
-empathy_connection_can_group_personas (TpConnection *connection)
+empathy_connection_can_group_personas (TpConnection *connection,
+				       FolksIndividual *individual)
 {
   gboolean retval;
-  FolksPersonaStore *persona_store;
 
   g_return_val_if_fail (TP_IS_CONNECTION (connection), FALSE);
 
@@ -832,13 +842,7 @@ empathy_connection_can_group_personas (TpConnection *connection)
           TP_CONNECTION_STATUS_CONNECTED)
       return FALSE;
 
-  persona_store = FOLKS_PERSONA_STORE (
-      empathy_dup_persona_store_for_connection (connection));
-
-  retval = (folks_persona_store_get_can_group_personas (persona_store) ==
-      FOLKS_MAYBE_BOOL_TRUE);
-
-  g_clear_object (&persona_store);
+  retval = check_writeable_property (connection, individual, "groups");
 
   return retval;
 }
@@ -988,3 +992,101 @@ empathy_account_has_uri_scheme_tel (TpAccount *account)
 
   return FALSE;
 }
+
+/* Return the TpContact on @conn associated with @individual, if any */
+TpContact *
+empathy_get_tp_contact_for_individual (FolksIndividual *individual,
+    TpConnection *conn)
+{
+  TpContact *contact = NULL;
+  GeeSet *personas;
+  GeeIterator *iter;
+
+  personas = folks_individual_get_personas (individual);
+  iter = gee_iterable_iterator (GEE_ITERABLE (personas));
+  while (contact == NULL && gee_iterator_next (iter))
+    {
+      TpfPersona *persona = gee_iterator_get (iter);
+      TpConnection *contact_conn;
+      TpContact *contact_cur = NULL;
+
+      if (TPF_IS_PERSONA (persona))
+        {
+          contact_cur = tpf_persona_get_contact (persona);
+          if (contact_cur != NULL)
+            {
+              contact_conn = tp_contact_get_connection (contact_cur);
+
+              if (!tp_strdiff (tp_proxy_get_object_path (contact_conn),
+                    tp_proxy_get_object_path (conn)))
+                contact = contact_cur;
+            }
+        }
+
+      g_clear_object (&persona);
+    }
+  g_clear_object (&iter);
+
+  return contact;
+}
+
+static gboolean
+properties_contains (gchar **list,
+		     gint length,
+		     const gchar *property)
+{
+  gint i;
+
+  for (i = 0; i < length; i++)
+    {
+      if (!tp_strdiff (list[i], property))
+	return TRUE;
+    }
+
+  return FALSE;
+}
+
+static gboolean
+check_writeable_property (TpConnection *connection,
+			  FolksIndividual *individual,
+			  gchar *property)
+{
+  gchar **properties;
+  gint prop_len;
+  gboolean retval = FALSE;
+  GeeSet *personas;
+  GeeIterator *iter;
+  FolksPersonaStore *persona_store;
+
+  persona_store = FOLKS_PERSONA_STORE (
+      empathy_dup_persona_store_for_connection (connection));
+
+  properties =
+    folks_persona_store_get_always_writeable_properties (persona_store,
+							 &prop_len);
+  retval = properties_contains (properties, prop_len, property);
+  if (retval == TRUE)
+    goto out;
+
+  /* Lets see if the Individual contains a Persona with the given property */
+  personas = folks_individual_get_personas (individual);
+  iter = gee_iterable_iterator (GEE_ITERABLE (personas));
+  while (!retval && gee_iterator_next (iter))
+    {
+      FolksPersona *persona = gee_iterator_get (iter);
+
+      properties =
+	folks_persona_get_writeable_properties (persona, &prop_len);
+      retval = properties_contains (properties, prop_len, property);
+
+      g_clear_object (&persona);
+
+      if (retval == TRUE)
+	break;
+    }
+  g_clear_object (&iter);
+
+out:
+  g_clear_object (&persona_store);
+  return retval;
+}
diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h
index fb25d7a99..ed603a80f 100644
--- a/libempathy/empathy-utils.h
+++ b/libempathy/empathy-utils.h
@@ -96,8 +96,10 @@ TpChannelGroupChangeReason tp_channel_group_change_reason_from_folks_groups_chan
 TpfPersonaStore * empathy_dup_persona_store_for_connection (
     TpConnection *connection);
 gboolean empathy_connection_can_add_personas (TpConnection *connection);
-gboolean empathy_connection_can_alias_personas (TpConnection *connection);
-gboolean empathy_connection_can_group_personas (TpConnection *connection);
+gboolean empathy_connection_can_alias_personas (TpConnection *connection,
+						FolksIndividual *individual);
+gboolean empathy_connection_can_group_personas (TpConnection *connection,
+						FolksIndividual *individual);
 gboolean empathy_folks_persona_is_interesting (FolksPersona *persona);
 
 gchar * empathy_get_x509_certificate_hostname (gnutls_x509_crt_t cert);
@@ -108,6 +110,9 @@ gchar *empathy_format_currency (gint amount,
 
 gboolean empathy_account_has_uri_scheme_tel (TpAccount *account);
 
+TpContact * empathy_get_tp_contact_for_individual (FolksIndividual *individual,
+    TpConnection *conn);
+
 /* Copied from wocky/wocky-utils.h */
 
 #define empathy_implement_finish_void(source, tag) \
diff --git a/m4/gsettings.m4 b/m4/gsettings.m4
index b68698980..76b808ae6 100644
--- a/m4/gsettings.m4
+++ b/m4/gsettings.m4
@@ -36,22 +36,10 @@ install-data-am: install-gsettings-schemas
 
 .SECONDARY: $(gsettings_SCHEMAS)
 
-gsettings__base_list = \
-  sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \
-  sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g"
-
-install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid)
+install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
 	@$(NORMAL_INSTALL)
 	test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"
-	@list='\''$(gsettings_SCHEMAS)'\''; test -n "$(gsettingsschemadir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(gsettings__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '\''$(DESTDIR)$(gsettingsschemadir)'\''"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(gsettingsschemadir)" || exit $$?; \
-	done
+	$(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"
 	test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
 
 uninstall-gsettings-schemas:
diff --git a/nautilus-sendto-plugin/empathy-nautilus-sendto.c b/nautilus-sendto-plugin/empathy-nautilus-sendto.c
index c480e02f7..2f38b8325 100644
--- a/nautilus-sendto-plugin/empathy-nautilus-sendto.c
+++ b/nautilus-sendto-plugin/empathy-nautilus-sendto.c
@@ -31,12 +31,11 @@
 
 #include <libempathy/empathy-contact.h>
 #include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-contact-manager.h>
 #include <libempathy/empathy-ft-factory.h>
 #include <libempathy/empathy-ft-handler.h>
 #include <libempathy/empathy-tp-file.h>
 
-#include <libempathy-gtk/empathy-contact-selector.h>
+#include <libempathy-gtk/empathy-contact-chooser.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
 
 #include "nautilus-sendto-plugin.h"
@@ -56,37 +55,84 @@ init (NstPlugin *plugin)
   return TRUE;
 }
 
+static EmpathyContact *
+dup_contact_from_individual (FolksIndividual *individual)
+{
+  EmpathyContact *contact;
+  gboolean can_do_action;
+
+  if (individual == NULL)
+    return NULL;
+
+  contact = empathy_contact_dup_best_for_action (individual,
+      EMPATHY_ACTION_SEND_FILE);
+  if (contact == NULL)
+    return NULL;
+
+  can_do_action = empathy_contact_can_do_action (contact,
+      EMPATHY_ACTION_SEND_FILE);
+
+  if (!can_do_action)
+    {
+      /* If contact can't do FT we don't care about him */
+      g_object_unref (contact);
+      return NULL;
+    }
+
+  return contact;
+}
+
+static gboolean
+filter_individual (EmpathyContactChooser *chooser,
+    FolksIndividual *individual,
+    gboolean is_online,
+    gboolean searching,
+    gpointer user_data)
+{
+  EmpathyContact *contact;
+
+  if (!is_online)
+    return FALSE;
+
+  contact = dup_contact_from_individual (individual);
+  if (contact == NULL)
+    return FALSE;
+
+  g_object_unref (contact);
+  return TRUE;
+}
+
 static GtkWidget *
 get_contacts_widget (NstPlugin *plugin)
 {
-  EmpathyContactManager *manager;
-  GtkWidget *selector;
+  GtkWidget *chooser;
 
-  manager = empathy_contact_manager_dup_singleton ();
-  selector = empathy_contact_selector_new (EMPATHY_CONTACT_LIST (manager));
+  chooser = empathy_contact_chooser_new ();
+  empathy_contact_chooser_set_filter_func (EMPATHY_CONTACT_CHOOSER (chooser),
+      filter_individual, plugin);
 
-  empathy_contact_selector_set_visible (EMPATHY_CONTACT_SELECTOR (selector),
-      (EmpathyContactSelectorFilterFunc) empathy_contact_can_send_files, NULL);
+  empathy_contact_chooser_show_search_entry (EMPATHY_CONTACT_CHOOSER (chooser),
+      FALSE);
 
-  g_object_unref (manager);
-
-  return selector;
+  /* Make sure to display some contacts */
+  gtk_widget_set_size_request (chooser, -1, 300);
+  return chooser;
 }
 
 static EmpathyContact *
-get_selected_contact (GtkWidget *contact_widget)
+get_selected_contact (GtkWidget *widget)
 {
+  FolksIndividual *individual;
   EmpathyContact *contact;
-  GtkTreeModel *model;
-  GtkTreeIter iter;
 
-  if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (contact_widget), &iter))
+  individual = empathy_contact_chooser_dup_selected (
+      EMPATHY_CONTACT_CHOOSER (widget));
+  if (individual == NULL)
     return NULL;
 
-  model = gtk_combo_box_get_model (GTK_COMBO_BOX (contact_widget));
-  gtk_tree_model_get (model, &iter,
-      EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact, -1);
+  contact = dup_contact_from_individual (individual);
 
+  g_object_unref (individual);
   return contact;
 }
 
@@ -100,24 +146,12 @@ validate_destination (NstPlugin *plugin,
 
   contact = get_selected_contact (contact_widget);
 
-  if (!contact)
+  if (contact == NULL)
     return FALSE;
 
-  if (!empathy_contact_can_send_files (contact))
-    {
-      *error = g_strdup (_("The selected contact cannot receive files."));
-      ret = FALSE;
-    }
-
-  if (ret && !empathy_contact_is_online (contact))
-    {
-      *error = g_strdup (_("The selected contact is offline."));
-      ret = FALSE;
-    }
-
   g_object_unref (contact);
 
-  return ret;
+  return TRUE;
 }
 
 static void
@@ -192,7 +226,7 @@ send_files (NstPlugin *plugin,
 
   contact = get_selected_contact (contact_widget);
 
-  if (!contact)
+  if (contact == NULL)
     return FALSE;
 
   factory = empathy_ft_factory_dup_singleton ();
@@ -210,7 +244,7 @@ send_files (NstPlugin *plugin,
       ++transfers;
 
       empathy_ft_factory_new_transfer_outgoing (factory,
-          contact, file);
+          contact, file, empathy_get_current_action_time ());
 
       g_object_unref (file);
     }
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1b60d8031..668d5f183 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -40,7 +40,6 @@ libempathy-gtk/empathy-contact-list-store.h
 libempathy-gtk/empathy-contact-list-view.c
 libempathy-gtk/empathy-contact-menu.c
 libempathy-gtk/empathy-contact-search-dialog.c
-libempathy-gtk/empathy-contact-selector.c
 libempathy-gtk/empathy-contact-widget.c
 [type: gettext/glade]libempathy-gtk/empathy-contact-widget.ui
 libempathy-gtk/empathy-groups-widget.c
@@ -114,7 +113,6 @@ src/empathy-map-view.c
 [type: gettext/glade]src/empathy-map-view.ui
 src/empathy-debug-window.c
 src/empathy-invite-participant-dialog.c
-src/cc-empathy-accounts-panel.c
 src/empathy-accounts.c
 src/empathy-av.c
 src/empathy-debugger.c
diff --git a/po/an.po b/po/an.po
index 473da96d0..691725635 100644
--- a/po/an.po
+++ b/po/an.po
@@ -7,16 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=empathy&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-04-08 10:10+0000\n"
-"PO-Revision-Date: 2011-04-11 18:16+0200\n"
+"product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2011-09-23 16:50+0000\n"
+"PO-Revision-Date: 2011-09-25 23:20+0200\n"
 "Last-Translator: Daniel Martinez Cucalon <entaltoaragon@gmail.com>\n"
 "Language-Team: Aragonese <softaragones@googlegroups.com>\n"
+"Language: an\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: an\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-DamnedLies-Scope: partial\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
@@ -39,385 +40,233 @@ msgid "Always open a separate chat window for new chats."
 msgstr "Ubrir una finestra direrent ta nuevas charradas."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Chat window theme"
-msgstr "Tema d'a finestra de chat"
+#| msgid "Call from %s"
+msgid "Call volume"
+msgstr "Volumen de la gritada"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr ""
+#| msgid "Camera On"
+msgid "Camera device"
+msgstr "Dispositivo de camara"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Compact contact list"
-msgstr "Lista de contactos preta"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-msgid "Connection managers should be used"
-msgstr ""
+#| msgid "Camera On"
+msgid "Camera position"
+msgstr "Posicion de la camara"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Contact list sort criterion"
-msgstr ""
+msgid "Chat window theme"
+msgstr "Tema d'a finestra de chat"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+msgid "Chat window theme variant"
+msgstr "Variante d'o tema d'a finestra de chat"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+msgid "Compact contact list"
+msgstr "Lista de contactos preta"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
 msgstr "Directorio por defecto d'an trigar un avatar"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr "Desactivar notificacions emerchents cuan siga ausent"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr "Desactivar sonius cuan siga ausent"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
 msgstr "Amostrar os eventos dentrantes en l'area d'estau"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr "Empathy puede publicar a localización d'o usuario"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy puede fer servir o GPS ta suposar a localización"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy puede fer servir o rete movil ta suposar a localización"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy puede fer servir o rete ta suposar a localización"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr "Carpeta predeterminada de descargas d'Empathy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
 msgstr "Empathy ha migrau os logs de butterfly"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy se meterá ausent automaticament cuan siga inactivo"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy s'enchegará automaticament al prencipie"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy reducirá a precisión d'a localización"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
 "Empathy ferá servir l'avatar d'o contacto como o icono d'a finestra de chat"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
-msgstr ""
+msgstr "Activar as ainas de desembolicador Webkit"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "Activar notificacions emerchents ta mensaches nuevos"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
-msgstr ""
+msgstr "Activar comprebador ortografico"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "Amagar finestra prencipal"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "Amagar a finestra prencipal"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Nick completed character"
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "Ubrir nuevas charradas en finestras separadas"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Path of the Adium theme to use"
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Fer sentir un soniu ta os mensaches dentrants"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "Fer sentir un soniu ta as nuevas charradas"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Fer sentir un soniu ta os mensaches salients"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "Fer sentir un soniu cuando un contacto s'enchega"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "Fer sentir un soniu cuando un contacto se desenchega"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Play a sound when we log in"
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Play a sound when we log out"
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Pop up notifications if the chat isn't focused"
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Pop up notifications when a contact logs in"
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Pop up notifications when a contact logs out"
-msgstr ""
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+msgid "Show Balance in contact list"
+msgstr "Amostrar credito en a lista de contactos"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "Amostrar avatars"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "Amostrar lista de contactos en salas"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Show hint about closing the main window"
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr "Amostrar contactos desenchegaus"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
 msgstr "Amostrar protocols"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Spell checking languages"
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "The default folder to save file transfers in."
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
 msgstr "O zaguero directorio d'an s'ha trigau un avatar."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "The position for the chat window side pane"
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Fer servir emoticons graficos"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "Fer servir sonius de notificación"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "Fer servir tema ta salas de charrada"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr ""
-"Dice cuan Empathy puede publicar a localizacion d'o usuario a os suyos "
+"Dice si Empathy puede publicar a localizacion d'o usuario a os suyos "
 "contactos."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Dice cuan Empathy puede usar o GPS ta suposar a localización."
+msgstr "Dice si Empathy puede usar o GPS ta suposar a localización."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
-"Dice cuan Empathy puede fer servir o rete movil ta suposar a localización."
+"Dice si Empathy puede fer servir o rete movil ta suposar a localización."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
-msgstr "Dice cuan Empathy puede fer servir o rete ta suposar a localizacio�n."
+msgstr "Dice si Empathy puede fer servir o rete ta suposar a localizacio�n."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "Dice si Empathy ha migrau os rechistros de butterfly."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr ""
+"Dice si Empathy ha d'encetar seson en as suyas cuentas automaticament en "
+"dentrar."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
+"Dice si Empathy ha d'entrar en modo de ausencia automaticament cuan l'usario "
+"ye inactivo."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
+"Dice si Empathy habría de reducir a precision d'a ubicacion por motivos de "
+"privacidad."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
+"Dice si Empathy ha d'usar lo avatar d'o contacto como l'icono d'a finestra "
+"de chat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
+"Dice si as ainas de desembolique de WebKit, como l'inspector web, han "
+"d'activar-se."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether to play a sound to notify of events."
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid "Whether to play a sound to notify of new conversations."
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid "Whether to play a sound when logging into a network."
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid "Whether to play a sound when logging out of a network."
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid "Whether to play sound notifications when away or busy."
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to show popup notifications when away or busy."
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to show the contact list in chat rooms."
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to show the contact list in compact mode."
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to use the theme for chat rooms."
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
-msgstr ""
+"Dice si s'han de fer servir chestors de conectividat ta enchegar-se/"
+"reenchegar-se automaticament."
 
 #: ../data/empathy-accounts.desktop.in.in.h:1
 msgid "Manage Messaging and VoIP accounts"
@@ -425,7 +274,7 @@ msgstr "Chestionar cuentas de mensacheria y VoIP"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2269
+#: ../src/empathy-accounts-dialog.c:2324
 msgid "Messaging and VoIP Accounts"
 msgstr "Cuentas de mensacheria y VoIP"
 
@@ -433,18 +282,34 @@ msgstr "Cuentas de mensacheria y VoIP"
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Trasferencia d'archivo rematada, pero l'archivo ye corrupto."
 
-#: ../libempathy/empathy-ft-handler.c:1113
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
 msgstr "O contacto remoto no soporta a transferencia d'archivos"
 
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is not a regular file"
 msgstr "L'archivo trigau no ye un archivo regular"
 
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1176
 msgid "The selected file is empty"
 msgstr "L'archivo trigau ye buedo"
 
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#, c-format
+msgid "Missed call from %s"
+msgstr "Gritada perdida de %s"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, c-format
+msgid "Called %s"
+msgstr "Gritó %s"
+
+#: ../libempathy/empathy-message.c:422
+#, c-format
+msgid "Call from %s"
+msgstr "Gritada de %s"
+
 #: ../libempathy/empathy-tp-file.c:268
 msgid "Socket type not supported"
 msgstr "Tipo de socket no soportau"
@@ -473,298 +338,286 @@ msgstr "Error prebando de transferir l'archivo"
 msgid "The other participant is unable to transfer the file"
 msgstr "L'atro participant no puede transferir l'archivo"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:383
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
 msgid "Unknown reason"
 msgstr "Razón desconoxida"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:232
 msgid "Available"
 msgstr "Disposable"
 
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:234
 msgid "Busy"
 msgstr "Aqueferau"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:237
 msgid "Away"
 msgstr "Ausent"
 
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:239
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-utils.c:241
 msgid "Offline"
 msgstr "Desenchegau"
 
 #. translators: presence type is unknown
-#. translators: encoding video codec is unknown
-#. translators: encoding audio codec is unknown
-#. translators: decoding video codec is unknown
-#. translators: decoding audio codec is unknown
-#: ../libempathy/empathy-utils.c:316
-#: ../src/empathy-streamed-media-window.c:1905
-#: ../src/empathy-streamed-media-window.c:1907
-#: ../src/empathy-streamed-media-window.c:1909
-#: ../src/empathy-streamed-media-window.c:1911
-#: ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:244
+msgctxt "presence"
 msgid "Unknown"
 msgstr "Desconoxiu"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:284
 msgid "No reason specified"
 msgstr "Denguna razón especificada"
 
-#: ../libempathy/empathy-utils.c:357 ../libempathy/empathy-utils.c:413
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
 msgid "Status is set to offline"
 msgstr "L'estau s'ha meso como desenchegau"
 
-#: ../libempathy/empathy-utils.c:359 ../libempathy/empathy-utils.c:393
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "Error de rete"
 
-#: ../libempathy/empathy-utils.c:361 ../libempathy/empathy-utils.c:395
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
 msgid "Authentication failed"
 msgstr "Error d'autenticación"
 
-#: ../libempathy/empathy-utils.c:363 ../libempathy/empathy-utils.c:397
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
 msgid "Encryption error"
 msgstr "Error de cifrau"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:294
 msgid "Name in use"
 msgstr "Nome en uso"
 
-#: ../libempathy/empathy-utils.c:367 ../libempathy/empathy-utils.c:399
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate not provided"
-msgstr "Certifucau no proporcionau"
+msgstr "Certificau no proporcionau"
 
-#: ../libempathy/empathy-utils.c:369 ../libempathy/empathy-utils.c:401
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate untrusted"
 msgstr "Certificau no seguro"
 
-#: ../libempathy/empathy-utils.c:371 ../libempathy/empathy-utils.c:403
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
 msgid "Certificate expired"
 msgstr "Certificau caducau"
 
-#: ../libempathy/empathy-utils.c:373 ../libempathy/empathy-utils.c:405
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
 msgid "Certificate not activated"
-msgstr "Certifucau no activau"
+msgstr "Certificau no activau"
 
-#: ../libempathy/empathy-utils.c:375 ../libempathy/empathy-utils.c:407
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
 msgid "Certificate hostname mismatch"
-msgstr ""
+msgstr "O nome d'o equipo d'o certificau no coincide"
 
-#: ../libempathy/empathy-utils.c:377 ../libempathy/empathy-utils.c:409
+#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
 msgid "Certificate fingerprint mismatch"
-msgstr ""
+msgstr "O rastro d'o certificau no coincide"
 
-#: ../libempathy/empathy-utils.c:379 ../libempathy/empathy-utils.c:411
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
 msgid "Certificate self-signed"
-msgstr ""
+msgstr "Certificau firmau consigo mesmo"
 
-#: ../libempathy/empathy-utils.c:381
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate error"
 msgstr "Error de certificau"
 
-#: ../libempathy/empathy-utils.c:415
+#: ../libempathy/empathy-utils.c:344
 msgid "Encryption is not available"
 msgstr "Cifrau no disposable"
 
-#: ../libempathy/empathy-utils.c:417
+#: ../libempathy/empathy-utils.c:346
 msgid "Certificate is invalid"
 msgstr "O certificau no ye valido"
 
-#: ../libempathy/empathy-utils.c:419
+#: ../libempathy/empathy-utils.c:348
 msgid "Connection has been refused"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:421
+#: ../libempathy/empathy-utils.c:350
 msgid "Connection can't be established"
 msgstr "No se puede establir a conixión"
 
-#: ../libempathy/empathy-utils.c:423
+#: ../libempathy/empathy-utils.c:352
 msgid "Connection has been lost"
 msgstr "A conixión s'ha perdiu"
 
-#: ../libempathy/empathy-utils.c:425
+#: ../libempathy/empathy-utils.c:354
 msgid "This resource is already connected to the server"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:427
+#: ../libempathy/empathy-utils.c:356
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:430
+#: ../libempathy/empathy-utils.c:359
 msgid "The account already exists on the server"
 msgstr "A cuenta ya existe en o servidor"
 
-#: ../libempathy/empathy-utils.c:432
+#: ../libempathy/empathy-utils.c:361
 msgid "Server is currently too busy to handle the connection"
 msgstr "O servidor ye masiau aqueferau ta manellar a conixión"
 
-#: ../libempathy/empathy-utils.c:434
+#: ../libempathy/empathy-utils.c:363
 msgid "Certificate has been revoked"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:436
+#: ../libempathy/empathy-utils.c:365
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:439
+#: ../libempathy/empathy-utils.c:368
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:602
+#: ../libempathy/empathy-utils.c:529
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "Chent a man"
 
-#: ../libempathy/empathy-utils.c:607
+#: ../libempathy/empathy-utils.c:534
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Chapón"
 
-#: ../libempathy/empathy-utils.c:636
+#: ../libempathy/empathy-utils.c:563
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:637
+#: ../libempathy/empathy-utils.c:564
 msgid "Facebook Chat"
 msgstr "Chat de Facebook"
 
-#: ../libempathy/empathy-time.c:137
+#: ../libempathy/empathy-time.c:88
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "fa %d segundo"
 msgstr[1] "fa %d segundos"
 
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:93
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "fa %d menuto"
 msgstr[1] "fa %d menutos"
 
-#: ../libempathy/empathy-time.c:147
+#: ../libempathy/empathy-time.c:98
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "fa %d hora"
 msgstr[1] "fa %d horas"
 
-#: ../libempathy/empathy-time.c:152
+#: ../libempathy/empathy-time.c:103
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "fa %d diya"
 msgstr[1] "fa %d diyas"
 
-#: ../libempathy/empathy-time.c:157
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "fa %d semana"
 msgstr[1] "fa %d semanas"
 
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:113
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "fa %d mes"
 msgstr[1] "fa %d meses"
 
-#: ../libempathy/empathy-time.c:167
+#: ../libempathy/empathy-time.c:136
 msgid "in the future"
 msgstr "en l'esvenidero"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:491
-msgid "All"
-msgstr "Tot"
+#: ../libempathy-gtk/empathy-account-chooser.c:540
+msgid "All accounts"
+msgstr "Todas as cuentas"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../libempathy-gtk/empathy-log-window.c:643
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "Cuenta"
 
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "Clau de paso"
 
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:685
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Puerto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:757
-#: ../libempathy-gtk/empathy-account-widget.c:814
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1166
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+#| msgid "_Accounts"
+msgid "My Web Accounts"
+msgstr "As mias cuentas web"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr ""
+#| msgid "The account %s cannot be edited in Empathy."
+msgid "The account %s is edited via %s."
+msgstr "A cuenta %s s'edita a travies de %s."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1172
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "A cuenta %s no se puet editar en Empathy."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
-msgstr ""
+msgstr "Lanzar as mias cuentas web"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1530
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+#| msgid "_Edit"
+msgid "Edit %s"
+msgstr "Editar %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Nome d'usuario:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1897
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "A_plicar"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1927
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
-msgstr ""
+msgstr "Encetar _sesion"
 
-#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1993
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:520
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1481
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "Cuenta:"
-
-#. translators: this is the label of a checkbox used to enable/disable IM
-#. * accounts
-#: ../libempathy-gtk/empathy-account-widget.c:2006
-msgid "_Enabled"
-msgstr "_Activau"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2071
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "Ista cuenta ya existe en o servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2074
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "Creyar una nueva cuenta en o servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2266
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "Ca_ncelar"
 
@@ -773,19 +626,19 @@ msgstr "Ca_ncelar"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2563
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s en %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2589
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "Cuenta de %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2593
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "Cuenta nueva"
 
@@ -797,6 +650,7 @@ msgstr "<b>Exemplo:</b> NombreTaAmostrar"
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -810,7 +664,7 @@ msgstr "Avanzau"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "Pass_word:"
 msgstr "Cla_u de paso:"
@@ -820,7 +674,7 @@ msgstr "Cla_u de paso:"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
 msgid "Remember Password"
 msgstr "Remerar clau de paso"
 
@@ -830,7 +684,7 @@ msgstr "Remerar clau de paso"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 #: ../libempathy-gtk/empathy-password-dialog.c:311
 msgid "Remember password"
@@ -838,7 +692,7 @@ msgstr "Remerar clau de paso"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 msgid "Screen _Name:"
-msgstr ""
+msgstr "_Nome en pantalla:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
 msgid "What is your AIM password?"
@@ -875,7 +729,7 @@ msgstr "<b>Exemplo:</b> nomedusuario"
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "Login I_D:"
-msgstr ""
+msgstr "_ID de sesion:"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
 msgid "What is your GroupWise User ID?"
@@ -906,76 +760,82 @@ msgstr "¿Cualo ye lo tuyo ICQ UIN?"
 msgid "What is your ICQ password?"
 msgstr "¿Cuala ye la tuya clau d'ICQ?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:183
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "Automatico"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:221
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "Rechistrar"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:226
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "Opcions"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "Denguna"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Character set:"
 msgstr "Conchunto de caracteres"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Network"
 msgstr "Rete"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Network:"
 msgstr "Rete:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "Clau de paso:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
-msgstr ""
+msgstr "Mensache de surtida:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "Nome reyal:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Servers"
 msgstr "Servidors"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "What is your IRC nickname?"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "¿Cualo rete de IRC?"
 
@@ -997,7 +857,7 @@ msgstr "No parar cuenta d'as errors de certificau SSL"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Override server settings"
-msgstr ""
+msgstr "Sobreescribir os achustes d'o servidor"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
 msgid "Priori_ty:"
@@ -1109,58 +969,67 @@ msgid "Discover the STUN server automatically"
 msgstr ""
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Interval (seconds)"
+msgid "Ignore TLS Errors"
 msgstr ""
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Keep-Alive Options"
+msgid "Interval (seconds)"
 msgstr ""
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Loose Routing"
-msgstr ""
+msgid "Keep-Alive Options"
+msgstr "Opcions de «keepalive»"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Mechanism:"
+msgid "Loose Routing"
 msgstr ""
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+msgid "Mechanism:"
+msgstr "Mecanismo:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
 msgid "Miscellaneous Options"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 msgid "NAT Traversal Options"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 msgid "Port:"
 msgstr "Puerto:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 msgid "Proxy Options"
 msgstr "Opcions de proxy"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "STUN Server:"
 msgstr "Servidor STUN:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.c:347
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid "Transport:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Fer servir ista cuenta ta gritar a te_lefonos fixos y moviles"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "¿Cuala ye la tuya clau d'a cuenta SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "¿Cualo ye lo tuyo ID de login SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "Nome d'_usuario:"
 
@@ -1184,329 +1053,415 @@ msgstr "I_D de Yahoo!:"
 msgid "_Room List locale:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:448
-#: ../libempathy-gtk/empathy-avatar-chooser.c:524
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "No s'ha puesto convertir a imachen"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:930
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+#| msgid "Couldn't convert image"
+msgid "Couldn't save picture to file"
+msgstr "No s'ha puesto alzar a imachen a un archivo"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "Trigar a tuya imachen d'Avatar"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
+msgid "Take a picture..."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "Sin imachen"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:995
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "Imachens"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:999
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "Totz os archivos"
 
 #: ../libempathy-gtk/empathy-avatar-image.c:322
 msgid "Click to enlarge"
+msgstr "Prete ta engrandar"
+
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
+msgid "There was an error starting the call"
+msgstr "Habió una error en prencipiar a gritada"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact doesn't support calls"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:652
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is offline"
+msgstr "O contacto especificau ye desenchegau"
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "The specified contact is not valid"
+msgstr "O contacto especificau no ye valido"
+
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "Emergency calls are not supported on this protocol"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:704
 msgid "Failed to open private chat"
 msgstr "No s'ha puesto ubrir chat privau"
 
-#: ../libempathy-gtk/empathy-chat.c:717
+#: ../libempathy-gtk/empathy-chat.c:765
 msgid "Topic not supported on this conversation"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:723
+#: ../libempathy-gtk/empathy-chat.c:771
 msgid "You are not allowed to change the topic"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:930
+#: ../libempathy-gtk/empathy-chat.c:975
+#, c-format
+msgid "“%s� is not a valid contact ID"
+msgstr "%s no ye un identificador de contacto valido"
+
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:933
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:936
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "/join <chat room ID>: join a new chat room"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:939
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid "/j <chat room ID>: join a new chat room"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:944
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:949
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:952
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:955
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:958
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:961
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:966
+#: ../libempathy-gtk/empathy-chat.c:1094
+msgid "/whois <contact ID>: display information about a contact"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:976
+#: ../libempathy-gtk/empathy-chat.c:1114
 #, c-format
 msgid "Usage: %s"
 msgstr "Uso: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1015
+#: ../libempathy-gtk/empathy-chat.c:1159
 msgid "Unknown command"
-msgstr ""
+msgstr "Comando desconoxiu"
 
-#: ../libempathy-gtk/empathy-chat.c:1141
+#: ../libempathy-gtk/empathy-chat.c:1285
 msgid "Unknown command; see /help for the available commands"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1278
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1455
+msgid "insufficient balance to send message"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1457
+msgid "not capable"
+msgstr "no ye posible"
+
+#: ../libempathy-gtk/empathy-chat.c:1464
 msgid "offline"
 msgstr "desenchegau"
 
-#: ../libempathy-gtk/empathy-chat.c:1281
+#: ../libempathy-gtk/empathy-chat.c:1467
 msgid "invalid contact"
 msgstr "contacto no valido"
 
-#: ../libempathy-gtk/empathy-chat.c:1284
+#: ../libempathy-gtk/empathy-chat.c:1470
 msgid "permission denied"
-msgstr ""
+msgstr "permiso denegau"
 
-#: ../libempathy-gtk/empathy-chat.c:1287
+#: ../libempathy-gtk/empathy-chat.c:1473
 msgid "too long message"
 msgstr "mensache masiau gran"
 
-#: ../libempathy-gtk/empathy-chat.c:1290
+#: ../libempathy-gtk/empathy-chat.c:1476
 msgid "not implemented"
 msgstr "sin implementar"
 
-#: ../libempathy-gtk/empathy-chat.c:1294
+#: ../libempathy-gtk/empathy-chat.c:1480
 msgid "unknown"
 msgstr "desconoxiu"
 
-#: ../libempathy-gtk/empathy-chat.c:1298
+#: ../libempathy-gtk/empathy-chat.c:1486
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Error ninviando lo mensache '%s': %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1359 ../src/empathy-chat-window.c:717
+#: ../libempathy-gtk/empathy-chat.c:1490
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Error ninviando lo mensache: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Tema:"
 
-#: ../libempathy-gtk/empathy-chat.c:1371
+#: ../libempathy-gtk/empathy-chat.c:1563
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Tema meso a: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1373
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "No topic defined"
 msgstr "Tema sin definir"
 
-#: ../libempathy-gtk/empathy-chat.c:1872
+#: ../libempathy-gtk/empathy-chat.c:2074
 msgid "(No Suggestions)"
-msgstr ""
+msgstr "(Sin de sucherencias)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1940
+#: ../libempathy-gtk/empathy-chat.c:2142
 #, c-format
 msgid "Add '%s' to Dictionary"
-msgstr ""
+msgstr "Anyadir '%s' a o diccionario"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1977
+#: ../libempathy-gtk/empathy-chat.c:2179
 #, c-format
 msgid "Add '%s' to %s Dictionary"
-msgstr ""
+msgstr "Anyadir '%s' a lo dicionario de '%s'"
 
-#: ../libempathy-gtk/empathy-chat.c:2034
+#: ../libempathy-gtk/empathy-chat.c:2249
 msgid "Insert Smiley"
 msgstr "Meter emoticon"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2052
-#: ../libempathy-gtk/empathy-ui-utils.c:1808
+#: ../libempathy-gtk/empathy-chat.c:2267
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "_Ninviar"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2087
+#: ../libempathy-gtk/empathy-chat.c:2321
 msgid "_Spelling Suggestions"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2176
+#: ../libempathy-gtk/empathy-chat.c:2410
 msgid "Failed to retrieve recent logs"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2287
+#: ../libempathy-gtk/empathy-chat.c:2547
 #, c-format
 msgid "%s has disconnected"
-msgstr "% s'ha desenchegau"
+msgstr "%s s'ha desenchegau"
 
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2294
+#: ../libempathy-gtk/empathy-chat.c:2554
 #, c-format
 msgid "%1$s was kicked by %2$s"
-msgstr ""
+msgstr "%2$s echó a %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2297
+#: ../libempathy-gtk/empathy-chat.c:2557
 #, c-format
 msgid "%s was kicked"
-msgstr ""
+msgstr "%s estió echau"
 
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2305
+#: ../libempathy-gtk/empathy-chat.c:2565
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2308
+#: ../libempathy-gtk/empathy-chat.c:2568
 #, c-format
 msgid "%s was banned"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2312
+#: ../libempathy-gtk/empathy-chat.c:2572
 #, c-format
 msgid "%s has left the room"
-msgstr ""
+msgstr "%s ha dixau la sala"
 
 #. Note to translators: this string is appended to
 #. * notifications like "foo has left the room", with the message
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2321
+#: ../libempathy-gtk/empathy-chat.c:2581
 #, c-format
 msgid " (%s)"
 msgstr "(%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2346
+#: ../libempathy-gtk/empathy-chat.c:2606
 #, c-format
 msgid "%s has joined the room"
-msgstr ""
+msgstr "%s ha dentrau en a sala"
 
-#: ../libempathy-gtk/empathy-chat.c:2371
+#: ../libempathy-gtk/empathy-chat.c:2631
 #, c-format
 msgid "%s is now known as %s"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-chat.c:2510
-#: ../src/empathy-streamed-media-window.c:1953
-#: ../src/empathy-event-manager.c:1126
+msgstr "Agora %s se dice %s"
+
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2784
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
+#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
 msgid "Disconnected"
 msgstr "Desenchegau"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3140
+#: ../libempathy-gtk/empathy-chat.c:3428
 msgid "Would you like to store this password?"
-msgstr "¿Te gustaria guardar ista clau?"
+msgstr "Te cuacaria alzar ista clau?"
 
-#: ../libempathy-gtk/empathy-chat.c:3146
+#: ../libempathy-gtk/empathy-chat.c:3434
 msgid "Remember"
 msgstr "Remerar"
 
-#: ../libempathy-gtk/empathy-chat.c:3156
+#: ../libempathy-gtk/empathy-chat.c:3444
 msgid "Not now"
 msgstr "Agora no"
 
-#: ../libempathy-gtk/empathy-chat.c:3200
+#: ../libempathy-gtk/empathy-chat.c:3488
 msgid "Retry"
 msgstr "Prebar atra vegada"
 
-#: ../libempathy-gtk/empathy-chat.c:3204
+#: ../libempathy-gtk/empathy-chat.c:3492
 msgid "Wrong password; please try again:"
-msgstr ""
+msgstr "Clau de paso incorrecta; prebe atra vegada:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3321
+#: ../libempathy-gtk/empathy-chat.c:3622
 msgid "This room is protected by a password:"
-msgstr ""
+msgstr "Ista sala ye protechida mediantes d'una clau de paso:"
 
-#: ../libempathy-gtk/empathy-chat.c:3348
+#: ../libempathy-gtk/empathy-chat.c:3649
 msgid "Join"
 msgstr "Chuntar-se"
 
-#: ../libempathy-gtk/empathy-chat.c:3518 ../src/empathy-event-manager.c:1147
+#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "Enchegau"
 
-#: ../libempathy-gtk/empathy-chat.c:3571
-#: ../libempathy-gtk/empathy-log-window.c:650
+#: ../libempathy-gtk/empathy-chat.c:3906
 msgid "Conversation"
 msgstr "Charrada"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:422
-msgid "Unknown or invalid identifier"
-msgstr ""
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:3911
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (SMS)"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+msgid "Unknown or invalid identifier"
+msgstr "Identificador desconoxiu u no valido"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
 msgid "Contact blocking temporarily unavailable"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
 msgid "Contact blocking unavailable"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
 msgid "Permission Denied"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
 msgid "Could not block contact"
-msgstr ""
+msgstr "No s'ha puesto bloqueyar lo contacto"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:701
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
 msgid "Edit Blocked Contacts"
-msgstr ""
+msgstr "Editar contactos bloqueayaus"
+
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Account:"
+msgstr "Cuenta:"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "Contactos bloqueyaus"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Sacar"
 
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:794
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Copiar l'adreza d'o entrastre"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:801
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Ubrir enrastre"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:420
+#: ../libempathy-gtk/empathy-chat-text-view.c:415
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
@@ -1525,24 +1480,24 @@ msgid "New Contact"
 msgstr "Nuevo contacto"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:199
+#: ../libempathy-gtk/empathy-individual-dialogs.c:200
 #, c-format
 msgid "Block %s?"
-msgstr ""
+msgstr "Bloqueyar a %s?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:247
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr ""
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
 msgid "_Block"
-msgstr ""
+msgstr "_Bloqueyar"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:278
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] ""
@@ -1558,7 +1513,7 @@ msgstr ""
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
 msgid "_Block User"
-msgstr ""
+msgstr "_Bloqueyar usuario"
 
 #: ../libempathy-gtk/empathy-contact-list-store.h:71
 msgid "Ungrouped"
@@ -1566,323 +1521,349 @@ msgstr "Sin colla"
 
 #: ../libempathy-gtk/empathy-contact-list-store.h:72
 msgid "Favorite People"
-msgstr ""
+msgstr "Chent favorita"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1987
-#: ../libempathy-gtk/empathy-individual-view.c:2343
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1989
-#: ../libempathy-gtk/empathy-individual-view.c:2346
+#: ../libempathy-gtk/empathy-contact-list-view.c:1988
+#: ../libempathy-gtk/empathy-individual-view.c:2379
 msgid "Removing group"
 msgstr "Borrando colla"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2038
-#: ../libempathy-gtk/empathy-contact-list-view.c:2115
-#: ../libempathy-gtk/empathy-individual-view.c:2401
-#: ../libempathy-gtk/empathy-individual-view.c:2595
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../libempathy-gtk/empathy-contact-list-view.c:2037
+#: ../libempathy-gtk/empathy-contact-list-view.c:2114
+#: ../libempathy-gtk/empathy-individual-view.c:2434
+#: ../libempathy-gtk/empathy-individual-view.c:2637
 msgid "_Remove"
 msgstr "Borra_r"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2068
-#: ../libempathy-gtk/empathy-individual-view.c:2465
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
+#: ../libempathy-gtk/empathy-individual-view.c:2501
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2070
-#: ../libempathy-gtk/empathy-individual-view.c:2486
+#: ../libempathy-gtk/empathy-contact-list-view.c:2069
+#: ../libempathy-gtk/empathy-individual-view.c:2522
 msgid "Removing contact"
 msgstr "Borrando contacto"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:219
-#: ../src/empathy-main-window.ui.h:13
+#: ../libempathy-gtk/empathy-contact-menu.c:220
+#: ../src/empathy-main-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "_Anyadir contacto…"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:299
-#, fuzzy
-#| msgid "Contact"
+#: ../libempathy-gtk/empathy-contact-menu.c:300
 msgid "_Block Contact"
-msgstr "Contacto"
+msgstr "_Bloqueyar contacto"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:328
-#: ../libempathy-gtk/empathy-individual-menu.c:517
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:329
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
-msgstr ""
+msgstr "_Charrada"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:359
-#: ../libempathy-gtk/empathy-individual-menu.c:560
+#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
-msgstr ""
+msgstr "Gritada de vo_z"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:390
-#: ../libempathy-gtk/empathy-individual-menu.c:602
+#: ../libempathy-gtk/empathy-contact-menu.c:394
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
-msgstr ""
+msgstr "Gritada de _vidio"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:436
-#: ../libempathy-gtk/empathy-individual-menu.c:645
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:440
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "Charradas _anteriors"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:458
-#: ../libempathy-gtk/empathy-individual-menu.c:686
+#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "Ninviar archivo"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:481
-#: ../libempathy-gtk/empathy-individual-menu.c:728
+#: ../libempathy-gtk/empathy-contact-menu.c:485
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
-msgstr ""
+msgstr "Compartir o mio escritorio"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:521
-#: ../libempathy-gtk/empathy-contact-widget.c:1763
-#: ../libempathy-gtk/empathy-individual-menu.c:763
+#: ../libempathy-gtk/empathy-contact-menu.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:1886
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
 #: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
-msgstr ""
+msgstr "Favorita"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:550
-#: ../libempathy-gtk/empathy-individual-menu.c:791
+#: ../libempathy-gtk/empathy-contact-menu.c:554
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "Infor_mación"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:596
+#: ../libempathy-gtk/empathy-contact-menu.c:600
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:650
-#: ../libempathy-gtk/empathy-individual-menu.c:972
-#: ../src/empathy-chat-window.c:935
+#: ../libempathy-gtk/empathy-contact-menu.c:654
+#: ../libempathy-gtk/empathy-individual-menu.c:1284
+#: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
-msgstr ""
+msgstr "Convidando-le a ista sala"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:681
-#: ../libempathy-gtk/empathy-individual-menu.c:1019
+#: ../libempathy-gtk/empathy-contact-menu.c:685
+#: ../libempathy-gtk/empathy-individual-menu.c:1330
 msgid "_Invite to Chat Room"
 msgstr ""
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:513
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
 msgid "Search contacts"
 msgstr "Buscar contactos"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:543
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
 msgid "Search: "
 msgstr "Buscar:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:601
-#, fuzzy
-#| msgid "_Add Contact…"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
 msgid "_Add Contact"
-msgstr "_Anyadir contacto…"
+msgstr "_Anyadir contacto"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:619
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
 msgid "No contacts found"
 msgstr "No s'han trobau contactos"
 
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
+msgstr "Dixa-me veyer cuan ye enchegau. Gracias."
+
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "Trigar un contacto"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:295
+#: ../libempathy-gtk/empathy-contact-widget.c:336
 #: ../libempathy-gtk/empathy-individual-widget.c:153
 msgid "Full name:"
-msgstr ""
+msgstr "Nome completo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:296
+#: ../libempathy-gtk/empathy-contact-widget.c:337
 #: ../libempathy-gtk/empathy-individual-widget.c:154
 msgid "Phone number:"
 msgstr "Numero de telefono:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:297
+#: ../libempathy-gtk/empathy-contact-widget.c:338
 #: ../libempathy-gtk/empathy-individual-widget.c:155
 msgid "E-mail address:"
 msgstr "Adreza de e-mail:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:298
+#: ../libempathy-gtk/empathy-contact-widget.c:339
 #: ../libempathy-gtk/empathy-individual-widget.c:156
 msgid "Website:"
 msgstr "Pachina web:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:299
+#: ../libempathy-gtk/empathy-contact-widget.c:340
 #: ../libempathy-gtk/empathy-individual-widget.c:157
 msgid "Birthday:"
 msgstr "Cabo d'año:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:346
+msgid "Last seen:"
+msgstr "Zaguera actividat:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:348
+msgid "Connected from:"
+msgstr "Enchegau dende:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:353
+msgid "Away message:"
+msgstr "Mensache d'ausencia:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+msgid "Channels:"
+msgstr "Canals:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
-msgstr ""
+msgstr "Codigo ISO de pais:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Country:"
-msgstr ""
+msgstr "País:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "State:"
 msgstr "Estau:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:768
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "City:"
 msgstr "Ciudat:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:770
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Area:"
 msgstr "Area:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:772
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
 msgstr "Codigo postal:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:774
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Street:"
 msgstr "Carrera:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:776
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
-msgstr ""
+msgstr "Edificio:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:778
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Floor:"
-msgstr ""
+msgstr "Planta:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:780
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Room:"
-msgstr ""
+msgstr "Cambra:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:782
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Text:"
 msgstr "Texto:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:784
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Description:"
 msgstr "Descripcion:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:786
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
-msgstr ""
+msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
 msgstr "Ran de precisión:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:790
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr "Error:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:792
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:794
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr "Velocidat:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Bearing:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:800
-#: ../libempathy-gtk/empathy-individual-widget.c:526
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:802
-#: ../libempathy-gtk/empathy-individual-widget.c:528
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
 msgstr "Esviellau por zaguera vegada en:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:804
-#: ../libempathy-gtk/empathy-individual-widget.c:530
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
-msgstr ""
+msgstr "Lonchitut:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:806
-#: ../libempathy-gtk/empathy-individual-widget.c:532
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
-msgstr ""
+msgstr "Latitut:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:808
-#: ../libempathy-gtk/empathy-individual-widget.c:534
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
-msgstr ""
+msgstr "Altitut:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:871
-#: ../libempathy-gtk/empathy-contact-widget.c:888
-#: ../libempathy-gtk/empathy-individual-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:633
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "Localizacion"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:890
-#: ../libempathy-gtk/empathy-individual-widget.c:635
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:942
-#: ../libempathy-gtk/empathy-individual-widget.c:684
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e de %B de %Y a las %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1024
-#: ../libempathy-gtk/empathy-individual-widget.c:919
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
 msgid "Save Avatar"
-msgstr ""
+msgstr "Alzar avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1080
-#: ../libempathy-gtk/empathy-individual-widget.c:977
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
 msgid "Unable to save avatar"
-msgstr ""
+msgstr "No s'ha puesto alzar o avatar"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1
 msgid "<b>Location</b> at (date)\t"
-msgstr ""
+msgstr "<b>Puesto</b> en (calendata)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1307
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr ""
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
 msgid "Client Information"
-msgstr ""
+msgstr "Informacion d'o client"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:5
 msgid "Client:"
@@ -1891,14 +1872,14 @@ msgstr "Client:"
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Contact Details"
-msgstr ""
+msgstr "Detalles d'o contacto"
 
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
-msgstr ""
+msgstr "Identificador:"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:3
@@ -1913,91 +1894,123 @@ msgstr "Sistema operativo:"
 msgid "Version:"
 msgstr "Version:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:332
+#: ../libempathy-gtk/empathy-groups-widget.c:333
 msgid "Groups"
 msgstr "Collas"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:344
+#: ../libempathy-gtk/empathy-groups-widget.c:345
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-groups-widget.c:363
+#: ../libempathy-gtk/empathy-groups-widget.c:364
 msgid "_Add Group"
 msgstr "_Anyadir colla"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:398
+#: ../libempathy-gtk/empathy-groups-widget.c:399
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Trigar"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1436
+#: ../libempathy-gtk/empathy-groups-widget.c:409
+#: ../src/empathy-main-window.c:1807
 msgid "Group"
 msgstr "Colla"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:259
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] ""
 msgstr[1] ""
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-individual-linker.c:354
+#: ../libempathy-gtk/empathy-individual-linker.c:370
 msgid "Select contacts to link"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-individual-linker.c:428
+#: ../libempathy-gtk/empathy-individual-linker.c:444
 msgid "New contact preview"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-individual-linker.c:472
+#: ../libempathy-gtk/empathy-individual-linker.c:488
 msgid "Contacts selected in the list on the left will be linked together."
 msgstr ""
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:131
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:839
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr ""
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "Gritar"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+#| msgid "Profile"
+msgid "Mobile"
+msgstr "Móvil"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "Treballo"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "Casa"
+
+#. add an SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+msgid "_SMS"
+msgstr "_SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1142
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Editar"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:865
+#: ../libempathy-gtk/empathy-individual-menu.c:1168
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-individual-view.c:2308
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 msgid "Delete and _Block"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-individual-view.c:2474
+#: ../libempathy-gtk/empathy-individual-view.c:2510
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
 "remove all the contacts which make up this linked contact."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2006,7 +2019,7 @@ msgstr[1] ""
 
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:1
 msgid "<b>Location</b> at (date)"
-msgstr ""
+msgstr "<b>Puesto</b> en (calendata)"
 
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Online from a phone or mobile device"
@@ -2022,7 +2035,7 @@ msgstr "Trigar un rete d'IRC"
 
 #: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
 msgid "Reset _Networks List"
-msgstr ""
+msgstr "Rei_niciar lista de retes"
 
 #: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
 msgctxt "verb displayed on a button to select an IRC network"
@@ -2042,12 +2055,12 @@ msgstr "SSL"
 #. * is a verb.
 #: ../libempathy-gtk/empathy-linking-dialog.c:115
 msgid "Link Contacts"
-msgstr ""
+msgstr "Enrastrar contactos"
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:120
 msgctxt "Unlink individual (button)"
 msgid "_Unlink…"
-msgstr ""
+msgstr "_Desenrastrar…"
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:121
 msgid ""
@@ -2060,7 +2073,7 @@ msgstr ""
 #. * meta-contact".
 #: ../libempathy-gtk/empathy-linking-dialog.c:136
 msgid "_Link"
-msgstr "_Enrastre"
+msgstr "_Enrastrar"
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:183
 #, c-format
@@ -2076,69 +2089,212 @@ msgstr ""
 #: ../libempathy-gtk/empathy-linking-dialog.c:190
 msgctxt "Unlink individual (button)"
 msgid "_Unlink"
+msgstr "_Desenrastrar"
+
+#: ../libempathy-gtk/empathy-log-window.c:634
+msgid "History"
+msgstr "Historial"
+
+#: ../libempathy-gtk/empathy-log-window.c:689
+msgid "Show"
+msgstr "Amostrar"
+
+#: ../libempathy-gtk/empathy-log-window.c:711
+msgid "Search"
+msgstr "Buscar"
+
+#: ../libempathy-gtk/empathy-log-window.c:1159
+#, c-format
+msgid "Chat in %s"
+msgstr "Charre en %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1161
+#, c-format
+msgid "Chat with %s"
+msgstr "Charrada con %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%A, %e de %B de %Y a las %X"
+
+#. Translators: this is an emote: '* Danielle waves'
+#: ../libempathy-gtk/empathy-log-window.c:1300
+#, c-format
+msgid "<i>* %s %s</i>"
+msgstr "<i>* %s %s</i>"
+
+#. Translators: this is a message: 'Danielle: hello'
+#. * The string in bold is the sender's name
+#: ../libempathy-gtk/empathy-log-window.c:1306
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1382
+#, c-format
+#| msgid "%d second ago"
+#| msgid_plural "%d seconds ago"
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s segundo"
+msgstr[1] "%s segundos"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+#| msgid "%d minute ago"
+#| msgid_plural "%d minutes ago"
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s menuto"
+msgstr[1] "%s menutos"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "A gritada duro %s, remató a las %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1729
+msgid "Today"
+msgstr "Hue"
+
+#: ../libempathy-gtk/empathy-log-window.c:1733
+msgid "Yesterday"
+msgstr "Ayere"
+
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
+#| msgctxt ""
+#| "A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+#| msgid "%e %B %Y"
+msgid "%e %B %Y"
+msgstr "%e de %B de %Y"
+
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3444
+msgid "Anytime"
+msgstr "Cualsiquier hora"
+
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2372
+msgid "Anyone"
+msgstr "Cualsiquiera"
+
+#: ../libempathy-gtk/empathy-log-window.c:2685
+msgid "Who"
+msgstr "Qui"
+
+#: ../libempathy-gtk/empathy-log-window.c:2889
+msgid "When"
+msgstr "Quan"
+
+#: ../libempathy-gtk/empathy-log-window.c:3005
+msgid "Anything"
+msgstr "Cualsiquier cosa"
+
+#: ../libempathy-gtk/empathy-log-window.c:3007
+msgid "Text chats"
+msgstr "Charradas de testo"
+
+#: ../libempathy-gtk/empathy-log-window.c:3009
+#: ../src/empathy-preferences.ui.h:4
+msgid "Calls"
+msgstr "Gritadas"
+
+#: ../libempathy-gtk/empathy-log-window.c:3014
+msgid "Incoming calls"
+msgstr "Gritadas dentrantz"
+
+#: ../libempathy-gtk/empathy-log-window.c:3015
+msgid "Outgoing calls"
+msgstr "Gritadas salientz"
+
+#: ../libempathy-gtk/empathy-log-window.c:3016
+msgid "Missed calls"
+msgstr "Gritadas perdidas"
+
+#: ../libempathy-gtk/empathy-log-window.c:3038
+msgid "What"
+msgstr "Que"
+
+#: ../libempathy-gtk/empathy-log-window.c:3747
+msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:660
-msgid "Date"
-msgstr "Calendata"
+#: ../libempathy-gtk/empathy-log-window.c:3751
+msgid "Clear All"
+msgstr "Escoscar tot"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
-msgstr "Conversacions"
+#: ../libempathy-gtk/empathy-log-window.c:3758
+msgid "Delete from:"
+msgstr "Borrar de:"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Cargando…</span>"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "Trobar vinient"
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Chat"
+msgstr "Chat"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "Trobar _anterior"
+msgid "Delete All History..."
+msgstr ""
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr "Conversacions anteriors"
+msgid "Profile"
+msgstr "Perfil"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Video"
+msgstr "Vidio"
 
-#. Tab Label
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "Buscar"
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:20
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "_File"
+msgstr "_Archivo"
 
-#. Searching *for* something
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "_Ta:"
+msgid "page 2"
+msgstr "pachina 2"
 
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
 msgid "Contact ID:"
-msgstr ""
+msgstr "ID d'o contacto:"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:171
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
 msgid "C_hat"
 msgstr "C_hat"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:181
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
 msgstr "Nueva charrada"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:253
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
 msgid "Send _Video"
 msgstr "Ninviar _Vidio"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:261
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
 msgid "C_all"
 msgstr "Grit_ar"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:271
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "New Call"
-msgstr ""
+msgstr "Gritada nueva"
 
 #: ../libempathy-gtk/empathy-password-dialog.c:274
 #, c-format
@@ -2155,34 +2311,34 @@ msgstr ""
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Message…"
-msgstr ""
+msgstr "Mensache presonalizau…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messages…"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
 msgstr "Meter estau"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:946
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
 msgid "Set your presence and current status"
 msgstr ""
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1134
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
 msgid "Custom messages…"
 msgstr "Mensaches presonalizaus…"
 
@@ -2195,18 +2351,28 @@ msgstr "Mensaches presonalizaus…"
 msgid "New %s account"
 msgstr "Nueva cuenta de %s"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "Trobar:"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Mat_ch case"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
 msgid "Phrase not found"
 msgstr "Frase no trobada"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+#| msgid "_Next Tab"
+msgid "_Next"
+msgstr "_Siguient"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+#| msgid "_Previous Tab"
+msgid "_Previous"
+msgstr "_Anterior"
+
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
 msgstr ""
@@ -2237,47 +2403,44 @@ msgstr "Desenchegau de lo servidor"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:65
 msgid "Incoming voice call"
-msgstr ""
+msgstr "Gritada de voz dentrant"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:67
 msgid "Outgoing voice call"
-msgstr ""
+msgstr "Gritada de voz salient"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:69
 msgid "Voice call ended"
-msgstr ""
+msgstr "Remató a gritada de voz"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
-msgstr ""
+msgstr "Editar mensaches presonalizaus"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr ""
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#, c-format
+msgid "Message edited at %s"
+msgstr "Mensache editau a las %s"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Status Messages"
-msgstr ""
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
+msgid "Normal"
+msgstr "Normal"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
-msgstr ""
+msgstr "Clasico"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
-msgstr ""
+msgstr "Simple"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
-msgstr ""
+msgstr "Escoscau"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
-msgstr ""
+msgstr "Azul"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:150
 msgid "The identity provided by the chat server cannot be verified."
@@ -2305,7 +2468,7 @@ msgstr ""
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:174
 msgid "The certificate is self-signed."
-msgstr ""
+msgstr "O certificau ye firmau consigo mesmo."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:177
 msgid ""
@@ -2327,7 +2490,7 @@ msgstr ""
 #: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
 msgid "Expected hostname: %s"
-msgstr ""
+msgstr "Nome d'o servidor esperau: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:209
 #, c-format
@@ -2350,33 +2513,35 @@ msgstr ""
 msgid "Certificate Details"
 msgstr "Detalles de certificau"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1705
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
-msgstr ""
+msgstr "No s'ha puesto ubrir l'URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1800
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
 msgstr "Trigar un archivo"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
 msgid "Insufficient free space to save file"
-msgstr ""
+msgstr "No bi ha espacio suficient ta alzar l'archivo"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr ""
+"Cal %s d'espacio libre ta alzar iste archivo, pero solo que bi ha %s "
+"disposable. Trie atro puesto."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1924
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid "Incoming file from %s"
-msgstr ""
+msgstr "Archivo dentrant de %s"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
-msgstr ""
+msgstr "Configuracion rechional actual"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:161
 #: ../libempathy-gtk/totem-subtitle-encoding.c:163
@@ -2543,11 +2708,11 @@ msgstr ""
 
 #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
 msgid "The selected contact cannot receive files."
-msgstr ""
+msgstr "O contacto trigau no puede recibir archivos."
 
 #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
 msgid "The selected contact is offline."
-msgstr ""
+msgstr "O contacto trigau ye desenchegau."
 
 #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
 msgid "No error message"
@@ -2555,25 +2720,25 @@ msgstr "Sin mensache d'error"
 
 #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
 msgid "Instant Message (Empathy)"
-msgstr ""
+msgstr "Mensache instantaneo (Empathy)"
 
-#: ../src/empathy.c:308
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
-msgstr ""
+msgstr "No enchegar-se automaticament en dentrar"
 
-#: ../src/empathy.c:312
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
-msgstr ""
+msgstr "No amostrar a lista de contactos u cualsiquier atro dialogo en dentrar"
 
-#: ../src/empathy.c:320
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr "Client de mensacheria instantanea Empathy"
 
-#: ../src/empathy.c:499
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
 msgstr ""
 
-#: ../src/empathy.c:501
+#: ../src/empathy.c:639
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2581,6 +2746,9 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Habió una error en prebar de conectar con o chestor de cuentas Telepathy. La "
+"error estió:\n"
+"%s"
 
 #: ../src/empathy-about-dialog.c:81
 msgid ""
@@ -2627,12 +2795,12 @@ msgstr ""
 
 #: ../src/empathy-account-assistant.c:175
 msgid "There was an error."
-msgstr ""
+msgstr "Habió una error."
 
 #: ../src/empathy-account-assistant.c:179
 #, c-format
 msgid "The error message was: %s"
-msgstr ""
+msgstr "O mensache d'error estió: %s"
 
 #: ../src/empathy-account-assistant.c:183
 msgid ""
@@ -2643,7 +2811,7 @@ msgstr ""
 #: ../src/empathy-account-assistant.c:220
 #: ../src/empathy-account-assistant.c:1271
 msgid "An error occurred"
-msgstr ""
+msgstr "Habio� una error"
 
 #: ../src/empathy-account-assistant.c:467
 msgid "What kind of chat account do you have?"
@@ -2655,7 +2823,7 @@ msgstr ""
 
 #: ../src/empathy-account-assistant.c:479
 msgid "Enter your account details"
-msgstr ""
+msgstr "Mete os detalles d'a suya cuenta"
 
 #: ../src/empathy-account-assistant.c:484
 msgid "What kind of chat account do you want to create?"
@@ -2691,7 +2859,7 @@ msgstr ""
 
 #: ../src/empathy-account-assistant.c:695
 msgid "No, I want a new account"
-msgstr ""
+msgstr "No, quiero creyar una cuenta nueva"
 
 #: ../src/empathy-account-assistant.c:705
 msgid "No, I just want to see people online nearby for now"
@@ -2702,8 +2870,8 @@ msgid "Select the accounts you want to import:"
 msgstr "Trigar as cuentas que quiers importar:"
 
 #: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "Yes"
 msgstr "Si"
 
@@ -2729,10 +2897,8 @@ msgid "Edit->Accounts"
 msgstr "Editar->Cuentas"
 
 #: ../src/empathy-account-assistant.c:1107
-#, fuzzy
-#| msgid "I don't want to enable this feature for now"
 msgid "I do _not want to enable this feature for now"
-msgstr "No quiero activar ista caracteristica por agora"
+msgstr "_No quiero activar ista caracteristica por agora"
 
 #: ../src/empathy-account-assistant.c:1143
 msgid ""
@@ -2773,102 +2939,103 @@ msgstr "Bi ha modificacions en a tuya cuenta de %s sin guardar."
 #. * an unsaved new account
 #: ../src/empathy-accounts-dialog.c:68
 msgid "Your new account has not been saved yet."
-msgstr ""
+msgstr "Encara no s'ha alzau a suya cuenta nueva."
 
-#: ../src/empathy-accounts-dialog.c:286
-#: ../src/empathy-streamed-media-window.c:809
+#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1216
 msgid "Connecting…"
 msgstr "Conectando…"
 
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:386
 #, c-format
 msgid "Offline — %s"
 msgstr "Desenchegau — %s"
 
-#: ../src/empathy-accounts-dialog.c:339
+#: ../src/empathy-accounts-dialog.c:398
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Desenchegau — %s"
 
-#: ../src/empathy-accounts-dialog.c:350
+#: ../src/empathy-accounts-dialog.c:409
 msgid "Offline — No Network Connection"
-msgstr ""
+msgstr "Desenchegau: sin conexión de rete"
 
-#: ../src/empathy-accounts-dialog.c:357
+#: ../src/empathy-accounts-dialog.c:416
 msgid "Unknown Status"
 msgstr "Estau desconoxiu"
 
-#: ../src/empathy-accounts-dialog.c:369
+#: ../src/empathy-accounts-dialog.c:428
 msgid "Offline — Account Disabled"
-msgstr ""
+msgstr "Desenchegau: cuenta desactivada"
 
-#: ../src/empathy-accounts-dialog.c:772
+#: ../src/empathy-accounts-dialog.c:831
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:1133
+#: ../src/empathy-accounts-dialog.c:1192
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:1137
+#: ../src/empathy-accounts-dialog.c:1196
 msgid "This will not remove your account on the server."
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:1375
+#: ../src/empathy-accounts-dialog.c:1432
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgstr ""
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1593
+#: ../src/empathy-accounts-dialog.c:1643
 msgid "_Enable"
 msgstr "_Activau"
 
-#: ../src/empathy-accounts-dialog.c:1594
+#: ../src/empathy-accounts-dialog.c:1644
 msgid "_Disable"
 msgstr "_Desactivau"
 
-#: ../src/empathy-accounts-dialog.c:2113
+#: ../src/empathy-accounts-dialog.c:2154
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgstr ""
 
 #: ../src/empathy-accounts-dialog.ui.h:1
-msgid "Loading account information"
-msgstr ""
+msgid "Add…"
+msgstr "_Anyadir…"
 
 #: ../src/empathy-accounts-dialog.ui.h:2
-msgid "No protocol installed"
-msgstr ""
+msgid "Loading account information"
+msgstr "Cargando informacion d'a cuenta"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
+msgid "No protocol installed"
+msgstr "No bi ha protocols instalaus"
+
+#: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add…"
-msgstr "_Anyadir…"
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Import…"
 msgstr "_Importar…"
 
-#: ../src/empathy-auth-client.c:250
+#: ../src/empathy-auth-client.c:249
 msgid " - Empathy authentication client"
 msgstr ""
 
-#: ../src/empathy-auth-client.c:266
+#: ../src/empathy-auth-client.c:265
 msgid "Empathy authentication client"
 msgstr ""
 
@@ -2876,129 +3043,157 @@ msgstr ""
 msgid "People nearby"
 msgstr "Chen a man"
 
-#: ../src/empathy-av.c:118
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr "- Client d'audio/vidio Empathy"
 
-#: ../src/empathy-av.c:134
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "Client d'audio/vidio Empathy"
 
-#: ../src/empathy-streamed-media-window.c:479
+#: ../src/empathy-streamed-media-window.c:431
 msgid "Contrast"
 msgstr "Contraste"
 
-#: ../src/empathy-streamed-media-window.c:482
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Brightness"
-msgstr ""
+msgstr "Brillo"
 
-#: ../src/empathy-streamed-media-window.c:485
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:590
+#: ../src/empathy-streamed-media-window.c:542
 msgid "Volume"
 msgstr "Voz"
 
-#: ../src/empathy-streamed-media-window.c:1166
+#: ../src/empathy-streamed-media-window.c:1110
 msgid "_Sidebar"
-msgstr ""
+msgstr "Barra _lateral"
 
-#: ../src/empathy-streamed-media-window.c:1186
+#: ../src/empathy-streamed-media-window.c:1130
 msgid "Audio input"
 msgstr "Dentrada d'audio"
 
-#: ../src/empathy-streamed-media-window.c:1190
+#: ../src/empathy-streamed-media-window.c:1134
 msgid "Video input"
 msgstr "Dentrada de vidio"
 
-#: ../src/empathy-streamed-media-window.c:1194
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Dialpad"
 msgstr "Teclau"
 
-#: ../src/empathy-streamed-media-window.c:1205
+#: ../src/empathy-streamed-media-window.c:1151
 msgid "Details"
 msgstr "Detalles"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1274
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1825
 #, c-format
 msgid "Call with %s"
 msgstr "Gritar con %s"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-streamed-media-window.c:1353
-msgid "Call"
-msgstr "Gritar"
-
-#: ../src/empathy-streamed-media-window.c:1507
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:2069
 msgid "The IP address as seen by the machine"
-msgstr ""
+msgstr "L'adreza IP como la veye a maquina"
 
-#: ../src/empathy-streamed-media-window.c:1509
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:2071
 msgid "The IP address as seen by a server on the Internet"
-msgstr ""
+msgstr "L'adreza IP como la veye o servidor d'Internet"
 
-#: ../src/empathy-streamed-media-window.c:1511
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:2073
 msgid "The IP address of the peer as seen by the other side"
-msgstr ""
+msgstr "L'adreza IP d'o par como la veye l'atra parti"
 
-#: ../src/empathy-streamed-media-window.c:1513
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:2075
 msgid "The IP address of a relay server"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:1515
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:2077
 msgid "The IP address of the multicast group"
 msgstr ""
 
+#: ../src/empathy-streamed-media-window.c:1843
+msgctxt "encoding video codec"
+msgid "Unknown"
+msgstr "Desconoxiu"
+
+#: ../src/empathy-streamed-media-window.c:1846
+msgctxt "encoding audio codec"
+msgid "Unknown"
+msgstr "Desconoxiu"
+
+#: ../src/empathy-streamed-media-window.c:1849
+msgctxt "decoding video codec"
+msgid "Unknown"
+msgstr "Desconoxiu"
+
+#: ../src/empathy-streamed-media-window.c:1852
+msgctxt "decoding audio codec"
+msgid "Unknown"
+msgstr "Desconoxiu"
+
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2270
+#: ../src/empathy-streamed-media-window.c:2144
 #, c-format
 msgid "Connected — %d:%02dm"
-msgstr ""
+msgstr "Enchegau — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2331
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2846
 msgid "Technical Details"
 msgstr "Detalles tecnicos"
 
-#: ../src/empathy-streamed-media-window.c:2369
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2884
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:2374
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2889
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:2380
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2895
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
 "does not allow direct connections."
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:2386
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2901
 msgid "There was a failure on the network"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:2390
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2905
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:2393
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2908
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:2403
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2920
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3006,169 +3201,221 @@ msgid ""
 "the Help menu."
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:2411
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2929
 msgid "There was a failure in the call engine"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:2414
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2932
 msgid "The end of the stream was reached"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:2454
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2972
 msgid "Can't establish audio stream"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:2464
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2982
 msgid "Can't establish video stream"
 msgstr ""
 
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "Audio"
 msgstr "Audio"
 
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Tornar a gritar a lo contacto"
-
 #: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
 msgstr ""
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr ""
+msgid "Disable camera"
+msgstr "Desactivar camara"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr ""
+msgid "Display the dialpad"
+msgstr "Amostrar o teclau"
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Desactivar a camara y aturar de ninviar vidio"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Activar a camara y ninviar vidio"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Hang up"
+msgstr "Colgar"
 
 #: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Activar a camara pero no ninviar vidio"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Hang up current call"
+msgstr "Colgar a gritada actual"
 
 #: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Local Candidate:"
 msgstr ""
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "Colgar"
+msgid "Maximise me"
+msgstr "Enamplar-me"
 
 #: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr ""
+msgid "Minimise me"
+msgstr "Achiquir-me"
 
 #: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Remote Candidate:"
 msgstr ""
 
 #: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "Previsualizar"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Send Audio"
+msgstr "Ninviar audio"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "Tornar a marcar"
+msgid "Send Video"
+msgstr "Ninviar vidio"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr ""
+msgid "Show dialpad"
+msgstr "Amostrar teclau de gritada"
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "Ninviar audio"
+msgid "Start a video call"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
+msgid "Start an audio call"
 msgstr ""
 
+#: ../src/empathy-call-window.ui.h:18
+#| msgid "Disable camera"
+msgid "Swap camera"
+msgstr "Intercambear camara"
+
 #: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_idio"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "Vidio"
-
-#: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
+msgid "Toggle video transmission"
 msgstr ""
 
-#: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr ""
+#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
+#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
+msgid "Unknown"
+msgstr "Desconoxiu"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr ""
+#| msgid "Video"
+msgid "Video call"
+msgstr "Gritada de vidio"
 
 #: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "_Gritar"
 
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:25
+#| msgid "Camera On"
+msgid "_Camera"
+msgstr "_Camara"
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:18
+msgid "_Contents"
+msgstr "_Contenius"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
+msgid "_Debug"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:22
+msgid "_Help"
+msgstr "Ad_uya"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Microphone"
+msgstr "_Microfono"
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "_Settings"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_Veyer"
 
-#: ../src/empathy-chat-window.c:474 ../src/empathy-chat-window.c:494
+#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s (%d sin leyer)"
+msgstr[1] "%s (%d sin leyer)"
 
-#: ../src/empathy-chat-window.c:486
+#: ../src/empathy-chat-window.c:493
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s (y otra)"
+msgstr[1] "%s (y %u atras)"
 
-#: ../src/empathy-chat-window.c:502
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s (%d sin leyer d'atros)"
+msgstr[1] "%s (%d sin leyer d'atros)"
 
-#: ../src/empathy-chat-window.c:511
+#: ../src/empathy-chat-window.c:518
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s (%d sin leer de totz)"
+msgstr[1] "%s (%d sin leer de totz)"
+
+#: ../src/empathy-chat-window.c:733
+msgid "SMS:"
+msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:721
+#: ../src/empathy-chat-window.c:743
+#, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "Ninviando %d mensache"
+msgstr[1] "Ninviando %d mensaches"
+
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
 msgstr "Escribindo un mensache"
 
 #: ../src/empathy-chat-window.ui.h:1
 msgid "C_lear"
-msgstr ""
+msgstr "_Escoscar"
 
 #: ../src/empathy-chat-window.ui.h:2
 msgid "C_ontact"
 msgstr "C_ontacto"
 
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Chat"
-
 #: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
 msgstr "Meter _emoticon"
 
 #: ../src/empathy-chat-window.ui.h:5
 msgid "Invite _Participant…"
-msgstr ""
+msgstr "Convidar pa_rticipant…"
 
 #: ../src/empathy-chat-window.ui.h:6
 msgid "Move Tab _Left"
@@ -3180,11 +3427,7 @@ msgstr "Mover a pestanya a la _dreita"
 
 #: ../src/empathy-chat-window.ui.h:8
 msgid "Notify for All Messages"
-msgstr ""
-
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
-msgid "_Contents"
-msgstr "_Contenius"
+msgstr "Notificar ta totz os mensaches"
 
 #: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
@@ -3194,18 +3437,10 @@ msgstr "_Charrada"
 msgid "_Detach Tab"
 msgstr ""
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
-msgid "_Edit"
-msgstr "_Editar"
-
 #: ../src/empathy-chat-window.ui.h:13
 msgid "_Favorite Chat Room"
 msgstr ""
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
-msgid "_Help"
-msgstr "Ad_uya"
-
 #: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "Pestanya _siguient"
@@ -3224,108 +3459,114 @@ msgstr "_Pestanyas"
 
 #: ../src/empathy-chat-window.ui.h:19
 msgid "_Undo Close Tab"
-msgstr ""
+msgstr "_Desfer trancar pestanya"
 
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
-msgstr ""
+msgstr "Sala"
 
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
-msgstr ""
+msgstr "Autoenchegar"
 
 #: ../src/empathy-chatrooms-window.ui.h:2
 msgid "Manage Favorite Rooms"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming video call"
-msgstr ""
+msgstr "Gritada de vidio dentrant"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
 msgid "Incoming call"
-msgstr ""
+msgstr "Gritada dentrant"
 
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:525
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:515 ../src/empathy-event-manager.c:667
+#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming call from %s"
-msgstr ""
+msgstr "Gritada dentrant de %s"
 
-#: ../src/empathy-event-manager.c:540
+#: ../src/empathy-event-manager.c:554
 msgid "_Reject"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:546
+#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
 msgid "_Answer"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:667
+#: ../src/empathy-event-manager.c:570
+msgid "_Answer with video"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming video call from %s"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:744
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
-msgstr ""
+msgstr "Convite a una sala"
 
-#: ../src/empathy-event-manager.c:746
+#: ../src/empathy-event-manager.c:838
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Convite a chuntar-te a %s"
 
-#: ../src/empathy-event-manager.c:753
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s ye convidando-te a chuntar-te a %s"
 
-#: ../src/empathy-event-manager.c:761
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Chuntar-se"
 
-#: ../src/empathy-event-manager.c:793
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s t'ha convidau a chuntar-te a %s"
 
-#: ../src/empathy-event-manager.c:799
+#: ../src/empathy-event-manager.c:891
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "T'han convidau a chuntar-te a %s"
 
-#: ../src/empathy-event-manager.c:850
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
-msgstr ""
+msgstr "Trasferencia d'archivo dentrant de %s"
 
-#: ../src/empathy-event-manager.c:1020 ../src/empathy-main-window.c:370
+#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
 msgid "Password required"
 msgstr "S'amenista clau de paso"
 
-#: ../src/empathy-event-manager.c:1076
+#: ../src/empathy-event-manager.c:1190
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:1080
+#: ../src/empathy-event-manager.c:1194
 #, c-format
 msgid ""
 "\n"
@@ -3398,7 +3639,7 @@ msgstr "Error ninviando un archivo"
 #: ../src/empathy-ft-manager.c:489
 #, c-format
 msgid "\"%s\" received from %s"
-msgstr ""
+msgstr "\"%s\" recibiu de %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
@@ -3411,29 +3652,29 @@ msgstr "\"%s\" ninviau a %s"
 msgid "File transfer completed"
 msgstr "Transferencia d'archivo rematada"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:783
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
 msgid "Waiting for the other participant's response"
 msgstr ""
 
 #: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
 #, c-format
 msgid "Checking integrity of \"%s\""
-msgstr ""
+msgstr "Comprebando la integridat de \"%s\""
 
 #: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Fendo o hash \"%s\""
 
-#: ../src/empathy-ft-manager.c:1029
+#: ../src/empathy-ft-manager.c:1026
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1041
+#: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "Archivo"
 
-#: ../src/empathy-ft-manager.c:1063
+#: ../src/empathy-ft-manager.c:1060
 msgid "Remaining"
 msgstr "Restant"
 
@@ -3470,143 +3711,154 @@ msgstr "Protocolo"
 msgid "Source"
 msgstr "Fuent"
 
-#: ../src/empathy-main-window.c:387
+#: ../src/empathy-main-window.c:392
 msgid "Provide Password"
 msgstr ""
 
-#: ../src/empathy-main-window.c:393
+#: ../src/empathy-main-window.c:398
 msgid "Disconnect"
 msgstr "Desenchegar"
 
-#: ../src/empathy-main-window.c:533
+#: ../src/empathy-main-window.c:622
 msgid "No match found"
-msgstr ""
+msgstr "No s'ha trobau garra concidencia"
 
-#: ../src/empathy-main-window.c:688
+#: ../src/empathy-main-window.c:777
 msgid "Reconnect"
 msgstr "Reenchegar"
 
-#: ../src/empathy-main-window.c:694
+#: ../src/empathy-main-window.c:783
 msgid "Edit Account"
 msgstr "Editar cuenta"
 
-#: ../src/empathy-main-window.c:700
+#: ../src/empathy-main-window.c:789
 msgid "Close"
 msgstr "Trancar"
 
-#: ../src/empathy-main-window.c:1418
+#. Translators: this string will be something like:
+#. *   Top up My Account ($1.23)..."
+#: ../src/empathy-main-window.c:928
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr "Recargar %s (%s)…"
+
+#: ../src/empathy-main-window.c:975
+msgid "Top up account credit"
+msgstr "Recargar o saldo d'a cuenta"
+
+#. top up button
+#: ../src/empathy-main-window.c:1046
+msgid "Top Up..."
+msgstr "Recargar…"
+
+#: ../src/empathy-main-window.c:1789
 msgid "Contact"
 msgstr "Contacto"
 
-#: ../src/empathy-main-window.c:1765
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "Lista de contactos"
 
-#: ../src/empathy-main-window.c:1881
-msgid "Show and edit accounts"
-msgstr "Amostrar y editar cuentas"
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
-msgstr ""
+msgstr "Contactos en o _mapa"
+
+#: ../src/empathy-main-window-menubar.ui.h:2
+msgid "Credit Balance"
+msgstr "Credito"
 
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-main-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "Buscar en a _lista de contacto"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
-msgstr ""
+msgstr "Chuntar-se a _favoritas"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
-msgstr ""
+msgstr "Chestionar favoritos"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
-msgstr ""
+msgstr "Tamanyo n_ormal"
 
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
-msgstr ""
+msgstr "_Gritada nueva…"
 
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
-msgstr ""
+msgstr "Tamanyo normal con _avatars"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "P_referencias"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "Amostrar p_rotocols"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
-msgstr ""
+msgstr "Ordenar por _nome"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
-msgstr ""
+msgstr "Ordenar por es_tau"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Cuentas"
 
-#: ../src/empathy-main-window.ui.h:14
-#, fuzzy
-#| msgid "_Offline Contacts"
+#: ../src/empathy-main-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
-msgstr "Contactos _desenchegaus"
+msgstr "Contactos _bloqueyaus"
 
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
-msgstr ""
-
-#: ../src/empathy-main-window.ui.h:18
-msgid "_Debug"
-msgstr ""
+msgstr "Tamanyo _preto"
 
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
-msgstr ""
+msgstr "_Transferencias d'archivos"
 
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "_Chuntar-se…"
 
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "_Nueva conversacion…"
 
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "Contactos _desenchegaus"
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "Informacion _presonal"
 
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
-msgstr ""
+msgstr "_Sala"
 
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window-menubar.ui.h:29
 msgid "_Search for Contacts…"
 msgstr "Bu_scar contactos…"
 
 #: ../src/empathy-new-chatroom-dialog.c:337
 msgid "Chat Room"
-msgstr ""
+msgstr "Sala de chat"
 
 #: ../src/empathy-new-chatroom-dialog.c:353
 msgid "Members"
-msgstr ""
+msgstr "Miembros"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:560
+#: ../src/empathy-new-chatroom-dialog.c:553
 #, c-format
 msgid ""
 "%s\n"
@@ -3614,23 +3866,27 @@ msgid ""
 "Password required: %s\n"
 "Members: %s"
 msgstr ""
+"%s\n"
+"Cal convite: %s\n"
+"Cal clau de paso: %s\n"
+"Miembros: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "No"
 msgstr "No"
 
-#: ../src/empathy-new-chatroom-dialog.c:591
+#: ../src/empathy-new-chatroom-dialog.c:584
 msgid "Could not start room listing"
-msgstr ""
+msgstr "No s'ha puesto encetar a lista d'a sala"
 
-#: ../src/empathy-new-chatroom-dialog.c:601
+#: ../src/empathy-new-chatroom-dialog.c:594
 msgid "Could not stop room listing"
-msgstr ""
+msgstr "No s'ha puesto aturar a lista d'a sala"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "Couldn't load room list"
-msgstr ""
+msgstr "No s'ha puesto cargar a lista d'a sala"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -3645,183 +3901,243 @@ msgstr ""
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid "Join Room"
-msgstr ""
+msgstr "Chuntar-se a la sala"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Room List"
-msgstr ""
+msgstr "Lista de salas"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:8
 msgid "_Room:"
-msgstr ""
+msgstr "_Sala:"
 
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr "Mensache recibiu"
 
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr "Mensache ninviau"
 
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
 msgstr "Nueva charrada"
 
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
 msgstr "Contacto s'enchega"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
 msgstr "Contacto se desenchega"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
 msgstr "Cuenta enchegada"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
 msgstr "Cuenta desenchegada"
 
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr "Luenga"
 
-#: ../src/empathy-preferences.c:875
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:734
+msgid "Juliet"
+msgstr "Chulieta"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:741
+msgid "Romeo"
+msgstr "Romeo"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:747
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr "¡Oh, Romeo, Romeo!, ¿an yes que no te veigo?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:750
+msgid "Deny thy father and refuse thy name;"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:753
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr "U, si no en quiers, churame solo que m'aimas"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:756
+msgid "And I'll no longer be a Capulet."
+msgstr "Y dixaré yo de estar una Capuleto."
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:759
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr "He de sentir mas, u contestar a lo dito?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:762
+msgid "Juliet has disconnected"
+msgstr "Chulieta s'ha desenchegau"
+
+#: ../src/empathy-preferences.c:1166
 msgid "Preferences"
 msgstr "Preferencias"
 
 #: ../src/empathy-preferences.ui.h:1
 msgid "Appearance"
-msgstr ""
+msgstr "Apariencia"
 
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
-msgstr ""
+msgstr "Comportamento"
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
 msgid "Chat Th_eme:"
-msgstr ""
+msgstr "_Tema d'a charrada:"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
 msgid "Disable notifications when _away or busy"
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
 msgid "Disable sounds when _away or busy"
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "Activar notificacions cuan s'enchega un contacto"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "Activar notificacions cuan se desenchega un contacto"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Activar notificacions cuan a _conversacion no tiene lo foco"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "Cheneral"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input level:"
+msgstr "Ran de dentrada:"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "Volumen de dentrada:"
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "Rechistrar charradas"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "Notificacions"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
-msgstr ""
+msgstr "Fer sentir un soniu ta eventos"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "Privacidat"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
 "decimal place."
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
-msgstr ""
+msgstr "Amostrar os _emoticons como imachens"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
-msgstr ""
+msgstr "Amostrar _lista de contactos en salas"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "Sonius"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "Temas"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:30
+msgid "Variant:"
+msgstr "Variant:"
+
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "Conectar _automaticament en dentrar"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Movil"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
-msgstr ""
+msgstr "_Activar notificacions de burbuxa"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "_Activar notificacions de soniu"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Rete (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr ""
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr ""
 
@@ -3833,82 +4149,130 @@ msgstr "Estau"
 msgid "_Quit"
 msgstr "_Surtir"
 
-#: ../src/empathy-map-view.c:442
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "Tornar a gritar a lo contacto"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "Camara amortada"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "Camara enchegada"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "Desactivar a camara y aturar de ninviar vidio"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "Activar a camara y ninviar vidio"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "Activar a camara pero no ninviar vidio"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "Previsualizar"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "Tornar a marcar"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "V_idio"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "Vidio amortau"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "Vidio enchegau"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr ""
+
+#: ../src/empathy-map-view.c:448
 msgid "Contact Map View"
 msgstr ""
 
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
 msgid "Save"
 msgstr "Guardar"
 
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
 msgstr ""
 
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
 msgstr "Pausar"
 
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
 msgstr "Ran"
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
 msgid "Debug"
 msgstr ""
 
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
 msgid "Info"
-msgstr ""
+msgstr "Informacion"
 
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
 msgid "Message"
 msgstr "Mensache"
 
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
 msgid "Warning"
-msgstr ""
+msgstr "Alvertencia"
 
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
 msgid "Critical"
 msgstr "Critico"
 
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
 msgid "Error"
 msgstr "Error"
 
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
 msgid "Time"
-msgstr ""
+msgstr "Hora"
 
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
 msgid "Domain"
 msgstr "Dominio"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
-msgstr ""
+msgstr "Categoria"
 
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "Ran"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr ""
 
-#: ../src/empathy-invite-participant-dialog.c:34
-#: ../src/empathy-invite-participant-dialog.c:48
+#: ../src/empathy-invite-participant-dialog.c:179
+#: ../src/empathy-invite-participant-dialog.c:205
 msgid "Invite Participant"
-msgstr ""
+msgstr "Convidar participant"
 
-#: ../src/empathy-invite-participant-dialog.c:35
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr ""
 
-#: ../src/empathy-invite-participant-dialog.c:45
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "Convidar"
 
@@ -3927,7 +4291,7 @@ msgstr ""
 
 #: ../src/empathy-accounts.c:193
 msgid "<account-id>"
-msgstr ""
+msgstr "<id-de-cuenta>"
 
 #: ../src/empathy-accounts.c:198
 msgid "- Empathy Accounts"
@@ -3937,7 +4301,16 @@ msgstr "- Cuentas d'empathy"
 msgid "Empathy Accounts"
 msgstr "Cuentas d'empathy"
 
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr ""
+
+#: ../src/empathy-debugger.c:75
+#| msgid "Empathy Debugger"
+msgid "- Empathy Debugger"
+msgstr "- Debugger d'Empathy"
+
+#: ../src/empathy-debugger.c:114
 msgid "Empathy Debugger"
 msgstr "Debugger d'Empathy"
 
@@ -3945,44 +4318,108 @@ msgstr "Debugger d'Empathy"
 msgid "- Empathy Chat Client"
 msgstr "- Client de mensacheria instantanea Empathy"
 
-#: ../src/empathy-notifications-approver.c:184
+#: ../src/empathy-notifications-approver.c:203
 msgid "Respond"
 msgstr ""
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1459
 msgid "Reject"
 msgstr ""
 
-#: ../src/empathy-notifications-approver.c:194
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1460
 msgid "Answer"
 msgstr ""
 
-#: ../src/empathy-notifications-approver.c:201
-#: ../src/empathy-notifications-approver.c:211
+#: ../src/empathy-notifications-approver.c:227
+msgid "Answer with video"
+msgstr ""
+
+#: ../src/empathy-notifications-approver.c:235
+#: ../src/empathy-notifications-approver.c:245
 msgid "Decline"
 msgstr ""
 
-#: ../src/empathy-notifications-approver.c:205
-#: ../src/empathy-notifications-approver.c:216
+#: ../src/empathy-notifications-approver.c:239
+#: ../src/empathy-notifications-approver.c:250
 msgid "Accept"
 msgstr "Aceptar"
 
-#: ../src/empathy-notifications-approver.c:223
-#, fuzzy
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:260
 #| msgid "Preview"
 msgid "Provide"
-msgstr "Previsualizar"
+msgstr "Proporcionar"
 
-#: ../src/empathy-call-observer.c:130
+#: ../src/empathy-call-observer.c:134
 #, c-format
-msgid "Missed call from %s"
+msgid "%s just tried to call you, but you were in another call."
+msgstr "%s prebó de gritar-le, pero yera en atra gritada."
+
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+msgid "i"
+msgstr "Informacion"
+
+#: ../src/empathy-call-window.c:2775
+msgid "On hold"
 msgstr ""
 
-#: ../src/empathy-call-observer.c:133
+#: ../src/empathy-call-window.c:2778
+msgid "Mute"
+msgstr "Silenciar"
+
+#: ../src/empathy-call-window.c:2780
+#| msgid "Location"
+msgid "Duration"
+msgstr "Duracion"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2783
 #, c-format
-msgid "%s just tried to call you, but you were in another call."
+msgid "%s — %d:%02dm"
+msgstr "%s: %d:%02dm"
+
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
 msgstr ""
 
+#~ msgid "Find Next"
+#~ msgstr "Trobar vinient"
+
+#~ msgid "Find Previous"
+#~ msgstr "Trobar _anterior"
+
+#~ msgid "Show and edit accounts"
+#~ msgstr "Amostrar y editar cuentas"
+
+#~| msgid "Call with %s"
+#~ msgid "Call with %d participants"
+#~ msgstr "Gritada con %d participantz"
+
+#~ msgid "All"
+#~ msgstr "Tot"
+
+#~ msgid "_Enabled"
+#~ msgstr "_Activau"
+
+#~ msgid "Date"
+#~ msgstr "Calendata"
+
+#~ msgid "Conversations"
+#~ msgstr "Conversacions"
+
+#~ msgid "Previous Conversations"
+#~ msgstr "Conversacions anteriors"
+
+#~ msgid "_For:"
+#~ msgstr "_Ta:"
+
 #~ msgid "%s is now offline."
 #~ msgstr "%s ye agora desenchegau."
 
diff --git a/po/as.po b/po/as.po
index 14e2a8fec..e0b71801b 100644
--- a/po/as.po
+++ b/po/as.po
@@ -2,580 +2,865 @@
 # Copyright (C) 2009 empathy's COPYRIGHT HOLDER
 # This file is distributed under the same license as the empathy package.
 #
-# , 2009.
+# Nilamdyuti Goswami <ngoswami@redhat.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy gnome-2-28\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
-"cgi?product=empathy&component=general\n"
-"POT-Creation-Date: 2009-09-16 07:22+0000\n"
-"PO-Revision-Date: 2009-09-16 17:33+0530\n"
-"Last-Translator: \n"
-"Language-Team: Assamese <>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2011-09-19 19:10+0000\n"
+"PO-Revision-Date: 2011-09-15 19:40+0530\n"
+"Last-Translator: Nilamdyuti Goswami <ngoswami@redhat.com>\n"
+"Language-Team: as_IN <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 0.2\n"
+"X-Generator: Lokalize 1.0\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Empathy"
-msgstr "Empathy"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Google Talk, Facebook, MSN আৰ� বহ�তো অন�য চেট সেৱাসমূহত চেট কৰক"
 
 #: ../data/empathy.desktop.in.in.h:2
-msgid "Empathy IM Client"
-msgstr "Empathy IM গ�ৰাহক"
+msgid "Empathy"
+msgstr "Empathy"
 
 #: ../data/empathy.desktop.in.in.h:3
-msgid "IM Client"
-msgstr "IM গ�ৰাহক"
+msgid "Empathy Internet Messaging"
+msgstr "Empathy ইন�টাৰনেট বাৰ�তাকৰণ"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "Send and receive messages"
-msgstr "বাৰ�তা পঠিয়াওক আৰ� পাওক"
+msgid "IM Client"
+msgstr "IM গ�ৰাহক"
 
-#: ../data/empathy.schemas.in.h:1
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
-msgstr "নত�ন সম�বাদৰ বাবে সদায়ে পৃথক সম�বাদ সংযোগক�ষেত�ৰ খোলা হ'ব ।"
+msgstr "নত�ন চেটৰ বাবে সদায়ে পৃথক চেট উইন�ডো খোলা হ'ব।"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr "কল ভলিউম"
 
-#: ../data/empathy.schemas.in.h:2
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr "কল ভলিউম, �টা শতাংশ হিচাপে।"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Camera device"
+msgstr "কেমেৰা ডিভাইচ"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "কেমেৰা অৱস�থান"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
-"দলৰ সৈতে সম�বাদৰ সময়ত কোনো নাম উল�লেখ কৰাৰ বাবে নাম সম�পূৰ�ণ কৰাৰ ব�যৱস�থা (টেব) "
-"প�ৰয়োগ কৰিলে নামৰ পিছত ব�যৱহাৰযোগ�য চিহ�ন ।"
+"দলৰ সৈতে চেট কৰা সময়ত উপনাম সম�পূৰ�ণ (টেব) ব�যৱহাৰ কৰোতে উপনামৰ পিছত যোগ কৰিব "
+"লগিয়া আখৰ।"
 
-#: ../data/empathy.schemas.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
-msgstr "সম�বাদ সংযোগক�ষেত�ৰৰ থিম"
+msgstr "চেট উইন�ডোৰ থীম"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+msgid "Chat window theme variant"
+msgstr "চেট উইন�ডো থীম অপৰ"
 
-#: ../data/empathy.schemas.in.h:4
-msgid "Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
-"বিভিন�ন ভাষাৰ বাবে ব�যৱহাৰযোগ�য বানান-পৰীক�ষণ ব�যৱস�থাৰ তালিকা, কমা চিহ�ন দ�বাৰা "
-"বিভক�ত  (যেনে, en, fr, nl) ।"
+"ব�যৱহাৰ কৰিবলে বানান নিৰীক�ষক ভাষাসমূহৰ কমা-পৃথকিত তালিকা (যেনে \"en, fr, nl\")।"
 
-#: ../data/empathy.schemas.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
-msgstr "পৰিচিত ব�যক�তিৰ তালিকা সংক�চিত কৰক"
+msgstr "পৰিচিত ব�যক�তিৰ তালিকা সংকোচিত কৰক"
 
-#: ../data/empathy.schemas.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
-msgstr "সংযোগ পৰিচালন ব�যৱস�থা ব�যৱহাৰ কৰা হ'ব"
+msgstr "সংযোগ ব�যৱস�থাপকসমূহ ব�যৱহাৰ কৰক"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+msgid "Contact list sort criterion"
+msgstr "পৰিচয় তালিকা সজোৱা নিয়ম"
 
-#: ../data/empathy.schemas.in.h:7
-msgid "Contact list sort criterium"
-msgstr "পৰিচিত ব�যক�তিৰ তালিকাৰ অন�ক�ৰম নিৰ�ধাৰণত ব�যৱহৃত মান"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr ""
+"ভিডিঅ' কলসমূহত ব�যৱহাৰ কৰিব লগিয়া অবিকল�পিত কেমেৰা ডিভাইচ, যেনে /dev/video0।"
 
-#: ../data/empathy.schemas.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
-msgstr "ব�যৱহাৰকৰ�তাৰ অৱতাৰ চিহ�নকৰ�তা ছবি নিৰ�ধাৰণৰ বাবে ব�যৱহৃত অবিকল�পিত পঞ�জিকা"
+msgstr "ব�যৱহাৰকাৰীৰ অৱতাৰ আখৰকৰ�তা ছবি নিৰ�ধাৰণৰ বাবে ব�যৱহৃত অবিকল�পিত পঞ�জিকা"
 
-#: ../data/empathy.schemas.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
-msgstr "অন�পস�থিত হ'লে প'প-আপ সূচনাবাৰ�তা নিষ�ক�ৰিয় কৰা হ'ব"
+msgstr "আতৰত থাকিলে প'প-আপ সূচনাবাৰ�তা নিষ�ক�ৰিয় কৰক"
 
-#: ../data/empathy.schemas.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
-msgstr "অন�পস�থিত হ'লে শব�দ নিষ�ক�ৰিয় কৰা হ'ব"
+msgstr "আতৰত থাকিলে শব�দ নিষ�ক�ৰিয় কৰক"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+msgid "Display incoming events in the status area"
+msgstr "অৱস�থা স�থানত আগ'ত ঘটনাসমূহ প�ৰদৰ�শন কৰক"
 
-#: ../data/empathy.schemas.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"অৱস�থা স�থানত আগ'ত ঘটনাসমূহ প�ৰদৰ�শন কৰক। যদি ভ�ল, সিহতক ব�যৱহাৰকাৰীলে তৎক�ষনাত "
+"প�ৰেৰণ কৰক।"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+msgid "Echo cancellation support"
+msgstr "প�ৰতিধ�বনি বাতিল সমৰ�থন"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
-msgstr "Empathy দ�বাৰা ব�যৱহাৰকৰ�তাৰ ভৌগলিক অৱস�থান প�ৰকাশ কৰা সম�ভৱ হ'ব"
+msgstr "Empathy দ�বাৰা ব�যৱহাৰকাৰীৰ ভৌগলিক অৱস�থান প�ৰকাশ কৰা সম�ভৱ হ'ব"
 
-#: ../data/empathy.schemas.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "GPS সহযোগে Empathy দ�বাৰা ভৌগলিক অৱস�থান গণনা কৰা সম�ভৱ হ'ব"
 
-#: ../data/empathy.schemas.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
-msgstr "ছেল�লাৰ নে'টৱৰ�ক সহযোগে Empathy দ�বাৰা ভৌগলিক অৱস�থান গণনা কৰা সম�ভৱ হ'ব"
+msgstr "চেল�লাৰ নেটৱাৰ�ক সহযোগে Empathy দ�বাৰা ভৌগলিক অৱস�থান গণনা কৰা সম�ভৱ হ'ব"
 
-#: ../data/empathy.schemas.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
-msgstr "নে'টৱৰ�ক সহযোগে Empathy দ�বাৰা ভৌগলিক অৱস�থান গণনা কৰা সম�ভৱ হ'ব"
+msgstr "নেটৱাৰ�ক সহযোগে Empathy দ�বাৰা ভৌগলিক অৱস�থান গণনা কৰা সম�ভৱ হ'ব"
 
-#: ../data/empathy.schemas.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
-msgstr "Empathy ৰ অবিকল�পিত ডাউনলোড ফোল�ডাৰ"
+msgstr "Empathy ৰ অবিকল�পিত ডাউনল'ড ফোল�ডাৰ"
 
-#: ../data/empathy.schemas.in.h:16
-msgid "Empathy has asked about importing accounts"
-msgstr "Empathy দ�বাৰা হিচাপ আমদানি সম�পৰ�কে প�ৰশ�ন কৰা হৈছে"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+msgid "Empathy has migrated butterfly logs"
+msgstr "Empathy -� বাটাৰফ�লাই লগসমূহ প�ৰব�ৰজন কৰিছে"
 
-#: ../data/empathy.schemas.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy অলস অৱস�থাত স�বচালিতভাৱে-আতৰত হব লাগিব"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
-msgstr "আৰম�ভ সময়ত Empathy দ�বাৰা স�বয়ংক�ৰিয়ৰূপে সংযোগ স�থাপন কৰা হ'ব"
+msgstr "আৰম�ভ সময়ত Empathy দ�বাৰা স�বচালিতভাৱে সংযোগ স�থাপন কৰক"
 
-#: ../data/empathy.schemas.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy দ�বাৰা ভৌগলিক অৱস�থানৰ নিৰ�ভ�লতাৰ পৰিমাণ হ�ৰাস"
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "সম�বাদৰ সংযোগক�ষেত�ৰৰ আইকন ৰূপে Empathy দ�বাৰা পৰিচয়ৰ অৱতাৰ প�ৰয়োগ কৰা হ'ব"
+msgstr "চেটৰ উইন�ডোৰ আইকন ৰূপে Empathy দ�বাৰা পৰিচয়ৰ অৱতাৰ প�ৰয়োগ কৰক"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
-msgstr "WebKit বিকাশক সৰঞ�জামৰ ব�যৱহাৰ সক�ৰিয় কৰা হ'ব"
+msgstr "WebKit উন�নয়নক স�জ�লিৰ ব�যৱহাৰ সামৰ�থবান কৰক"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
-msgstr "নত�ন বাৰ�তাৰ বাবে প'প-আপ সূচনাবাৰ�তা সক�ৰিয় কৰা হ'ব"
+msgstr "নত�ন বাৰ�তাৰ বাবে প'প-আপ সূচনাবাৰ�তা সামৰ�থবান কৰক"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
-msgstr "বানা পৰীক�ষণ সক�ৰিয় কৰা হ'ব"
+msgstr "বানান পৰীক�ষণ সামৰ�থবান কৰক"
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
-msgstr "প�ৰধান সংযোগক�ষেত�ৰ ল�ক�ৱা হ'ব"
+msgstr "প�ৰধান উইন�ডো ল�ক�ৱা হ'ব"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
-msgstr "প�ৰধান সংযোগক�ষেত�ৰ ল�ক�ৱা হ'ব ।"
-
-#: ../data/empathy.schemas.in.h:25
-msgid "MC 4 accounts have been imported"
-msgstr "MC 4 হিচাপ আমদানি কৰা হৈছে"
+msgstr "প�ৰধান উইন�ডো ল�ক�ৱা হ'ব।"
 
-#: ../data/empathy.schemas.in.h:26
-msgid "MC 4 accounts have been imported."
-msgstr "MC 4 হিচাপ আমদানি কৰা হৈছে ।"
-
-#: ../data/empathy.schemas.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
-msgstr "নাম সম�পূৰ�ণকৰণৰ চিহ�ন"
+msgstr "নাম সম�পূৰ�ণকৰণৰ আখৰ"
 
-#: ../data/empathy.schemas.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
-msgstr "নত�ন সম�বাদ আৰম�ভ হ'লে পৃথক সংযোগক�ষেত�ৰত প�ৰদৰ�শন কৰা হ'ব"
+msgstr "নত�ন চেট আৰম�ভ হ'লে পৃথক উইন�ডোত প�ৰদৰ�শন কৰক"
 
-#: ../data/empathy.schemas.in.h:29
-msgid "Path of the adium theme to use"
-msgstr "ব�যৱহাৰযোগ�য adium থিমৰ পাথ"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+msgid "Path of the Adium theme to use"
+msgstr "ব�যৱহাৰ কৰিবলে Adium থীমৰ পথ"
 
-#: ../data/empathy.schemas.in.h:30
-msgid "Path of the adium theme to use if the theme used for chat is adium."
-msgstr "সম�বাদৰ বাবে adium থিম ব�যৱহাৰ কৰা হ'লে adium থিমৰ পাথ ।"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr ""
+"যদি চেটৰ বাবে ব�যৱহাৰ কৰা থীম Adium হয় তেন�তে ব�যৱহাৰ কৰিব লগিয়া Adium থীমৰ পথ।"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
-msgstr "নত�ন বাৰ�তা প�ৰাপ�ত হ'লে শব�দ বজোৱা হ'ব"
+msgstr "নত�ন বাৰ�তা প�ৰাপ�ত হ'লে শব�দ বজাওক"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
-msgstr "নত�ন সম�বাদৰ বাবে শব�দ বজোৱা হ'ব"
+msgstr "নত�ন চেটৰ বাবে শব�দ বজাওক"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
-msgstr "নত�ন বাৰ�তা পঠিওৱা হ'লে শব�দ বজোৱা হ'ব"
+msgstr "নত�ন বাৰ�তা পঠিওৱা হ'লে শব�দ বজাওক"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
-msgstr "পৰিচিত ব�যক�তি প�ৰৱেশ কৰিলে শব�দ বজোৱা হ'ব"
+msgstr "পৰিচিত ব�যক�তি লগিন কৰিলে শব�দ বজাওক"
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
-msgstr "পৰিচিত ব�যক�তি প�ৰস�থান কৰিলে শব�দ বজোৱা হ'ব"
+msgstr "পৰিচিত ব�যক�তি প�ৰস�থান কৰিলে শব�দ বজাওক"
 
-#: ../data/empathy.schemas.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
-msgstr "নিজেই প�ৰৱেশ কৰিলে শব�দ বজোৱা হ'ব"
+msgstr "নিজেই লগিন কৰিলে শব�দ বজাওক"
 
-#: ../data/empathy.schemas.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
-msgstr "নিজেই প�ৰস�থান কৰিলে শব�দ বজোৱা হ'ব"
+msgstr "নিজেই প�ৰস�থান কৰিলে শব�দ বজাওক"
 
-#: ../data/empathy.schemas.in.h:38
-msgid "Popup notifications if the chat isn't focused"
-msgstr "সম�বাদৰ ক�ষেত�ৰত ফোকাছ নকৰিলে প'প-আপ দ�বাৰা সূচিত কৰা হ'ব"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "অধিসূচনাসমূহ পপ আপ কৰিব যদি চেট মনোনিবেষিত নহয়"
 
-#: ../data/empathy.schemas.in.h:39
-msgid "Popup notifications when a contact sign in"
-msgstr "পৰিচিত ব�যক�তি সংযোগ কৰিলে প'প-আপ দ�বাৰা সূচিত কৰা হ'ব"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+msgid "Pop up notifications when a contact logs in"
+msgstr "যেতিয়া �জন পৰিচয় লগিন কৰে অধিসূচনাসমূহ পপ-আপ কৰিব "
 
-#: ../data/empathy.schemas.in.h:40
-msgid "Popup notifications when a contact sign out"
-msgstr "পৰিচিত ব�যক�তিয়ে �ৰি গ'লে কৰিলে প'প-আপ দ�বাৰা সূচিত কৰা হ'ব"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+msgid "Pop up notifications when a contact logs out"
+msgstr "যেতিয়া �জন পৰিচয় লগআউট কৰে অধিসূচনাসমূহ পপ আপ কৰিব"
 
-#: ../data/empathy.schemas.in.h:41
-msgid "Salut account is created"
-msgstr "Salut হিচাপ নিৰ�মিত হৈছে"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr "�টা কলৰ সময়ত কেমেৰা পূৰ�বদৰ�শন যি অৱস�থাত থাকিব লাগিব।"
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+msgid "Show Balance in contact list"
+msgstr "অৱশিষ�ট পৰিচয় তালিকাত দেখ�ৱাওক"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
-msgstr "অৱতাৰৰ ছবি প�ৰদৰ�শন কৰা হ'ব"
+msgstr "অৱতাৰৰ ছবি প�ৰদৰ�শন কৰক"
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
-msgstr "ৰ�মত ব�যক�তিৰ তালিকা প�ৰদৰ�শন কৰা হ'ব"
+msgstr "ৰ�মত ব�যক�তিৰ তালিকা প�ৰদৰ�শন কৰক"
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
-msgstr "প�ৰধান সংযোগক�ষেত�ৰ বন�ধ কৰাৰ বাবে ইঙ�গিত প�ৰদৰ�শন কৰা হ'ব"
+msgstr "প�ৰধান উইন�ডো বন�ধ কৰাৰ বাবে ইঙ�গিত প�ৰদৰ�শন কৰক"
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
-msgstr "অফ-লাইন অৱস�থাত থকা পৰিচিত ব�যক�তিৰ তালিকা প�ৰদৰ�শন কৰা হ'ব"
+msgstr "অফ-লাইন অৱস�থাত থকা পৰিচিত ব�যক�তিৰ তালিকা প�ৰদৰ�শন কৰক"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+msgid "Show protocols"
+msgstr "প�ৰটোকলসমূহ দেখ�ৱাওক"
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "ভাষাৰ বাবে বানান পৰীক�ষণ"
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
-msgstr "বিনিময় কৰা সামগ�ৰী সংৰক�ষণৰ বাবে চিহ�নিত ফোল�ডাৰ ।"
+msgstr "স�থানান�তৰ কৰা সামগ�ৰী সংৰক�ষণৰ বাবে চিহ�নিত ফোল�ডাৰ।"
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
-msgstr "সৰ�বশেষ অৱতাৰৰ বাবে ব�যৱহৃত ছবি যি পঞ�জিকাৰ পৰা নিৰ�বাচন কৰা হৈছে ।"
+msgstr "সৰ�বশেষ অৱতাৰৰ বাবে ব�যৱহৃত ছবি যি পঞ�জিকাৰ পৰা নিৰ�বাচন কৰা হৈছে।"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+msgid "The position for the chat window side pane"
+msgstr "চেট উইন�ডো কাষ পেইনৰ অৱস�থান"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "চেট উইন�ডো কাষ পেইনৰ সংৰক�ষিত অৱস�থান (পিক�সেলসমূহত)।"
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
-msgstr "সম�বাদৰ সংযোগক�ষেত�ৰত কথোপকথন প�ৰদৰ�শনৰ বাবে ব�যৱহৃত থিম ।"
+msgstr "চেটৰ উইন�ডোত কথোপকথন প�ৰদৰ�শনৰ বাবে ব�যৱহৃত থীম।"
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "চেট উইন�ডোত কথোপকথনৰ প�ৰদৰ�শনৰ বাবে ব�যৱহৃত থীম অপৰ"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "গ�ৰাফিকেল স�মাইলি ব�যৱহাৰ কৰক"
 
-#: ../data/empathy.schemas.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
-msgstr "সূচনামূলক শব�দ ব�যৱহাৰ কৰা হ'ব"
+msgstr "সূচনামূলক শব�দ ব�যৱহাৰ কৰক"
 
-#: ../data/empathy.schemas.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
-msgstr "ছেট ৰ�মৰ বাবে থিম প�ৰয়োগ কৰা হ'ব"
+msgstr "চেট ৰ�মৰ বাবে থীম প�ৰয়োগ কৰক"
 
-#: ../data/empathy.schemas.in.h:53
-msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "WebKit বিকাশক সৰঞ�জাম যেনে Web Inspector সক�ৰিয় কৰা হ'ব নে নাই ।"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Empathy -� ব�যৱহাৰকাৰীৰ অৱস�থান সিহতৰ পৰিচয়সমূহলে প�ৰকাশ কৰিব পাৰিব নে।"
 
-#: ../data/empathy.schemas.in.h:54
-msgid "Whether or not Empathy can publish the user's location to his contacts."
-msgstr ""
-"ব�যৱহাৰকৰ�তাৰ ভৌগলিক অৱস�থান Empathy দ�বাৰা ব�যৱহাৰকৰ�তাৰ পৰিচিতক প�ৰকাশ কৰা হ'ব নে "
-"নাই ।"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Empathy -� অৱস�থান ঠাওৰ কৰিবলে GPS ব�যৱহাৰ কৰিব পাৰিব নে।"
 
-#: ../data/empathy.schemas.in.h:55
-msgid "Whether or not Empathy can use the GPS to guess the location."
-msgstr "ভৌগলিক অৱস�থান নিৰ�ধাৰণৰ বাবে Empathy দ�বাৰা GPS ব�যৱহাৰ কৰা হ'ব নে নাই ।"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Empathy -� অৱস�থান ঠাওৰ কৰিবলে চেল�লাৰ নেটৱাৰ�ক ব�যৱহাৰ কৰিব পাৰিব নে।"
 
-#: ../data/empathy.schemas.in.h:56
-msgid "Whether or not Empathy can use the cellular network to guess the location."
-msgstr ""
-"ভৌগলিক অৱস�থান নিৰ�ধাৰণৰ বাবে Empathy দ�বাৰা ছেল�লাৰ নে'টৱৰ�ক ব�যৱহাৰ কৰা হ'ব নে নাই ।"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Empathy -� অৱস�থান ঠাওৰ কৰিবলে নেটৱাৰ�ক ব�যৱহাৰ কৰিব পাৰিব নে।"
 
-#: ../data/empathy.schemas.in.h:57
-msgid "Whether or not Empathy can use the network to guess the location."
-msgstr "ভৌগলিক অৱস�থান নিৰ�ধাৰণৰ বাবে Empathy দ�বাৰা নে'টৱৰ�ক ব�যৱহাৰ কৰা হ'ব নে নাই ।"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+msgid "Whether Empathy has migrated butterfly logs."
+msgstr "Empathy -� বাটাফ�লাই লগসমূহ প�ৰব�ৰজন কৰিছে নে।"
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Empathy -� আৰম�ভণিত আপোনাৰ �কাওন�টসমূহত স�বচালিতভাৱে লগিন কৰিব লাগে নে।"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
-"Whether or not Empathy has asked about importing accounts from other "
-"programs."
-msgstr ""
-"অন�য প�ৰোগ�ৰামৰ পৰা হিচাপ আমদানি কৰাৰ উদ�দেশ�যে Empathy দ�বাৰা প�ৰশ�ন কৰা হৈছে নে নাই ।"
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "ব�যৱহাৰকাৰী অলস থাকিলে Empathy -� স�বচালিতভাৱে আতৰ অৱস�থাত যাব লাগে নে।"
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
-"Whether or not Empathy should automatically log in to your accounts on "
-"startup."
-msgstr "Empathy প�ৰাৰম�ভসময়ত স�বয়ংক�ৰিয়ৰূপে সকল হিচাপে প�ৰৱেশ কৰা হ'ব নে নাই ।"
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Empathy -� গোপনীয়তা কাৰণসমূহৰ বাবে অৱস�থানৰ সঠিকতা কমাব লাগে নে।"
 
-#: ../data/empathy.schemas.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether or not Empathy should reduce the location's accuracy for privacy "
-"reasons."
-msgstr ""
-"ভৌগলিক অৱস�থানৰ গোপনীয়তা বজায় ৰখাৰ বাবে Empathy দ�বাৰা অৱস�থান নিৰ�ধাৰণৰ সময় "
-"নিৰ�ভ�লতাৰ পৰিমাণ হ�ৰাস কৰা হ'ব নে নাই ।"
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Empathy -� পৰিচয়ৰ অৱতাৰক চেট উইন�ডোৰ আইকন হিচাপে ব�যৱহাৰ কৰিব লাগে নে।"
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
-"Whether or not Empathy should use the avatar of the contact as the chat "
-"window icon."
-msgstr ""
-"সম�বাদৰ সংযোগক�ষেত�ৰৰ আইকনৰূপে পৰিচয়ৰ অৱতাৰৰ ছবি Empathy দ�বাৰা প�ৰয়োগ কৰা হ'ব নে নাই ।"
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "WebKit উন�নয়নক স�জ�লি যেনে Web Inspector সামৰ�থবান কৰক নে নাই।"
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
-"Whether or not connectivity managers should be used to automatically "
-"disconnect/reconnect."
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
 msgstr ""
-"স�বয়ংক�ৰিয়ৰূপে সংযোগ স�থাপন/বিচ�ছিন�ন কৰাৰ বাবে সংযোগ পৰিচালনব�যৱস�থা প�ৰয়োগ কৰা হ'ব "
-"নে নাই ।"
+"স�বচালিতভাৱে বিচ�ছিন�ন/প�নৰসংযোগ কৰিবলে সংযোগ ব�যৱস�থাপকসমূহক ব�যৱহাৰ কৰিব লাগে নে।"
 
-#: ../data/empathy.schemas.in.h:63
-msgid "Whether or not the Salut account has been created on the first Empathy run."
-msgstr "Empathy প�ৰথমবাৰ সঞ�চালনৰ সময় Salut হিচাপ নিৰ�মিত হৈছে নে নাই ।"
-
-#: ../data/empathy.schemas.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
-"Whether or not to check words typed against the languages you want to check "
-"with."
+"Whether to check words typed against the languages you want to check with."
 msgstr ""
-"কোনো শব�দ লিখা হ'লে পৰীক�ষণৰ বাবে চিহ�নিত ভাষাসমূহ অন�যায়ী তাক পৰীক�ষা কৰা হ'ব নে নাই ।"
+"আপ�নি নিৰীক�ষণ কৰিব বিচৰা ভাষাসমূহৰ কাষত টাইপ কৰা শব�দসমূহ নিৰীক�ষণ কৰা হব নে।"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "স�মাইলিসমূহক কথোপকথনৰ সময়ত গ�ৰাফীয় ছবিসমূহলে পৰিৱৰ�তন কৰা হব নে।"
 
-#: ../data/empathy.schemas.in.h:65
-msgid "Whether or not to convert smileys into graphical images in conversations."
-msgstr "সম�বাদৰ সময় স�মাইলি চিহ�নসমূহ ছবিতে ৰূপান�তৰ কৰা হ'ব নে নাই ।"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Pulseaudio -ৰ প�ৰতিধ�বনি বাতিল কৰা পৰিস�ৰাৱন সামৰ�থবান কৰিব লাগে নে।"
 
-#: ../data/empathy.schemas.in.h:66
-msgid "Whether or not to play a sound to notify for contacts logging in the network."
-msgstr "পৰিচিত ব�যক�তিৰ নে'টৱৰ�কত প�ৰৱেশ কৰিলে সূচনাপ�ৰদানৰ বাবে শব�দ বজোৱা হ'ব নে নাই ।"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "নেটৱাৰ�কত লগিন কৰা পৰিচয়সমূহ অধিসূচনা কৰিবলে �টা শব�দ বজোৱা হব নে।"
 
-#: ../data/empathy.schemas.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
-"Whether or not to play a sound to notify for contacts logging off the "
-"network."
-msgstr ""
-"পৰিচিত ব�যক�তিৰ নে'টৱৰ�কত প�ৰস�থান কৰিলে সূচনাপ�ৰদানৰ বাবে শব�দ বজোৱা হ'ব নে নাই ।"
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "নেটৱাৰ�কৰ পৰা লগ আউট কৰা পৰিচয়সমূহ অধিসূচনা কৰিবলে �টা শব�দ বজোৱা হব নে।"
 
-#: ../data/empathy.schemas.in.h:68
-msgid "Whether or not to play a sound to notify for events."
-msgstr "বিভিন�ন ঘটনা সম�পৰ�কে সূচনাপ�ৰদানৰ বাবে শব�দ বজোৱা হ'ব নে নাই ।"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+msgid "Whether to play a sound to notify of events."
+msgstr "ঘটনাসমূহ অধিসূচনা দিবলে �টা শব�দ বজোৱা হব নে।"
 
-#: ../data/empathy.schemas.in.h:69
-msgid "Whether or not to play a sound to notify for incoming messages."
-msgstr "প�ৰাপ�ত বাৰ�তা সম�পৰ�কে সূচনাপ�ৰদানৰ বাবে শব�দ বজোৱা হ'ব নে নাই ।"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "আগ'ত বাৰ�তাসমূহৰ বিষয়ে অধিসূচনা দিবলে �টা শব�দ বজোৱা হব নে।"
 
-#: ../data/empathy.schemas.in.h:70
-msgid "Whether or not to play a sound to notify for new conversations."
-msgstr "নত�ন সম�বাদ সম�পৰ�কে সূচনাপ�ৰদানৰ বাবে শব�দ বজোৱা হ'ব নে নাই ।"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "নত�ন কথোপকথনসমূহৰ বিষয়ে অধিসূচনা দিবলে �টা শব�দ বজোৱা হব নে।"
 
-#: ../data/empathy.schemas.in.h:71
-msgid "Whether or not to play a sound to notify for outgoing messages."
-msgstr "প�ৰৰিত বাৰ�তা সম�পৰ�কে সূচনাপ�ৰদানৰ বাবে শব�দ বজোৱা হ'ব নে নাই ।"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "বাহিৰগামি বাৰ�তাসমূহৰ অধিসূচনা দিবলে �টা শব�দ বজোৱা হব নে।"
 
-#: ../data/empathy.schemas.in.h:72
-msgid "Whether or not to play a sound when logging in a network."
-msgstr "নে'টৱৰ�কত প�ৰৱেশ কৰিলে সূচনাপ�ৰদানৰ বাবে শব�দ বজোৱা হ'ব নে নাই ।"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+msgid "Whether to play a sound when logging into a network."
+msgstr "�টা নেটৱাৰ�কত লগিন কৰোতে �টা শব�দ বজোৱা হব নে।"
 
-#: ../data/empathy.schemas.in.h:73
-msgid "Whether or not to play a sound when logging off a network."
-msgstr "নে'টৱৰ�কত প�ৰস�থান কৰিলে সূচনাপ�ৰদানৰ বাবে শব�দ বজোৱা হ'ব নে নাই ।"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+msgid "Whether to play a sound when logging out of a network."
+msgstr "�টা নেটৱাৰ�কৰ পৰা লগ আউট কৰোতে �টা শব�দ বজোৱা হব নে।"
 
-#: ../data/empathy.schemas.in.h:74
-msgid "Whether or not to play sound notifications when away or busy."
-msgstr "অন�পস�থিত অথবা ব�যস�ত থাকিলে সূচনাপ�ৰদানৰ বাবে শব�দ বজোৱা হ'ব নে নাই ।"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+msgid "Whether to play sound notifications when away or busy."
+msgstr "আতৰত বা ব�যস�ত থাকোতে শব�দ অধিসূচনাসমূহ বজোৱা হব নে।"
 
-#: ../data/empathy.schemas.in.h:75
-msgid "Whether or not to show a popup notification when a contact goes offline."
-msgstr "পৰিচিত ব�যক�তি অফ-লাইন হ'লে প'প-আপ সূচনাবাৰ�তা প�ৰদৰ�শন কৰা হ'ব নে নাই ।"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "�জন পৰিচয় অফলাইন হওতে �টা পপআপ অধিসূচনা দেখাব লাগে নে।"
 
-#: ../data/empathy.schemas.in.h:76
-msgid "Whether or not to show a popup notification when a contact goes online."
-msgstr "পৰিচিত ব�যক�তি অন-লাইন আহিলে প'প-আপ সূচনাবাৰ�তা প�ৰদৰ�শন কৰা হ'ব নে নাই ।"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "�জন পৰিচয় অনলাইন হওতে �টা পপআপ অধিসূচনা দেখাব লাগে নে।"
 
-#: ../data/empathy.schemas.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
-"Whether or not to show a popup notification when receiving a new message "
-"even if the chat is already opened, but not focused."
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
 msgstr ""
+"�টা নত�ন বাৰ�তা গ�ৰহণ কৰোতে চেট ইতিমধ�যে খোলা থাকিলেও, কিন�ত� মনোনিবেষিত নহয় �টা "
+"পপআপ অধিসূচনা দেখ�ৱা হব নে। "
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "�টা নত�ন বাৰ�তা গ�ৰহণ কৰোতে �টা পপআপ অধিসূচনা দেখ�ৱা হব নে।"
 
-#: ../data/empathy.schemas.in.h:78
-msgid "Whether or not to show a popup notification when receiving a new message."
-msgstr "নত�ন বাৰ�তা প�ৰাপ�ত কৰা হ'লে প'প-আপৰ মাধ�যমে সূচনা প�ৰদান কৰা হ'ব নে নাই ।"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+msgid "Whether to show account balances in the contact list."
+msgstr "�কাওন�ট অৱশিষ�টসমূহ পৰিচয় তালিকাত দেখ�ৱা হব নে।"
 
-#: ../data/empathy.schemas.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
-"Whether or not to show avatars for contacts in the contact list and chat "
-"windows."
-msgstr ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "পৰিচয় তালিকা আৰ� চেট উইন�ডোসমূহত পৰিচয়সমূহৰ বাবে অৱতাৰসমূহ দেখ�ৱা হব নে।"
 
-#: ../data/empathy.schemas.in.h:80
-msgid "Whether or not to show contacts that are offline in the contact list."
-msgstr ""
-"পৰিচয় তালিকাত উপস�থিত ব�যক�তি অফ-লাইন থাকিলে তালিকাত তেও�ৰ প�ৰদৰ�শন কৰা হ'ব "
-"নে নাই ।"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "পৰিচয় তালিকাত অফলাইন থকা পৰিচয়সমূহ দেখ�ৱা হব নে।"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+msgid "Whether to show popup notifications when away or busy."
+msgstr "আতৰত বা ব�যস�ত থাকোতে পপ আপ অধিসূচনাসমূহ দেখ�ৱা হব নে।"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "পৰিচয় তালিকাৰ পৰিচয়সমূহৰ বাবে প�ৰটোকলসমূহ দেখ�ৱা হব নে।"
 
-#: ../data/empathy.schemas.in.h:81
-msgid "Whether or not to show popup notifications when away or busy."
-msgstr "অন�পস�থিত অথবা ব�যস�ত থাকিলে প'প-আপ সূচনাবাৰ�তা প�ৰদৰ�শন কৰা হ'ব নে নাই ।"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+msgid "Whether to show the contact list in chat rooms."
+msgstr "চেট ৰ�মসমূহত পৰিচয় তালিকা দেখ�ৱা হব নে।"
 
-#: ../data/empathy.schemas.in.h:82
-msgid "Whether or not to show the contact list in chat rooms."
-msgstr "ছেট ৰ�মত পৰিচয় তালিকা প�ৰদৰ�শন কৰা হ'ব নে নাই ।"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+msgid "Whether to show the contact list in compact mode."
+msgstr "পৰিচয় তালিকাক সংকোচিত অৱস�থাত দেখ�ৱা হব নে।"
 
-#: ../data/empathy.schemas.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
-"Whether or not to show the message dialog about closing the main window with "
-"the 'x' button in the title bar."
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
 msgstr ""
+"মূখ�য উইন�ডোক শীৰ�ষক বাৰৰ 'x' ব�টামৰ সৈতে বন�ধ কৰাৰ বাৰ�তা ডাইলগক দেখ�ৱা হব নে।"
 
-#: ../data/empathy.schemas.in.h:84
-msgid "Whether to show the contact list in compact mode or not."
-msgstr "সংক�চিত মোডত পৰিচয় তালিকা প�ৰদৰ�শন কৰা হ'ব নে নাই ।"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+msgid "Whether to use the theme for chat rooms."
+msgstr "চেট ৰ�মসমূহৰ বাবে থীম ব�যৱহাৰ কৰা হব নে।"
 
-#: ../data/empathy.schemas.in.h:85
-msgid "Whether to use the theme for chat rooms or not."
-msgstr "ছেট ৰ�মৰ বাবে থিম ব�যৱহাৰ কৰা হ'ব নে নাই ।"
-
-#: ../data/empathy.schemas.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
-"Which criterium to use when sorting the contact list. Default is to use sort "
-"by the contact's name with the value \"name\". A value of \"state\" will "
-"sort the contact list by state."
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's name with the value \"name\". A value of \"state\" will sort "
+"the contact list by state."
 msgstr ""
+"পৰিচয় তালিকা সজাওতে কোনটো নিয়ম ব�যৱহাৰ কৰা হব। অবিকল�পিত হল পৰিচয়ৰ নামৰে সজোৱা "
+"\"নাম\" মানৰ সৈতে। \"state\" -ৰ মানে পৰিচয় তালিকাক অৱস�থাৰে সজাব।"
+
+#: ../data/empathy-accounts.desktop.in.in.h:1
+msgid "Manage Messaging and VoIP accounts"
+msgstr "বাৰ�তা আৰ� VoIP �কাওন�টসমূহ ব�যৱস�থাপনা কৰক"
 
-#: ../libempathy/empathy-account.c:1158
-msgid "Can't set an empty display name"
-msgstr "প�ৰদৰ�শনযোগ�য নাম ৰিক�ত ৰখা নাযাব"
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:2
+#: ../src/empathy-accounts-dialog.c:2324
+msgid "Messaging and VoIP Accounts"
+msgstr "বাৰ�তা আৰ� VoIP �কাওন�টসমূহ"
 
-#: ../libempathy/empathy-ft-handler.c:839
-msgid "The hash of the received file and the sent one do not match"
-msgstr "প�ৰাপ�ত আৰ� প�ৰেৰিত নথিপত�ৰৰ হেশ�ব অমিল"
+#: ../libempathy/empathy-ft-handler.c:825
+msgid "File transfer completed, but the file was corrupted"
+msgstr "নথিপত�ৰ স�থানান�তৰ সম�পূৰ�ণ হল, কিন�ত� নথিপত�ৰ ক�ষতিগ�ৰস�থ আছিল"
 
-#: ../libempathy/empathy-ft-handler.c:1099
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
-msgstr "দূৰবৰ�তী পৰিচয় দ�বাৰা নথিপত�ৰ বিনিময় সমৰ�থিত নহয়"
+msgstr "দূৰবৰ�তী পৰিচয় দ�বাৰা নথিপত�ৰ স�থানান�তৰ সমৰ�থিত নহয়"
 
-#: ../libempathy/empathy-ft-handler.c:1157
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is not a regular file"
 msgstr "নিৰ�বাচিত নথিপত�ৰ �টা স�বাভাবিক নথিপত�ৰ নহয়"
 
-#: ../libempathy/empathy-ft-handler.c:1166
+#: ../libempathy/empathy-ft-handler.c:1176
 msgid "The selected file is empty"
 msgstr "নিৰ�বাচিত নথিপত�ৰ ৰিক�ত"
 
-#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:285
-msgid "People nearby"
-msgstr "ওচৰৰ ব�যক�তিৰ"
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#, c-format
+msgid "Missed call from %s"
+msgstr "%s -ৰ পৰা মিচ কল"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, c-format
+msgid "Called %s"
+msgstr "%s -ক কল কৰা হৈছিল"
+
+#: ../libempathy/empathy-message.c:422
+#, c-format
+msgid "Call from %s"
+msgstr "%s -ৰ পৰা কল"
 
-#: ../libempathy/empathy-tp-file.c:280
+#: ../libempathy/empathy-tp-file.c:268
 msgid "Socket type not supported"
 msgstr "ছ'কেটৰ ধৰন সমৰ�থিত নহয়"
 
-#: ../libempathy/empathy-tp-file.c:399
+#: ../libempathy/empathy-tp-file.c:387
 msgid "No reason was specified"
 msgstr "কোনো কাৰণ উল�লিখিত নহয়"
 
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-tp-file.c:390
 msgid "The change in state was requested"
 msgstr "অৱস�থাৰ পৰিবৰ�তন অন�ৰোধ কৰা হৈছে"
 
-#: ../libempathy/empathy-tp-file.c:405
+#: ../libempathy/empathy-tp-file.c:393
 msgid "You canceled the file transfer"
-msgstr "নথিপত�ৰ বিনিময়ৰ কাম আপ�নি বাতিল কৰিছে"
+msgstr "নথিপত�ৰ স�থানান�তৰৰ কাম আপ�নি বাতিল কৰিছে"
 
-#: ../libempathy/empathy-tp-file.c:408
+#: ../libempathy/empathy-tp-file.c:396
 msgid "The other participant canceled the file transfer"
-msgstr "নথিপত�ৰ বিনিময়ৰ কাম অন�য ব�যৱহাৰকৰ�তা বাতিল কৰিছে"
+msgstr "নথিপত�ৰ স�থানান�তৰৰ কাম অন�য ব�যৱহাৰকাৰী বাতিল কৰিছে"
 
-#: ../libempathy/empathy-tp-file.c:411
+#: ../libempathy/empathy-tp-file.c:399
 msgid "Error while trying to transfer the file"
-msgstr "নথিপত�ৰ বিনিময় কৰিবলৈ সমস�যা"
+msgstr "নথিপত�ৰ স�থানান�তৰ কৰিবলৈ সমস�যা"
 
-#: ../libempathy/empathy-tp-file.c:414
+#: ../libempathy/empathy-tp-file.c:402
 msgid "The other participant is unable to transfer the file"
-msgstr "অন�য ব�যৱহাৰকৰ�তা নথিপত�ৰ বিনিময় কৰিবলৈ সক�ষম নহয়"
+msgstr "অন�য ব�যৱহাৰকাৰী নথিপত�ৰ স�থানান�তৰ কৰিবলৈ সক�ষম নহয়"
 
-#: ../libempathy/empathy-tp-file.c:417
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
 msgid "Unknown reason"
 msgstr "অজ�ঞাত কাৰণ"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:232
 msgid "Available"
 msgstr "উপস�থিত"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:234
 msgid "Busy"
 msgstr "ব�যস�ত"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:237
 msgid "Away"
-msgstr "অন�পস�থিত"
+msgstr "আতৰত"
 
-#: ../libempathy/empathy-utils.c:242
-msgid "Hidden"
-msgstr "ল�ক�ৱা"
+#: ../libempathy/empathy-utils.c:239
+msgid "Invisible"
+msgstr "অদৃশ�য"
 
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:241
 msgid "Offline"
 msgstr "অফ-লাইন"
 
-#: ../libempathy/empathy-utils.c:380 ../src/empathy-import-mc4-accounts.c:104
+#. translators: presence type is unknown
+#: ../libempathy/empathy-utils.c:244
+msgctxt "presence"
+msgid "Unknown"
+msgstr "অজ�ঞাত"
+
+#: ../libempathy/empathy-utils.c:284
+msgid "No reason specified"
+msgstr "কোনো কাৰণ ধাৰ�য�য কৰা হোৱা নাই"
+
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+msgid "Status is set to offline"
+msgstr "অৱস�থা অফলাইনলে সংহতি কৰা হৈছে"
+
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
+#: ../libempathy-gtk/empathy-call-utils.c:49
+msgid "Network error"
+msgstr "নেটৱাৰ�ক  ত�ৰ�টি"
+
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+msgid "Authentication failed"
+msgstr "প�ৰমাণীকৰণ ব�যৰ�থ"
+
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+msgid "Encryption error"
+msgstr "�নক�ৰিপছন  ত�ৰ�টি"
+
+#: ../libempathy/empathy-utils.c:294
+msgid "Name in use"
+msgstr "নাম বৰ�তমানে ব�যৱহৃত হৈছে"
+
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+msgid "Certificate not provided"
+msgstr "প�ৰমাণপত�ৰ উপলব�ধ কৰা নহয়"
+
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+msgid "Certificate untrusted"
+msgstr "প�ৰমাণপত�ৰ বিশ�বস�ত নহয়"
+
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+msgid "Certificate expired"
+msgstr "প�ৰমাণপত�ৰৰ সময়সীমা উত�তীৰ�ণ হৈছে"
+
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+msgid "Certificate not activated"
+msgstr "প�ৰমাণপত�ৰ সক�ৰিয় কৰা নহয়"
+
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+msgid "Certificate hostname mismatch"
+msgstr "প�ৰমাণপত�ৰৰ হস�টনাম লৈ অমিল"
+
+#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+msgid "Certificate fingerprint mismatch"
+msgstr "প�ৰমাণপত�ৰৰ ফিনঙ�গাৰপ�ৰিন�ট লৈ অমিল"
+
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+msgid "Certificate self-signed"
+msgstr "স�বয়ং স�বাক�ষৰিত প�ৰমাণপত�ৰ"
+
+#: ../libempathy/empathy-utils.c:310
+msgid "Certificate error"
+msgstr "প�ৰমাণপত�ৰ  ত�ৰ�টি"
+
+#: ../libempathy/empathy-utils.c:344
+msgid "Encryption is not available"
+msgstr "ইনক�ৰিপষণ উপলব�ধ নহয়"
+
+#: ../libempathy/empathy-utils.c:346
+msgid "Certificate is invalid"
+msgstr "প�ৰমাণপত�ৰ অবৈধ"
+
+#: ../libempathy/empathy-utils.c:348
+msgid "Connection has been refused"
+msgstr "সংযোগ নাকচ কৰা হৈছে"
+
+#: ../libempathy/empathy-utils.c:350
+msgid "Connection can't be established"
+msgstr "সংযোগ স�থাপন কৰিব নোৱাৰি"
+
+#: ../libempathy/empathy-utils.c:352
+msgid "Connection has been lost"
+msgstr "সংযোগ হেৰাইছে"
+
+#: ../libempathy/empathy-utils.c:354
+msgid "This resource is already connected to the server"
+msgstr "সম�পদ ইতিমধ�যে চাৰ�ভাৰৰ সৈতে সংযোগিত"
+
+#: ../libempathy/empathy-utils.c:356
+msgid ""
+"Connection has been replaced by a new connection using the same resource"
+msgstr "সংযোগক �কে সম�পদ ব�যৱহাৰ কৰি �টা নত�ন সংযোগৰে প�ৰতিস�থাপন কৰা হৈছে"
+
+#: ../libempathy/empathy-utils.c:359
+msgid "The account already exists on the server"
+msgstr "�কাওন�ট ইতিমধ�যে চাৰ�ভাৰত উপস�থিত"
+
+#: ../libempathy/empathy-utils.c:361
+msgid "Server is currently too busy to handle the connection"
+msgstr "চাৰ�ভাৰ সংযোগ ব�যৱস�থাপনা কৰিবলে বৰ�তমানে অতি ব�যস�ত"
+
+#: ../libempathy/empathy-utils.c:363
+msgid "Certificate has been revoked"
+msgstr "প�ৰমাণপত�ৰ প�ৰত�যাহাৰ কৰা হৈছে"
+
+#: ../libempathy/empathy-utils.c:365
+msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr ""
+"প�ৰমাণপত�ৰয় �টা অস�ৰক�ষিত চিফাৰ �লগৰিথম ব�যৱহাৰ কৰে অথবা ক�ৰিপ�টোগ�ৰাফিয়ভাৱে দ�ৰ�বল"
+
+#: ../libempathy/empathy-utils.c:368
+msgid ""
+"The length of the server certificate, or the depth of the server certificate "
+"chain, exceed the limits imposed by the cryptography library"
+msgstr ""
+"চাৰ�ভাৰ প�ৰমাণপত�ৰৰ দৈৰ�ঘ, অথবা চাৰ�ভাৰ প�ৰমাণপত�ৰ শৃংখলৰ গভীৰতা, ক�ৰিপ�টোগ�ৰাফী "
+"লাইব�ৰেৰীয়ে প�ৰণয়ন কৰা সীমাসমূহত অতিক�ৰম কৰে"
+
+#: ../libempathy/empathy-utils.c:529
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "ওচৰৰ ব�যক�তিৰ"
 
-#: ../libempathy/empathy-utils.c:385
+#: ../libempathy/empathy-utils.c:534
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:386
+#: ../libempathy/empathy-utils.c:563
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../libempathy/empathy-utils.c:564
 msgid "Facebook Chat"
 msgstr "Facebook Chat"
 
-#: ../libempathy/empathy-time.c:137
+#: ../libempathy/empathy-time.c:88
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d ছেকেণ�ড আগতে"
 msgstr[1] "%d ছেকেণ�ড আগতে"
 
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:93
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d মিনিট আগতে"
 msgstr[1] "%d মিনিট আগতে"
 
-#: ../libempathy/empathy-time.c:147
+#: ../libempathy/empathy-time.c:98
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d ঘন�টা আগতে"
 msgstr[1] "%d ঘন�টা আগতে"
 
-#: ../libempathy/empathy-time.c:152
+#: ../libempathy/empathy-time.c:103
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d দিন আগতে"
 msgstr[1] "%d দিন আগতে"
 
-#: ../libempathy/empathy-time.c:157
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d সপ�তাহ আগতে"
 msgstr[1] "%d সপ�তাহ আগতে"
 
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:113
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d মাহ আগতে"
 msgstr[1] "%d মাহ আগতে"
 
-#: ../libempathy/empathy-time.c:167
+#: ../libempathy/empathy-time.c:136
 msgid "in the future"
 msgstr "ভবিষ�যতে"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:424
-msgid "All"
-msgstr "সকলো"
+#: ../libempathy-gtk/empathy-account-chooser.c:540
+msgid "All accounts"
+msgstr "সকলো �কাওন�ট"
+
+#: ../libempathy-gtk/empathy-account-widget.c:694
+#: ../src/empathy-import-widget.c:321
+msgid "Account"
+msgstr "�কাওন�ট"
+
+#: ../libempathy-gtk/empathy-account-widget.c:695
+msgid "Password"
+msgstr "পাছৱাৰ�ড"
+
+#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
+msgid "Server"
+msgstr "চাৰ�ভাৰ"
+
+#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
+msgid "Port"
+msgstr "পোৰ�ট"
 
-#: ../libempathy-gtk/empathy-account-widget.c:430
-#: ../libempathy-gtk/empathy-account-widget.c:486
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1264
-msgid "Enabled"
-msgstr "সক�ৰিয়"
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "মোৰ ৱেব �কাওন�টসমূহ"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
+#, c-format
+msgid "The account %s is edited via %s."
+msgstr "�কাওন�ট %s -ক %s -ৰে সম�পাদন কৰা হৈছে।"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1214
+#, c-format
+msgid "The account %s cannot be edited in Empathy."
+msgstr "�কাওন�ট %s -ক Empathy -ত সম�পাদন কৰিব নোৱাৰি।"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1233
+msgid "Launch My Web Accounts"
+msgstr "মোৰ ৱেব �কাওন�টসমূহ লঞ�চ কৰক"
+
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "%s সম�পাদনা কৰক"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+msgid "Username:"
+msgstr "ব�যৱহাৰকাৰীৰ নাম:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1909
+msgid "A_pply"
+msgstr "প�ৰয়োগ কৰক (_p)"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1939
+msgid "L_og in"
+msgstr "লগিন কৰক (_o)"
+
+#: ../libempathy-gtk/empathy-account-widget.c:2013
+msgid "This account already exists on the server"
+msgstr "�ই �কাওন�ট ইতিমধ�যে চাৰ�ভাৰত অস�তিত�ববান"
+
+#: ../libempathy-gtk/empathy-account-widget.c:2016
+msgid "Create a new account on the server"
+msgstr "চাৰ�ভাৰত �টা নত�ন �কাওন�ট সৃষ�টি কৰক"
+
+#: ../libempathy-gtk/empathy-account-widget.c:2208
+msgid "Ca_ncel"
+msgstr "বাতিল কৰক (_n)"
+
+#. To translators: The first parameter is the login id and the
+#. * second one is the network. The resulting string will be something
+#. * like: "MyUserName on freenode".
+#. * You should reverse the order of these arguments if the
+#. * server should come before the login id in your locale.
+#: ../libempathy-gtk/empathy-account-widget.c:2486
+#, c-format
+msgid "%1$s on %2$s"
+msgstr "%1$s %2$s ত"
+
+#. To translators: The parameter is the protocol name. The resulting
+#. * string will be something like: "Jabber Account"
+#: ../libempathy-gtk/empathy-account-widget.c:2512
+#, c-format
+msgid "%s Account"
+msgstr "%s �কাওন�ট"
+
+#: ../libempathy-gtk/empathy-account-widget.c:2516
+msgid "New account"
+msgstr "নত�ন �কাওন�ট"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> MyScreenName</span>"
-msgstr "<span size=\"small\"><b>যেনে:</b> MyScreenName</span>"
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>উদাহৰণ:</b> মোৰপৰ�দানাম"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -586,360 +871,642 @@ msgstr "উন�নত বিকল�প"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "Pass_word:"
-msgstr "গ�প�তশব�দ: (_w)"
+msgstr "পাছৱাৰ�ড: (_w)"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Remember Password"
+msgstr "পাছৱাৰ�ড মনত ৰাখক"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-password-dialog.c:311
+msgid "Remember password"
+msgstr "পাছৱাৰ�ড মনত ৰাখক"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 msgid "Screen _Name:"
 msgstr "পৰ�দাত ব�যৱহৃত নাম: (_N)"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
 msgid "What is your AIM password?"
-msgstr "আপোনাৰ AIM গ�প�তশব�দ কি ?"
+msgstr "আপোনাৰ AIM পাছৱাৰ�ড কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
-msgstr "আপোনাৰ AIM হিচাপৰ ব�যৱহাৰকৰ�তাৰ-নাম কি ?"
+msgstr "আপোনাৰ AIM �কাওন�টৰ ব�যৱহাৰকাৰীৰ-নাম কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "_Port:"
 msgstr "পোৰ�ট: (_P)"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
 #: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
-msgstr "সেৱক: (_S)"
+msgstr "চাৰ�ভাৰ: (_S)"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> username</span>"
-msgstr "<span size=\"small\"><b>যেনে:</b> username</span>"
+msgid "<b>Example:</b> username"
+msgstr "<b>উদাহৰণ:</b> ব�যৱহাৰকাৰীনাম"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "Login I_D:"
-msgstr "প�ৰৱেশ ID: (_D)"
+msgstr "লগিন ID: (_D)"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
 msgid "What is your GroupWise User ID?"
-msgstr "আপোনাৰ GroupWise ব�যৱহাৰকৰ�তাৰ ID কি ?"
+msgstr "আপোনাৰ GroupWise ব�যৱহাৰকাৰীৰ ID কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise password?"
-msgstr "আপোনাৰ GroupWise গ�প�তশব�দ কি ?"
+msgstr "আপোনাৰ GroupWise পাছৱাৰ�ড কি ?"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> 123456789</span>"
-msgstr "<span size=\"small\"><b>যেনে:</b> 123456789</span>"
+msgid "<b>Example:</b> 123456789"
+msgstr "<b>উদাহৰণ:</b> 123456789"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "Ch_aracter set:"
+msgstr "আখৰ সংহতি (_a):"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
 msgid "ICQ _UIN:"
 msgstr "ICQ _UIN:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
 msgid "What is your ICQ UIN?"
 msgstr "আপোনাৰ ICQ UIN কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ password?"
-msgstr "ICQ গ�প�তশব�দ কি ?"
+msgstr "ICQ পাছৱাৰ�ড কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Charset:"
-msgstr "কেৰছেট: (_C)"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
+msgid "Auto"
+msgstr "স�বচালিত"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:244
-msgid "New Network"
-msgstr "নত�ন নে'টৱৰ�ক"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
+msgid "UDP"
+msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Charset:"
-msgstr "কেৰছেট:"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
+msgid "TCP"
+msgstr "TCP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
+msgid "TLS"
+msgstr "TLS"
+
+#. translators: this string is very specific to SIP's internal; maybe
+#. * best to keep the English version.
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
+msgid "Register"
+msgstr "ৰেজিস�টাৰ কৰক"
+
+#. translators: this string is very specific to SIP's internal; maybe
+#. * best to keep the English version.
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
+msgid "Options"
+msgstr "বিকল�পসমূহ"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
+msgid "None"
+msgstr "কোনো নহয়"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "Network"
-msgstr "নে'টৱৰ�ক"
+msgid "Character set:"
+msgstr "আখৰ সংহতি:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-msgid "Network:"
-msgstr "নে'টৱৰ�ক:"
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"সৰহভাগ IRC চাৰ�ভাৰসমূহৰ �টা পাছৱাৰ�ডৰ প�ৰয়োজন নহয়, সেয়েহে যদি আপ�নি নিশ�চিত নহয়, "
+"�টা পাছৱাৰ�ড নসোমাব।"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Network"
+msgstr "নেটৱাৰ�ক"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+msgid "Network:"
+msgstr "নেটৱাৰ�ক:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "উপনাম:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
-msgstr "গ�প�তশব�দ:"
+msgstr "পাছৱাৰ�ড:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "প�ৰস�থানসময়ত প�ৰদৰ�শিত বাৰ�তা:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "প�ৰকৃত নাম:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Servers"
-msgstr "সেৱক"
+msgstr "চাৰ�ভাৰসমূহ"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
+msgid "What is your IRC nickname?"
+msgstr "আপোনাৰ IRC উপনাম কি?"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "Which IRC network?"
+msgstr "কোন IRC নেটৱাৰ�ক?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> user@gmail.com</span>"
-msgstr "<span size=\"small\"><b>যেনে:</b> user@gmail.com</span>"
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>উদাহৰণ:</b> user@gmail.com"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<span size=\"small\"><b>Example:</b> user@jabber.org</span>"
-msgstr "<span size=\"small\"><b>যেনে:</b> user@jabber.org</span>"
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>উদাহৰণ:</b> user@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "ইনক�ৰিপষণৰ প�ৰয়োজন (TLS/SSL) (_y)"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "Override server settings"
-msgstr "সেৱকৰ বৈশিষ�ট�য উপেক�ষা কৰা হ'ব"
+msgid "I_gnore SSL certificate errors"
+msgstr "SSL প�ৰমাণপত�ৰ ত�ৰ�টিসমূহ উপেক�ষা কৰক (_g)"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Pri_ority:"
-msgstr "গ�ৰ�ত�ব: (_o)"
+msgid "Override server settings"
+msgstr "চাৰ�ভাৰৰ বৈশিষ�ট�য উপেক�ষা কৰক"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "Priori_ty:"
+msgstr "গ�ৰ�ত�ব (_t):"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 msgid "Reso_urce:"
-msgstr "সামগ�ৰী: (_u)"
+msgstr "সম�পদ: (_u)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+msgid ""
+"This is your username, not your normal Facebook login.\n"
+"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
+"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
+"Facebook username if you don't have one."
+msgstr ""
+"�ইটো আপোনাৰ ব�যৱহাৰকাৰীনাম, আপোনাৰ সাধাৰণ Facebook লগিন নহয়।\n"
+"যদি আপ�নি �জন facebook.com/<b>badger</b> হয়, সোমাওক <b>badger</b>।\n"
+"যদি আপোনাৰ �টা Facebook ব�যৱহাৰকাৰীনাম নাই �টা বাছইবলে <a href=\"http://www."
+"facebook .com/username/\">�ই পৃষ�ঠা ব�যৱহাৰ কৰক</a>।"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "Use old SS_L"
 msgstr "প�ৰনি SSL ব�যৱহাৰ কৰা হ'ব (_L)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "What is your Facebook password?"
+msgstr "আপোনাৰ Facebook পাছৱাৰ�ড কি?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "What is your Facebook username?"
+msgstr "আপোনাৰ Facebook ব�যৱহাৰকাৰীনাম কি?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 msgid "What is your Google ID?"
 msgstr "আপোনাৰ Google ID কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 msgid "What is your Google password?"
-msgstr "আপোনাৰ Google গ�প�তশব�দ কি ?"
+msgstr "আপোনাৰ Google পাছৱাৰ�ড কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
 msgid "What is your Jabber ID?"
 msgstr "আপোনাৰ Jabber ID কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
 msgid "What is your Jabber password?"
-msgstr "আপোনাৰ Jabber গ�প�তশব�দ কি ?"
+msgstr "আপোনাৰ Jabber পাছৱাৰ�ড কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your desired Jabber ID?"
 msgstr "আপোনাৰ পছন�দৰ Jabber ID কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber password?"
-msgstr "আপোনাৰ পছন�দৰ Jabber গ�প�তশব�দ কি ?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
-msgid "_Encryption required (TLS/SSL)"
-msgstr "�নক�ৰিপছন আৱশ�যক (TLS/SSL) (_E)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "_Ignore SSL certificate errors"
-msgstr "SSL প�ৰমাণপত�ৰ সংক�ৰান�ত সমস�যা উপেক�ষা কৰা হ'ব (_I)"
+msgstr "আপোনাৰ পছন�দৰ Jabber পাছৱাৰ�ড কি ?"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> user@hotmail.com</span>"
-msgstr "<span size=\"small\"><b>উদাহৰণ:</b> user@hotmail.com</span>"
+msgid "<b>Example:</b> user@hotmail.com"
+msgstr "<b>উদাহৰণ:</b> user@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-msgid "What is your Windows Live password?"
-msgstr "আপোনাৰ Windows Live গ�প�তশব�দ কি ?"
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+msgid "What is your Windows Live ID?"
+msgstr "আপোনাৰ Windows Live ID কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-msgid "What is your Windows Live user name?"
-msgstr "আপোনাৰ Windows Live ব�যৱহাৰকৰ�তাৰ নাম কি ?"
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+msgid "What is your Windows Live password?"
+msgstr "আপোনাৰ Windows Live পাছৱাৰ�ড কি ?"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_Email:"
-msgstr "ঈ-মেইল: (_E)"
+msgid "E-_mail address:"
+msgstr "ই-মেইল ঠিকনা (_m):"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+msgid "Nic_kname:"
+msgstr "উপনাম (_k):"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
 msgid "_First Name:"
 msgstr "নাম: (_F)"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
 msgid "_Last Name:"
 msgstr "পদবি: (_L)"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Nickname:"
-msgstr "উপনাম: (_N)"
-
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
 msgid "_Published Name:"
 msgstr "প�ৰকাশিত নাম: (_P)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> user@my.sip.server</span>"
-msgstr "<span size=\"small\"><b>যেনে:</b> user@my.sip.server</span>"
+msgid "<b>Example:</b> user@my.sip.server"
+msgstr "<b>উদাহৰণ:</b> user@my.sip.server"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
+msgid "Authentication username:"
+msgstr "প�ৰমাণীকৰণ ব�যৱহাৰকাৰীনাম:"
 
-#. look up the DNS SRV record at the service's domain for the host name of a STUN server.
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover STUN"
-msgstr "STUN অন�সন�ধান কৰা হ'ব"
+msgid "Discover Binding"
+msgstr "বান�ধনী খোজ কৰক"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+msgid "Discover the STUN server automatically"
+msgstr "STUN চাৰ�ভাৰ স�বচালিতভাৱে খোজ কৰক"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "STUN Server:"
-msgstr "STUN সেৱক:"
+msgid "Ignore TLS Errors"
+msgstr "TLS ত�ৰ�টিসমূহ উপেক�ষা কৰক"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "STUN port:"
-msgstr "STUN পোৰ�ট:"
+msgid "Interval (seconds)"
+msgstr "অন�তৰাল (ছেকেণ�ডসমূহ)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "What is your SIP account password?"
-msgstr "আপোনাৰ SIP হিচাপৰ গ�প�তশব�দ কি ?"
+msgid "Keep-Alive Options"
+msgstr "জীৱন�ত-ৰাখক বিকল�পসমূহ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "What is your SIP login ID?"
-msgstr "আপোনাৰ SIP প�ৰৱেশ ID কি ?"
+msgid "Loose Routing"
+msgstr "ঢিলা ৰ�টিং"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+msgid "Mechanism:"
+msgstr "পদ�ধতি:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+msgid "Miscellaneous Options"
+msgstr "বহ� বিকল�পসমূহ"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+msgid "NAT Traversal Options"
+msgstr "NAT ভ�ৰমণ বিকল�পসমূহ"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+msgid "Port:"
+msgstr "পোৰ�ট:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+msgid "Proxy Options"
+msgstr "প�ৰক�সি বিকল�পসমূহ"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+msgid "STUN Server:"
+msgstr "STUN চাৰ�ভাৰ:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.c:347
+msgid "Server:"
+msgstr "চাৰ�ভাৰ:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+msgid "Transport:"
+msgstr "পৰিৱহন:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "�ই �কাওন�টক লেন�ডলাইন আৰ� মবাইল ফোনসমূহ কল কৰিবলে ব�যৱহাৰ কৰক"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+msgid "What is your SIP account password?"
+msgstr "আপোনাৰ SIP �কাওন�টৰ পাছৱাৰ�ড কি ?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP login ID?"
+msgstr "আপোনাৰ SIP লগিন ID কি ?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
-msgstr "ব�যৱহাৰকৰ�তাৰ নাম: (_U)"
+msgstr "ব�যৱহাৰকাৰীৰ নাম: (_U)"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-msgid "Use _Yahoo Japan"
-msgstr "Yahoo Japan ব�যৱহাৰ কৰা হ'ব (_Y)"
+msgid "I_gnore conference and chat room invitations"
+msgstr "কনফাৰেঞ�চ আৰ� চেট ৰ�ম নিমন�ত�ৰণসমূহ উপেক�ষা কৰক (_g)"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "What is your Yahoo! ID?"
 msgstr "আপোনাৰ Yahoo! ID কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "What is your Yahoo! password?"
-msgstr "আপোনাৰ Yahoo! গ�প�তশব�দ কি ?"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Yahoo I_D:"
-msgstr "Yahoo I_D:"
+msgstr "আপোনাৰ Yahoo! পাছৱাৰ�ড কি ?"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "_Ignore conference and chatroom invitations"
-msgstr "বৈঠক আৰ� ছেট ৰ�মৰ পৰা প�ৰাপ�ত আমন�ত�ৰণসমূহ উপেক�ষা কৰা হ'ব (_I)"
+msgid "Yahoo! I_D:"
+msgstr "Yahoo! ID (_D):"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "_Room List locale:"
-msgstr "ৰ�ম তালিকাৰ লোকেইল: (_R)"
+msgstr "ৰ�ম তালিকাৰ স�থানীয়: (_R)"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
-#: ../libempathy-gtk/empathy-avatar-chooser.c:525
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "ছবি ৰূপান�তৰ কৰিবলৈ ব�যৰ�থ"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:450
-msgid "None of the accepted image formats is supported on your system"
-msgstr "গ�ৰহণযোগ�য ছবিৰ বিন�যাসসমূহত �টাও আপোনাৰ প�ৰণালী দ�বাৰা সমৰ�থিত নহয়"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
+msgid "None of the accepted image formats are supported on your system"
+msgstr "গ�ৰহণ কৰা ছবি বিন�যাসসমূহৰ �টাও আপোনাৰ চিস�টেমত সমৰ�থিত নহয়"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+msgid "Couldn't save picture to file"
+msgstr "ছবিক নথিপত�ৰলে সংৰক�ষণ কৰিব নোৱাৰি"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "নিজৰ অৱতাৰৰ ছবি নিৰ�বাচন কৰক"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:936
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
+msgid "Take a picture..."
+msgstr "�টা ছবি তোলক..."
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "ছবি নাই"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:998
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
-msgstr "ছবি"
+msgstr "ছবিবোৰ"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "সকলো নথিপত�ৰ"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:324
+#: ../libempathy-gtk/empathy-avatar-image.c:322
 msgid "Click to enlarge"
 msgstr "ডাঙৰ মাপত প�ৰদৰ�শনৰ বাবে ক�লিক কৰক"
 
-#: ../libempathy-gtk/empathy-chat.c:186
-msgid "Failed to reconnect this chat"
-msgstr "�ই সম�বাদৰ সৈতে সংযোগ স�থাপন কৰিবলৈ ব�যৰ�থ"
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
+msgid "There was an error starting the call"
+msgstr "কল আৰম�ভ কৰোতে �টা ত�ৰ�টি হৈছিল"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact doesn't support calls"
+msgstr "ধাৰ�য�য কৰা পৰিচয়ে কলসমূহৰ সমৰ�থন নকৰে"
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is offline"
+msgstr "ধাৰ�য�য কৰা পৰিচয় অফলাইন"
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "The specified contact is not valid"
+msgstr "ধাৰ�য�য কৰা পৰিচয় বৈধ নহয়"
+
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "Emergency calls are not supported on this protocol"
+msgstr "�ই প�ৰটোকলত আপাতকালীন কলসমূহ সমৰ�থিত নহয়"
+
+#: ../libempathy-gtk/empathy-chat.c:704
+msgid "Failed to open private chat"
+msgstr "ব�যক�তিগত চেট খোলিবলে ব�যৰ�থ"
+
+#: ../libempathy-gtk/empathy-chat.c:765
+msgid "Topic not supported on this conversation"
+msgstr "বিষয় �ই কথোপকথনত সমৰ�থিত নহয়"
+
+#: ../libempathy-gtk/empathy-chat.c:771
+msgid "You are not allowed to change the topic"
+msgstr "আপোনাৰ �ই বিষয় সলনি কৰাৰ অন�মতি নাই"
+
+#: ../libempathy-gtk/empathy-chat.c:975
+#, c-format
+msgid "“%s� is not a valid contact ID"
+msgstr "“%s� �টা বৈধ পৰিচয় ID নহয়"
+
+#: ../libempathy-gtk/empathy-chat.c:1060
+msgid "/clear: clear all messages from the current conversation"
+msgstr "/clear: বৰ�তমান কথোপকথনৰ পৰা সকলো বাৰ�তা পৰিষ�কাৰ কৰক"
+
+#: ../libempathy-gtk/empathy-chat.c:1063
+msgid "/topic <topic>: set the topic of the current conversation"
+msgstr "/topic <topic>: বৰ�তমান কথোপকথনৰ বিষয় সংহতি কৰক"
+
+#: ../libempathy-gtk/empathy-chat.c:1066
+msgid "/join <chat room ID>: join a new chat room"
+msgstr "/join <chat room ID>: �টা নত�ন চেট ৰ�মত যোগদান কৰক"
+
+#: ../libempathy-gtk/empathy-chat.c:1069
+msgid "/j <chat room ID>: join a new chat room"
+msgstr "/j <chat room ID>: �টা নত�ন চেট ৰ�মত যোগদান কৰক"
+
+#: ../libempathy-gtk/empathy-chat.c:1073
+msgid ""
+"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
+"current one"
+msgstr "/part [<chat room ID>] [<reason>]: চেট ৰ�ম �ৰক, অবিকল�পিতভাৱে বৰ�তমানটো"
+
+#: ../libempathy-gtk/empathy-chat.c:1077
+msgid "/query <contact ID> [<message>]: open a private chat"
+msgstr "/query <contact ID> [<message>]: �টা ব�যক�তিগত চেট খোলক"
+
+#: ../libempathy-gtk/empathy-chat.c:1080
+msgid "/msg <contact ID> <message>: open a private chat"
+msgstr "/msg <contact ID> <message>: �টা ব�যক�তিগত চেট খোলক"
+
+#: ../libempathy-gtk/empathy-chat.c:1083
+msgid "/nick <nickname>: change your nickname on the current server"
+msgstr "/nick <nickname>: বৰ�তমান চাৰ�ভাৰত আপোনাৰ উপনাম সলনি কৰক"
+
+#: ../libempathy-gtk/empathy-chat.c:1086
+msgid "/me <message>: send an ACTION message to the current conversation"
+msgstr "/me <message>: বৰ�তমান কথোপকথনলে ACTION বাৰ�তা পঠাওক"
+
+#: ../libempathy-gtk/empathy-chat.c:1089
+msgid ""
+"/say <message>: send <message> to the current conversation. This is used to "
+"send a message starting with a '/'. For example: \"/say /join is used to "
+"join a new chat room\""
+msgstr ""
+"/say <message>: বৰ�তমান কথোপকথনলে <message> পঠাওক। ইয়াক �টা  '/' -ৰে আৰম�ভ "
+"হোৱা বাৰ�তা পঠাবলে ব�যৱহাৰ কৰা হয়। উদাহৰণস�বৰূপ: \"/say /join -ক �টা নত�ন চেট "
+"ৰ�মলে যোগদান কৰিবলে ব�যৱহাৰ কৰা হয়\""
+
+#: ../libempathy-gtk/empathy-chat.c:1094
+msgid "/whois <contact ID>: display information about a contact"
+msgstr "/whois <contact ID>: �জন পৰিচয়ৰ বিষয়ে তথ�য প�ৰদৰ�শন কৰে"
+
+#: ../libempathy-gtk/empathy-chat.c:1097
+msgid ""
+"/help [<command>]: show all supported commands. If <command> is defined, "
+"show its usage."
+msgstr ""
+"/help [<command>]: সকলো সমৰ�থিত কমান�ড দেখ�ৱাওক। যদি <command> -ৰ বিৱৰণ দিয়া "
+"আছে, ইয়াৰ ব�যৱহাৰ দেখ�ৱাওক।"
+
+#: ../libempathy-gtk/empathy-chat.c:1114
+#, c-format
+msgid "Usage: %s"
+msgstr "ব�যৱহাৰ: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1159
+msgid "Unknown command"
+msgstr "অজ�ঞাত কমান�ড"
+
+#: ../libempathy-gtk/empathy-chat.c:1285
+msgid "Unknown command; see /help for the available commands"
+msgstr "অজ�ঞাত কমান�ড; উপলব�ধ কমান�ডসমূহৰ বাবে /help চাওক"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1455
+msgid "insufficient balance to send message"
+msgstr "বাৰ�তা পঠাবলে অপৰ�যাপ�ত মেমৰি আছে"
 
-#: ../libempathy-gtk/empathy-chat.c:403
-msgid "Unsupported command"
-msgstr "আদেশ সমৰ�থিত নহয়"
+#: ../libempathy-gtk/empathy-chat.c:1457
+msgid "not capable"
+msgstr "ক�ষমতাবান নহয়"
 
-#: ../libempathy-gtk/empathy-chat.c:535
+#: ../libempathy-gtk/empathy-chat.c:1464
 msgid "offline"
 msgstr "অফ-লাইন"
 
-#: ../libempathy-gtk/empathy-chat.c:538
+#: ../libempathy-gtk/empathy-chat.c:1467
 msgid "invalid contact"
 msgstr "পৰিচিত ব�যক�তিৰ তথ�য বৈধ নহয়"
 
-#: ../libempathy-gtk/empathy-chat.c:541
+#: ../libempathy-gtk/empathy-chat.c:1470
 msgid "permission denied"
 msgstr "অন�মতি প�ৰদান কৰা নহয়"
 
-#: ../libempathy-gtk/empathy-chat.c:544
+#: ../libempathy-gtk/empathy-chat.c:1473
 msgid "too long message"
 msgstr "বাৰ�তা অত�যাধিক দীঘল"
 
-#: ../libempathy-gtk/empathy-chat.c:547
+#: ../libempathy-gtk/empathy-chat.c:1476
 msgid "not implemented"
 msgstr "প�ৰয়োগ কৰা নহয়"
 
-#: ../libempathy-gtk/empathy-chat.c:550
+#: ../libempathy-gtk/empathy-chat.c:1480
 msgid "unknown"
 msgstr "অজ�ঞাত"
 
-#: ../libempathy-gtk/empathy-chat.c:554
+#: ../libempathy-gtk/empathy-chat.c:1486
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "'%s' বাৰ�তা পঠিয়াবলৈ সমস�যা: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:584
+#: ../libempathy-gtk/empathy-chat.c:1490
+#, c-format
+msgid "Error sending message: %s"
+msgstr "বাৰ�তা পঠাবলে ত�ৰ�টি: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761
+msgid "Topic:"
+msgstr "বিষয়:"
+
+#: ../libempathy-gtk/empathy-chat.c:1563
 #, c-format
 msgid "Topic set to: %s"
 msgstr "নিৰ�ধাৰিত বিষয়: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:586
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "No topic defined"
 msgstr "বিষয় নিৰ�ধাৰিত নহয়"
 
-#: ../libempathy-gtk/empathy-chat.c:956
+#: ../libempathy-gtk/empathy-chat.c:2074
 msgid "(No Suggestions)"
 msgstr "(প�ৰস�তাবিত তথ�য অন�পস�থিত)"
 
-#: ../libempathy-gtk/empathy-chat.c:1010
+#. translators: %s is the selected word
+#: ../libempathy-gtk/empathy-chat.c:2142
+#, c-format
+msgid "Add '%s' to Dictionary"
+msgstr "'%s' -ক শব�দকোষলে যোগ কৰক"
+
+#. translators: first %s is the selected word,
+#. * second %s is the language name of the target dictionary
+#: ../libempathy-gtk/empathy-chat.c:2179
+#, c-format
+msgid "Add '%s' to %s Dictionary"
+msgstr "'%s' -ক %s শব�দকোষলে যোগ কৰক"
+
+#: ../libempathy-gtk/empathy-chat.c:2249
 msgid "Insert Smiley"
-msgstr "স�মাইলি চিহ�ন অন�তৰ�ভ�ক�ত কৰক"
+msgstr "স�মাইলি আখৰ অন�তৰ�ভ�ক�ত কৰক"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1028
-#: ../libempathy-gtk/empathy-ui-utils.c:1492
+#: ../libempathy-gtk/empathy-chat.c:2267
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "পঠিয়াই দিয়ক (_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1062
+#. Spelling suggestions
+#: ../libempathy-gtk/empathy-chat.c:2321
 msgid "_Spelling Suggestions"
 msgstr "প�ৰস�তাবিত বানান (_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1177
+#: ../libempathy-gtk/empathy-chat.c:2410
+msgid "Failed to retrieve recent logs"
+msgstr "শেহতীয়া লগসমূহ উদ�ধাৰ কৰোতে ব�যৰ�থ হল"
+
+#: ../libempathy-gtk/empathy-chat.c:2547
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s ৰ সৈতে সংযোগ বিচ�ছিন�ন কৰা হৈছে"
@@ -947,12 +1514,12 @@ msgstr "%s ৰ সৈতে সংযোগ বিচà§�ছিনà§�ন কৰà¦
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:1184
+#: ../libempathy-gtk/empathy-chat.c:2554
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s ক %2$s দ�বাৰা বিতাড়ন কৰা হৈছে"
 
-#: ../libempathy-gtk/empathy-chat.c:1187
+#: ../libempathy-gtk/empathy-chat.c:2557
 #, c-format
 msgid "%s was kicked"
 msgstr "%s ক বিতাড়ন কৰা হৈছে"
@@ -960,17 +1527,17 @@ msgstr "%s ক বিতাড়ন কৰা হৈছে"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:1195
+#: ../libempathy-gtk/empathy-chat.c:2565
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s ক %2$s দ�বাৰা প�ৰতিৰোধ কৰা হৈছে"
 
-#: ../libempathy-gtk/empathy-chat.c:1198
+#: ../libempathy-gtk/empathy-chat.c:2568
 #, c-format
 msgid "%s was banned"
 msgstr "%s ক প�ৰতিৰোধ কৰা হৈছে"
 
-#: ../libempathy-gtk/empathy-chat.c:1202
+#: ../libempathy-gtk/empathy-chat.c:2572
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ৰ�মৰ পৰা ওলাই গৈছে"
@@ -980,409 +1547,978 @@ msgstr "%s ৰ�মৰ পৰা ওলাই গৈছে"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:1211
+#: ../libempathy-gtk/empathy-chat.c:2581
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:1234
+#: ../libempathy-gtk/empathy-chat.c:2606
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s ৰ�মত আহিছে"
 
-#: ../libempathy-gtk/empathy-chat.c:1367 ../src/empathy-call-window.c:1285
+#: ../libempathy-gtk/empathy-chat.c:2631
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s �তিয়া %s হিচাপে জনাজাত"
+
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2784
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
+#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
 msgid "Disconnected"
 msgstr "বিচ�ছিন�ন"
 
-#: ../libempathy-gtk/empathy-chat.c:1803
+#. Add message
+#: ../libempathy-gtk/empathy-chat.c:3428
+msgid "Would you like to store this password?"
+msgstr "আপ�নি �ই পাছৱাৰ�ড সংৰক�ষণ কৰিব বিচাৰে নে?"
+
+#: ../libempathy-gtk/empathy-chat.c:3434
+msgid "Remember"
+msgstr "মনত ৰাখক"
+
+#: ../libempathy-gtk/empathy-chat.c:3444
+msgid "Not now"
+msgstr "�তিয়া নহয়"
+
+#: ../libempathy-gtk/empathy-chat.c:3488
+msgid "Retry"
+msgstr "প�নৰ চেষ�টা কৰক"
+
+#: ../libempathy-gtk/empathy-chat.c:3492
+msgid "Wrong password; please try again:"
+msgstr "ভ�ল পাছৱাৰ�ড। অন�গ�ৰহ কৰি প�নৰ চেষ�টা কৰক।:"
+
+#. Add message
+#: ../libempathy-gtk/empathy-chat.c:3622
+msgid "This room is protected by a password:"
+msgstr "�ই ৰ�ম �টা পাছৱাৰ�ডৰে স�ৰক�ষিত:"
+
+#: ../libempathy-gtk/empathy-chat.c:3649
+msgid "Join"
+msgstr "যোগদান কৰক"
+
+#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "সংয�ক�ত"
 
-#: ../libempathy-gtk/empathy-chat.c:1853
-#: ../libempathy-gtk/empathy-log-window.c:502
+#: ../libempathy-gtk/empathy-chat.c:3906
 msgid "Conversation"
-msgstr "সম�বাদ"
+msgstr "চেট"
 
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:477
-msgid "Topic:"
-msgstr "বিষয়:"
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:3911
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (SMS)"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+msgid "Unknown or invalid identifier"
+msgstr "অজ�ঞাত অথবা অবৈধ চিনাক�তক"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+msgid "Contact blocking temporarily unavailable"
+msgstr "পৰিচয় প�ৰতিৰোধ কৰা অস�থায়ীভাৱে উপলব�ধ নহয়"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+msgid "Contact blocking unavailable"
+msgstr "পৰিচয় প�ৰতিৰোধ কৰা উপলব�ধ নহয়"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+msgid "Permission Denied"
+msgstr "অন�মতি নাকচ কৰা হৈছে"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+msgid "Could not block contact"
+msgstr "পৰিচয় প�ৰতিৰোধ কৰিব নোৱাৰি"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+msgid "Edit Blocked Contacts"
+msgstr "প�ৰতিৰোধ কৰা পৰিচয়সমূহ সম�পাদনা কৰক"
+
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Account:"
+msgstr "�কাওন�ট"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "প�ৰতিৰোধ কৰা পৰিচয়সমূহ"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "আতৰাওক"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:316
-#: ../libempathy-gtk/empathy-theme-adium.c:276
+#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "লিঙ�ক দ�বাৰা চিহ�নিত ঠিকনা নকল কৰক (_C)"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:323
-#: ../libempathy-gtk/empathy-theme-adium.c:284
+#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "সংযোগ খোলক (_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:421
+#: ../libempathy-gtk/empathy-chat-text-view.c:415
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:177
-#: ../libempathy-gtk/empathy-contact-dialogs.c:236
+#: ../libempathy-gtk/empathy-contact-dialogs.c:299
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
 msgid "Edit Contact Information"
-msgstr "যোগাযোগ সংক�ৰান�ত তথ�য পৰিবৰ�তন কৰক"
+msgstr "যোগাযোগ  তথ�য পৰিবৰ�তন কৰক"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:287
+#: ../libempathy-gtk/empathy-contact-dialogs.c:350
 msgid "Personal Information"
 msgstr "ব�যক�তিগত তথ�য"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:392
+#: ../libempathy-gtk/empathy-contact-dialogs.c:459
+#: ../libempathy-gtk/empathy-individual-dialogs.c:119
 msgid "New Contact"
 msgstr "নত�ন পৰিচয়"
 
+#: ../libempathy-gtk/empathy-contact-dialogs.c:533
+#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#, c-format
+msgid "Block %s?"
+msgstr "%s প�ৰতিৰোধ কৰিবনে?"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:538
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#, c-format
+msgid "Are you sure you want to block '%s' from contacting you again?"
+msgstr ""
+"আপ�নি নিশ�চিত নে আপ�নি '%s' -ক আপোনাৰ লগত যোগাযোগ কৰাৰ পৰা প�ৰতিৰোধ কৰিব বিচাৰে?"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:543
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+msgid "_Block"
+msgstr "প�ৰতিৰোধ কৰক (_B)"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:559
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+msgid "_Report this contact as abusive"
+msgid_plural "_Report these contacts as abusive"
+msgstr[0] "�ই পৰিচয় নিন�দ�ক হিচাপে সংবাদন কৰক (_R)"
+msgstr[1] "�ই পৰিচয়সমূহক নিন�দ�ক হিচাপে সংবাদন কৰক (_R)"
+
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
 msgstr "পিছত নিৰ�ধাৰণ কৰা হ'ব (_L)"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
-msgstr "ছাবস�ক�ৰিপছনৰ অন�ৰোধ"
+msgstr "স�বাক�ষৰণৰ অন�ৰোধ"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "_Block User"
+msgstr "ব�যৱহাৰকাৰীক প�ৰতিৰোধ কৰক (_B)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1414
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "দলীয় নহয়"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "পছন�দৰ মান�হ"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "'%s' নামৰ দল নিশ�চিতৰূপে আ�তৰাবলৈ ইচ�ছ�ক নে ?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1416
+#: ../libempathy-gtk/empathy-contact-list-view.c:1988
+#: ../libempathy-gtk/empathy-individual-view.c:2379
 msgid "Removing group"
 msgstr "দল আ�তৰ�ৱা হৈছে"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1463
-#: ../libempathy-gtk/empathy-contact-list-view.c:1540
+#: ../libempathy-gtk/empathy-contact-list-view.c:2037
+#: ../libempathy-gtk/empathy-contact-list-view.c:2114
+#: ../libempathy-gtk/empathy-individual-view.c:2434
+#: ../libempathy-gtk/empathy-individual-view.c:2637
 msgid "_Remove"
 msgstr "আ�তৰাওক (_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1493
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
+#: ../libempathy-gtk/empathy-individual-view.c:2501
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "আপ�নি নিশ�চিতৰূপে '%s' ক পৰিচিত তালিকাৰ পৰা আ�তৰাবলৈ ইচ�ছ�ক নে ?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1495
+#: ../libempathy-gtk/empathy-contact-list-view.c:2069
+#: ../libempathy-gtk/empathy-individual-view.c:2522
 msgid "Removing contact"
 msgstr "পৰিচিত ব�যক�তিক আ�তৰ�ৱা হৈছে"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:195
-#: ../src/empathy-main-window.ui.h:11
-msgid "_Add Contact..."
-msgstr "পৰিচিত ব�যক�তিৰ তথ�য যোগ কৰক... (_A)"
+#: ../libempathy-gtk/empathy-contact-menu.c:220
+#: ../src/empathy-main-window-menubar.ui.h:14
+msgid "_Add Contact…"
+msgstr "পৰিচয় যোগ কৰক (_A)…"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:222
-#: ../src/empathy-main-window.ui.h:12
+#: ../libempathy-gtk/empathy-contact-menu.c:300
+msgid "_Block Contact"
+msgstr "পৰিচয় প�ৰতিৰোধ কৰক (_B)"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:329
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
-msgstr "সম�বাদ (_C)"
+msgstr "চেট (_C)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:253
+#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "অডিঅ' কল (_A)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:285
+#: ../libempathy-gtk/empathy-contact-menu.c:394
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "ভিডিঅ' কল (_V)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:324
-msgid "_View Previous Conversations"
-msgstr "পূৰ�ববৰ�তী সম�বাদ প�ৰদৰ�শন কৰা হ'ব (_V)"
+#: ../libempathy-gtk/empathy-contact-menu.c:440
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
+msgid "_Previous Conversations"
+msgstr "পূৰ�ববৰ�তী কথোপকথনসমূহ (_P)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:346
-msgid "Send file"
+#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-individual-menu.c:988
+msgid "Send File"
 msgstr "নথিপত�ৰ পঠিয়াওক"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:369
-msgid "Share my desktop"
-msgstr "আমাৰ ডেস�কটপৰ যৌথ ব�যৱহাৰ অন�মোদন কৰা হ'ব"
+#: ../libempathy-gtk/empathy-contact-menu.c:485
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
+msgid "Share My Desktop"
+msgstr "মোৰ ডেস�কটপ অংশীদাৰী কৰক"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:397
+#: ../libempathy-gtk/empathy-contact-menu.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:1886
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
+msgid "Favorite"
+msgstr "পছন�দৰ"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:554
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "তথ�য (_m)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:441
-#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
+#: ../libempathy-gtk/empathy-contact-menu.c:600
+msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
-msgstr "সম�পাদনা (_E)"
+msgstr "সম�পাদনা কৰক (_E)"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:654
+#: ../libempathy-gtk/empathy-individual-menu.c:1284
+#: ../src/empathy-chat-window.c:1011
+msgid "Inviting you to this room"
+msgstr "আপোনাক �ই ৰ�মলৈ আমন�ত�ৰণ জনোৱা হৈছে"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:685
+#: ../libempathy-gtk/empathy-individual-menu.c:1330
+msgid "_Invite to Chat Room"
+msgstr "চেট ৰ�মলৈ আমন�ত�ৰণ কৰক (_I)"
+
+#. Title
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+msgid "Search contacts"
+msgstr "পৰিচয়সমূহ বিচাৰক"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+msgid "Search: "
+msgstr "সন�ধান কৰক: "
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+msgid "_Add Contact"
+msgstr "পৰিচয় যোগ কৰক (_A)"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+msgid "No contacts found"
+msgstr "কোনো পৰিচয় পোৱা নগল"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:501
-msgid "Inviting to this room"
-msgstr "�ই ৰ�মলৈ আমন�ত�ৰণ কৰক"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr "আপোনাৰ পৰিচয় দিয়া বাৰ�তা:"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:532
-msgid "_Invite to chatroom"
-msgstr "ছেট ৰ�মলৈ আমন�ত�ৰণ কৰক (_I)"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
+msgstr "অন�গ�ৰহ কৰি যেতিয়া আপ�নি অনলাইন থাকে মোক চাব দিব। ধন�যবাদ!"
 
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "�টা পৰিচয় নিৰ�বাচন কৰক"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:447
-msgid "Save Avatar"
-msgstr "অৱতাৰৰ ছবি সংৰক�ষণ কৰক"
+#: ../libempathy-gtk/empathy-contact-widget.c:336
+#: ../libempathy-gtk/empathy-individual-widget.c:153
+msgid "Full name:"
+msgstr "সম�পূৰ�ণ নাম:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:503
-msgid "Unable to save avatar"
-msgstr "অৱতাৰৰ ছবি সংৰক�ষণ কৰিবলৈ ব�যৰ�থ"
+#: ../libempathy-gtk/empathy-contact-widget.c:337
+#: ../libempathy-gtk/empathy-individual-widget.c:154
+msgid "Phone number:"
+msgstr "ফোন নম�বৰ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1000
-msgid "Select"
-msgstr "নিৰ�বাচন কৰক"
+#: ../libempathy-gtk/empathy-contact-widget.c:338
+#: ../libempathy-gtk/empathy-individual-widget.c:155
+msgid "E-mail address:"
+msgstr "ই-মেইল ঠিকনা:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1009
-#: ../src/empathy-main-window.c:1019
-msgid "Group"
-msgstr "দল"
+#: ../libempathy-gtk/empathy-contact-widget.c:339
+#: ../libempathy-gtk/empathy-individual-widget.c:156
+msgid "Website:"
+msgstr "ৱেবছাইট:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:340
+#: ../libempathy-gtk/empathy-individual-widget.c:157
+msgid "Birthday:"
+msgstr "জন�মদিন:"
+
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:346
+msgid "Last seen:"
+msgstr "শেষ দেখা হৈছিল:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:348
+msgid "Connected from:"
+msgstr "পৰা সংয�ক�ত:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:353
+msgid "Away message:"
+msgstr "আতৰত বাৰ�তা:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1260
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+msgid "Channels:"
+msgstr "চেনেলসমূহ:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
 msgstr "দেশৰ ISO কোড:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1262
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Country:"
 msgstr "দেশ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1264
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "State:"
 msgstr "ৰাজ�য:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1266
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "City:"
-msgstr "ছহৰ:"
+msgstr "নগৰ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1268
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Area:"
 msgstr "অঞ�চল:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1270
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
 msgstr "পোস�টেল কোড:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1272
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Street:"
 msgstr "ৰাস�তা:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1274
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
 msgstr "বিল�ডিং:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1276
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Floor:"
 msgstr "তল:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1278
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Room:"
 msgstr "ঘৰ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1280
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Text:"
-msgstr "টেক�সট:"
+msgstr "লিখনী:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1282
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Description:"
 msgstr "বিৱৰণ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1284
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1286
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
 msgstr "যথাৰ�থতাৰ মাত�ৰা:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1288
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr "ত�ৰ�টি:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1290
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
-msgstr "উলম�ব দিশাৰ ত�ৰ�টি (মিটাৰ):"
+msgstr "উলম�ব দিশৰ ত�ৰ�টি (মিটাৰ):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1292
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
-msgstr "অন�ভূমিক দিশাৰ ত�ৰ�টি (মিটাৰ):"
+msgstr "অন�ভূমিক দিশৰ ত�ৰ�টি (মিটাৰ):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr "গতি:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1296
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Bearing:"
 msgstr "বিয়েৰিং:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1298
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
-msgstr "ক�লাইম�ব গতি:"
+msgstr "আৰোহণৰ গতি:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1300
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
 msgstr "সৰ�বশেষ উন�নয়নৰ তাৰিখ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1302
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
 msgstr "দ�ৰাঘিমাংশ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1304
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
 msgstr "অক�ষাংশ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1306
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
 msgstr "উচ�চতা:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1353
-msgid "<b>Location</b>"
-msgstr "<b>অৱস�থান</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:17
+msgid "Location"
+msgstr "অৱস�থান"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1366
-msgid "<b>Location</b>, "
-msgstr "<b>অৱস�থান</b>, "
+#. translators: format is "Location, $date"
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
+#, c-format
+msgid "%s, %s"
+msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1416
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y %R UTC ত"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
+msgid "Save Avatar"
+msgstr "অৱতাৰৰ ছবি সংৰক�ষণ কৰক"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
+msgid "Unable to save avatar"
+msgstr "অৱতাৰৰ ছবি সংৰক�ষণ কৰিবলৈ ব�যৰ�থ"
+
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1
 msgid "<b>Location</b> at (date)\t"
 msgstr "<b>অৱস�থান</b> (date) ত\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "হিচাপ:"
-
+#. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr "উপনাম:"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Birthday:"
-msgstr "জন�মদিন:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
 msgid "Client Information"
-msgstr "গ�ৰাহক সংক�ৰান�ত তথ�য"
+msgstr "গ�ৰাহক  তথ�য"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
 msgid "Client:"
 msgstr "গ�ৰাহক:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:1002
-msgid "Contact"
-msgstr "পৰিচিত ব�যক�তি"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+msgid "Contact Details"
+msgstr "যোগাযোগ  বিবৰণ"
 
+#. Identifier to connect to Instant Messaging network
+#. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-msgid "Contact Details"
-msgstr "যোগাযোগ সংক�ৰান�ত বিবৰণ"
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
+msgid "Identifier:"
+msgstr "চিনাক�তআখৰ:"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "Email:"
-msgstr "ঈ-মেইল:"
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Information requested…"
+msgstr "তথ�য অন�ৰোধ কৰা হৈছে…"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "Fullname:"
-msgstr "সম�পূৰ�ণ নাম:"
+msgid "OS:"
+msgstr "OS:"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Version:"
+msgstr "সংস�কৰণ:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:333
 msgid "Groups"
+msgstr "দলসমূহ"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:345
+msgid ""
+"Select the groups you want this contact to appear in.  Note that you can "
+"select more than one group or no groups."
+msgstr ""
+"দলসমূহ যত আপ�নি �ই পৰিচয় উপস�থিত থকাটো বিচাৰে নিৰ�বাচন কৰক। মনব কৰিব যে আপ�নি "
+"�টাতকে বেছি দল অথবা কোনো দল নহয় নিৰ�বাচন কৰিব পাৰিব। "
+
+#: ../libempathy-gtk/empathy-groups-widget.c:364
+msgid "_Add Group"
+msgstr "দল যোগ কৰক (_A)"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:399
+msgctxt "verb in a column header displaying group names"
+msgid "Select"
+msgstr "নিৰ�বাচন কৰক"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:409
+#: ../src/empathy-main-window.c:1807
+msgid "Group"
 msgstr "দল"
 
-#. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
-msgid "Identifier:"
-msgstr "চিনাক�তচিহ�ন:"
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+msgid "The following identity will be blocked:"
+msgid_plural "The following identities will be blocked:"
+msgstr[0] "নিম�নলিখিত পৰিচয় প�ৰতিৰোধ কৰা হব:"
+msgstr[1] "নিম�নলিখিত পৰিচয়সমূহ প�ৰতিৰোধ কৰা হব:"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+msgid "The following identity can not be blocked:"
+msgid_plural "The following identities can not be blocked:"
+msgstr[0] "নিম�নলিখিত পৰিচয় প�ৰতিৰোধ কৰিব নোৱাৰি:"
+msgstr[1] "নিম�নলিখিত পৰিচয়সমূহ প�ৰতিৰোধ কৰিব নোৱাৰি:"
+
+#. Translators: the heading at the top of the Information dialogue
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
+msgid "Linked Contacts"
+msgstr "সংয�ক�ত পৰিচয়সমূহ"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:370
+msgid "Select contacts to link"
+msgstr "সংযোগ কৰিবলে পৰিচয়সমূহ বাছক"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:444
+msgid "New contact preview"
+msgstr "নত�ন পৰিচয় পূৰ�বদৰ�শন"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:488
+msgid "Contacts selected in the list on the left will be linked together."
+msgstr "বাওফালে থকা তালিকাত নিৰ�বাচন কৰা পৰিচয়সমূহ �কেলগে সংয�ক�ত কৰা হব।"
+
+#. Translators: this is used in the context menu for a contact. The first
+#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
+#. * of the user's account IDs (e.g. me@hotmail.com).
+#: ../libempathy-gtk/empathy-individual-menu.c:145
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
-msgid "Information requested..."
-msgstr "অন�ৰোধ কৰা তথ�য..."
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "কল স�থাপনা কৰিবলে ব�যৱহাৰ কৰিব লগিয়া �কাওন�ট বাছক"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
-msgid "OS:"
-msgstr "OS:"
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "কল"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+msgid "Mobile"
+msgstr "মবাইল"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "কৰ�ম"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "HOME"
+
+#. add an SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+msgid "_SMS"
+msgstr "SMS (_S)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1142
+msgctxt "Edit individual (contextual menu)"
+msgid "_Edit"
+msgstr "সম�পাদনা কৰক (_E)"
+
+#. Translators: this is a verb meaning "to connect two contacts together
+#. * to form a meta-contact".
+#: ../libempathy-gtk/empathy-individual-menu.c:1168
+msgctxt "Link individual (contextual menu)"
+msgid "_Link Contacts…"
+msgstr "পৰিচয়সমূহ সংযোগ কৰক (_L)…"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
+#: ../libempathy-gtk/empathy-individual-view.c:2341
+msgid "Delete and _Block"
+msgstr "মচি পেলাওক আৰ� প�ৰতিৰোধ কৰক (_B)"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2510
+#, c-format
 msgid ""
-"Select the groups you want this contact to appear in.  Note that you can "
-"select more than one group or no groups."
+"Do you really want to remove the linked contact '%s'? Note that this will "
+"remove all the contacts which make up this linked contact."
 msgstr ""
+"আপ�নি স�চাকে সংয�ক�ত পৰিচয় '%s' আতৰাব বিচাৰে নে? মন কৰিব যে ই সকলো পৰিচয় যি �ই "
+"সংয�ক�ত পৰিচয় বনায় আতৰাই পেলাব।"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
-msgid "Version:"
-msgstr "সংস�কৰণ:"
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#, c-format
+msgid "Linked contact containing %u contact"
+msgid_plural "Linked contacts containing %u contacts"
+msgstr[0] "%u পৰিচয় অন�তৰ�ভ�ক�ত কৰা সংয�ক�ত পৰিচয়"
+msgstr[1] "%u পৰিচয়সমূহ অন�তৰ�ভ�ক�ত কৰা সংয�ক�ত পৰিচয়"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
-msgid "Web site:"
-msgstr "ৱেব-ছাইট:"
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
+msgid "<b>Location</b> at (date)"
+msgstr "<b>অৱস�থান</b> (date) -ত"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
-msgid "_Add Group"
-msgstr "দল যোগ কৰক (_A)"
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Online from a phone or mobile device"
+msgstr "�টা ফোন বা মবাইল ডিভাইচৰ পৰা অনলাইন"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:281
-msgid "new server"
-msgstr "নত�ন সেৱক"
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+msgid "New Network"
+msgstr "নত�ন নেটৱাৰ�ক"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:508
-msgid "Server"
-msgstr "সেৱক"
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+msgid "Choose an IRC network"
+msgstr "�টা IRC নেটৱাৰ�ক বাছক"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:523
-msgid "Port"
-msgstr "পোৰ�ট"
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+msgid "Reset _Networks List"
+msgstr "নেটৱাৰ�কসমূহৰ তালিকা প�নৰ সংহতি কৰক (_N)"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:536
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+msgctxt "verb displayed on a button to select an IRC network"
+msgid "Select"
+msgstr "নিৰ�বাচন কৰক"
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
+msgid "new server"
+msgstr "নত�ন চাৰ�ভাৰ"
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:495
-#: ../src/empathy-import-widget.c:302
-msgid "Account"
-msgstr "হিচাপ"
+#. Translators: this is the title of the linking dialogue (reached by
+#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
+#. * is a verb.
+#: ../libempathy-gtk/empathy-linking-dialog.c:115
+msgid "Link Contacts"
+msgstr "পৰিচয়সমূহ সংয�ক�ত কৰক"
 
-#: ../libempathy-gtk/empathy-log-window.c:512
-msgid "Date"
-msgstr "তাৰিখ"
+#: ../libempathy-gtk/empathy-linking-dialog.c:120
+msgctxt "Unlink individual (button)"
+msgid "_Unlink…"
+msgstr "অসংয�ক�ত কৰক (_U)…"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "Conversations"
-msgstr "সম�বাদ"
+#: ../libempathy-gtk/empathy-linking-dialog.c:121
+msgid ""
+"Completely split the displayed linked contacts into the separate contacts."
+msgstr "প�ৰদৰ�শিত সংয�ক�ত পৰিচয়সমূহক পৃথক পৰিচয়সমূহত সম�পূৰ�ণভাৱে বিভাজন কৰক।"
+
+#. Add button
+#. Translators: this is an action button in the linking dialogue. "Link" is
+#. * used here as a verb meaning "to connect two contacts to form a
+#. * meta-contact".
+#: ../libempathy-gtk/empathy-linking-dialog.c:136
+msgid "_Link"
+msgstr "সংয�ক�ত কৰক (_L)"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:183
+#, c-format
+msgid "Unlink linked contacts '%s'?"
+msgstr "সংয�ক�ত পৰিচয়সমূহ '%s' অসংয�ক�ত কৰিব নে?"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Previous Conversations"
-msgstr "পূৰ�ববৰ�তী সম�বাদ"
+#: ../libempathy-gtk/empathy-linking-dialog.c:186
+msgid ""
+"Are you sure you want to unlink these linked contacts? This will completely "
+"split the linked contacts into separate contacts."
+msgstr ""
+"আপ�নি নিশ�চিত নে আপ�নি �ই সংয�ক�ত পৰিচয়সমূহ অসংয�ক�ত কৰিব বিচাৰে? ই সংয�ক�ত পৰিচয়সমূহক "
+"সম�পূৰ�ণভাৱে পৃথক পৰিচয়সমূহত বিভাজন কৰিব।"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../libempathy-gtk/empathy-linking-dialog.c:190
+msgctxt "Unlink individual (button)"
+msgid "_Unlink"
+msgstr "অসংয�ক�ত কৰক (_U)"
+
+#: ../libempathy-gtk/empathy-log-window.c:634
+msgid "History"
+msgstr "ইতিহাস"
+
+#: ../libempathy-gtk/empathy-log-window.c:689
+msgid "Show"
+msgstr "দেখ�ৱাওক"
+
+#: ../libempathy-gtk/empathy-log-window.c:711
 msgid "Search"
 msgstr "অন�সন�ধান"
 
+#: ../libempathy-gtk/empathy-log-window.c:1159
+#, c-format
+msgid "Chat in %s"
+msgstr "%s -ত চেট কৰক"
+
+#: ../libempathy-gtk/empathy-log-window.c:1161
+#, c-format
+msgid "Chat with %s"
+msgstr "%s -ৰ সৈতে চেট কৰক"
+
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%A, %e %B %Y %X"
+
+#. Translators: this is an emote: '* Danielle waves'
+#: ../libempathy-gtk/empathy-log-window.c:1300
+#, c-format
+msgid "<i>* %s %s</i>"
+msgstr "<i>* %s %s</i>"
+
+#. Translators: this is a message: 'Danielle: hello'
+#. * The string in bold is the sender's name
+#: ../libempathy-gtk/empathy-log-window.c:1306
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1382
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s ছেকেণ�ড"
+msgstr[1] "%s ছেকেণ�ড"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s মিনিট"
+msgstr[1] "%s মিনিট"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "কলে %s ললে, %s -ত সমাপ�ত হল"
+
+#: ../libempathy-gtk/empathy-log-window.c:1729
+msgid "Today"
+msgstr "আজি"
+
+#: ../libempathy-gtk/empathy-log-window.c:1733
+msgid "Yesterday"
+msgstr "যোৱাকালী"
+
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
+msgid "%e %B %Y"
+msgstr "%e %B %Y"
+
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3444
+msgid "Anytime"
+msgstr "যেতিয়া তেতিয়া"
+
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2372
+msgid "Anyone"
+msgstr "যোনে-তোনে"
+
+#: ../libempathy-gtk/empathy-log-window.c:2685
+msgid "Who"
+msgstr "কোন"
+
+#: ../libempathy-gtk/empathy-log-window.c:2889
+msgid "When"
+msgstr "কেতিয়া"
+
+#: ../libempathy-gtk/empathy-log-window.c:3005
+msgid "Anything"
+msgstr "যিকোনো বস�ত�"
+
+#: ../libempathy-gtk/empathy-log-window.c:3007
+msgid "Text chats"
+msgstr "লিখনী চেটসমূহ"
+
+#: ../libempathy-gtk/empathy-log-window.c:3009
+#: ../src/empathy-preferences.ui.h:4
+msgid "Calls"
+msgstr "কলসমূহ"
+
+#: ../libempathy-gtk/empathy-log-window.c:3014
+msgid "Incoming calls"
+msgstr "আগ'ত কলসমূহ"
+
+#: ../libempathy-gtk/empathy-log-window.c:3015
+msgid "Outgoing calls"
+msgstr "বাহিৰগামি কলসমূহ"
+
+#: ../libempathy-gtk/empathy-log-window.c:3016
+msgid "Missed calls"
+msgstr "মিচ কলসমূহ"
+
+#: ../libempathy-gtk/empathy-log-window.c:3038
+msgid "What"
+msgstr "কি"
+
+#: ../libempathy-gtk/empathy-log-window.c:3747
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr "আপ�নি নিশ�চিত নে আপ�নি পূৰ�বৱৰ�তী কথোপকথনৰ সকলো লগ মচি পেলাব বিচাৰে?"
+
+#: ../libempathy-gtk/empathy-log-window.c:3751
+msgid "Clear All"
+msgstr "সকলো পৰিষ�কাৰ কৰক"
+
+#: ../libempathy-gtk/empathy-log-window.c:3758
+msgid "Delete from:"
+msgstr "পৰা মচি পেলাওক:"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">ল'ড কৰা হৈ আছে...</span>"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Chat"
+msgstr "চেট"
+
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-msgid "_For:"
-msgstr "-ৰ কাৰণে: (_F)"
+msgid "Delete All History..."
+msgstr "সকলো ইতিহাস মচি পেলাওক..."
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+msgid "Profile"
+msgstr "আলেখ�য"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Video"
+msgstr "ভিডিঅ'"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:7
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:20
+msgid "_Edit"
+msgstr "সম�পাদনা (_E)"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
-msgid "C_all"
-msgstr "কল (_a)"
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "_File"
+msgstr "নথিপত�ৰ (_F)"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
-msgid "C_hat"
-msgstr "সম�বাদ (_h)"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "page 2"
+msgstr "পৃষ�ঠা ২"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
 msgid "Contact ID:"
 msgstr "পৰিচয়ৰ ID:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
+#. add chat button
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
+msgid "C_hat"
+msgstr "চেট (_h)"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
-msgstr "নত�ন সম�বাদ"
+msgstr "নত�ন কথোপকথন "
+
+#. add video toggle
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
+msgid "Send _Video"
+msgstr "ভিডিঅ' পঠাওক (_V)"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
+msgid "C_all"
+msgstr "কল (_a)"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+msgid "New Call"
+msgstr "নত�ন কল"
+
+#: ../libempathy-gtk/empathy-password-dialog.c:274
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+"�কাওন�ট <b>%s</b> -ৰ বাবে\n"
+"আপোনাৰ পাছৱাৰ�ড সোমাওক"
 
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
@@ -1390,124 +2526,235 @@ msgstr "নত�ন সম�বাদ"
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:176
-#: ../libempathy-gtk/empathy-presence-chooser.c:212
-msgid "Custom Message..."
-msgstr "স�বনিৰ�ধাৰিত বাৰ�তা..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
+msgid "Custom Message…"
+msgstr "স�বনিৰ�বাচিত বাৰ�তা…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:229
-#: ../libempathy-gtk/empathy-presence-chooser.c:231
-msgid "Edit Custom Messages..."
-msgstr "স�বনিৰ�ধাৰিত বাৰ�তা সম�পাদনা..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
+msgid "Edit Custom Messages…"
+msgstr "স�বনিৰ�বাচিত বাৰ�তাসমূহ সম�পাদনা কৰক…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:330
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
 msgstr "�ই অৱস�থা বাৰ�তাক পছন�দৰ তালিকাৰ পৰা আ�তৰ�ৱাৰ বাবে ক�লিক কৰক"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:339
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
 msgstr "�ই অৱস�থা বাৰ�তাক পছন�দৰ তালিকাত অন�তৰ�ভ�ক�ত কৰাৰ বাবে ক�লিক কৰক"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:373
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
 msgstr "অৱস�থা নিৰ�ধাৰণ কৰক"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:794
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
 msgid "Set your presence and current status"
 msgstr "আপোনাৰ উপস�থিতি আৰ� বৰ�তমান অৱস�থাৰ তথ�য নিৰ�ধাৰণ কৰক"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1043
-msgid "Custom messages..."
-msgstr "স�বনিৰ�ধাৰিত বাৰ�তা..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+msgid "Custom messages…"
+msgstr "স�বনিৰ�বাচিত বাৰ�তাসমূহ…"
 
-#: ../libempathy-gtk/empathy-sound.c:51
+#. Create account
+#. To translator: %s is the name of the protocol, such as "Google Talk" or
+#. * "Yahoo!"
+#.
+#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#, c-format
+msgid "New %s account"
+msgstr "নত�ন %s �কাওন�ট"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find:"
+msgstr "সন�ধান কৰক:"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Mat_ch case"
+msgstr "ফলা মিল খোৱাওক (_c)"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+msgid "Phrase not found"
+msgstr "বাক�যাংশ পোৱা নগল"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "_Next"
+msgstr "পৰবৰ�তী (_N)"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+msgid "_Previous"
+msgstr "পূৰ�ববৰ�তী (_P)"
+
+#: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
-msgstr "ইনস�টেন�ট বাৰ�তা প�ৰাপ�ত হৈছে"
+msgstr "তৎক�ষনাত বাৰ�তা প�ৰাপ�ত হৈছে"
 
-#: ../libempathy-gtk/empathy-sound.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:53
 msgid "Sent an instant message"
-msgstr "ইনস�টেন�ট বাৰ�তা পঠিওৱা হৈছে"
+msgstr "তৎক�ষনাত বাৰ�তা পঠিওৱা হৈছে"
 
-#: ../libempathy-gtk/empathy-sound.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:55
 msgid "Incoming chat request"
-msgstr "ছেটৰ আগত অন�ৰোধ"
+msgstr "চেটৰ আগত অন�ৰোধ"
 
-#: ../libempathy-gtk/empathy-sound.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:57
 msgid "Contact connected"
 msgstr "পৰিচয়ৰ সৈতে সংযোগ কৰা হৈছে"
 
-#: ../libempathy-gtk/empathy-sound.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:59
 msgid "Contact disconnected"
 msgstr "পৰিচয়ৰ সৈতে সংযোগ বিচ�ছিন�ন কৰা হৈছে"
 
-#: ../libempathy-gtk/empathy-sound.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:61
 msgid "Connected to server"
-msgstr "সেৱকৰ সৈতে সংয�ক�ত"
+msgstr "চাৰ�ভাৰৰ সৈতে সংয�ক�ত"
 
-#: ../libempathy-gtk/empathy-sound.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:63
 msgid "Disconnected from server"
-msgstr "সেৱকে সৈতে সংযোগ বিচ�ছিন�ন"
+msgstr "চাৰ�ভাৰৰ সৈতে সংযোগ বিচ�ছিন�ন"
 
-#: ../libempathy-gtk/empathy-sound.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:65
 msgid "Incoming voice call"
 msgstr "আগত ভাষাৰ কল"
 
-#: ../libempathy-gtk/empathy-sound.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:67
 msgid "Outgoing voice call"
 msgstr "বাহিৰগামি ভাষাৰ কল"
 
-#: ../libempathy-gtk/empathy-sound.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:69
 msgid "Voice call ended"
 msgstr "ভাষাৰ কল সমাপ�ত হৈছে"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
-msgid "Enter Custom Message"
-msgstr "স�বনিৰ�ধাৰিত বাৰ�তা লিখক"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
-msgstr "স�বনিৰ�ধাৰিত বাৰ�তা সম�পাদনা"
+msgstr "স�বনিৰ�বাচিত বাৰ�তা সম�পাদনা"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Add _New Preset"
-msgstr "নত�ন প�ৰি-ছেট যোগ কৰক (_N)"
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#, c-format
+msgid "Message edited at %s"
+msgstr "বাৰ�তা %s -ত সম�পাদনা কৰা হৈছে"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Presets"
-msgstr "সংৰক�ষিত প�ৰি-ছেট"
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
+msgid "Normal"
+msgstr "স�বাভাৱিক"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "পাৰম�পৰিক"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "সাধাৰণ"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "পৰিশ�ৰ�ত"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "নীলা"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1394
+#: ../libempathy-gtk/empathy-tls-dialog.c:150
+msgid "The identity provided by the chat server cannot be verified."
+msgstr "চেট চাৰ�ভাৰৰ দ�বাৰা প�ৰদান কৰা পৰিচয়ৰ সতা সত�য নিৰূপণ কৰিব নোৱাৰি।"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:157
+msgid "The certificate is not signed by a Certification Authority."
+msgstr "প�ৰমাণপত�ৰ �জন প�ৰমাণপত�ৰ কতৃপক�ষৰ দ�বাৰা স�বাক�ষৰীত নহয়।"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
+msgid "The certificate has expired."
+msgstr "প�ৰমাণপত�ৰৰ অৱসান ঘটিছে।"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
+msgid "The certificate hasn't yet been activated."
+msgstr "প�ৰমাণপত�ৰ �তিয়াও সক�ৰিয় কৰা হোৱা নাই।"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
+msgid "The certificate does not have the expected fingerprint."
+msgstr "প�ৰমাণপত�ৰৰ আশা কৰা ফিংগাৰপ�ৰিন�ট নাই।"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:170
+msgid "The hostname verified by the certificate doesn't match the server name."
+msgstr "প�ৰমাণপত�ৰ দ�বাৰা সতা সত�য নিৰূপণ কৰা হস�টনাম চাৰ�ভাৰ নামৰ সৈতে মিল নাখায়।"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
+msgid "The certificate is self-signed."
+msgstr "প�ৰমাণপত�ৰ স�ব-স�বাক�ষৰীত।"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:177
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
+msgstr "প�ৰমাণপত�ৰক প�ৰেৰণকাৰী প�ৰমাণপত�ৰ কতৃপক�ষ দ�বাৰা প�ৰত�যাহাৰ কৰা হৈছে।"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
+msgid "The certificate is cryptographically weak."
+msgstr "প�ৰমাণপত�ৰ ক�ৰিপ�টোগ�ৰাফীয়ভাৱে দ�ৰ�বল।"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:184
+msgid "The certificate length exceeds verifiable limits."
+msgstr "প�ৰমাণপত�ৰৰ দৈৰ�ঘ প�ৰমাণিত সীমাসমূহ পাৰ হৈ যায়।"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:188
+msgid "The certificate is malformed."
+msgstr "প�ৰমাণপত�ৰ ক�ষতিগ�ৰস�থ।"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#, c-format
+msgid "Expected hostname: %s"
+msgstr "আশা কৰা হস�টনাম: %s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#, c-format
+msgid "Certificate hostname: %s"
+msgstr "প�ৰমাণপত�ৰ হস�টনাম: %s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:281
+msgid "Continue"
+msgstr "চলাই থাকক"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "This connection is untrusted. Would you like to continue anyway?"
+msgstr "�ই সংযোগ ভৰষা কৰিব নোৱাৰি। আপ�নি তথাপিও আগবা�িব বিচাৰে নে?"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:297
+msgid "Remember this choice for future connections"
+msgstr "�ই পছন�দক ভৱিষ�যত সংযোগসমূহৰ বাবে মনত ৰাখিব"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:303
+msgid "Certificate Details"
+msgstr "প�ৰমাণপত�ৰ বিৱৰণসমূহ"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
 msgstr "URI খ�লিবলৈ ব�যৰ�থ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1484
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
 msgstr "�টা নথিপত�ৰ নিৰ�বাচন কৰক"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1544
-msgid "Select a destination"
-msgstr "�টা লক�ষ�য নিৰ�বাচন কৰক"
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
+msgid "Insufficient free space to save file"
+msgstr "নথিপত�ৰ সংৰক�ষণ কৰিবলে অপৰ�যাপ�ত ৰিক�ত স�থান"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#, c-format
+msgid ""
+"%s of free space are required to save this file, but only %s is available. "
+"Please choose another location."
+msgstr ""
+"�ই নথিপত�ৰ সা�চিবলে %s ৰিক�ত স�থানৰ প�ৰয়োজন, কিন�ত� কেৱল %s উপলব�ধ। অন�গ�ৰহ কৰি অন�য "
+"অৱস�থান বাছক।"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#, c-format
+msgid "Incoming file from %s"
+msgstr "%s -ৰ পৰা আগ'ত নথিপত�ৰ"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
-msgstr "বৰ�তমান লোকেইল"
+msgstr "বৰ�তমান স�থানীয়"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:161
 #: ../libempathy-gtk/totem-subtitle-encoding.c:163
@@ -1672,572 +2919,899 @@ msgstr "পশ�চিমি"
 msgid "Vietnamese"
 msgstr "ভিয়েতনামিছ"
 
-#.
-#. * vim: sw=2 ts=8 cindent noai bs=2
-#.
-#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:1
-msgid "The contact to display in the applet. Empty means no contact is displayed."
-msgstr "�প�লেটত প�ৰদৰ�শনযোগ�য পৰিচয় । ৰিক�ত হ'লে কোনো পৰিচয় প�ৰদৰ�শন কৰা ন'হ'ব ।"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:2
-msgid "The contact's avatar token. Empty means contact has no avatar."
-msgstr "পৰিচয়ৰ অৱতাৰৰ টোকেন । পৰিচয়ৰ অৱতাৰ নাথাকিলে ৰিক�ত থাকিব ।"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:1
-msgid "Megaphone"
-msgstr "মেগাফোন"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:522
-msgid "Talk!"
-msgstr "Talk!"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:1
-#: ../nothere/data/GNOME_NotHere_Applet.xml.h:1
-msgid "_About"
-msgstr "বিষয়ে (_A)"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:2
-msgid "_Information"
-msgstr "তথ�য (_I)"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.ui.h:23
-msgid "_Preferences"
-msgstr "পছন�দ (_P)"
-
-#: ../megaphone/src/megaphone-applet.c:166
-msgid "Please configure a contact."
-msgstr "অন�গ�ৰহ কৰে পৰিচয়ৰ তথ�য বিন�যাস কৰক ।"
-
-#: ../megaphone/src/megaphone-applet.c:256
-msgid "Select contact..."
-msgstr "পৰিচিত ব�যক�তি নিৰ�বাচন কৰক..."
-
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:1
-msgid "Presence"
-msgstr "উপস�থিতি"
-
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2
-#: ../nothere/src/nothere-applet.c:105
-msgid "Set your own presence"
-msgstr "নিজৰ উপস�থিতি সংক�ৰান�ত তথ�য নিৰ�ধাৰণ কৰক"
-
-#: ../src/empathy.c:742
-msgid "Don't connect on startup"
-msgstr "প�ৰাৰম�ভে সংযোগ স�থাপন কৰা ন'হ'ব"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
+msgid "The selected contact cannot receive files."
+msgstr "নিৰ�বাচিত পৰিচয়ে নথিপত�ৰসমূহ গ�ৰহণ কৰিব নোৱাৰে।"
 
-#: ../src/empathy.c:746
-msgid "Don't show the contact list on startup"
-msgstr "প�ৰাৰম�ভসময়ত পৰিচিত ব�যক�তিৰ তালিকা প�ৰদৰ�শন কৰা ন'হ'ব"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
+msgid "The selected contact is offline."
+msgstr "নিৰ�বাচিত পৰিচয় অফলাইন।"
+
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+msgid "No error message"
+msgstr "কোনো ত�ৰ�টি বাৰ�তা নাই"
+
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+msgid "Instant Message (Empathy)"
+msgstr "তৎক�ষনাত বাৰ�তা (Empathy)"
+
+#: ../src/empathy.c:431
+msgid "Don't connect on startup"
+msgstr "প�ৰাৰম�ভে সংযোগ স�থাপন কৰা নহব"
 
-#: ../src/empathy.c:750
-msgid "Show the accounts dialog"
-msgstr "হিচাপ সংক�ৰান�ত ডায়লগ প�ৰদৰ�শন কৰা হ'ব"
+#: ../src/empathy.c:435
+msgid "Don't display the contact list or any other dialogs on startup"
+msgstr "আৰম�ভণিত পৰিচয় তালিকা বা অন�য কোনো ডাইলগ প�ৰদৰ�শন নকৰিব"
 
-#: ../src/empathy.c:762
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr "- Empathy IM গ�ৰাহক"
 
-#: ../src/empathy-about-dialog.c:83
+#: ../src/empathy.c:637
+msgid "Error contacting the Account Manager"
+msgstr "�কাওন�ট ব�যৱস�থাপকৰ সৈতে সংযোগ কৰোতে ত�ৰ�টি"
+
+#: ../src/empathy.c:639
+#, c-format
 msgid ""
-"Empathy is free software; you can redistribute it and/or modify it under the "
-"terms of the GNU General Public License as published by the Free Software "
-"Foundation; either version 2 of the License, or (at your option) any later "
-"version."
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
 msgstr ""
+"টেলিপেথী �কাওন�ট ব�যৱস�থাপকৰ সৈতে সংযোগ কৰোতে �টা ত�ৰ�টি হৈছিল। ত�ৰ�টি আছিল:\n"
+"\n"
+"%s"
+
+#: ../src/empathy-about-dialog.c:81
+msgid ""
 "Empathy is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
 "Foundation; either version 2 of the License, or (at your option) any later "
 "version."
+msgstr ""
+"Empathy �টা বিনাম�লিয়া চফ�টওৱেৰ; আপ�নি Free Software Foundation -ৰ দ�বাৰা "
+"প�ৰকাশিত GNU General Public License -ৰ চ�ক�তিসমূহৰ অন�তৰ�গত ইয়াক প�নৰ বিলাব পাৰিব "
+"অথবা সলনি  কৰিব পাৰিব; হৈতো লাইচেঞ�চৰ সংস�কৰণ ২, অথবা (আপ�নাৰ বিকল�পত) যিকোনো "
+"পৰৱৰ�তী সংস�কৰণ।"
 
-#: ../src/empathy-about-dialog.c:87
+#: ../src/empathy-about-dialog.c:85
 msgid ""
 "Empathy 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."
 msgstr ""
-"Empathy 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."
+"Empathy �ইটো আশাত বিলোৱা হৈছে যে ই ব�যৱহাৰযোগ�য হ'ব, কিন�ত� কোনো ওৱাৰেন�টি "
+"নথকাকৈ; ব�যৱসায়ীক  অথবা কোনো �টা বিশেষ কাৰণৰ যোগ�যতাৰ বাবে ব�জ�ৱা ওৱাৰেন�টি  "
+"নথকাকৈ। অধিক যানিবলৈ  GNU General Public License চাওক।"
 
-#: ../src/empathy-about-dialog.c:91
+#: ../src/empathy-about-dialog.c:89
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
 msgstr ""
-"You should have received a copy of the GNU General Public License along with "
-"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
-"Street, Fifth Floor, Boston, MA 02110-130159 USA"
+"আপ�নি হৈতো ইতিমধ�যে �ই প�ৰগ�ৰামৰ সৈতে GNU General Public License -ৰ কপি �টা "
+"পাইছে। যদি নহয়,  Free Software Foundation, Inc., 51 Franklin Street, Fifth "
+"Floor, Boston, MA 02110-130159 USA -লে লিখক"
 
-#: ../src/empathy-about-dialog.c:119
+#: ../src/empathy-about-dialog.c:107
 msgid "An Instant Messaging client for GNOME"
-msgstr "GNOME ৰ সৈতে ব�যৱহাৰযোগ�য ইনস�টেন�ট মেছেজিং গ�ৰাহক"
+msgstr "GNOME ৰ সৈতে ব�যৱহাৰযোগ�য তৎক�ষনাত বাৰ�তাকৰণ ক�লা�ন�ট"
 
-#: ../src/empathy-about-dialog.c:125
+#: ../src/empathy-about-dialog.c:113
 msgid "translator-credits"
-msgstr "অমিতাক�ষ ফ�কন (aphukan@fedoraproject.org)"
+msgstr ""
+"অমিতাক�ষ ফ�কন (aphukan@fedoraproject.org), নীলমদ�য�তি গোস�বামী (ngoswami@redhat."
+"com)"
 
-#: ../src/empathy-account-assistant.c:118
-msgid "There has been an error while importing the accounts."
-msgstr "হিচাপ আমদানি কৰাৰ সময় কিছ� সমস�যা দেখা দিছে ।"
+#: ../src/empathy-account-assistant.c:167
+msgid "There was an error while importing the accounts."
+msgstr "�কাওন�টসমূহ ইমপোৰ�ট কৰোতে �টা ত�ৰ�টি হৈছিল।"
 
-#: ../src/empathy-account-assistant.c:121
-msgid "There has been an error while parsing the account details."
-msgstr "হিচাপৰ তথ�য পাৰ�স কৰাৰ সময় �টা সমস�যা দেখা দিছে ।"
+#: ../src/empathy-account-assistant.c:170
+msgid "There was an error while parsing the account details."
+msgstr "�কাওন�ট বিৱৰণসমূহ বিশ�লেষণ কৰোতে �টা ত�ৰ�টি হৈছিল।"
 
-#: ../src/empathy-account-assistant.c:124
-msgid "There has been an error while creating the account."
-msgstr "হিচাপ নিৰ�মাণসময়ত �টা সমস�যা দেখা দিছে ।"
+#: ../src/empathy-account-assistant.c:173
+msgid "There was an error while creating the account."
+msgstr "�কাওন�ট সৃষ�টি কৰোতে �টা ত�ৰ�টি হৈছিল।"
 
-#: ../src/empathy-account-assistant.c:126
-msgid "There has been an error."
-msgstr "�টা সমস�যা দেখা দিছে ।"
+#: ../src/empathy-account-assistant.c:175
+msgid "There was an error."
+msgstr "�টা ত�ৰ�টি হৈছিল।"
 
-#: ../src/empathy-account-assistant.c:141
+#: ../src/empathy-account-assistant.c:179
 #, c-format
-msgid "The error message was: <span style=\"italic\">%s</span>"
-msgstr "উৎপন�ন ত�ৰ�টিৰ বাৰ�তা: <span style=\"italic\">%s</span>"
+msgid "The error message was: %s"
+msgstr "ত�ৰ�টি বাৰ�তা আছিল: %s"
 
-#: ../src/empathy-account-assistant.c:149
+#: ../src/empathy-account-assistant.c:183
 msgid ""
 "You can either go back and try to enter your accounts' details again or quit "
 "this assistant and add accounts later from the Edit menu."
 msgstr ""
+"আপ�নি হয় উভতি যাব পাৰে আৰ� আপোনাৰ �কাওন�ট বিৱৰনসমূহ প�নৰ সোমোৱাৰ চেষ�টা কৰিব পাৰে "
+"অথবা �ই সহায়ক প�ৰস�থান কৰক আৰ� �কাওন�টসমূহ পিছত সম�পাদনা মেন�ৰ পৰা যোগ কৰক।"
 
-#: ../src/empathy-account-assistant.c:184
+#: ../src/empathy-account-assistant.c:220
+#: ../src/empathy-account-assistant.c:1271
 msgid "An error occurred"
 msgstr "�টা ত�ৰ�টি দেখা দিছে"
 
-#. Create account
-#. To translator: %s is the protocol name
-#. Create account
-#. To translator: %s is the name of the protocol, such as "Google Talk" or
-#. * "Yahoo!"
-#.
-#: ../src/empathy-account-assistant.c:321
-#: ../src/empathy-accounts-dialog.c:1400
-#, c-format
-msgid "New %s account"
-msgstr "নত�ন %s হিচাপ"
-
-#: ../src/empathy-account-assistant.c:393
+#: ../src/empathy-account-assistant.c:467
 msgid "What kind of chat account do you have?"
-msgstr "সম�বাদৰ কি ধৰনৰ হিচাপ উপস�থিত আছে?"
+msgstr "চেটৰ কি ধৰনৰ �কাওন�ট উপস�থিত আছে?"
 
-#: ../src/empathy-account-assistant.c:399
+#: ../src/empathy-account-assistant.c:473
 msgid "Do you have any other chat accounts you want to set up?"
-msgstr "প�ৰস�ত�ত কৰাৰ উদ�দেশ�যে অন�য কোনো সম�বাদৰ হিচাপ উপস�থিত আছে নেকি ?"
+msgstr "প�ৰস�ত�ত কৰাৰ উদ�দেশ�যে অন�য কোনো চেটৰ �কাওন�ট উপস�থিত আছে নেকি ?"
 
-#: ../src/empathy-account-assistant.c:405
+#: ../src/empathy-account-assistant.c:479
 msgid "Enter your account details"
-msgstr "আপোনাৰ হিচাপৰ বিবৰণ ইয়াত লিখক"
+msgstr "আপোনাৰ �কাওন�টৰ বিবৰণ ইয়াত লিখক"
 
-#: ../src/empathy-account-assistant.c:410
+#: ../src/empathy-account-assistant.c:484
 msgid "What kind of chat account do you want to create?"
-msgstr "কি ধৰনৰ সম�বাদৰ হিচাপ আপ�নি নিৰ�মাণ কৰিবলৈ ইচ�ছ�ক নে ?"
+msgstr "কি ধৰনৰ চেটৰ �কাওন�ট আপ�নি নিৰ�মাণ কৰিবলৈ ইচ�ছ�ক ?"
 
-#: ../src/empathy-account-assistant.c:416
+#: ../src/empathy-account-assistant.c:490
 msgid "Do you want to create other chat accounts?"
-msgstr "সম�বাদৰ অন�য হিচাপ নিৰ�মাণ কৰিবলৈ ইচ�ছ�ক নেকি?"
+msgstr "চেটৰ অন�য �কাওন�ট নিৰ�মাণ কৰিবলৈ ইচ�ছ�ক নেকি?"
 
-#: ../src/empathy-account-assistant.c:423
+#: ../src/empathy-account-assistant.c:497
 msgid "Enter the details for the new account"
-msgstr "নত�ন হিচাপৰ বিৱৰণ লিখক"
+msgstr "নত�ন �কাওন�টৰ বিৱৰণ লিখক"
 
-#: ../src/empathy-account-assistant.c:509
+#: ../src/empathy-account-assistant.c:612
 msgid ""
 "With Empathy you can chat with people online nearby and with friends and "
 "colleagues who use Google Talk, AIM, Windows Live and many other chat "
 "programs. With a microphone or a webcam you can also have audio or video "
 "calls."
 msgstr ""
+"Empathy -ৰ সৈতে আপ�নি কাষৰীয়া মান�হ আৰ� বন�ধ�সকল আৰ� সহকৰ�মীসকল যোনে Google Talk, "
+"AIM, Windows Live আৰ� অন�য বহতো চেট প�ৰগ�ৰামসমূহ ব�যৱহাৰ কৰে সিহতৰ লগত অনলাইন চেট "
+"কৰিব পাৰিব। �টা মাক�ৰোফোন অথবা �টা ৱেবকেমৰ সৈতে আপ�নি অডিঅ' অথবা ভিডিঅ' কলসমূহ "
+"কৰিব পাৰিব।"
 
-#: ../src/empathy-account-assistant.c:526
+#: ../src/empathy-account-assistant.c:629
 msgid "Do you have an account you've been using with another chat program?"
 msgstr ""
-"অন�য কোনো সম�বাদৰ প�ৰোগ�ৰামৰ সৈতে ব�যৱহৃত হৈছে �মন কোনো হিচাপ কি বৰ�তমানে উপস�থিত আছে?"
+"অন�য কোনো চেটৰ প�ৰোগ�ৰামৰ সৈতে ব�যৱহৃত হৈছে �নে কোনো �কাওন�ট কি বৰ�তমানে উপস�থিত আছে?"
 
-#: ../src/empathy-account-assistant.c:549
+#: ../src/empathy-account-assistant.c:652
 msgid "Yes, import my account details from "
-msgstr "হয়, চিহ�নিত স�থানৰ পৰা মোৰ হিচাপৰ তথ�য আমদানি কৰা হ'ব "
+msgstr "হয়, চিহ�নিত স�থানৰ পৰা মোৰ �কাওন�টৰ তথ�য ইমপোৰ�ট কৰা হ'ব "
 
-#: ../src/empathy-account-assistant.c:570
+#: ../src/empathy-account-assistant.c:673
 msgid "Yes, I'll enter my account details now"
-msgstr "হয়, মোৰ হিচাপৰ তথ�য আমি ইয়াত লিখিবলৈ ইচ�ছ�ক"
+msgstr "হয়, মোৰ �কাওন�টৰ তথ�য মই �তিয়ায় লিখিবলৈ ইচ�ছ�ক"
 
-#: ../src/empathy-account-assistant.c:592
+#: ../src/empathy-account-assistant.c:695
 msgid "No, I want a new account"
-msgstr "নহয়, মই নত�ন হিচাপ প�ৰাপ�ত কৰিবলৈ ইচ�ছ�ক"
+msgstr "নহয়, মই নত�ন �কাওন�ট প�ৰাপ�ত কৰিবলৈ ইচ�ছ�ক"
 
-#: ../src/empathy-account-assistant.c:602
+#: ../src/empathy-account-assistant.c:705
 msgid "No, I just want to see people online nearby for now"
 msgstr "নহয়, বৰ�তমানে মই অকল ওচৰৰ ব�যক�তিৰ তথ�য চাবলৈ ইচ�ছ�ক"
 
-#: ../src/empathy-account-assistant.c:623
+#: ../src/empathy-account-assistant.c:726
 msgid "Select the accounts you want to import:"
-msgstr "আমদানি কৰাৰ উদ�দেশ�যে হিচাপ নিৰ�বাচন কৰক:"
+msgstr "ইমপোৰ�ট কৰাৰ উদ�দেশ�যে �কাওন�ট নিৰ�বাচন কৰক:"
 
-#: ../src/empathy-account-assistant.c:710
-#: ../src/empathy-new-chatroom-dialog.c:496
-#: ../src/empathy-new-chatroom-dialog.c:497
+#: ../src/empathy-account-assistant.c:813
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "Yes"
 msgstr "হয়"
 
-#: ../src/empathy-account-assistant.c:717
+#: ../src/empathy-account-assistant.c:820
 msgid "No, that's all for now"
 msgstr "নহয়, �তিয়াৰ কাৰণে �ইয়াই"
 
-#: ../src/empathy-account-assistant.c:910
+#: ../src/empathy-account-assistant.c:1085
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct. You can easily change these details later or "
+"disable this feature by using the 'Accounts' dialog"
+msgstr ""
+"Empathy -� আপ�নি থকা নেটৱাৰ�কত সংয�ক�ত থকা মান�হবোৰক স�বচালিতভাৱে খোজ কৰি চেট কৰিব "
+"পাৰে। যদি আপ�নি �ই বৈশিষ�ট ব�যৱহাৰ কৰিব বিচাৰে, অন�গ�ৰহ কৰি তলত থকা বিৱৰণসমূহ সঠিক "
+"আছে নে নিৰীক�ষণ কৰক। আপ�নি সহজতে �ই বিৱৰণসমূহ পিছত সলনি কৰিব পাৰিব বা �ই বৈশিষ�ট "
+"'Accounts' ডাইলগ ব�যৱহাৰ কৰি অসামৰ�থবান কৰিব পাৰিব"
+
+#: ../src/empathy-account-assistant.c:1091
+#: ../src/empathy-account-assistant.c:1147
+msgid "Edit->Accounts"
+msgstr "সম�পাদনা কৰক -> �কাওন�টসমূহ"
+
+#: ../src/empathy-account-assistant.c:1107
+msgid "I do _not want to enable this feature for now"
+msgstr "মই �ই বৈশিষ�ট �তিয়ায় সামৰ�থবান কৰিব নিবিচাৰো (_n)"
+
+#: ../src/empathy-account-assistant.c:1143
+msgid ""
+"You won't be able to chat with people connected to your local network, as "
+"telepathy-salut is not installed. If you want to enable this feature, please "
+"install the telepathy-salut package and create a People Nearby account from "
+"the Accounts dialog"
+msgstr ""
+"আপ�নি আপোনাৰ স�থানীয় নেটৱাৰ�কত সংয�ক�ত মান�হবোৰৰ লগত চেট কৰিব নোৱাৰিব কাৰণ, "
+"telepathy-salut ইনস�টল নাই। যদি আপ�নি �ই বৈশিষ�ট সামৰ�থবান কৰিব বিচাৰে, অন�গ�ৰহ "
+"কৰি telepathy-salut পেকেইজ ইনস�টল কৰক আৰ� �কাওন�টসমূহ ডাইলগৰ পৰা �টা কাষৰীয়া "
+"মান�হবোৰ �কাওন�ট সৃষ�টি কৰক"
+
+#: ../src/empathy-account-assistant.c:1149
+msgid "telepathy-salut not installed"
+msgstr "telepathy-salut ইনস�টল নাই"
+
+#: ../src/empathy-account-assistant.c:1195
+msgid "Messaging and VoIP Accounts Assistant"
+msgstr "বাৰ�তা আৰ� VoIP �কাওন�টসমূহ সহায়ক"
+
+#: ../src/empathy-account-assistant.c:1229
 msgid "Welcome to Empathy"
 msgstr "Empathy লৈ স�বাগতম"
 
-#: ../src/empathy-account-assistant.c:919
+#: ../src/empathy-account-assistant.c:1238
 msgid "Import your existing accounts"
-msgstr "আপোনাৰ উপস�থিত হিচাপ আমদানি কৰক"
+msgstr "আপোনাৰ উপস�থিত �কাওন�ট ইমপোৰ�ট কৰক"
+
+#: ../src/empathy-account-assistant.c:1256
+msgid "Please enter personal details"
+msgstr "অন�গ�ৰহ কৰি ব�যক�তিগত বিৱৰণসমূহ সোমাওক"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:63
+#: ../src/empathy-accounts-dialog.c:64
 #, c-format
-msgid "There are unsaved modification regarding your %s account."
-msgstr "আপোনাৰ %s হিচাপ সংক�ৰান�ত কিছ� পৰিবৰ�তনৰ তথ�য বৰ�তমানে সংৰক�ষণ কৰা নহয় ।"
+msgid "There are unsaved modifications to your %s account."
+msgstr "আপোনাৰ %s �কাওন�টত অসংৰক�ষীত পৰিৱৰ�তনসমূহ আছে।"
 
-#. To translators: The first parameter is the login id and the
-#. * second one is the server. The resulting string will be something
-#. * like: "MyUserName on chat.freenode.net".
-#. * You should reverse the order of these arguments if the
-#. * server should come before the login id in your locale.
-#: ../src/empathy-accounts-dialog.c:236
+#. The primary text of the dialog shown to the user when he is about to lose
+#. * an unsaved new account
+#: ../src/empathy-accounts-dialog.c:68
+msgid "Your new account has not been saved yet."
+msgstr "আপোনাৰ নত�ন �কাওন�ট �তিয়াও সংৰক�ষণ কৰা হোৱা নাই"
+
+#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1216
+msgid "Connecting…"
+msgstr "সংযোগ কৰা হৈ আছে…"
+
+#: ../src/empathy-accounts-dialog.c:386
 #, c-format
-msgid "%1$s on %2$s"
-msgstr "%1$s %2$s ত"
+msgid "Offline — %s"
+msgstr "অফলাইন— %s"
 
-#. To translators: The parameter is the protocol name. The resulting
-#. * string will be something like: "Jabber Account"
-#: ../src/empathy-accounts-dialog.c:248
+#: ../src/empathy-accounts-dialog.c:398
 #, c-format
-msgid "%s Account"
-msgstr "%s হিচাপ"
+msgid "Disconnected — %s"
+msgstr "বিচ�ছিন�নিত — %s"
 
-#: ../src/empathy-accounts-dialog.c:252
-msgid "New account"
-msgstr "নত�ন হিচাপ"
+#: ../src/empathy-accounts-dialog.c:409
+msgid "Offline — No Network Connection"
+msgstr "অফলাইন — কোনো নেটৱাৰ�ক সংযোগ নাই"
 
-#: ../src/empathy-accounts-dialog.c:502
+#: ../src/empathy-accounts-dialog.c:416
+msgid "Unknown Status"
+msgstr "অজ�ঞাত অৱস�থা"
+
+#: ../src/empathy-accounts-dialog.c:428
+msgid "Offline — Account Disabled"
+msgstr "অফলাইন — �কাওন�ট অসামৰ�থবান"
+
+#: ../src/empathy-accounts-dialog.c:831
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgstr ""
+"আপ�নি �টা নত�ন �কাওন�ট সৃষ�টি কৰিব লৈছে, যাৰ ফলত আপোনাৰ পৰিৱৰ�তনসমূহ\n"
+"আতৰোৱা হব। আপ�নি নিশ�চিত নে আপ�নি আগবা�িব বিচাৰে?"
 
-#: ../src/empathy-accounts-dialog.c:787
+#: ../src/empathy-accounts-dialog.c:1192
 #, c-format
-msgid ""
-"You are about to remove your %s account!\n"
-"Are you sure you want to proceed?"
-msgstr "আপ�নি %s হিচাপ আ�তৰাব লৈছে!\n
আপ�নি নিশ�চিতৰূপে আগবা�িবলৈ ইচ�ছ�ক নে ?"
+msgid "Do you want to remove %s from your computer?"
+msgstr "আপ�নি %s -ক আপোনাৰ কমপিউটাৰৰ পৰা আতৰাব বিচাৰে নে?"
 
-#: ../src/empathy-accounts-dialog.c:792
-msgid ""
-"Any associated conversations and chat rooms will NOT be removed if you "
-"decide to proceed.\n"
-"\n"
-"Should you decide to add the account back at a later time, they will still "
-"be available."
-msgstr ""
+#: ../src/empathy-accounts-dialog.c:1196
+msgid "This will not remove your account on the server."
+msgstr "ই চাৰ�ভাৰত আপোনাৰ �কাওন�টক আতৰাই নিদিয়ে।"
 
-#: ../src/empathy-accounts-dialog.c:980
+#: ../src/empathy-accounts-dialog.c:1432
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgstr ""
+"আপ�নি অন�য �কাওন�ট নিৰ�বাচন কৰিব লৈছে, যাৰ ফলত আপোনাৰ পৰিৱৰ�তনসমূহ\n"
+"আতৰোৱা হব। আপ�নি নিশ�চিত নে আপ�নি আগবা�িব বিচাৰে?"
+
+#. Menu items: to enabled/disable the account
+#: ../src/empathy-accounts-dialog.c:1643
+msgid "_Enable"
+msgstr "সামৰ�থবান কৰক (_E)"
 
-#: ../src/empathy-accounts-dialog.c:1475
+#: ../src/empathy-accounts-dialog.c:1644
+msgid "_Disable"
+msgstr "অসামৰ�থবান কৰক (_D)"
+
+#: ../src/empathy-accounts-dialog.c:2154
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgstr ""
+"আপ�নি �টা উইন�ডো বন�ধ কৰিব লৈছে, যাৰ ফলত আপোনাৰ কৰা পৰিৱৰ�তনসমূহ\n"
+"আতৰোৱা হব। আপ�নি নিশ�চিত নে আপ�নি আগবা�িব বিচাৰে?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
-msgid "Accounts"
-msgstr "হিচাপ"
+msgid "Add…"
+msgstr "যোগ কৰক…"
 
 #: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Add new"
-msgstr "নত�ন যোগ কৰা হ'ব"
+msgid "Loading account information"
+msgstr "�কাওন�ট তথ�য ল'ড কৰা হৈ আছে"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "Cr_eate"
-msgstr "নিৰ�মাণ কৰক (_e)"
+msgid "No protocol installed"
+msgstr "কোনো প�ৰটোকল সংস�থাপন কৰা নহয়"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "No protocol installed"
-msgstr "কোনো প�ৰোটোকল সংস�থাপন কৰা নহয়"
+msgid "Protocol:"
+msgstr "প�ৰটোকল:"
 
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr ""
-"নত�ন হিচাপ যোগ কৰাৰ বাবে, প�ৰথমে ব�যৱহাৰযোগ�য প�ৰতি প�ৰোটোকলৰ বাবে �টা বেক লৈন�ড "
-"সংস�থাপন কৰা আৱশ�যক ।"
-
-#: ../src/empathy-accounts-dialog.ui.h:6
-msgid "_Add..."
-msgstr "যোগ কৰক...(_A)"
+"নত�ন �কাওন�ট যোগ কৰাৰ বাবে, প�ৰথমে ব�যৱহাৰযোগ�য প�ৰতি প�ৰটোকলৰ বাবে �টা বেক লৈন�ড "
+"সংস�থাপন কৰা আৱশ�যক।"
 
 #: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Create a new account"
-msgstr "�টা নত�ন হিচাপ নিৰ�মাণ কৰক (_C)"
+msgid "_Import…"
+msgstr "ইমপোৰ�ট কৰক (_I)..."
+
+#: ../src/empathy-auth-client.c:249
+msgid " - Empathy authentication client"
+msgstr " - Empathy প�ৰমাণীকৰণ ক�লা�ন�ট"
 
-#: ../src/empathy-accounts-dialog.ui.h:8
-msgid "_Reuse an existing account"
-msgstr "�টা উপস�থিত হিচাপ প�নঃ ব�যৱহাৰ কৰক (_R)"
+#: ../src/empathy-auth-client.c:265
+msgid "Empathy authentication client"
+msgstr "Empathy প�ৰমাণীকৰণ ক�লা�ন�ট"
 
-#: ../src/empathy-accounts-dialog.ui.h:9
-msgid "account"
-msgstr "হিচাপ"
+#: ../src/empathy-auto-salut-account-helper.c:83
+msgid "People nearby"
+msgstr "ওচৰৰ ব�যক�তিৰ"
 
-#: ../src/empathy-call-window.c:427
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+msgid "- Empathy Audio/Video Client"
+msgstr "- Empathy অডিঅ'/ভিডিঅ' ক�লা�ন�ট"
+
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+msgid "Empathy Audio/Video Client"
+msgstr "Empathy অডিঅ'/ভিডিঅ' ক�লা�ন�ট"
+
+#: ../src/empathy-streamed-media-window.c:431
 msgid "Contrast"
 msgstr "বৈপৰিত�য"
 
-#: ../src/empathy-call-window.c:430
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Brightness"
 msgstr "উজ�জ�বলতা"
 
-#: ../src/empathy-call-window.c:433
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Gamma"
 msgstr "গামা"
 
-#: ../src/empathy-call-window.c:541
+#: ../src/empathy-streamed-media-window.c:542
 msgid "Volume"
 msgstr "ধ�বনি"
 
-#: ../src/empathy-call-window.c:674
-msgid "Connecting..."
-msgstr "সংযোগ স�থাপন কৰা হৈছে..."
-
-#: ../src/empathy-call-window.c:781
+#: ../src/empathy-streamed-media-window.c:1110
 msgid "_Sidebar"
-msgstr "ছাইড-বাৰ (_S)"
-
-#: ../src/empathy-call-window.c:800
-msgid "Dialpad"
-msgstr "ডায়েল-পেড"
+msgstr "কাষ-বাৰ (_S)"
 
-#: ../src/empathy-call-window.c:806
+#: ../src/empathy-streamed-media-window.c:1130
 msgid "Audio input"
-msgstr "অডিঅ' নিবেশ"
+msgstr "অডিঅ' ইনপ�ট"
 
-#: ../src/empathy-call-window.c:810
+#: ../src/empathy-streamed-media-window.c:1134
 msgid "Video input"
-msgstr "ভিডিঅ' নিবেশ"
+msgstr "ভিডিঅ' ইনপ�ট"
+
+#: ../src/empathy-streamed-media-window.c:1140
+msgid "Dialpad"
+msgstr "ডায়েল-পেড"
+
+#: ../src/empathy-streamed-media-window.c:1151
+msgid "Details"
+msgstr "বিৱৰণসমূহ"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:873
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1825
 #, c-format
 msgid "Call with %s"
 msgstr "%s ৰ সৈতে কল"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-call-window.c:944
-msgid "Call"
-msgstr "কল"
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:2069
+msgid "The IP address as seen by the machine"
+msgstr "মেচিনে দেখা দৰে IP ঠিকনা"
+
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:2071
+msgid "The IP address as seen by a server on the Internet"
+msgstr "ইন�টাৰনেটত �টা চাৰ�ভাৰে দেখা দৰে IP ঠিকনা"
+
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:2073
+msgid "The IP address of the peer as seen by the other side"
+msgstr "অন�য কাষে দেখা ধৰণে সমনীয়াৰ IP ঠিকনা"
+
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:2075
+msgid "The IP address of a relay server"
+msgstr "�টা প�ৰেৰণ চাৰ�ভাৰৰ IP ঠিকনা"
+
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:2077
+msgid "The IP address of the multicast group"
+msgstr "মাল�টিকাস�ট দলৰ IP ঠিকনা"
+
+#: ../src/empathy-streamed-media-window.c:1843
+msgctxt "encoding video codec"
+msgid "Unknown"
+msgstr "অজ�ঞাত"
+
+#: ../src/empathy-streamed-media-window.c:1846
+msgctxt "encoding audio codec"
+msgid "Unknown"
+msgstr "অজ�ঞাত"
+
+#: ../src/empathy-streamed-media-window.c:1849
+msgctxt "decoding video codec"
+msgid "Unknown"
+msgstr "অজ�ঞাত"
+
+#: ../src/empathy-streamed-media-window.c:1852
+msgctxt "decoding audio codec"
+msgid "Unknown"
+msgstr "অজ�ঞাত"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1445
+#: ../src/empathy-streamed-media-window.c:2144
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "সংযোগেৰ অবকাল — %d:%02dm"
 
-#: ../src/empathy-call-window.ui.h:1
-msgid "Hang up"
-msgstr "বিচ�ছিন�ন কৰক"
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2846
+msgid "Technical Details"
+msgstr "কাৰিকৰী বিৱৰণসমূহ"
 
-#: ../src/empathy-call-window.ui.h:2
-msgid "Redial"
-msgstr "প�নঃ ডায়েল কৰক"
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2884
+#, c-format
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
+msgstr "%s -ৰ চফ�টৱেৰে আপোনাৰ কমপিউটাৰে সমৰ�থন কৰা কোনো অডিঅ' বিন�যাস ব�জি নাপায়"
+
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2889
+#, c-format
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
+msgstr "%s -ৰ চফ�টৱেৰে আপোনাৰ কমপিউটাৰে সমৰ�থন কৰা কোনো ভিডিঅ' বিন�যাস ব�জি নাপায়"
+
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2895
+#, c-format
+msgid ""
+"Can't establish a connection to %s. One of you might be on a network that "
+"does not allow direct connections."
+msgstr ""
+"%s লে �টা সংযোগ স�থাপন কৰিব নোৱাৰে। আপোনা লোকৰ �জন হয়তো �নে নেটৱাৰ�কত আছে যি "
+"প�ৰত�যক�ষ সংযোগসমূহৰ অন�মতি নিদিয়ে।"
+
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2901
+msgid "There was a failure on the network"
+msgstr "নেটৱাৰ�কত �টা ব�যৰ�থতা হৈছিল"
+
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2905
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
+msgstr "�ই কলৰ বাবে প�ৰয়োজনীয় অডিঅ' বিন�যাসসমূহ আপোনাৰ কমপিউটাৰত ইনস�টল নাই"
+
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2908
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr "�ই কলৰ বাবে ভিডিঅ' বিন�যাসসমূহ আপোনাৰ কমপিউটাৰত ইনস�টল নাই"
+
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2920
+#, c-format
+msgid ""
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+msgstr ""
+"কিবা অপ�ৰত�যাশিত �টা Telepathy উপাদানত ঘটিছে। অন�গ�ৰহ কৰি <a href=\"%s\">�ই বাগ "
+"সংবাদন কৰক</a> আৰ� সহায় মেন�ৰ 'ডিবাগ' উইন�ডোৰ পৰা সংগ�ৰহ কৰা লগসমূহ �টাচ কৰক।"
+
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2929
+msgid "There was a failure in the call engine"
+msgstr "কল ইঞ�জীনত �টা ব�যৰ�থতা হৈছিল"
+
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2932
+msgid "The end of the stream was reached"
+msgstr "স�ট�ৰিমৰ অন�ত পোৱা গল"
+
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2972
+msgid "Can't establish audio stream"
+msgstr "অডিঅ' স�ট�ৰিম স�থাপনা কৰিব নোৱাৰি"
+
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2982
+msgid "Can't establish video stream"
+msgstr "ভিডিঅ' স�ট�ৰিম স�থাপনা কৰিব নোৱাৰি"
+
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:1
+msgid "Audio"
+msgstr "অডিঅ'"
 
 #: ../src/empathy-call-window.ui.h:3
-msgid "Send Audio"
-msgstr "অডিঅ' পঠিয়াওক"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "কডেক ডিক'ড কৰা হৈ আছে:"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Send video"
-msgstr "ভিডিঅ' পঠিয়াওক"
+msgid "Disable camera"
+msgstr "কেমেৰা অসামৰ�থবান কৰক"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Video preview"
-msgstr "ভিডিঅ'ৰ পূৰ�বদৃশ�য"
+msgid "Display the dialpad"
+msgstr "ডায়েলপেড প�ৰদৰ�শন কৰক"
 
 #: ../src/empathy-call-window.ui.h:6
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "কডেক �নক'ড কৰা হৈ আছে:"
+
+#: ../src/empathy-call-window.ui.h:7
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Hang up"
+msgstr "বিচ�ছিন�ন কৰক"
+
+#: ../src/empathy-call-window.ui.h:8
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Hang up current call"
+msgstr "বৰ�তমান কল হেঙআপ কৰক"
+
+#: ../src/empathy-call-window.ui.h:9
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "স�থানীয় প�ৰাৰ�থী:"
+
+#: ../src/empathy-call-window.ui.h:10
+msgid "Maximise me"
+msgstr "মোক ডাঙৰ কৰক"
+
+#: ../src/empathy-call-window.ui.h:11
+msgid "Minimise me"
+msgstr "মোক সৰ� কৰক"
+
+#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "দূৰৱৰ�তী প�ৰাৰ�থী:"
+
+#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Send Audio"
+msgstr "অডিঅ' পঠিয়াওক"
+
+#: ../src/empathy-call-window.ui.h:14
+msgid "Send Video"
+msgstr "ভিডিঅ' পঠাওক"
+
+#: ../src/empathy-call-window.ui.h:15
+msgid "Show dialpad"
+msgstr "ডায়েলপেড দেখ�ৱাওক"
+
+#: ../src/empathy-call-window.ui.h:16
+msgid "Start a video call"
+msgstr "�টা ভিডিঅ' কল আৰম�ভ কৰক"
+
+#: ../src/empathy-call-window.ui.h:17
+msgid "Start an audio call"
+msgstr "�টা অডিঅ' কল আৰম�ভ কৰক"
+
+#: ../src/empathy-call-window.ui.h:18
+msgid "Swap camera"
+msgstr "কেমেৰা স�বাপ কৰক"
+
+#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr "অডিঅ' সৰবৰাহ অদল বদল কৰক"
+
+#: ../src/empathy-call-window.ui.h:20
+msgid "Toggle video transmission"
+msgstr "ভিডিঅ' সৰবৰাহ অদল বদল কৰক"
+
+#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
+#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
+msgid "Unknown"
+msgstr "অজ�ঞাত"
+
+#: ../src/empathy-call-window.ui.h:23
+msgid "Video call"
+msgstr "ভিডিঅ' কল "
+
+#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "কল (_C)"
 
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-call-window.ui.h:25
+msgid "_Camera"
+msgstr "কেমেৰা (_C)"
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:18
+msgid "_Contents"
+msgstr "সূচী (_C)"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
+msgid "_Debug"
+msgstr "ডিবাগ কৰক (_D)"
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:22
+msgid "_Help"
+msgstr "সহায় (_H)"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Microphone"
+msgstr "মাক�ৰোফোন (_M)"
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "_Settings"
+msgstr "সংহতিসমূহ (_S)"
+
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "প�ৰদৰ�শন (_V)"
 
-#: ../src/empathy-chat-window.c:349
+#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#, c-format
+msgid "%s (%d unread)"
+msgid_plural "%s (%d unread)"
+msgstr[0] "%s (%d প�া হোৱা নাই)"
+msgstr[1] "%s (%d প�া হোৱা নাই)"
+
+#: ../src/empathy-chat-window.c:493
+#, c-format
+msgid "%s (and %u other)"
+msgid_plural "%s (and %u others)"
+msgstr[0] "%s (আৰ� %u অন�য)"
+msgstr[1] "%s (আৰ� %u অন�য)"
+
+#: ../src/empathy-chat-window.c:509
+#, c-format
+msgid "%s (%d unread from others)"
+msgid_plural "%s (%d unread from others)"
+msgstr[0] "%s (%d অন�যৰ পৰা প�া হোৱা নাই)"
+msgstr[1] "%s (%d অন�যৰ পৰা প�া হোৱা নাই)"
+
+#: ../src/empathy-chat-window.c:518
+#, c-format
+msgid "%s (%d unread from all)"
+msgid_plural "%s (%d unread from all)"
+msgstr[0] "%s (%d সকলোৰ পৰা প�া হোৱা নাই)"
+msgstr[1] "%s (%d সকলোৰ পৰা প�া হোৱা নাই)"
+
+#: ../src/empathy-chat-window.c:733
+msgid "SMS:"
+msgstr "SMS:"
+
+#: ../src/empathy-chat-window.c:743
 #, c-format
-msgid "Conversations (%d)"
-msgstr "সম�বাদ (%d)"
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "%d বাৰ�তা পঠোৱা হৈ আছে"
+msgstr[1] "%d বাৰ�তাসমূহ পঠোৱা হৈ আছে"
 
-#: ../src/empathy-chat-window.c:481
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
-msgstr "বাৰ�তা লিখা হৈছে ।"
+msgstr "বাৰ�তা লিখা হৈছে।"
 
 #: ../src/empathy-chat-window.ui.h:1
 msgid "C_lear"
 msgstr "আ�তৰাওক (_l)"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "Chat"
-msgstr "সম�বাদ"
+msgid "C_ontact"
+msgstr "পৰিচয় (_o)"
 
-#: ../src/empathy-chat-window.ui.h:3
+#: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
 msgstr "স�মাইলি যোগ কৰক (_S)"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:5
+msgid "Invite _Participant…"
+msgstr "প�ৰতিযোগীক আমন�ত�ৰণ দিয়ক (_P)…"
+
+#: ../src/empathy-chat-window.ui.h:6
 msgid "Move Tab _Left"
 msgstr "টেব বাও�ফালে নিয়ক (_L)"
 
-#: ../src/empathy-chat-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:7
 msgid "Move Tab _Right"
 msgstr "টেব সো�ফালে নিয়ক (_R)"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "_Contact"
-msgstr "পৰিচিত ব�যক�তি (_C)"
-
-#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
-msgid "_Contents"
-msgstr "সূচী (_C)"
-
 #: ../src/empathy-chat-window.ui.h:8
+msgid "Notify for All Messages"
+msgstr "সকলো বাৰ�তাৰ বাবে অধিসূচনা দিয়ক"
+
+#: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
-msgstr "সম�বাদ (_C)"
+msgstr "কথোপকথন (_C)"
 
-#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-chat-window.ui.h:11
 msgid "_Detach Tab"
 msgstr "টেব বিচ�ছিন�ন কৰক (_D)"
 
-#: ../src/empathy-chat-window.ui.h:11
-msgid "_Favorite Chatroom"
-msgstr "জনপ�ৰিয় ছেট ৰ�ম (_F)"
-
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
-msgid "_Help"
-msgstr "সহায় (_H)"
-
 #: ../src/empathy-chat-window.ui.h:13
+msgid "_Favorite Chat Room"
+msgstr "জনপ�ৰিয় চেট ৰ�ম (_F)"
+
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "পৰবৰ�তী টেব (_N)"
 
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:16
 msgid "_Previous Tab"
 msgstr "পূৰ�ববৰ�তী টেব (_P)"
 
-#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
 msgid "_Show Contact List"
 msgstr "পৰিচিত ব�যক�তিৰ তালিকা প�ৰদৰ�শন কৰা হ'ব (_S)"
 
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:18
 msgid "_Tabs"
 msgstr "টেব (_T)"
 
-#: ../src/empathy-chatrooms-window.c:258
+#: ../src/empathy-chat-window.ui.h:19
+msgid "_Undo Close Tab"
+msgstr "টেব বন�ধ বাতিল কৰক (_U)"
+
+#: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "নাম"
 
-#: ../src/empathy-chatrooms-window.c:276
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
 msgstr "ৰ�ম"
 
-#: ../src/empathy-chatrooms-window.c:285
+#: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "স�বয়ংক�ৰিয়-সংযোগ"
 
 #: ../src/empathy-chatrooms-window.ui.h:2
 msgid "Manage Favorite Rooms"
-msgstr "পছন�দৰ ৰ�ম পৰিচালনা কৰক"
+msgstr "পছন�দৰ ৰ�ম পৰিচয়লনা কৰক"
+
+#: ../src/empathy-event-manager.c:521
+msgid "Incoming video call"
+msgstr "আগ'ত ভিডিঅ' কল"
 
-#: ../src/empathy-event-manager.c:322
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
 msgid "Incoming call"
 msgstr "আগমনকৰ�তা কল"
 
-#: ../src/empathy-event-manager.c:325
+#: ../src/empathy-event-manager.c:525
+#, c-format
+msgid "%s is video calling you. Do you want to answer?"
+msgstr "%s -� আপোনাক ভিডিঅ' কল কৰি আছে। আপ�নি উত�তৰ দিব বিচাৰে নে?"
+
+#: ../src/empathy-event-manager.c:526
 #, c-format
-msgid "%s is calling you, do you want to answer?"
-msgstr "%s � আপোনাক কল কৰিছে, আপ�নি ইয়াৰ উত�তৰ দিবলৈ ইচ�ছ�ক নে ?"
+msgid "%s is calling you. Do you want to answer?"
+msgstr "%s -� আপোনাক কল কৰি আছে। আপ�নি উত�তৰ দিব বিচাৰে নে?"
 
-#: ../src/empathy-event-manager.c:332
+#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
+#, c-format
+msgid "Incoming call from %s"
+msgstr "%sৰ পৰা আগমনকৰ�তা কল"
+
+#: ../src/empathy-event-manager.c:554
 msgid "_Reject"
 msgstr "প�ৰত�যাখ�যান কৰক (_R)"
 
-#: ../src/empathy-event-manager.c:338
+#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
 msgid "_Answer"
 msgstr "উত�তৰ দিয়ক (_A)"
 
-#: ../src/empathy-event-manager.c:453
-#, c-format
-msgid "Incoming call from %s"
-msgstr "%sৰ পৰা আগমনকৰ�তা কল"
+#: ../src/empathy-event-manager.c:570
+msgid "_Answer with video"
+msgstr "ভিডিঅ'ৰ সৈতে উত�তৰ দিয়ক (_A)"
 
-#: ../src/empathy-event-manager.c:497
+#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1455
 #, c-format
-msgid "%s is offering you an invitation"
-msgstr "%s � আপোনাক আমন�ত�ৰণ জনাইছে"
-
-#: ../src/empathy-event-manager.c:503
-msgid "An external application will be started to handle it."
-msgstr "ইয়াৰ পৰিচালনাৰ বাবে �টা বহিস�থিত অন�প�ৰয়োগ আৰম�ভ কৰা হ'ব ।"
+msgid "Incoming video call from %s"
+msgstr "%s -ৰ পৰা আগ'ত ভিডিঅ' কল"
 
-#: ../src/empathy-event-manager.c:508
-msgid "You don't have the needed external application to handle it."
-msgstr "ইয়াৰ পৰিচালনাৰ বাবে বহিস�থিত অন�প�ৰয়োগৰ প�ৰয়োজন নাই ।"
-
-#: ../src/empathy-event-manager.c:635
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
 msgstr "ৰ�মৰ আমন�ত�ৰণ"
 
-#: ../src/empathy-event-manager.c:638
+#: ../src/empathy-event-manager.c:838
+#, c-format
+msgid "Invitation to join %s"
+msgstr "%s -ত যোগদান দিবলে আমন�ত�ৰণ"
+
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s � আপোনাক %s লৈ আমন�ত�ৰণ জনাইছে"
 
-#: ../src/empathy-event-manager.c:646
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
 msgstr "প�ৰত�যাখ�যান কৰক (_D)"
 
-#: ../src/empathy-event-manager.c:651
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "যোগ কৰক (_J)"
 
-#: ../src/empathy-event-manager.c:690
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s � আপোনাক %s লৈ আমন�ত�ৰণ জনাইছে"
 
-#: ../src/empathy-event-manager.c:716
+#: ../src/empathy-event-manager.c:891
+#, c-format
+msgid "You have been invited to join %s"
+msgstr "আপোনাক %s -ত যোগদান দিবলে আমন�ত�ৰণ জনোৱা হৈছে"
+
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "%s দ�বাৰা প�ৰৰিত নথিপত�ৰ আগত"
 
-#: ../src/empathy-event-manager.c:896
+#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+msgid "Password required"
+msgstr "পাছৱাৰ�ডৰ প�ৰয়োজন"
+
+#: ../src/empathy-event-manager.c:1190
 #, c-format
-msgid "Subscription requested by %s"
-msgstr "%s দ�বাৰা অন�ৰোধ কৰা বৰঙনি"
+msgid "%s would like permission to see when you are online"
+msgstr "আপ�নি কেতিয়া অনলাইন আছে চাবলে %s -� অন�মতি বিচাৰিব"
 
-#: ../src/empathy-event-manager.c:900
+#: ../src/empathy-event-manager.c:1194
 #, c-format
 msgid ""
 "\n"
@@ -2246,347 +3820,333 @@ msgstr ""
 "\n"
 "বাৰ�তা: %s"
 
-#. someone is logging off
-#: ../src/empathy-event-manager.c:936
-#, c-format
-msgid "%s is now offline."
-msgstr "%s বৰ�তমানে অফলাইন আছে ।"
-
-#. someone is logging in
-#: ../src/empathy-event-manager.c:952
-#, c-format
-msgid "%s is now online."
-msgstr "%s বৰ�তমানে অন-লাইন আছে ।"
-
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:101
+#: ../src/empathy-ft-manager.c:100
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:104
+#: ../src/empathy-ft-manager.c:103
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:180
+#: ../src/empathy-ft-manager.c:179
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "অজ�ঞাত"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s, %s ৰ %s/s ত"
 
-#: ../src/empathy-ft-manager.c:276
+#: ../src/empathy-ft-manager.c:275
 #, c-format
 msgid "%s of %s"
 msgstr "%s, ম�ঠ %s ৰ"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:307
+#: ../src/empathy-ft-manager.c:306
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "\"%s\" প�ৰাপ�ত কৰা হৈছে, %sৰ পৰা"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:310
+#: ../src/empathy-ft-manager.c:309
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "\"%s\" পঠিওৱা হৈছে, %s ক"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:340
+#: ../src/empathy-ft-manager.c:339
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "\"%s\" প�ৰাপ�ত কৰিবলৈ সমস�যা, %sৰ পৰা আগত"
 
-#: ../src/empathy-ft-manager.c:343
+#: ../src/empathy-ft-manager.c:342
 msgid "Error receiving a file"
 msgstr "নথিপত�ৰ প�ৰাপ�ত কৰিবলৈ সমস�যা"
 
-#: ../src/empathy-ft-manager.c:348
+#: ../src/empathy-ft-manager.c:347
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "\"%s\" ক %s লৈ পঠিয়াবলৈ ব�যৰ�থ"
 
-#: ../src/empathy-ft-manager.c:351
+#: ../src/empathy-ft-manager.c:350
 msgid "Error sending a file"
 msgstr "নথিপত�ৰ পঠিয়াবলৈ সমস�যা"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:490
+#: ../src/empathy-ft-manager.c:489
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" প�ৰাপ�ত হৈছে, %sৰ পৰা"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:495
+#: ../src/empathy-ft-manager.c:494
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" প�ৰৰিত হৈছে, %s ক"
 
-#: ../src/empathy-ft-manager.c:498
+#: ../src/empathy-ft-manager.c:497
 msgid "File transfer completed"
-msgstr "নথিপত�ৰ বিনিময় সম�পূৰ�ণ হৈছে"
+msgstr "নথিপত�ৰ স�থানান�তৰ সম�পূৰ�ণ হৈছে"
 
-#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
 msgid "Waiting for the other participant's response"
-msgstr "অন�য ব�যৱহাৰকৰ�তাৰ প�ৰতিক�ৰিয়াৰ অপেক�ষা কৰা হৈছে"
+msgstr "অন�য ব�যৱহাৰকাৰীৰ প�ৰতিক�ৰিয়াৰ অপেক�ষা কৰা হৈছে"
 
-#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "\"%s\" ৰ অখণ�ডতা পৰীক�ষা কৰা হৈছে"
 
-#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "\"%s\" হেশ�ব কৰা হৈছে"
 
-#: ../src/empathy-ft-manager.c:1024
+#: ../src/empathy-ft-manager.c:1026
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1036
+#: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "নথিপত�ৰ"
 
-#: ../src/empathy-ft-manager.c:1058
+#: ../src/empathy-ft-manager.c:1060
 msgid "Remaining"
 msgstr "অবশিষ�ট"
 
 #: ../src/empathy-ft-manager.ui.h:1
 msgid "File Transfers"
-msgstr "নথিপত�ৰ বিনিময়"
+msgstr "নথিপত�ৰ স�থানান�তৰ"
 
 #: ../src/empathy-ft-manager.ui.h:2
 msgid "Remove completed, canceled and failed file transfers from the list"
-msgstr "সমাপ�ত, বাতিল আৰ� বিফল নথিপত�ৰ বিনিময়ৰ তথ�য �ই তালিকাৰ পৰা আ�তৰ�ৱা হ'ব"
+msgstr "সমাপ�ত, বাতিল আৰ� বিফল নথিপত�ৰ স�থানান�তৰৰ তথ�য �ই তালিকাৰ পৰা আ�তৰ�ৱা হ'ব"
 
 #: ../src/empathy-import-dialog.c:84
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr ""
+"ইমপোৰ�ট কৰিবলে কোনো �কাওন�ট পোৱা নগল। Empathy -� বৰ�তমানে কেৱল Pidgin -ৰ পৰা "
+"�কাওন�টসমূহ ইমপোৰ�ট কৰা সমৰ�থন কৰে।"
 
 #: ../src/empathy-import-dialog.c:199
 msgid "Import Accounts"
-msgstr "হিচাপ আমদানি কৰক"
+msgstr "�কাওন�ট ইমপোৰ�ট কৰক"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:282
+#: ../src/empathy-import-widget.c:301
 msgid "Import"
-msgstr "আমদানি"
+msgstr "ইমপোৰ�ট"
 
-#: ../src/empathy-import-widget.c:291
+#: ../src/empathy-import-widget.c:310
 msgid "Protocol"
-msgstr "প�ৰোটোকল"
+msgstr "প�ৰটোকল"
 
-#: ../src/empathy-import-widget.c:315
+#: ../src/empathy-import-widget.c:334
 msgid "Source"
-msgstr "উৎসস�থল"
+msgstr "উৎস"
 
-#: ../src/empathy-import-mc4-accounts.c:106
-#, c-format
-msgid "%s account"
-msgstr "%s হিচাপ"
-
-#: ../src/empathy-main-window.c:399
-msgid "_Edit account"
-msgstr "হিচাপ সম�পাদনা (_E)"
+#: ../src/empathy-main-window.c:392
+msgid "Provide Password"
+msgstr "পাছৱাৰ�ড প�ৰদান কৰক"
 
-#: ../src/empathy-main-window.c:502
-msgid "No error specified"
-msgstr "ত�ৰ�টি নিৰ�ধাৰিত নহয়"
-
-#: ../src/empathy-main-window.c:505
-msgid "Network error"
-msgstr "নে'টৱৰ�ক সংক�ৰান�ত ত�ৰ�টি"
-
-#: ../src/empathy-main-window.c:508
-msgid "Authentication failed"
-msgstr "অন�মোদন ব�যৰ�থ"
-
-#: ../src/empathy-main-window.c:511
-msgid "Encryption error"
-msgstr "�নক�ৰিপছন সংক�ৰান�ত ত�ৰ�টি"
-
-#: ../src/empathy-main-window.c:514
-msgid "Name in use"
-msgstr "নাম বৰ�তমানে ব�যৱহৃত হৈছে"
-
-#: ../src/empathy-main-window.c:517
-msgid "Certificate not provided"
-msgstr "প�ৰমাণপত�ৰ উপলব�ধ কৰা নহয়"
-
-#: ../src/empathy-main-window.c:520
-msgid "Certificate untrusted"
-msgstr "প�ৰমাণপত�ৰ বিশ�বস�ত নহয়"
+#: ../src/empathy-main-window.c:398
+msgid "Disconnect"
+msgstr "বিচ�ছিন�ন কৰক"
 
-#: ../src/empathy-main-window.c:523
-msgid "Certificate expired"
-msgstr "প�ৰমাণপত�ৰৰ সময়সীমা উত�তীৰ�ণ হৈছে"
+#: ../src/empathy-main-window.c:622
+msgid "No match found"
+msgstr "কোনো মিল পোৱা নগল"
 
-#: ../src/empathy-main-window.c:526
-msgid "Certificate not activated"
-msgstr "প�ৰমাণপত�ৰ সক�ৰিয় কৰা নহয়"
+#: ../src/empathy-main-window.c:777
+msgid "Reconnect"
+msgstr "প�নৰ সংযোগ কৰক"
 
-#: ../src/empathy-main-window.c:529
-msgid "Certificate hostname mismatch"
-msgstr "প�ৰমাণপত�ৰৰ গৃহস�থৰনাম লৈ অমিল"
+#: ../src/empathy-main-window.c:783
+msgid "Edit Account"
+msgstr "�কাওন�ট সম�পাদন কৰক"
 
-#: ../src/empathy-main-window.c:532
-msgid "Certificate fingerprint mismatch"
-msgstr "প�ৰমাণপত�ৰৰ ফিনঙ�গাৰপ�ৰিন�ট লৈ অমিল"
+#: ../src/empathy-main-window.c:789
+msgid "Close"
+msgstr "বন�ধ কৰক"
 
-#: ../src/empathy-main-window.c:535
-msgid "Certificate self-signed"
-msgstr "স�বয়ং স�বাক�ষৰিত প�ৰমাণপত�ৰ"
+#. Translators: this string will be something like:
+#. *   Top up My Account ($1.23)..."
+#: ../src/empathy-main-window.c:928
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr "টপ আপ %s (%s)..."
 
-#: ../src/empathy-main-window.c:538
-msgid "Certificate error"
-msgstr "প�ৰমাণপত�ৰ সংক�ৰান�ত ত�ৰ�টি"
+#: ../src/empathy-main-window.c:975
+msgid "Top up account credit"
+msgstr "টপ আপ �কাওন�ট দেনা"
 
-#: ../src/empathy-main-window.c:541
-msgid "Unknown error"
-msgstr "অজ�ঞাত ত�ৰ�টি"
+#. top up button
+#: ../src/empathy-main-window.c:1046
+msgid "Top Up..."
+msgstr "টপ আপ..."
 
-#: ../src/empathy-main-window.c:1288
-msgid "Show and edit accounts"
-msgstr "হিচাপ প�ৰদৰ�শন আৰ� সম�পাদনা"
+#: ../src/empathy-main-window.c:1789
+msgid "Contact"
+msgstr "পৰিচিত ব�যক�তি"
 
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "পৰিচিত ব�যক�তিৰ তালিকা"
 
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "মানচিত�ৰত পৰিচয়ৰ তথ�য (_M)"
 
-#: ../src/empathy-main-window.ui.h:3
-msgid "Context"
-msgstr "প�ৰসঙ�গ"
+#: ../src/empathy-main-window-menubar.ui.h:2
+msgid "Credit Balance"
+msgstr "দেনা অৱশিষ�ট"
+
+#: ../src/empathy-main-window-menubar.ui.h:3
+msgid "Find in Contact _List"
+msgstr "পৰিচয় তালিকাত সন�ধান কৰক (_L)"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "জনপ�ৰিয়সমূহত যোগ দিন (_F)"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
-msgstr "জনপ�ৰিয় মান পৰিচালনা"
+msgstr "জনপ�ৰিয় মান পৰিচয়লনা"
 
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "স�বাভাবিক মাপ (_o)"
 
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
+msgid "New _Call…"
+msgstr "নত�ন কল (_C)…"
+
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "অৱতাৰ সহযোগে স�বাভাবিক মাপ (_A)"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:9
+msgid "P_references"
+msgstr "পছন�দসমূহ (_r)"
+
+#: ../src/empathy-main-window-menubar.ui.h:10
+msgid "Show P_rotocols"
+msgstr "প�ৰটোকলসমূহ দেখ�ৱাওক"
+
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
-msgstr "নাম অন�যায়ী স�বিন�যস�ত কৰা হ'ব (_N)"
+msgstr "নাম অন�যায়ী সজাওক (_N)"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
-msgstr "অৱস�থা অন�যায়ী স�বিন�যস�ত কৰা হ'ব (_S)"
+msgstr "অৱস�থা অন�যায়ী সজাওক (_S)"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
-msgstr "হিচাপ তালিকা (_A)"
+msgstr "�কাওন�টসমূহ (_A)"
+
+#: ../src/empathy-main-window-menubar.ui.h:15
+msgid "_Blocked Contacts"
+msgstr "প�ৰতিৰোধিত পৰিচয়সমূহ (_B)"
 
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "সংক�চিত মাপ (_C)"
 
-#: ../src/empathy-main-window.ui.h:15
-msgid "_Debug"
-msgstr "ডিবাগ কৰক (_D)"
-
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
-msgstr "নথিপত�ৰ বিনিময় (_F)"
+msgstr "নথিপত�ৰ স�থানান�তৰসমূহ (_F)"
 
-#: ../src/empathy-main-window.ui.h:19
-msgid "_Join..."
-msgstr "যোগ দিন... (_J)"
+#: ../src/empathy-main-window-menubar.ui.h:23
+msgid "_Join…"
+msgstr "যোগদান কৰক (_J)…"
 
-#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation..."
-msgstr "নত�ন সম�বাদ...(_N)"
+#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
+msgid "_New Conversation…"
+msgstr "নত�ন কথোপকথন (_N)…"
 
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "অফ-লাইন পৰিচয় (_O)"
 
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "ব�যক�তিগত তথ�য (_P)"
 
-#: ../src/empathy-main-window.ui.h:24
-msgid "_Previous Conversations"
-msgstr "পূৰ�ববৰ�তী সম�বাদ (_P)"
-
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "ৰ�ম (_R)"
 
-#: ../src/empathy-new-chatroom-dialog.c:328
+#: ../src/empathy-main-window-menubar.ui.h:29
+msgid "_Search for Contacts…"
+msgstr "পৰিচয়সমূহৰ বাবে সন�ধান কৰক (_S)…"
+
+#: ../src/empathy-new-chatroom-dialog.c:337
 msgid "Chat Room"
-msgstr "ছেট ৰ�ম"
+msgstr "চেট ৰ�ম"
 
-#: ../src/empathy-new-chatroom-dialog.c:344
+#: ../src/empathy-new-chatroom-dialog.c:353
 msgid "Members"
 msgstr "সদস�যবৃন�দ"
 
-#: ../src/empathy-new-chatroom-dialog.c:494
+#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
+#. yes/no, yes/no and a number.
+#: ../src/empathy-new-chatroom-dialog.c:553
 #, c-format
-msgctxt ""
-"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
-"and a number."
 msgid ""
-"<b>%s</b>\n"
+"%s\n"
 "Invite required: %s\n"
 "Password required: %s\n"
 "Members: %s"
 msgstr ""
-"<b>%s</b>\n"
-"আমন�ত�ৰণ আৱশ�যক: %s\n"
-"গ�প�তশব�দ আৱশ�যক: %s\n"
-"সদস�যবৃন�দ: %s"
+"%s\n"
+"আমন�ত�ৰণৰ প�ৰয়োজন: %s\n"
+"পাছৱাৰ�ডৰ প�ৰয়োজন: %s\n"
+"সদস�যসমূহ: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:496
-#: ../src/empathy-new-chatroom-dialog.c:497
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "No"
 msgstr "নহয়"
 
-#: ../src/empathy-new-chatroom-dialog.c:524
+#: ../src/empathy-new-chatroom-dialog.c:584
 msgid "Could not start room listing"
 msgstr "ৰ�মৰ তালিকা নিৰ�মাণ কৰিবলৈ ব�যৰ�থ"
 
-#: ../src/empathy-new-chatroom-dialog.c:534
+#: ../src/empathy-new-chatroom-dialog.c:594
 msgid "Could not stop room listing"
 msgstr "ৰ�মৰ তালিকা নিৰ�মাণ বন�ধ কৰিবলৈ ব�যৰ�থ"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "Couldn't load room list"
-msgstr "ৰ�মৰ তালিকা লোড কৰিবলৈ ব�যৰ�থ"
+msgstr "ৰ�মৰ তালিকা ল'ড কৰিবলৈ ব�যৰ�থ"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
-msgid "Enter the room name to join here or click on one or more rooms in the list."
+msgid ""
+"Enter the room name to join here or click on one or more rooms in the list."
 msgstr ""
+"ইয়াত যোগদান কৰিবলে ৰ�মৰ নাম সোমাওক অথবা তালিকাত থকা �টা বা অধিক ৰ�মসমূহত ক�লিক "
+"কৰক।"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
 msgstr ""
+"ৰ�মক হস�ট কৰা চাৰ�ভাৰ সোমাওক, অথবা ইয়াক ৰিক�ত �ৰক যদি ৰ�ম বৰ�তমান �কাওন�টৰ চাৰ�ভাৰত "
+"আছে"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid "Join Room"
@@ -2600,255 +4160,673 @@ msgstr "ৰ�মৰ তালিকা"
 msgid "_Room:"
 msgstr "ৰ�ম: (_R)"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr "প�ৰাপ�ত বাৰ�তা"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr "বাৰ�তা পঠিওৱা হৈছে"
 
-#: ../src/empathy-preferences.c:150
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
-msgstr "নত�ন সম�বাদ"
+msgstr "নত�ন কথোপকথন"
 
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
 msgstr "পৰিচয় অন-লাইন আহিছে"
 
-#: ../src/empathy-preferences.c:152
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
 msgstr "পৰিচয় অফ-লাইন হৈছে"
 
-#: ../src/empathy-preferences.c:153
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
-msgstr "হিচাপ সংয�ক�ত কৰা হৈছে"
+msgstr "�কাওন�ট সংয�ক�ত কৰা হৈছে"
 
-#: ../src/empathy-preferences.c:154
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
-msgstr "হিচাপৰ সৈতে সংযোগ বিচ�ছিন�ন কৰা হৈছে"
+msgstr "�কাওন�টৰ সৈতে সংযোগ বিচ�ছিন�ন কৰা হৈছে"
 
-#: ../src/empathy-preferences.c:394
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr "ভাষা"
 
-#: ../src/empathy-preferences.ui.h:1
-msgid "Allow _GPS usage"
-msgstr "GPS ৰ ব�যৱহাৰ অন�মোদন কৰা হ'ব (_G)"
-
-#: ../src/empathy-preferences.ui.h:2
-msgid "Allow _cellphone usage"
-msgstr "ছেলফোনৰ ব�যৱহাৰ অন�মোদন কৰা হ'ব (_c)"
-
-#: ../src/empathy-preferences.ui.h:3
-msgid "Allow _network usage"
-msgstr "নে'টৱৰ�কৰ ব�যৱহাৰ অন�মোদন কৰা হ'ব (_n)"
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:734
+msgid "Juliet"
+msgstr "জ�লিয়েট"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:741
+msgid "Romeo"
+msgstr "ৰোমিও"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:747
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr "অ ৰোমিও, ৰোমিও, ত�মি ক'ত আছা ৰোমিও?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:750
+msgid "Deny thy father and refuse thy name;"
+msgstr "তোমাৰ দেউতাক অস�বীকাৰ কৰা আৰ� তোমাৰ নামক মানি নলবা;"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:753
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr "অথবা যদি �নে নকৰা, মোৰ প�ৰেমৰ প�ৰতিজ�ঞা লোৱা"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:756
+msgid "And I'll no longer be a Capulet."
+msgstr "আৰ� মই আৰ� Capulet হৈ নাথাকিম।"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:759
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr "মই আৰ� শ�নিম, নে ইয়াত কিবা কম?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:762
+msgid "Juliet has disconnected"
+msgstr "জ�লিয়েট -� সংযোগ বিচ�ছিন�নিত কৰিছে"
+
+#: ../src/empathy-preferences.c:1166
+msgid "Preferences"
+msgstr "পছন�দ"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:1
 msgid "Appearance"
 msgstr "চেহেৰা ছবি"
 
-#: ../src/empathy-preferences.ui.h:5
-msgid "Automatically _connect on startup "
-msgstr "প�ৰাৰম�ভসময়ত স�বয়ংক�ৰিয়ৰূপে সংযোগ স�থাপন কৰা হ'ব (_c)"
-
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
 msgstr "আচৰণ"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:5
 msgid "Chat Th_eme:"
-msgstr "ছেটৰ থিম: (_e)"
+msgstr "চেটৰ থীম: (_e)"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:6
 msgid "Disable notifications when _away or busy"
 msgstr "অন�পস�থিত অথবা ব�যস�ত থাকিলে সূচনাপ�ৰদানৰ ব�যৱস�থা নিষ�ক�ৰিয় কৰা হ'ব (_a)"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:7
 msgid "Disable sounds when _away or busy"
 msgstr "অন�পস�থিত অথবা ব�যস�ত থাকিলে শব�দ নিষ�ক�ৰিয় কৰা হ'ব (_a)"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "Display incoming events in the notification area"
+msgstr "আগ'ত ঘটনাসমূহক অধিসূচনা স�থানত প�ৰদৰ�শন কৰক"
+
+#: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"প�ৰতিধ�বনি বাতিল কৰায় আপোনাৰ কন�ঠক অন�য ব�যক�তিয়ে স�পষ�ট শ�নিবলে সহায় কৰে, কিন�ত� "
+"কিছ�মান কমপিউটাৰত সমস�যা সৃষ�টি কৰিব পাৰে। যদি আপ�নি অথবা অন�য মান�হজনে কলৰ সমূয়ত "
+"অদ�ভ�ত শব�দ বা খেৰখেৰনি শ�নে, প�ৰতিধ�বনি বাতিল কৰা বন�ধ কৰি কল প�নৰাম�ভ কৰি চাওক।"
+
 #: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
-msgstr "পৰিচিত ব�যক�তি অন-লাইন আহিলে সূচনাপ�ৰদানৰ ব�যৱস�থা সক�ৰিয় কৰা হ'ব"
+msgstr "পৰিচিত ব�যক�তি অন-লাইন আহিলে সূচনাপ�ৰদানৰ ব�যৱস�থা সামৰ�থবান কৰক"
 
 #: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
-msgstr "পৰিচিত ব�যক�তি অফ-লাইন হ'লে সূচনাপ�ৰদানৰ ব�যৱস�থা সক�ৰিয় কৰা হ'ব"
+msgstr "পৰিচিত ব�যক�তি অফ-লাইন হ'লে সূচনাপ�ৰদানৰ ব�যৱস�থা সামৰ�থবান কৰক"
 
 #: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
-msgstr ""
+msgstr "চেট মনোনিবেশিত নথকাত অধিসূচনাসমূহ সামৰ�থবান কৰক (_c)"
 
 #: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
-msgstr "চিহ�নিত ভাষাসমূহৰ বাবে বানান পৰীক�ষণ সক�ৰিয় কৰা হ'ব:"
+msgstr "চিহ�নিত ভাষাসমূহৰ বাবে বানান পৰীক�ষণ সামৰ�থবান কৰক:"
 
 #: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "সাধাৰণ"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Geoclue Settings"
-msgstr "Geoclue সংক�ৰান�ত বৈশিষ�ট�য"
+msgid "Input level:"
+msgstr "ইনপ�ট স�তৰ:"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Location"
-msgstr "অৱস�থান"
-
-#: ../src/empathy-preferences.ui.h:17
-msgid "Notifications"
-msgstr "সূচনাবাৰ�তা"
+msgid "Input volume:"
+msgstr "ইনপ�ট ভলিউম:"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Play sound for events"
-msgstr "বিভিন�ন ঘটনাৰ বাবে শব�দ বজোৱা হ'ব"
+msgid "Location sources:"
+msgstr "অৱস�থান উৎসসমূহ:"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Preferences"
-msgstr "পছন�দ"
+msgid "Log conversations"
+msgstr "লগ কথোপকথনসমূহ"
 
 #: ../src/empathy-preferences.ui.h:20
+msgid "Notifications"
+msgstr "সূচনাবাৰ�তা"
+
+#: ../src/empathy-preferences.ui.h:21
+msgid "Play sound for events"
+msgstr "বিভিন�ন ঘটনাৰ বাবে শব�দ বজাওক"
+
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "গোপনীয়তা"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
 "decimal place."
 msgstr ""
+"কমোৱা অৱস�থান সঠিকতায় ব�জায় যে আপোনাৰ শহৰ, ৰাজ�য আৰ� দেশৰ বাহিৰে আৰ� �কো প�ৰকাশ "
+"কৰা নহব। GPS অক�ষসমূহ ই দশমিক লৈকে সঠিক হব।"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "ছবি ৰূপে স�মাইলি প�ৰদৰ�শন কৰা হ'ব (_s)"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "ৰ�মত পৰিচিত ব�যক�তিৰ তালিকা প�ৰদৰ�শন কৰা হ'ব (_l)"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "শব�দ"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "বানান পৰীক�ষণ"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
+"ভাষাসমূহৰ তালিকায় কেৱল সেই ভাষাসমূহ যাৰ বাবে আপোনাৰ �টা শব�দকোষ ইনস�টল আছে "
+"সেইসমূহ প�ৰতিফলন কৰে।"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
-msgstr "থিম"
+msgstr "থীমসমূহ"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:30
+msgid "Variant:"
+msgstr "অপৰ:"
+
+#: ../src/empathy-preferences.ui.h:31
+msgid "_Automatically connect on startup"
+msgstr "আৰম�ভত স�বচালিতভাৱে সংযোগ কৰক (_A)"
+
+#: ../src/empathy-preferences.ui.h:32
+msgid "_Cellphone"
+msgstr "চেলফোন (_C)"
+
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
-msgstr "বাবল দ�বাৰা সূচনাপ�ৰদান সক�ৰিয় কৰা হ'ব (_E)"
+msgstr "বাবল দ�বাৰা সূচনাপ�ৰদান সামৰ�থবান কৰক (_E)"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
-msgstr "শব�দ দ�বাৰা সূচনাপ�ৰদান সক�ৰিয় কৰা হ'ব (_E)"
+msgstr "শব�দ দ�বাৰা সূচনাপ�ৰদান সামৰ�থবান কৰক (_E)"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:35
+msgid "_GPS"
+msgstr "GPS (_G)"
+
+#: ../src/empathy-preferences.ui.h:36
+msgid "_Network (IP, Wi-Fi)"
+msgstr "নেটৱাৰ�ক (IP, Wi-Fi) (_N)"
+
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
-msgstr "নত�ন ছেটসমূহ পৃথক সংযোগক�ষেত�ৰত খোলা হ'ব (_O)"
+msgstr "নত�ন চেটসমূহ পৃথক উইন�ডোত খোলা হ'ব (_O)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "পৰিচিত ব�যক�তিৰ অৱস�থান প�ৰকাশ কৰা হ'ব (_P)"
 
-#: ../src/empathy-preferences.ui.h:32
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
-msgstr ""
+msgstr "অৱস�থান সঠিকতা কম কৰক (_R)"
 
-#: ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "অৱস�থা"
 
-#: ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-status-icon.ui.h:4
 msgid "_Quit"
 msgstr "প�ৰস�থান (_Q)"
 
-#: ../src/empathy-tube-dispatch.c:376
-#, c-format
-msgid "Unable to start application for service %s: %s"
-msgstr "%s সেৱাৰ বাবে অন�প�ৰয়োগ আৰম�ভ কৰিবলৈ ব�যৰ�থ: %s"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "পৰিচয়ক আকো কল কৰক"
 
-#: ../src/empathy-tube-dispatch.c:447
-#, c-format
-msgid ""
-"An invitation was offered for service %s, but you don't have the needed "
-"application to handle it"
-msgstr ""
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "কেমেৰা বন�ধ কৰক"
 
-#: ../src/empathy-map-view.ui.h:1
-msgid "Contact Map View"
-msgstr "Map View ৰ সৈতে সংযোগ স�থাপন কৰা হ'ব"
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "কেমেৰা অন কৰক"
 
-#: ../src/empathy-debug-window.c:111 ../src/empathy-debug-window.c:1081
-msgid "Error"
-msgstr "ত�ৰ�টি"
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "কেমেৰা অসামৰ�থবান কৰক আৰ� ভিডিঅ' পঠোৱা বন�ধ কৰক"
 
-#: ../src/empathy-debug-window.c:114 ../src/empathy-debug-window.c:1075
-msgid "Critical"
-msgstr "গ�ৰ�ত�বপূৰ�ণ"
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "কেমেৰা সামৰ�থবান কৰক আৰ� ভিডিঅ' পঠাওক"
 
-#: ../src/empathy-debug-window.c:117 ../src/empathy-debug-window.c:1069
-msgid "Warning"
-msgstr "সতৰ�কবাৰ�তা"
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "কেমেৰা সামৰ�থবান কৰক কিন�ত� ভিডিঅ' নপঠাব"
 
-#: ../src/empathy-debug-window.c:120 ../src/empathy-debug-window.c:1063
-#: ../src/empathy-debug-window.c:1111
-msgid "Message"
-msgstr "বাৰ�তা"
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "পূৰ�বদৰ�শন কৰক"
 
-#: ../src/empathy-debug-window.c:123 ../src/empathy-debug-window.c:1057
-msgid "Info"
-msgstr "তথ�য"
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "প�নঃ ডায়েল কৰক"
 
-#: ../src/empathy-debug-window.c:126 ../src/empathy-debug-window.c:1051
-msgid "Debug"
-msgstr "ডিবাগ"
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "ভিডিঅ' (_i)"
 
-#: ../src/empathy-debug-window.c:841
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "ভিডিঅ' বন�ধ কৰক"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "ভিডিঅ' অন কৰক"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "ভিডিঅ' পূৰ�বদৰ�শন কৰক"
+
+#: ../src/empathy-map-view.c:448
+msgid "Contact Map View"
+msgstr "Map View ৰ সৈতে সংযোগ স�থাপন কৰক"
+
+#: ../src/empathy-debug-window.c:1228
 msgid "Save"
 msgstr "সংৰক�ষণ"
 
-#: ../src/empathy-debug-window.c:944
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
-msgstr "ডিবাগ সংযোগক�ষেত�ৰ"
+msgstr "ডিবাগ উইন�ডো"
 
-#: ../src/empathy-debug-window.c:1019
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
-msgstr "স�থাগিত কৰা হ'ব"
+msgstr "স�থগিত কৰক"
 
-#: ../src/empathy-debug-window.c:1031
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
 msgstr "স�তৰ "
 
-#: ../src/empathy-debug-window.c:1100
+#: ../src/empathy-debug-window.c:1549
+msgid "Debug"
+msgstr "ডিবাগ"
+
+#: ../src/empathy-debug-window.c:1555
+msgid "Info"
+msgstr "তথ�য"
+
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+msgid "Message"
+msgstr "বাৰ�তা"
+
+#: ../src/empathy-debug-window.c:1567
+msgid "Warning"
+msgstr "সতৰ�কবাৰ�তা"
+
+#: ../src/empathy-debug-window.c:1573
+msgid "Critical"
+msgstr "গ�ৰ�ত�বপূৰ�ণ"
+
+#: ../src/empathy-debug-window.c:1579
+msgid "Error"
+msgstr "ত�ৰ�টি"
+
+#: ../src/empathy-debug-window.c:1598
 msgid "Time"
 msgstr "সময়"
 
-#: ../src/empathy-debug-window.c:1102
+#: ../src/empathy-debug-window.c:1601
 msgid "Domain"
 msgstr "ডোমেইন"
 
-#: ../src/empathy-debug-window.c:1104
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
 msgstr "শ�ৰেণী"
 
-#: ../src/empathy-debug-window.c:1106
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "স�তৰ"
 
-#: ../src/empathy-debug-window.c:1138
+#: ../src/empathy-debug-window.c:1642
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
+msgstr "নিৰ�বাচিত সংযোগ ব�যৱস�থাপকে দূৰৱৰ�তী ডিবাগিং সম�প�ৰসাৰন সমৰ�থন নকৰে।"
+
+#: ../src/empathy-invite-participant-dialog.c:179
+#: ../src/empathy-invite-participant-dialog.c:205
+msgid "Invite Participant"
+msgstr "অংশগ�ৰহণকাৰীক আমন�ত�ৰণ জনাওক"
+
+#: ../src/empathy-invite-participant-dialog.c:180
+msgid "Choose a contact to invite into the conversation:"
+msgstr "কথোপকথনলে আমন�ত�ৰণ জনাবলে �টা পৰিচয় বাছক"
+
+#: ../src/empathy-invite-participant-dialog.c:201
+msgid "Invite"
+msgstr "আমন�ত�ৰণ জনাওক"
+
+#: ../src/empathy-accounts.c:183
+msgid "Don't display any dialogs; do any work (eg, importing) and exit"
+msgstr ""
+"কোনো ডাইলগ প�ৰদৰ�শন নকৰিব; যিকোনো কাম কৰক (উদাহৰনস�বৰূপ, ইমপোৰ�ট কৰা) আৰ� প�ৰস�থান "
+"কৰক"
+
+#: ../src/empathy-accounts.c:187
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr "কোনো ডাইলগ প�ৰদৰ�শন নকৰিব যেতিয়ালৈকে সিহত \"কাষৰীয়া মান�হ\"�কাওন�টসমূহ নহয়"
+
+#: ../src/empathy-accounts.c:191
+msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
+"আৰম�ভণিত প�ৰদান কৰা �কাওন�ট (উদাহৰনস�বৰূপ, gabble/jabber/foo_40example_2eorg0) "
+"নিৰ�বাচন কৰক"
+
+#: ../src/empathy-accounts.c:193
+msgid "<account-id>"
+msgstr "<account-id>"
+
+#: ../src/empathy-accounts.c:198
+msgid "- Empathy Accounts"
+msgstr "- Empathy �কাওন�টসমূহ"
+
+#: ../src/empathy-accounts.c:237
+msgid "Empathy Accounts"
+msgstr "Empathy �কাওন�টসমূহ"
+
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr "�টা বিশেষ সেৱা দেখ�ৱাওক"
+
+#: ../src/empathy-debugger.c:75
+msgid "- Empathy Debugger"
+msgstr "- Empathy ডিবাগাৰ"
+
+#: ../src/empathy-debugger.c:114
+msgid "Empathy Debugger"
+msgstr "Empathy ডিবাগাৰ"
+
+#: ../src/empathy-chat.c:107
+msgid "- Empathy Chat Client"
+msgstr "- Empathy চেট ক�লা�ন�ট"
+
+#: ../src/empathy-notifications-approver.c:203
+msgid "Respond"
+msgstr "প�ৰতিক�ৰিয়া"
+
+#: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1459
+msgid "Reject"
+msgstr "নাকচ কৰক"
+
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1460
+msgid "Answer"
+msgstr "উত�তৰ"
+
+#: ../src/empathy-notifications-approver.c:227
+msgid "Answer with video"
+msgstr "ভিডিঅ'ৰ সৈতে উত�তৰ দিয়ক"
+
+#: ../src/empathy-notifications-approver.c:235
+#: ../src/empathy-notifications-approver.c:245
+msgid "Decline"
+msgstr "নাকচ কৰক"
+
+#: ../src/empathy-notifications-approver.c:239
+#: ../src/empathy-notifications-approver.c:250
+msgid "Accept"
+msgstr "গ�ৰহন কৰক"
+
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:260
+msgid "Provide"
+msgstr "প�ৰদান কৰক"
+
+#: ../src/empathy-call-observer.c:134
+#, c-format
+msgid "%s just tried to call you, but you were in another call."
+msgstr "%s - �ইমাত�ৰ আপোনাক কল কৰাৰ চেষ�টা কৰিছিল, কিন�ত� আপ�নি অন�য �টা কলত আছিল।"
+
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+msgid "i"
+msgstr "i"
+
+#: ../src/empathy-call-window.c:2775
+msgid "On hold"
+msgstr "হল�ডত আছে"
+
+#: ../src/empathy-call-window.c:2778
+msgid "Mute"
+msgstr "মিউট"
+
+#: ../src/empathy-call-window.c:2780
+msgid "Duration"
+msgstr "অবধি"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2783
+#, c-format
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02dm"
+
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "ফলা মিলাওক (_M)"
+
+#~ msgid "Send and receive messages"
+#~ msgstr "বাৰ�তা পঠিয়াওক আৰ� পাওক"
+
+#~ msgid "Empathy has asked about importing accounts"
+#~ msgstr "Empathy দ�বাৰা �কাওন�ট ইমপোৰ�ট সম�পৰ�কে প�ৰশ�ন কৰা হৈছে"
+
+#~ msgid "MC 4 accounts have been imported"
+#~ msgstr "MC 4 �কাওন�ট ইমপোৰ�ট কৰা হৈছে"
+
+#~ msgid "MC 4 accounts have been imported."
+#~ msgstr "MC 4 �কাওন�ট ইমপোৰ�ট কৰা হৈছে।"
+
+#~ msgid ""
+#~ "Whether or not Empathy has asked about importing accounts from other "
+#~ "programs."
+#~ msgstr ""
+#~ "অন�য প�ৰোগ�ৰামৰ পৰা �কাওন�ট ইমপোৰ�ট কৰাৰ উদ�দেশ�যে Empathy দ�বাৰা প�ৰশ�ন কৰা হৈছে "
+#~ "নে নাই।"
+
+#~ msgid ""
+#~ "Whether or not the Salut account has been created on the first Empathy "
+#~ "run."
+#~ msgstr "Empathy প�ৰথমবাৰ সঞ�চালনৰ সময় Salut �কাওন�ট নিৰ�মিত হৈছে নে নাই।"
+
+#~ msgid "Can't set an empty display name"
+#~ msgstr "প�ৰদৰ�শনযোগ�য নাম ৰিক�ত ৰখা নাযাব"
+
+#~ msgid "The hash of the received file and the sent one do not match"
+#~ msgstr "প�ৰাপ�ত আৰ� প�ৰেৰিত নথিপত�ৰৰ হেশ�ব অমিল"
+
+#~ msgid "Hidden"
+#~ msgstr "ল�ক�ৱা"
+
+#~ msgid "All"
+#~ msgstr "সকলো"
+
+#~ msgid "_Charset:"
+#~ msgstr "কেৰচেট: (_C)"
+
+#~ msgid "_Email:"
+#~ msgstr "ঈ-মেইল: (_E)"
+
+#~ msgid "_Nickname:"
+#~ msgstr "উপনাম: (_N)"
+
+#~ msgid "Use _Yahoo Japan"
+#~ msgstr "Yahoo Japan ব�যৱহাৰ কৰা হ'ব (_Y)"
+
+#~ msgid "Unsupported command"
+#~ msgstr "আদেশ সমৰ�থিত নহয়"
+
+#~ msgid "_View Previous Conversations"
+#~ msgstr "পূৰ�ববৰ�তী চেট প�ৰদৰ�শন কৰা হ'ব (_V)"
+
+#~ msgid "<b>Location</b>"
+#~ msgstr "<b>অৱস�থান</b>"
+
+#~ msgid "<b>Location</b>, "
+#~ msgstr "<b>অৱস�থান</b>, "
+
+#~ msgid "Email:"
+#~ msgstr "ঈ-মেইল:"
+
+#~ msgid "Date"
+#~ msgstr "তাৰিখ"
+
+#~ msgid "Previous Conversations"
+#~ msgstr "পূৰ�ববৰ�তী চেট"
+
+#~ msgid "_For:"
+#~ msgstr "-ৰ কাৰণে: (_F)"
+
+#~ msgid "Edit Custom Messages..."
+#~ msgstr "স�বনিৰ�বাচিত বাৰ�তা সম�পাদনা..."
+
+#~ msgid "Enter Custom Message"
+#~ msgstr "স�বনিৰ�বাচিত বাৰ�তা লিখক"
+
+#~ msgid "Add _New Preset"
+#~ msgstr "নত�ন প�ৰি-চেট যোগ কৰক (_N)"
+
+#~ msgid "Saved Presets"
+#~ msgstr "সংৰক�ষিত প�ৰি-চেট"
+
+#~ msgid "Select a destination"
+#~ msgstr "�টা লক�ষ�য নিৰ�বাচন কৰক"
+
+#~ msgid ""
+#~ "The contact to display in the applet. Empty means no contact is displayed."
+#~ msgstr "�প�লেটত প�ৰদৰ�শনযোগ�য পৰিচয়। ৰিক�ত হ'লে কোনো পৰিচয় প�ৰদৰ�শন কৰা নহব।"
+
+#~ msgid "The contact's avatar token. Empty means contact has no avatar."
+#~ msgstr "পৰিচয়ৰ অৱতাৰৰ টোকেন। পৰিচয়ৰ অৱতাৰ নাথাকিলে ৰিক�ত থাকিব।"
+
+#~ msgid "Talk!"
+#~ msgstr "Talk!"
+
+#~ msgid "_Information"
+#~ msgstr "তথ�য (_I)"
+
+#~ msgid "_Preferences"
+#~ msgstr "পছন�দ (_P)"
+
+#~ msgid "Please configure a contact."
+#~ msgstr "অন�গ�ৰহ কৰে পৰিচয়ৰ তথ�য বিন�যাস কৰক।"
+
+#~ msgid "Select contact..."
+#~ msgstr "পৰিচিত ব�যক�তি নিৰ�বাচন কৰক..."
+
+#~ msgid "Presence"
+#~ msgstr "উপস�থিতি"
+
+#~ msgid "Set your own presence"
+#~ msgstr "নিজৰ উপস�থিতি  তথ�য নিৰ�ধাৰণ কৰক"
+
+#~ msgid "Show the accounts dialog"
+#~ msgstr "�কাওন�ট  ডায়লগ প�ৰদৰ�শন কৰক"
+
+#~ msgid "The error message was: <span style=\"italic\">%s</span>"
+#~ msgstr "উৎপন�ন ত�ৰ�টিৰ বাৰ�তা: <span style=\"italic\">%s</span>"
+
+#~ msgid ""
+#~ "You are about to remove your %s account!\n"
+#~ "Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "আপ�নি %s �কাওন�ট আ�তৰাব লৈছে!\n"
+#~ "
আপ�নি নিশ�চিতৰূপে আগবা�িবলৈ ইচ�ছ�ক নে ?"
+
+#~ msgid "Add new"
+#~ msgstr "নত�ন যোগ কৰক"
+
+#~ msgid "Cr_eate"
+#~ msgstr "নিৰ�মাণ কৰক (_e)"
+
+#~ msgid "_Add..."
+#~ msgstr "যোগ কৰক...(_A)"
+
+#~ msgid "_Reuse an existing account"
+#~ msgstr "�টা উপস�থিত �কাওন�ট প�নঃ ব�যৱহাৰ কৰক (_R)"
+
+#~ msgid "Conversations (%d)"
+#~ msgstr "চেট (%d)"
+
+#~ msgid "%s is offering you an invitation"
+#~ msgstr "%s � আপোনাক আমন�ত�ৰণ জনাইছে"
+
+#~ msgid "An external application will be started to handle it."
+#~ msgstr "ইয়াৰ পৰিচয়লনাৰ বাবে �টা বহিস�থিত অন�প�ৰয়োগ আৰম�ভ কৰা হ'ব।"
+
+#~ msgid "You don't have the needed external application to handle it."
+#~ msgstr "ইয়াৰ পৰিচয়লনাৰ বাবে বহিস�থিত অন�প�ৰয়োগৰ প�ৰয়োজন নাই।"
+
+#~ msgid "Subscription requested by %s"
+#~ msgstr "%s দ�বাৰা অন�ৰোধ কৰা বৰঙনি"
+
+#~ msgid "%s account"
+#~ msgstr "%s �কাওন�ট"
+
+#~ msgid "No error specified"
+#~ msgstr "ত�ৰ�টি নিৰ�ধাৰিত নহয়"
+
+#~ msgid "Unknown error"
+#~ msgstr "অজ�ঞাত ত�ৰ�টি"
+
+#~ msgid "Show and edit accounts"
+#~ msgstr "�কাওন�ট প�ৰদৰ�শন আৰ� সম�পাদনা"
+
+#~ msgid "_Join..."
+#~ msgstr "যোগ দিন... (_J)"
+
+#~ msgid "_New Conversation..."
+#~ msgstr "নত�ন চেট...(_N)"
+
+#~ msgid "Allow _GPS usage"
+#~ msgstr "GPS ৰ ব�যৱহাৰ অন�মোদন কৰা হ'ব (_G)"
+
+#~ msgid "Allow _cellphone usage"
+#~ msgstr "ছেলফোনৰ ব�যৱহাৰ অন�মোদন কৰা হ'ব (_c)"
+
+#~ msgid "Allow _network usage"
+#~ msgstr "নেটৱাৰ�কৰ ব�যৱহাৰ অন�মোদন কৰা হ'ব (_n)"
 
+#~ msgid "Unable to start application for service %s: %s"
+#~ msgstr "%s সেৱাৰ বাবে অন�প�ৰয়োগ আৰম�ভ কৰিবলৈ ব�যৰ�থ: %s"
diff --git a/po/ast.po b/po/ast.po
index 9ba946454..244034b8d 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -1,27 +1,24 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Asturian translation for empathy.
-# Copyright (C) 2009 empathy's COPYRIGHT HOLDER
-# This file is distributed under the same license as the empathy package.
-# Astur <malditoastur@gmail.com>, 2009.
-# Xandru Armesto <xandru@softastur.org>, 2010.
+# Xandru Armesto <xandru@softastur.org>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&component=general\n"
-"POT-Creation-Date: 2011-02-16 14:50+0000\n"
-"PO-Revision-Date: 2011-02-16 17:55+0100\n"
-"Last-Translator: ivarela <ivarela@softastur.org>\n"
-"Language-Team: Asturian Team alministradores@softastur.org\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empath"
+"y&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2011-09-07 13:59+0000\n"
+"PO-Revision-Date: 2011-09-07 17:34+0200\n"
+"Last-Translator: Xandru Armesto <xandru@softastur.org>\n"
+"Language-Team: Softastur <alministradores@softastur.org>\n"
 "Language: ast\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-02-16 16:32+0000\n"
-"X-Generator: Launchpad (build 12381)\n"
+"X-Generator: Virtaal 0.5.2\n"
 "X-Poedit-Language: Asturian\n"
+"X-Poedit-SourceCharset: utf-8\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
@@ -44,360 +41,492 @@ msgid "Always open a separate chat window for new chats."
 msgstr "Siempres abrir una ventana de charra separtada pa charres nueves."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr "Caráuter qu'amestar dempués del nomatu cuando s'usa el completáu de nomatos (tab) en sales de charra."
+msgid "Call volume"
+msgstr "Volume de la llamada"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Chat window theme"
-msgstr "Tema de la ventana de charra"
+msgid "Call volume, as a percentage."
+msgstr "Volume de la llamada, como porcentaxe"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr "Llista separtada por comes de llingües que van usase na revisión ortográfica (ex. «en, ast, fr»)."
+msgid "Camera device"
+msgstr "Preséu de cámara"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "Posición de cámara"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Caráuter qu'amestar dempués del nomatu cuando s'usa el completáu de nomatos "
+"(tab) en sales de charra."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+msgid "Chat window theme"
+msgstr "Tema de la ventana de charra"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+msgid "Chat window theme variant"
+msgstr "Variante del tema de la ventana de charra"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr ""
+"Llista separtada por comes de llingües que van usase na revisión ortográfica "
+"(ex. «en, ast, fr»)."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "Llista compauta de contautos"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "Tendríen d'usase xestores de conexón"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "Criteriu d'ordenación de la llista de contautos"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr ""
+"El preséu de cámara predetermináu qu'usar nes llamaes de videu, ex. "
+"/dev/video0."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
 msgstr "Direutoriu predetermináu pa esbillar un avatar"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr "Desactivar les notificaciones emerxentes al tar ausente"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr "Desactivar los soníos al ausentarse"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
 msgstr "Amosar los eventos entrantes nel área d'estáu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Display incoming events in the status area. If false, present them to the user immediately."
-msgstr "Amosar socesos d'entrada nel área d'estáu. Si ye falso, presentay-los darréu al usuariu."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Amosar socesos d'entrada nel área d'estáu. Si ye falso, presentay-los darréu "
+"al usuariu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+msgid "Echo cancellation support"
+msgstr "Sofitu d'encaboxamientu d'eco"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr "Empathy puede espublizar la ubicación de l'usuariu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy puede usar el GPS pa deducir la ubicación"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy puede usar la rede telefónica móvil pa deducir la ubicación"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy puede usar la rede pa deducir la ubicación"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr "Carpeta de descargues predeterminada d'Epiphany"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
 msgstr "Empathy migró los rexistros de butterfly"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy tendría d'autoconeutase cuando ta inactivu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy tendría d'autoconeutase al aniciu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy tendría d'amenorgar la precisión de la ubicación"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Empathy tendría d'usar l'avatar del contautu como iconu de la ventana de charra"
+msgstr ""
+"Empathy tendría d'usar l'avatar del contautu como iconu de la ventana de "
+"charra"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr "Activar les ferramientes de desendolcu de WebKit"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "Activar notificaciones emerxentes pa mensaxes nuevos"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "Activar revisor ortográficu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "Anubrir la ventana principal"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "Anubrir la ventana principal."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "Caráuter de completáu de nomatu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "Abrir charres nueves en ventanes separtaes"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "Ruta del tema Adium qu'usar"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "Ruta al tema Adium qu'usar si'l tema usáu pal chat ye Adium."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Reproducir un soníu cuando aporten mensaxes"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "Reproducir un soníu pa conversaciones nueves"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Reproducir un soníu al unviar mensaxes"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "Reproducir un soníu cuando un contautu anicie sesión"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "Reproducir un soníu cuando un contautu fine la so sesión"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "Reproducir un soníu cuando aniciemos sesión"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "Reproducir un soníu cuando finemos una sesión"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Amosar notificaciones emerxentes si la ventana de chat nun tien el focu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "Amosar notificaciones emerxentes cuando un contautu se coneuta"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "Amosar notificaciones emerxentes cuando un contautu se desconeuta"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr ""
+"Posición au tien de tar la vista previa de la cámara durante una llamada."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+msgid "Show Balance in contact list"
+msgstr "Amosar créditu na llista de contautos"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "Amosar avatares"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "Amosar llista de contautos en sales"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr "Amosar conseyu sobro cómo zarrar la ventana principal"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr "Amosar contautos non coneutaos"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
 msgstr "Amosar protocolos"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "Llingües pa revisión ortográfica"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr "La carpeta predeterminada au atroxar los ficheros tresferíos."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Caberu direutoriu del que s'esbilló un avatar."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
 msgstr "La posición pal panel llateral del ventanu de charra"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "La posición atroxada (en píxeles) del panel llateral del ventanu de charra."
+msgstr ""
+"La posición atroxada (en píxeles) del panel llateral del ventanu de charra."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "El tema que s'usará p'amosar la conversación nes ventanes de charra."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr ""
+"La variante del tema que va usase p'amosar la conversación nes ventanes de "
+"charra."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Usar fustaxes gráficos"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "Usar soníos de notificación"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "Usar tema pa sales de charra"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Indica si Empathy puede espublizar l'allugamientu del usuariu a los sos contautos."
+msgstr ""
+"Indica si Empathy puede espublizar l'allugamientu del usuariu a los sos "
+"contautos."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Indica si Empathy puede usar el GPS pa pescudar l'allugamientu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Indica si Empathy puede usar la rede telefónica móvil pa pescudar l'allugamientu."
+msgstr ""
+"Indica si Empathy puede usar la rede telefónica móvil pa pescudar "
+"l'allugamientu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Indica si Empathy puede usar la rede pa pescudar l'allugamientu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "Indica si Empathy migró los rexistros de butterfly."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Indica si Empathy tien d'aniciar sesión nes sos cuentes automáticamente al aniciu."
+msgstr ""
+"Indica si Empathy tien d'aniciar sesión nes sos cuentes automáticamente al "
+"aniciu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid "Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "Si Empathy tendría de pasar a mou ausente automáticamente si l'usuariu ta inactivu."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr ""
+"Si Empathy tendría de pasar a mou ausente automáticamente si l'usuariu ta "
+"inactivu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "Indica si Empathy tendría d'amenorgar la precisión del allugamientu por motivos de privacidá."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+msgid ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr ""
+"Indica si Empathy tendría d'amenorgar la precisión del allugamientu por "
+"motivos de privacidá."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "Indica si Empathy tendría d'usar l'avatar del contautu como l'iconu de la ventana de charra."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr ""
+"Indica si Empathy tendría d'usar l'avatar del contautu como l'iconu de la "
+"ventana de charra."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "Indica si les ferramientes de desendolcu de WebKit, como l'Inspector web, tienen d'activase."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr ""
+"Indica si les ferramientes de desendolcu de WebKit, como l'Inspector web, "
+"tienen d'activase."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
-msgstr "Indica si hai d'usar xestores de conectividá pa desconeutase/reconeutase automáticamente."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Indica si hai d'usar xestores de conectividá pa desconeutase/reconeutase "
+"automáticamente."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether to check words typed against the languages you want to check with."
-msgstr "Indica si hai de revisar les pallabres tecleaes con respeutu a les llingües coles que quies comprobar."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr ""
+"Indica si hai de revisar les pallabres tecleaes con respeutu a les llingües "
+"coles que quies comprobar."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Indica si hai de convertir los fustaxes n'imáxenes gráfiques nes conversaciones."
+msgstr ""
+"Indica si hai de convertir los fustaxes n'imáxenes gráfiques nes "
+"conversaciones."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Indica si hai d'activar el filtru d'encaboxamientu d'eco de Pulseaudio."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Indica si tien de reproducise un soníu pa notificar los anicios de sesión de los contautos na rede."
+msgstr ""
+"Indica si tien de reproducise un soníu pa notificar los anicios de sesión de "
+"los contautos na rede."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Indica si tien de reproducise un soníu pa notificar les finalizaciones de sesión de los contautos na rede."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr ""
+"Indica si tien de reproducise un soníu pa notificar les finalizaciones de "
+"sesión de los contautos na rede."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "Indica si tien de reproducise un soníu pa notificar eventos."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Indica si tien de reproducise un soníu pa notificar mensaxes entrantes."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
-msgstr "Indica si tien de reproducise un soníu pa notificar conversaciones nueves."
+msgstr ""
+"Indica si tien de reproducise un soníu pa notificar conversaciones nueves."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Indica si tien de reproducise un soníu pa notificar mensaxes salientes."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "Indica si tien de reproducise un soníu al aniciar sesión nuna rede."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Indica si tien de reproducise un soníu al finar sesión nuna rede."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
-msgstr "Indica si tien de reproducise soníos de notificaciones cuando tas ausente u ocupáu."
+msgstr ""
+"Indica si tien de reproducise soníos de notificaciones cuando tas ausente u "
+"ocupáu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Indica si tienen d'amosase les notificaciones emerxentes cuando un contautu se desconeuta."
+msgstr ""
+"Indica si tienen d'amosase les notificaciones emerxentes cuando un contautu "
+"se desconeuta."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
-msgstr "Indica si tienen d'amosase les notificaciones emerxentes cuando un contautu se coneuta."
+msgstr ""
+"Indica si tienen d'amosase les notificaciones emerxentes cuando un contautu "
+"se coneuta."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
-msgstr "Indica si tienen d'amosase les notificaciones emerxentes al recibir un mensax nuevu inclusu si la ventana de charra yá ta abierta pero nun tien el focu."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Indica si tienen d'amosase les notificaciones emerxentes al recibir un "
+"mensax nuevu inclusu si la ventana de charra yá ta abierta pero nun tien el "
+"focu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Indica si hai d'amosar notificaciones emerxentes al recibir un mensax nuevu."
+msgstr ""
+"Indica si hai d'amosar notificaciones emerxentes al recibir un mensax nuevu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "Indica si tienen d'amosase los avatares pa los contautos na llista de contautos y ventanes de charra."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+msgid "Whether to show account balances in the contact list."
+msgstr "Indica si hai d'amosar el créditu na llista de contautos."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr ""
+"Indica si tienen d'amosase los avatares pa los contautos na llista de "
+"contautos y ventanes de charra."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Indica si tienen d'amosase los contautos que tán desconeutaos na llista de contautos."
+msgstr ""
+"Indica si tienen d'amosase los contautos que tán desconeutaos na llista de "
+"contautos."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
-msgstr "Indica si tienen d'amosase les notificaciones emerxentes cuando tas ausente u ocupáu."
+msgstr ""
+"Indica si tienen d'amosase les notificaciones emerxentes cuando tas ausente "
+"u ocupáu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Indica si tienen d'amosase los protocolos pa los contautos na llista de contautos."
+msgstr ""
+"Indica si tienen d'amosase los protocolos pa los contautos na llista de "
+"contautos."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Indica si hai d'amosar la llista de contautos en sales de charra."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "Indica si hai d'amosar la llista de contautos en mou compautu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
-msgstr "Indica si hai d'amosar un mensax de diálogu tocante a cómo zarrar la ventana principal col botón «x» na barra de títulu."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr ""
+"Indica si hai d'amosar un mensax de diálogu tocante a cómo zarrar la ventana "
+"principal col botón «x» na barra de títulu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "Indica si hai d'usar el tema pa sales de charra."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Which criterion to use when sorting the contact list. Default is to sort by the contact's name with the value \"name\". A value of \"state\" will sort the contact list by state."
-msgstr "Qué criteriu usar al axeitar la llista de contautos. El criteriu predetermináu ye axeitar pel nome del contautu col valor «name» (nome). Un valor «state» (estáu) axeita la llista pol estáu."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's name with the value \"name\". A value of \"state\" will sort "
+"the contact list by state."
+msgstr ""
+"Qué criteriu usar al axeitar la llista de contautos. El criteriu "
+"predetermináu ye axeitar pel nome del contautu col valor «name» (nome). Un "
+"valor «state» (estáu) axeita la llista pol estáu."
 
 #: ../data/empathy-accounts.desktop.in.in.h:1
 msgid "Manage Messaging and VoIP accounts"
@@ -405,26 +534,42 @@ msgstr "Xestionar les cuentes de mensaxería y Voz IP"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2229
+#: ../src/empathy-accounts-dialog.c:2324
 msgid "Messaging and VoIP Accounts"
 msgstr "Cuentes de mensaxería y Voz IP"
 
-#: ../libempathy/empathy-ft-handler.c:835
+#: ../libempathy/empathy-ft-handler.c:825
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Tresferencia de ficheru completada, pero'l ficheru ta corruptu"
 
-#: ../libempathy/empathy-ft-handler.c:1126
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
 msgstr "El contautu remotu nun sofita la tresferencia de ficheros"
 
-#: ../libempathy/empathy-ft-handler.c:1182
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is not a regular file"
 msgstr "El ficheru esbilláu nun ye un ficheru regular"
 
-#: ../libempathy/empathy-ft-handler.c:1191
+#: ../libempathy/empathy-ft-handler.c:1176
 msgid "The selected file is empty"
 msgstr "El ficheru esbilláu ta baleru"
 
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#, c-format
+msgid "Missed call from %s"
+msgstr "Llamada perdida de %s"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, c-format
+msgid "Called %s"
+msgstr "Llamó %s"
+
+#: ../libempathy/empathy-message.c:422
+#, c-format
+msgid "Call from %s"
+msgstr "Llamada de %s"
+
 #: ../libempathy/empathy-tp-file.c:268
 msgid "Socket type not supported"
 msgstr "La triba de socket nun ta sofitada"
@@ -453,298 +598,288 @@ msgstr "Fallu al intentar tresferir el ficheru"
 msgid "The other participant is unable to transfer the file"
 msgstr "L'otru participante nun puede tresferir el ficheru"
 
-#: ../libempathy/empathy-tp-file.c:405
-#: ../libempathy/empathy-utils.c:383
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
 msgid "Unknown reason"
 msgstr "Razón desconocía"
 
-#: ../libempathy/empathy-utils.c:305
+#: ../libempathy/empathy-utils.c:222
 msgid "Available"
 msgstr "Disponible"
 
-#: ../libempathy/empathy-utils.c:307
+#: ../libempathy/empathy-utils.c:224
 msgid "Busy"
 msgstr "Ocupáu"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:227
 msgid "Away"
 msgstr "Ausente"
 
-#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:229
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:231
 msgid "Offline"
 msgstr "Desconeutáu"
 
-#: ../libempathy/empathy-utils.c:316
-#: ../src/empathy-streamed-media-window.c:1897
-#: ../src/empathy-streamed-media-window.c:1898
-#: ../src/empathy-streamed-media-window.c:1899
-#: ../src/empathy-streamed-media-window.c:1900
-#: ../src/empathy-call-window.ui.h:18
+#. translators: presence type is unknown
+#: ../libempathy/empathy-utils.c:234
+msgctxt "presence"
 msgid "Unknown"
 msgstr "Desconocíu"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:274
 msgid "No reason specified"
 msgstr "Nun se dió denguna razón"
 
-#: ../libempathy/empathy-utils.c:357
-#: ../libempathy/empathy-utils.c:413
+#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
 msgid "Status is set to offline"
 msgstr "Afitóse l'estáu a desconeutáu"
 
-#: ../libempathy/empathy-utils.c:359
-#: ../libempathy/empathy-utils.c:393
+#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "Fallu de rede"
 
-#: ../libempathy/empathy-utils.c:361
-#: ../libempathy/empathy-utils.c:395
+#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
 msgid "Authentication failed"
 msgstr "Falló l'autenticación"
 
-#: ../libempathy/empathy-utils.c:363
-#: ../libempathy/empathy-utils.c:397
+#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
 msgid "Encryption error"
 msgstr "Fallu de cifráu"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:284
 msgid "Name in use"
 msgstr "Nome n'usu"
 
-#: ../libempathy/empathy-utils.c:367
-#: ../libempathy/empathy-utils.c:399
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
 msgid "Certificate not provided"
 msgstr "Nun se proporcionó'l certificáu"
 
-#: ../libempathy/empathy-utils.c:369
-#: ../libempathy/empathy-utils.c:401
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
 msgid "Certificate untrusted"
 msgstr "Certificáu sospechosu"
 
-#: ../libempathy/empathy-utils.c:371
-#: ../libempathy/empathy-utils.c:403
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
 msgid "Certificate expired"
 msgstr "El certificáu espiró"
 
-#: ../libempathy/empathy-utils.c:373
-#: ../libempathy/empathy-utils.c:405
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
 msgid "Certificate not activated"
 msgstr "El certificáu nun ta activáu"
 
-#: ../libempathy/empathy-utils.c:375
-#: ../libempathy/empathy-utils.c:407
+#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
 msgid "Certificate hostname mismatch"
 msgstr "El nome del equipu del certificáu nun concasa"
 
-#: ../libempathy/empathy-utils.c:377
-#: ../libempathy/empathy-utils.c:409
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate fingerprint mismatch"
 msgstr "La buelga del certificáu nun concasa"
 
-#: ../libempathy/empathy-utils.c:379
-#: ../libempathy/empathy-utils.c:411
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate self-signed"
 msgstr "Certificáu robláu consigo mesmu"
 
-#: ../libempathy/empathy-utils.c:381
+#: ../libempathy/empathy-utils.c:300
 msgid "Certificate error"
 msgstr "Fallu del certificáu"
 
-#: ../libempathy/empathy-utils.c:415
+#: ../libempathy/empathy-utils.c:334
 msgid "Encryption is not available"
 msgstr "El cifráu nun ta disponible"
 
-#: ../libempathy/empathy-utils.c:417
+#: ../libempathy/empathy-utils.c:336
 msgid "Certificate is invalid"
 msgstr "El certificáu nun ye válidu"
 
-#: ../libempathy/empathy-utils.c:419
+#: ../libempathy/empathy-utils.c:338
 msgid "Connection has been refused"
 msgstr "Refugóse la conexón"
 
-#: ../libempathy/empathy-utils.c:421
+#: ../libempathy/empathy-utils.c:340
 msgid "Connection can't be established"
 msgstr "Nun pudo afitase la conexón"
 
-#: ../libempathy/empathy-utils.c:423
+#: ../libempathy/empathy-utils.c:342
 msgid "Connection has been lost"
 msgstr "Perdióse la conexón"
 
-#: ../libempathy/empathy-utils.c:425
+#: ../libempathy/empathy-utils.c:344
 msgid "This resource is already connected to the server"
 msgstr "El recursu yá ta coneutáu al sirvidor"
 
-#: ../libempathy/empathy-utils.c:427
-msgid "Connection has been replaced by a new connection using the same resource"
+#: ../libempathy/empathy-utils.c:346
+msgid ""
+"Connection has been replaced by a new connection using the same resource"
 msgstr "Trocóse la conexón por una conexón nueva usando'l mesmu recursu"
 
-#: ../libempathy/empathy-utils.c:430
+#: ../libempathy/empathy-utils.c:349
 msgid "The account already exists on the server"
 msgstr "La cuenta yá esiste nel sirvidor"
 
-#: ../libempathy/empathy-utils.c:432
+#: ../libempathy/empathy-utils.c:351
 msgid "Server is currently too busy to handle the connection"
 msgstr "Anguaño'l sirrvidor ta enforma ocupáu pa xestionar la conexón"
 
-#: ../libempathy/empathy-utils.c:434
+#: ../libempathy/empathy-utils.c:353
 msgid "Certificate has been revoked"
 msgstr "Revocóse'l certificáu"
 
-#: ../libempathy/empathy-utils.c:436
-msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
-msgstr "El certificáu usa un algoritmu de cifráu inseguru o ye criptográficamente feble"
+#: ../libempathy/empathy-utils.c:355
+msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr ""
+"El certificáu usa un algoritmu de cifráu inseguru o ye criptográficamente "
+"feble"
 
-#: ../libempathy/empathy-utils.c:439
-msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
-msgstr "La llonxitú del certificáu de sirvidor, o la fondura de la cadena de certificáu del sirvidor, perpasen les llendes impuestes pola biblioteca de criptografía"
+#: ../libempathy/empathy-utils.c:358
+msgid ""
+"The length of the server certificate, or the depth of the server certificate "
+"chain, exceed the limits imposed by the cryptography library"
+msgstr ""
+"La llonxitú del certificáu de sirvidor, o la fondura de la cadena de "
+"certificáu del sirvidor, perpasen les llendes impuestes pola biblioteca de "
+"criptografía"
 
-#: ../libempathy/empathy-utils.c:602
+#: ../libempathy/empathy-utils.c:519
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "Xente cerca"
 
-#: ../libempathy/empathy-utils.c:607
+#: ../libempathy/empathy-utils.c:524
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:636
+#: ../libempathy/empathy-utils.c:553
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:637
+#: ../libempathy/empathy-utils.c:554
 msgid "Facebook Chat"
 msgstr "Facebook Chat"
 
-#: ../libempathy/empathy-time.c:137
+#: ../libempathy/empathy-time.c:88
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "fai %d segundu"
 msgstr[1] "fai %d segundos"
 
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:93
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "fai %d minutu"
 msgstr[1] "fai %d minutos"
 
-#: ../libempathy/empathy-time.c:147
+#: ../libempathy/empathy-time.c:98
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "fai %d hora"
 msgstr[1] "fai %d hores"
 
-#: ../libempathy/empathy-time.c:152
+#: ../libempathy/empathy-time.c:103
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "fai %d día"
 msgstr[1] "fai %d díes"
 
-#: ../libempathy/empathy-time.c:157
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "fai %d selmana"
 msgstr[1] "fai %d selmanes"
 
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:113
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "fai %d mes"
 msgstr[1] "fai %d meses"
 
-#: ../libempathy/empathy-time.c:167
+#: ../libempathy/empathy-time.c:136
 msgid "in the future"
 msgstr "nel futuru"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:501
-msgid "All"
-msgstr "Too"
+#: ../libempathy-gtk/empathy-account-chooser.c:539
+msgid "All accounts"
+msgstr "Toles cuentes"
 
-#: ../libempathy-gtk/empathy-account-widget.c:679
-#: ../libempathy-gtk/empathy-log-window.c:650
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "Cuenta"
 
-#: ../libempathy-gtk/empathy-account-widget.c:680
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "Contraseña"
 
-#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Sirvidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Puertu"
 
-#: ../libempathy-gtk/empathy-account-widget.c:754
-#: ../libempathy-gtk/empathy-account-widget.c:811
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1163
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "Les mios cuentes Web"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "La cuenta %s edítase a traviés de My Web Accounts"
+msgid "The account %s is edited via %s."
+msgstr "La cuenta %s edítase vía %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1169
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "La cuenta %s nun pue editase n'Empathy."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1189
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
 msgstr "Llanzar My Web Accounts"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1527
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "Editar %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Nome d'usuariu:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1894
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "A_plicar"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1924
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
 msgstr "C_oneutase"
 
-#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1990
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:451
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1486
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "Cuenta:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2001
-msgid "_Enabled"
-msgstr "_Activáu"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2066
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "Esta cuenta yá esiste nel sirvidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2069
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "Crear una cuenta nueva nel sirvidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2261
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "E_ncaboxar"
 
@@ -753,19 +888,19 @@ msgstr "E_ncaboxar"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2558
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s en %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2584
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "Cuenta %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2588
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "Cuenta nueva"
 
@@ -777,6 +912,7 @@ msgstr "<b>Exemplu:</b> MioNomeEnPantalla"
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -790,7 +926,7 @@ msgstr "Avanzáu"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "Pass_word:"
 msgstr "Contra_seña:"
@@ -800,37 +936,48 @@ msgstr "Contra_seña:"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
 msgid "Remember Password"
-msgstr "Remembrar Contraseña"
+msgstr "Remembrar contraseña"
 
+#. remember password ticky box
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-password-dialog.c:311
+msgid "Remember password"
+msgstr "Remembrar la contraseña"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 msgid "Screen _Name:"
 msgstr "_Nome en pantalla:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
 msgid "What is your AIM password?"
 msgstr "¿Cuál ye la so contraseña de AIM?"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "¿Cuál ye'l so nome de pantalla en AIM?"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Port:"
-msgstr "_Puertu:"
-
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+msgid "_Port:"
+msgstr "_Puertu:"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
 #: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
 msgstr "_Sirvidor:"
@@ -846,11 +993,11 @@ msgstr "<b>Exemplu:</b> usuariu"
 msgid "Login I_D:"
 msgstr "_ID de sesión:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
 msgid "What is your GroupWise User ID?"
 msgstr "¿Cuál ye'l so ID d'usuariu en GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise password?"
 msgstr "¿Cuál ye la so contraseña en GroupWise?"
 
@@ -867,84 +1014,92 @@ msgstr "Xueu de C_arauteres:"
 msgid "ICQ _UIN:"
 msgstr "_UIN ICQ:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
 msgid "What is your ICQ UIN?"
 msgstr "¿Cuál ye'l so UIN de ICQ?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ password?"
 msgstr "¿Cuál ye la so contraseña de ICQ?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:183
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "Auto"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:221
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "Register"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:226
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "Opciones"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "Dengún"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Character set:"
 msgstr "Xuegu de carauteres:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"La mayoría de los sirvidores IRC nun necesiten una contraseña, de mou que si "
+"nun tas seguru, nun introduzas una contraseña."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Network"
 msgstr "Rede"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Network:"
 msgstr "Rede:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Nomatu:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "Mensax de salida:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "Nome real:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Servers"
 msgstr "Sirvidores"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "What is your IRC nickname?"
 msgstr "¿Cuál ye'l to alcuñu nel IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "¿Qué rede IRC?"
 
@@ -972,54 +1127,56 @@ msgstr "Sobrescribir los axustes del sirvidor"
 msgid "Priori_ty:"
 msgstr "Priori_dá:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 msgid "Reso_urce:"
 msgstr "Re_cursu:"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
-"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a Facebook username if you don't have one."
+"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
+"Facebook username if you don't have one."
 msgstr ""
 "Esti ye'l to nome d'usuariu, non el to aniciu de sesión normal en Facebook.\n"
 "Si ye facebook.com/<b>usuariu</b>, introduz <b>usuariu</b>.\n"
-"Usa <a href=\"http://www.facebook.com/username/\">esta páxina</a> pa escoyer un nome d'usuariu en Facebook si nun tienes ún."
+"Usa <a href=\"http://www.facebook.com/username/\">esta páxina</a> pa escoyer "
+"un nome d'usuariu en Facebook si nun tienes ún."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "Use old SS_L"
 msgstr "Usar SS_L antiguu"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
 msgid "What is your Facebook password?"
 msgstr "¿Cuál ye la to contraseña de Facebook?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
 msgid "What is your Facebook username?"
 msgstr "¿Cuál ye'l to usuariu de Facebook?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 msgid "What is your Google ID?"
 msgstr "¿Cuál ye'l to ID de Google?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 msgid "What is your Google password?"
 msgstr "¿Cuál ye la to contraseña de Google?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
 msgid "What is your Jabber ID?"
 msgstr "¿Cuál ye'l so ID de Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
 msgid "What is your Jabber password?"
 msgstr "¿Cuál ye la so contraseña de Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your desired Jabber ID?"
 msgstr "¿Cuál ye la to ID de Jabber deseyada?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber password?"
 msgstr "¿Cuál ye la to contraseña de Jabber deseyada?"
 
@@ -1027,11 +1184,11 @@ msgstr "¿Cuál ye la to contraseña de Jabber deseyada?"
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Exemplu:</b> usuariu@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
 msgid "What is your Windows Live ID?"
 msgstr "¿Cuál ye la to ID de Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live password?"
 msgstr "¿Cuál ye la so contraseña de Windows Live?"
 
@@ -1076,58 +1233,67 @@ msgid "Discover the STUN server automatically"
 msgstr "Descubrir el sirvidor STUN automáticamente"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "Ignore TLS Errors"
+msgstr "Inorar fallos TLS"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Interval (seconds)"
 msgstr "Intervalu (segundos)"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
 msgid "Keep-Alive Options"
 msgstr "Opciones de «keepalive»"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
 msgid "Loose Routing"
 msgstr "Enrutáu imprecisu"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Mechanism:"
 msgstr "Mecanismu:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
 msgid "Miscellaneous Options"
 msgstr "Otres opciones"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 msgid "NAT Traversal Options"
 msgstr "Opciones de NAT transversal"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 msgid "Port:"
 msgstr "Puertu:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 msgid "Proxy Options"
 msgstr "Opciones Proxy"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "STUN Server:"
 msgstr "Sirvidor STUN:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.c:347
 msgid "Server:"
 msgstr "Sirvidor:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid "Transport:"
 msgstr "Tresporte:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Usar esta cuenta pa llamar a te_léfonos fixos y móviles"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "¿Cuál ye la so contraseña de cuenta de SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "¿Cuál ye'l so ID d'accesu de SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "_Usuariu:"
 
@@ -1135,42 +1301,44 @@ msgstr "_Usuariu:"
 msgid "I_gnore conference and chat room invitations"
 msgstr "I_norar los errores d'invitación a conferencies y sales de charra"
 
-#. remember password ticky box
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "Remembrar contraseña"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "What is your Yahoo! ID?"
 msgstr "¿Cuál ye'l so ID de Yahoo!?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "What is your Yahoo! password?"
 msgstr "¿Cuál ye la so contraseña de Yahoo!?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
 msgid "Yahoo! I_D:"
 msgstr "I_D de Yahoo!:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "_Room List locale:"
 msgstr "Configuración de la llista de _sales:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:448
-#: ../libempathy-gtk/empathy-avatar-chooser.c:524
+#: ../libempathy-gtk/empathy-avatar-chooser.c:470
+#: ../libempathy-gtk/empathy-avatar-chooser.c:555
 msgid "Couldn't convert image"
 msgstr "Nun pudo convertise la imaxe"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
 msgid "None of the accepted image formats are supported on your system"
 msgstr "El sistema nun soporta dengún de los formatos d'imaxe aceutaos"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:936
+#: ../libempathy-gtk/empathy-avatar-chooser.c:818
+msgid "Couldn't save picture to file"
+msgstr "Nun pudo guardase la imaxe a un ficheru"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:934
 msgid "Select Your Avatar Image"
 msgstr "Escueyi la to imaxe d'avatar"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:939
+#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+msgid "Take a picture..."
+msgstr "Tomar una imaxe…"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:941
 msgid "No Image"
 msgstr "Ensin imaxe"
 
@@ -1186,151 +1354,213 @@ msgstr "Tolos ficheros"
 msgid "Click to enlarge"
 msgstr "Calque p'agrandar"
 
-#: ../libempathy-gtk/empathy-chat.c:646
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
+msgid "There was an error starting the call"
+msgstr "Hebo un fallu al aniciar la llamada"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact doesn't support calls"
+msgstr "El contautu especificáu nun permite llamaes"
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is offline"
+msgstr "El contautu especificáu nun ta en llinia"
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "The specified contact is not valid"
+msgstr "El contautu especificáu nun ye válidu"
+
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "Emergency calls are not supported on this protocol"
+msgstr "Les llamaes d'emerxencies nun son compatibles con esti protocolu"
+
+#: ../libempathy-gtk/empathy-chat.c:702
 msgid "Failed to open private chat"
 msgstr "Falló al abrir la charra privada"
 
-#: ../libempathy-gtk/empathy-chat.c:697
+#: ../libempathy-gtk/empathy-chat.c:763
 msgid "Topic not supported on this conversation"
 msgstr "El tema nun tien sofitu téunicu nesta conversación"
 
-#: ../libempathy-gtk/empathy-chat.c:703
+#: ../libempathy-gtk/empathy-chat.c:769
 msgid "You are not allowed to change the topic"
 msgstr "Nun tienes permisu pa camudar el tema"
 
-#: ../libempathy-gtk/empathy-chat.c:842
+#: ../libempathy-gtk/empathy-chat.c:973
+#, c-format
+msgid "“%s� is not a valid contact ID"
+msgstr "%s nun ye un identificador de contautu válidu"
+
+#: ../libempathy-gtk/empathy-chat.c:1030
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: llimpiar tolos mensaxes de la conversación actual"
 
-#: ../libempathy-gtk/empathy-chat.c:845
+#: ../libempathy-gtk/empathy-chat.c:1033
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <tema>: afitar el tema pa la conversación actual"
 
-#: ../libempathy-gtk/empathy-chat.c:848
+#: ../libempathy-gtk/empathy-chat.c:1036
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <id de sala de charra>: xunise a una sala de charra nueva"
 
-#: ../libempathy-gtk/empathy-chat.c:851
+#: ../libempathy-gtk/empathy-chat.c:1039
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <id de sala de charra>: xunise a una sala de charra nueva"
 
-#: ../libempathy-gtk/empathy-chat.c:856
+#: ../libempathy-gtk/empathy-chat.c:1043
+msgid ""
+"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
+"current one"
+msgstr ""
+"/part [<ID sala de charra>] [<razón>]: dexar la sala de charra, por defeutu "
+"l'actual."
+
+#: ../libempathy-gtk/empathy-chat.c:1047
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <id del contautu> [<mensaxe>]: abrir una charra privada"
 
-#: ../libempathy-gtk/empathy-chat.c:859
+#: ../libempathy-gtk/empathy-chat.c:1050
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <id del contautu> <mensaxe>: abrir una charra privada"
 
-#: ../libempathy-gtk/empathy-chat.c:863
+#: ../libempathy-gtk/empathy-chat.c:1053
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nomatu>: camudar el to nomatu nel sirvidor actual"
 
-#: ../libempathy-gtk/empathy-chat.c:866
+#: ../libempathy-gtk/empathy-chat.c:1056
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <mensaxe>: unviar un mensaxe de AICIÓN a la conversación actual"
 
-#: ../libempathy-gtk/empathy-chat.c:869
-msgid "/say <message>: send <message> to the current conversation. This is used to send a message starting with a '/'. For example: \"/say /join is used to join a new chat room\""
-msgstr "/say <mensaxe>: unviar un <mensaxe> a la conversación actual. Esto úsase pa unviar un mensaxe empecipiando per una «/». Por exemplu: «/say /join úsase pa xunise a una sala de charra nueva»"
+#: ../libempathy-gtk/empathy-chat.c:1059
+msgid ""
+"/say <message>: send <message> to the current conversation. This is used to "
+"send a message starting with a '/'. For example: \"/say /join is used to "
+"join a new chat room\""
+msgstr ""
+"/say <mensaxe>: unviar un <mensaxe> a la conversación actual. Esto úsase pa "
+"unviar un mensaxe empecipiando per una «/». Por exemplu: «/say /join úsase "
+"pa xunise a una sala de charra nueva»"
 
-#: ../libempathy-gtk/empathy-chat.c:874
-msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
-msgstr "/help [<comandu>]: amosar tolos comandos soportaos. Si <comandu> ta definíu, amuesa'l so usu."
+#: ../libempathy-gtk/empathy-chat.c:1064
+msgid "/whois <contact ID>: display information about a contact"
+msgstr "/whois <ID del contautu>: amosar info sobre un contautu"
 
-#: ../libempathy-gtk/empathy-chat.c:884
+#: ../libempathy-gtk/empathy-chat.c:1067
+msgid ""
+"/help [<command>]: show all supported commands. If <command> is defined, "
+"show its usage."
+msgstr ""
+"/help [<comandu>]: amosar tolos comandos soportaos. Si <comandu> ta definíu, "
+"amuesa'l so usu."
+
+#: ../libempathy-gtk/empathy-chat.c:1077
 #, c-format
 msgid "Usage: %s"
 msgstr "Usu: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:926
+#: ../libempathy-gtk/empathy-chat.c:1116
 msgid "Unknown command"
 msgstr "Orde desconocía"
 
-#: ../libempathy-gtk/empathy-chat.c:1052
+#: ../libempathy-gtk/empathy-chat.c:1242
 msgid "Unknown command; see /help for the available commands"
 msgstr "Comandu desconocíu; consulta /help p'adicar los comandos disponibles"
 
-#: ../libempathy-gtk/empathy-chat.c:1192
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1412
+msgid "insufficient balance to send message"
+msgstr "nun hai balance suficiente pa unviar el mensaxe"
+
+#: ../libempathy-gtk/empathy-chat.c:1414
+msgid "not capable"
+msgstr "nun ye dable"
+
+#: ../libempathy-gtk/empathy-chat.c:1421
 msgid "offline"
 msgstr "desconeutáu"
 
-#: ../libempathy-gtk/empathy-chat.c:1195
+#: ../libempathy-gtk/empathy-chat.c:1424
 msgid "invalid contact"
 msgstr "contautu non válidu"
 
-#: ../libempathy-gtk/empathy-chat.c:1198
+#: ../libempathy-gtk/empathy-chat.c:1427
 msgid "permission denied"
 msgstr "permisu denegáu"
 
-#: ../libempathy-gtk/empathy-chat.c:1201
+#: ../libempathy-gtk/empathy-chat.c:1430
 msgid "too long message"
 msgstr "mensaxe enforma llargu"
 
-#: ../libempathy-gtk/empathy-chat.c:1204
+#: ../libempathy-gtk/empathy-chat.c:1433
 msgid "not implemented"
 msgstr "non implementáu"
 
-#: ../libempathy-gtk/empathy-chat.c:1208
+#: ../libempathy-gtk/empathy-chat.c:1437
 msgid "unknown"
 msgstr "desconocíu"
 
-#: ../libempathy-gtk/empathy-chat.c:1212
+#: ../libempathy-gtk/empathy-chat.c:1443
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Error al unviar el mensaxe «%s»: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1273
-#: ../src/empathy-chat-window.c:711
+#: ../libempathy-gtk/empathy-chat.c:1447
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Fallu al unviar mensax: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1508 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Tema:"
 
-#: ../libempathy-gtk/empathy-chat.c:1285
+#: ../libempathy-gtk/empathy-chat.c:1520
 #, c-format
 msgid "Topic set to: %s"
 msgstr "El tema afitóse a: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1287
+#: ../libempathy-gtk/empathy-chat.c:1522
 msgid "No topic defined"
 msgstr "Nun se definió'l tema"
 
-#: ../libempathy-gtk/empathy-chat.c:1786
+#: ../libempathy-gtk/empathy-chat.c:2031
 msgid "(No Suggestions)"
 msgstr "(Ensin suxerencies)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1854
+#: ../libempathy-gtk/empathy-chat.c:2099
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Amestar '%s' al diccionariu"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1891
+#: ../libempathy-gtk/empathy-chat.c:2136
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Amestar «%s» al diccionariu de «%s»"
 
-#: ../libempathy-gtk/empathy-chat.c:1950
+#: ../libempathy-gtk/empathy-chat.c:2206
 msgid "Insert Smiley"
 msgstr "Inxertar fustax"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1968
-#: ../libempathy-gtk/empathy-ui-utils.c:1810
+#: ../libempathy-gtk/empathy-chat.c:2224
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "U_nviar"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2003
+#: ../libempathy-gtk/empathy-chat.c:2278
 msgid "_Spelling Suggestions"
 msgstr "_Suxerencies ortográfiques"
 
-#: ../libempathy-gtk/empathy-chat.c:2092
+#: ../libempathy-gtk/empathy-chat.c:2367
 msgid "Failed to retrieve recent logs"
 msgstr "Falló al recibir los rexistros recientes"
 
-#: ../libempathy-gtk/empathy-chat.c:2198
+#: ../libempathy-gtk/empathy-chat.c:2504
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s desconeutóse"
@@ -1338,12 +1568,12 @@ msgstr "%s desconeutóse"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2205
+#: ../libempathy-gtk/empathy-chat.c:2511
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s espulsó a %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2208
+#: ../libempathy-gtk/empathy-chat.c:2514
 #, c-format
 msgid "%s was kicked"
 msgstr "a %s espulsárenlu"
@@ -1351,17 +1581,17 @@ msgstr "a %s espulsárenlu"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2216
+#: ../libempathy-gtk/empathy-chat.c:2522
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s torgó a %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2219
+#: ../libempathy-gtk/empathy-chat.c:2525
 #, c-format
 msgid "%s was banned"
 msgstr "a %s vetárenlu"
 
-#: ../libempathy-gtk/empathy-chat.c:2223
+#: ../libempathy-gtk/empathy-chat.c:2529
 #, c-format
 msgid "%s has left the room"
 msgstr "%s dexó la sala"
@@ -1371,99 +1601,175 @@ msgstr "%s dexó la sala"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2232
+#: ../libempathy-gtk/empathy-chat.c:2538
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2257
+#: ../libempathy-gtk/empathy-chat.c:2563
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s entró na sala"
 
-#: ../libempathy-gtk/empathy-chat.c:2282
+#: ../libempathy-gtk/empathy-chat.c:2588
 #, c-format
 msgid "%s is now known as %s"
 msgstr "Agora %s ye conocíu como %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2421
-#: ../src/empathy-streamed-media-window.c:1942
-#: ../src/empathy-event-manager.c:1122
+#: ../libempathy-gtk/empathy-chat.c:2727
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:2355
 msgid "Disconnected"
 msgstr "Desconeutáu"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3048
+#: ../libempathy-gtk/empathy-chat.c:3374
 msgid "Would you like to store this password?"
 msgstr "¿Quies almacenar esta contraseña?"
 
-#: ../libempathy-gtk/empathy-chat.c:3054
+#: ../libempathy-gtk/empathy-chat.c:3380
 msgid "Remember"
 msgstr "Remembrar"
 
-#: ../libempathy-gtk/empathy-chat.c:3064
+#: ../libempathy-gtk/empathy-chat.c:3390
 msgid "Not now"
 msgstr "Agora non"
 
-#: ../libempathy-gtk/empathy-chat.c:3108
+#: ../libempathy-gtk/empathy-chat.c:3434
 msgid "Retry"
 msgstr "Reintentar"
 
-#: ../libempathy-gtk/empathy-chat.c:3112
+#: ../libempathy-gtk/empathy-chat.c:3438
 msgid "Wrong password; please try again:"
 msgstr "Contraseña incorreuta; inténtalo otra vegada:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3229
+#: ../libempathy-gtk/empathy-chat.c:3568
 msgid "This room is protected by a password:"
 msgstr "Esta sala ta protexida por contraseña:"
 
-#: ../libempathy-gtk/empathy-chat.c:3256
+#: ../libempathy-gtk/empathy-chat.c:3595
 msgid "Join"
 msgstr "Xunise"
 
-#: ../libempathy-gtk/empathy-chat.c:3426
-#: ../src/empathy-event-manager.c:1144
+#: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "Coneutáu"
 
-#: ../libempathy-gtk/empathy-chat.c:3479
-#: ../libempathy-gtk/empathy-log-window.c:657
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "Conversation"
 msgstr "Conversación"
 
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:3857
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (SMS)"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+msgid "Unknown or invalid identifier"
+msgstr "Identificador desconocíu o inválidu"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+msgid "Contact blocking temporarily unavailable"
+msgstr "Bloquéu de contautos temporalmente non disponible"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+msgid "Contact blocking unavailable"
+msgstr "Bloquéu de contautos non disponible"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+msgid "Permission Denied"
+msgstr "Permisu denegáu"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+msgid "Could not block contact"
+msgstr "Nun se pue bloquiar el contautu"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+msgid "Edit Blocked Contacts"
+msgstr "Editar contautos bloquiaos"
+
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1485
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Account:"
+msgstr "Cuenta:"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "Contautos bloquiaos"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Desaniciar"
+
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:794
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Copiar la direición del enllaz"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:801
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Abrir enllaz"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:420
+#: ../libempathy-gtk/empathy-chat-text-view.c:415
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:265
+#: ../libempathy-gtk/empathy-contact-dialogs.c:299
 #: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
 msgid "Edit Contact Information"
 msgstr "Editar información del contautu"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:316
+#: ../libempathy-gtk/empathy-contact-dialogs.c:350
 msgid "Personal Information"
 msgstr "Información personal"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:425
-#: ../libempathy-gtk/empathy-individual-dialogs.c:115
+#: ../libempathy-gtk/empathy-contact-dialogs.c:459
+#: ../libempathy-gtk/empathy-individual-dialogs.c:119
 msgid "New Contact"
 msgstr "Contautu nuevu"
 
+#: ../libempathy-gtk/empathy-contact-dialogs.c:533
+#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#, c-format
+msgid "Block %s?"
+msgstr "¿Bloquiar %s?"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:538
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#, c-format
+msgid "Are you sure you want to block '%s' from contacting you again?"
+msgstr ""
+"¿Tas seguru de que quies bloquiar a «%s» pa evitar que contaute contigo?"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:543
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+msgid "_Block"
+msgstr "_Bloquiar"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:559
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+msgid "_Report this contact as abusive"
+msgid_plural "_Report these contacts as abusive"
+msgstr[0] "Info_rmar d'esti contautu como abusivu"
+msgstr[1] "Info_rmar d'estos contautos como abusivos"
+
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
 msgstr "Decidir _dempués"
@@ -1472,6 +1778,10 @@ msgstr "Decidir _dempués"
 msgid "Subscription Request"
 msgstr "Petición de suscripción"
 
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "_Block User"
+msgstr "_Bloquiar usuariu"
+
 #: ../libempathy-gtk/empathy-contact-list-store.h:71
 msgid "Ungrouped"
 msgstr "Desagrupaos"
@@ -1480,293 +1790,331 @@ msgstr "Desagrupaos"
 msgid "Favorite People"
 msgstr "Xente favorito"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2012
-#: ../libempathy-gtk/empathy-individual-view.c:2293
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "¿Daveres quies quitar el grupu «%s»?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2014
-#: ../libempathy-gtk/empathy-individual-view.c:2296
+#: ../libempathy-gtk/empathy-contact-list-view.c:1988
+#: ../libempathy-gtk/empathy-individual-view.c:2379
 msgid "Removing group"
 msgstr "Quitando grupu"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2063
-#: ../libempathy-gtk/empathy-contact-list-view.c:2140
-#: ../libempathy-gtk/empathy-individual-view.c:2351
-#: ../libempathy-gtk/empathy-individual-view.c:2498
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../libempathy-gtk/empathy-contact-list-view.c:2037
+#: ../libempathy-gtk/empathy-contact-list-view.c:2114
+#: ../libempathy-gtk/empathy-individual-view.c:2434
+#: ../libempathy-gtk/empathy-individual-view.c:2637
 msgid "_Remove"
 msgstr "_Quitar"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2093
-#: ../libempathy-gtk/empathy-individual-view.c:2401
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
+#: ../libempathy-gtk/empathy-individual-view.c:2501
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "¿Daveres quies quitar el contautu «%s»?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2095
-#: ../libempathy-gtk/empathy-individual-view.c:2417
+#: ../libempathy-gtk/empathy-contact-list-view.c:2069
+#: ../libempathy-gtk/empathy-individual-view.c:2522
 msgid "Removing contact"
 msgstr "Quitando'l contautu"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:204
-#: ../src/empathy-main-window.ui.h:13
+#: ../libempathy-gtk/empathy-contact-menu.c:220
+#: ../src/empathy-main-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "_Amestar contautu…"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:231
-#: ../libempathy-gtk/empathy-individual-menu.c:517
-#: ../src/empathy-main-window.ui.h:14
+#: ../libempathy-gtk/empathy-contact-menu.c:300
+msgid "_Block Contact"
+msgstr "_Bloquiar contautu"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:329
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "_Charra"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:262
-#: ../libempathy-gtk/empathy-individual-menu.c:560
+#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "Llamada de _soníu"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:293
-#: ../libempathy-gtk/empathy-individual-menu.c:602
+#: ../libempathy-gtk/empathy-contact-menu.c:394
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
-msgstr "Llamada de _vídeo"
+msgstr "Llamada de _videu"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:334
-#: ../libempathy-gtk/empathy-individual-menu.c:645
-#: ../src/empathy-main-window.ui.h:25
+#: ../libempathy-gtk/empathy-contact-menu.c:440
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "Conversaciones an_teriores"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:356
-#: ../libempathy-gtk/empathy-individual-menu.c:686
+#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "Unviar Ficheru"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:379
-#: ../libempathy-gtk/empathy-individual-menu.c:728
+#: ../libempathy-gtk/empathy-contact-menu.c:485
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
 msgstr "Compartir el mio escritoriu"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:419
-#: ../libempathy-gtk/empathy-contact-widget.c:1682
-#: ../libempathy-gtk/empathy-individual-menu.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:1377
+#: ../libempathy-gtk/empathy-contact-menu.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:1886
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:1373
 msgid "Favorite"
 msgstr "Favoritu"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:448
-#: ../libempathy-gtk/empathy-individual-menu.c:789
+#: ../libempathy-gtk/empathy-contact-menu.c:554
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "Infor_mación"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:494
+#: ../libempathy-gtk/empathy-contact-menu.c:600
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:548
-#: ../libempathy-gtk/empathy-individual-menu.c:970
-#: ../src/empathy-chat-window.c:923
+#: ../libempathy-gtk/empathy-contact-menu.c:654
+#: ../libempathy-gtk/empathy-individual-menu.c:1283
+#: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "Convidándote a esta sala"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:579
-#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-contact-menu.c:685
+#: ../libempathy-gtk/empathy-individual-menu.c:1329
 msgid "_Invite to Chat Room"
 msgstr "_Invitar a sala de chat"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:445
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
 msgid "Search contacts"
-msgstr "Guetar contautos"
+msgstr "Guetar contactos"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:473
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
 msgid "Search: "
-msgstr "Guetar:"
+msgstr "Guetar: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:534
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+msgid "_Add Contact"
+msgstr "_Amestar contautu"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
 msgid "No contacts found"
 msgstr "Nun s'alcontraron contautos"
 
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr "El to mensaxe de presentación:"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
+msgstr "Déxame ver cuando tas en llinia. Gracies."
+
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "Seleicionar un contautu"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:276
+#: ../libempathy-gtk/empathy-contact-widget.c:336
 #: ../libempathy-gtk/empathy-individual-widget.c:153
 msgid "Full name:"
 msgstr "Nome completu:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:277
+#: ../libempathy-gtk/empathy-contact-widget.c:337
 #: ../libempathy-gtk/empathy-individual-widget.c:154
 msgid "Phone number:"
 msgstr "Númberu de teléfonu:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:278
+#: ../libempathy-gtk/empathy-contact-widget.c:338
 #: ../libempathy-gtk/empathy-individual-widget.c:155
 msgid "E-mail address:"
 msgstr "Direición de corréu-e:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:279
+#: ../libempathy-gtk/empathy-contact-widget.c:339
 #: ../libempathy-gtk/empathy-individual-widget.c:156
 msgid "Website:"
 msgstr "Sitiu web:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:280
+#: ../libempathy-gtk/empathy-contact-widget.c:340
 #: ../libempathy-gtk/empathy-individual-widget.c:157
 msgid "Birthday:"
 msgstr "Cumpleaños:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:724
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:346
+msgid "Last seen:"
+msgstr "Cabera actividá:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:348
+msgid "Connected from:"
+msgstr "Coneutáu dende:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:353
+msgid "Away message:"
+msgstr "Mensaxe d'ausencia:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+msgid "Channels:"
+msgstr "Canales:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
 msgstr "Códigu ISO de país:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:726
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Country:"
 msgstr "País:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:728
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "State:"
 msgstr "Estáu:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:730
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "City:"
 msgstr "Ciudá:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:732
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Area:"
 msgstr "Estaya:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:734
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
 msgstr "Códigu postal:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:736
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Street:"
 msgstr "Cai:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:738
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
 msgstr "Edificiu:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:740
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Floor:"
 msgstr "Planta:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:742
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Room:"
 msgstr "Habitación:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:744
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Text:"
 msgstr "Testu:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:746
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Description:"
 msgstr "Descripción:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:748
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:750
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
 msgstr "Nivel de precisión:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:752
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr "Error:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:754
-#: ../libempathy-gtk/empathy-individual-widget.c:517
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
 msgstr "Error vertical (metros):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:756
-#: ../libempathy-gtk/empathy-individual-widget.c:519
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
 msgstr "Error horizontal (metros):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:758
-#: ../libempathy-gtk/empathy-individual-widget.c:521
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr "Velocidá:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:760
-#: ../libempathy-gtk/empathy-individual-widget.c:523
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Bearing:"
 msgstr "Allanciu:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
 msgstr "Velocidá d'ascensu:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:527
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
 msgstr "Anováu per cabera vegada:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:529
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
 msgstr "Llonxitú_"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:768
-#: ../libempathy-gtk/empathy-individual-widget.c:531
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
 msgstr "Llatitú:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:770
-#: ../libempathy-gtk/empathy-individual-widget.c:533
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
 msgstr "Altitú:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:833
-#: ../libempathy-gtk/empathy-contact-widget.c:850
-#: ../libempathy-gtk/empathy-individual-widget.c:615
-#: ../libempathy-gtk/empathy-individual-widget.c:632
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:16
 msgid "Location"
 msgstr "Ubicación"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:852
-#: ../libempathy-gtk/empathy-individual-widget.c:634
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:904
-#: ../libempathy-gtk/empathy-individual-widget.c:683
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e de %B de %Y a les %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:987
-#: ../libempathy-gtk/empathy-individual-widget.c:925
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
 msgid "Save Avatar"
 msgstr "Guardar avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1043
-#: ../libempathy-gtk/empathy-individual-widget.c:983
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
 msgid "Unable to save avatar"
 msgstr "Nun pudo guardase l'avatar"
 
@@ -1776,7 +2124,7 @@ msgstr "<b>Ubicación</b> en (data)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1312
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr "Nomatu:"
 
@@ -1796,7 +2144,7 @@ msgstr "Detalles del contautu"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1516
+#: ../libempathy-gtk/empathy-individual-widget.c:1515
 msgid "Identifier:"
 msgstr "Identificador:"
 
@@ -1813,71 +2161,126 @@ msgstr "SO:"
 msgid "Version:"
 msgstr "Versión:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:332
+#: ../libempathy-gtk/empathy-groups-widget.c:333
 msgid "Groups"
 msgstr "Grupos"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:344
-msgid "Select the groups you want this contact to appear in.  Note that you can select more than one group or no groups."
-msgstr "Escueyi los grupos nos que quies qu'esti contautu apareza. Decátate que puedes esbillar más d'un grupu o dengún grupu."
+#: ../libempathy-gtk/empathy-groups-widget.c:345
+msgid ""
+"Select the groups you want this contact to appear in.  Note that you can "
+"select more than one group or no groups."
+msgstr ""
+"Escueyi los grupos nos que quies qu'esti contautu apareza. Decátate que "
+"puedes esbillar más d'un grupu o dengún grupu."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:363
+#: ../libempathy-gtk/empathy-groups-widget.c:364
 msgid "_Add Group"
 msgstr "_Amestar grupu"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:398
+#: ../libempathy-gtk/empathy-groups-widget.c:399
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Seleicionar"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1432
+#: ../libempathy-gtk/empathy-groups-widget.c:409
+#: ../src/empathy-main-window.c:1807
 msgid "Group"
 msgstr "Grupu"
 
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+msgid "The following identity will be blocked:"
+msgid_plural "The following identities will be blocked:"
+msgstr[0] "Va bloquiase la siguiente identidá:"
+msgstr[1] "Van bloquiase les siguientes identidaes:"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+msgid "The following identity can not be blocked:"
+msgid_plural "The following identities can not be blocked:"
+msgstr[0] "Nun pudo bloquiase la siguiente identidá:"
+msgstr[1] "Nun pudieron bloquiase les siguientes identidaes:"
+
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
 msgstr "Contautos enllazaos"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:354
+#: ../libempathy-gtk/empathy-individual-linker.c:370
 msgid "Select contacts to link"
 msgstr "Seleicionar contautos pa enllazar"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:428
+#: ../libempathy-gtk/empathy-individual-linker.c:444
 msgid "New contact preview"
 msgstr "Vista previa del nuevu contautu"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:472
+#: ../libempathy-gtk/empathy-individual-linker.c:488
 msgid "Contacts selected in the list on the left will be linked together."
 msgstr "Los contautos esbillaos na llista de la izquierda s'enllazarán xuntos."
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:131
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:837
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "Seleicionar la cuenta qu'usar pa facer la llamada"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "Llamar"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+msgid "Mobile"
+msgstr "Móvil"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "Trabayu"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "Casa"
+
+#. add an SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+msgid "_SMS"
+msgstr "_SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1141
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Editar"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:863
+#: ../libempathy-gtk/empathy-individual-menu.c:1167
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "_Enllazar contautos…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2409
+#: ../libempathy-gtk/empathy-individual-view.c:2341
+msgid "Delete and _Block"
+msgstr "Desaniciar y _bloquiar"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2510
 #, c-format
-msgid "Do you really want to remove the linked contact '%s'? Note that this will remove all the contacts which make up this linked contact."
-msgstr "¿Daveres que quies quitar el contautu enllazáu «%s»? Esto quitará tolos contautos que componen esti contautu enllazáu"
+msgid ""
+"Do you really want to remove the linked contact '%s'? Note that this will "
+"remove all the contacts which make up this linked contact."
+msgstr ""
+"¿Daveres que quies quitar el contautu enllazáu «%s»? Esto quitará tolos "
+"contautos que componen esti contautu enllazáu"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1657
+#: ../libempathy-gtk/empathy-individual-widget.c:1662
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -1902,7 +2305,7 @@ msgstr "Escoyer una rede d'IRC"
 
 #: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
 msgid "Reset _Networks List"
-msgstr "Rea_niciar llista de redes"
+msgstr "Re_stablecer la llista de redes"
 
 #: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
 msgctxt "verb displayed on a button to select an IRC network"
@@ -1930,8 +2333,11 @@ msgid "_Unlink…"
 msgstr "_Desenllazar…"
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid "Completely split the displayed linked contacts into the separate contacts."
-msgstr "Separtar dafechu los contautos enllazaos que s'amuesen en contautos separtaos."
+msgid ""
+"Completely split the displayed linked contacts into the separate contacts."
+msgstr ""
+"Separtar dafechu los contautos enllazaos que s'amuesen en contautos "
+"separtaos."
 
 #. Add button
 #. Translators: this is an action button in the linking dialogue. "Link" is
@@ -1947,73 +2353,207 @@ msgid "Unlink linked contacts '%s'?"
 msgstr "¿Desenllazar los contautos enllazaos «%s»?"
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid "Are you sure you want to unlink these linked contacts? This will completely split the linked contacts into separate contacts."
-msgstr "¿Daveres quies desenllazar estos contautos enllazaos? Esto va separtar dafechu los contautos enllazaos en contautos separtaos."
+msgid ""
+"Are you sure you want to unlink these linked contacts? This will completely "
+"split the linked contacts into separate contacts."
+msgstr ""
+"¿Daveres quies desenllazar estos contautos enllazaos? Esto va separtar "
+"dafechu los contautos enllazaos en contautos separtaos."
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:190
 msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "Desen_llazar"
 
-#: ../libempathy-gtk/empathy-log-window.c:667
-msgid "Date"
-msgstr "Data"
+#: ../libempathy-gtk/empathy-log-window.c:633
+msgid "History"
+msgstr "Históricu"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
-msgstr "Conversaciones"
+#: ../libempathy-gtk/empathy-log-window.c:688
+msgid "Show"
+msgstr "Amosar"
+
+#: ../libempathy-gtk/empathy-log-window.c:710
+msgid "Search"
+msgstr "Guetar"
+
+#: ../libempathy-gtk/empathy-log-window.c:1158
+#, c-format
+msgid "Chat in %s"
+msgstr "Charrar en %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1160
+#, c-format
+msgid "Chat with %s"
+msgstr "Charra con %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1210
+#: ../libempathy-gtk/empathy-log-window.c:1357
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%A, %e de %B de %Y a les %X"
+
+#. Translators: this is an emote: '* Danielle waves'
+#: ../libempathy-gtk/empathy-log-window.c:1299
+#, c-format
+msgid "<i>* %s %s</i>"
+msgstr "<i>* %s %s</i>"
+
+#. Translators: this is a message: 'Danielle: hello'
+#. * The string in bold is the sender's name
+#: ../libempathy-gtk/empathy-log-window.c:1305
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1376
+#: ../libempathy-gtk/empathy-log-window.c:1378
+#: ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "%"
+
+#: ../libempathy-gtk/empathy-log-window.c:1385
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "La llamada duró %s, finó a les %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1717
+msgid "Today"
+msgstr "Güei"
+
+#: ../libempathy-gtk/empathy-log-window.c:1721
+msgid "Yesterday"
+msgstr "Ayeri"
+
+#: ../libempathy-gtk/empathy-log-window.c:1737
+msgctxt ""
+"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+msgid "%e %B %Y"
+msgstr "%e de %B de %Y"
+
+#: ../libempathy-gtk/empathy-log-window.c:1818
+#: ../libempathy-gtk/empathy-log-window.c:3399
+msgid "Anytime"
+msgstr "Cualquier hora"
+
+#: ../libempathy-gtk/empathy-log-window.c:1898
+#: ../libempathy-gtk/empathy-log-window.c:2328
+msgid "Anyone"
+msgstr "Cualesquiera"
+
+#: ../libempathy-gtk/empathy-log-window.c:2640
+msgid "Who"
+msgstr "Quién"
+
+#: ../libempathy-gtk/empathy-log-window.c:2844
+msgid "When"
+msgstr "Cuándo"
+
+#: ../libempathy-gtk/empathy-log-window.c:2960
+msgid "Anything"
+msgstr "Cualquier cosa"
+
+#: ../libempathy-gtk/empathy-log-window.c:2962
+msgid "Text chats"
+msgstr "Charres de testu"
+
+#: ../libempathy-gtk/empathy-log-window.c:2964
+#: ../src/empathy-preferences.ui.h:4
+msgid "Calls"
+msgstr "Llamaes"
+
+#: ../libempathy-gtk/empathy-log-window.c:2969
+msgid "Incoming calls"
+msgstr "Llamaes entrantes"
+
+#: ../libempathy-gtk/empathy-log-window.c:2970
+msgid "Outgoing calls"
+msgstr "Llamaes salientes"
+
+#: ../libempathy-gtk/empathy-log-window.c:2971
+msgid "Missed calls"
+msgstr "Llamaes perdíes"
+
+#: ../libempathy-gtk/empathy-log-window.c:2993
+msgid "What"
+msgstr "Qué"
+
+#: ../libempathy-gtk/empathy-log-window.c:3702
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr ""
+"¿De xuru que quies desaniciar tolos rexistros de conversaciones anteriores?"
+
+#: ../libempathy-gtk/empathy-log-window.c:3706
+msgid "Clear All"
+msgstr "Llimpiar too"
+
+#: ../libempathy-gtk/empathy-log-window.c:3713
+msgid "Delete from:"
+msgstr "Desaniciar dende:"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Cargando…</span>"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "Guetar siguiente"
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Chat"
+msgstr "Charra"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "Guetar anterior"
+msgid "Delete All History..."
+msgstr "Desaniciar tol historial..."
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr "Conversaciones anteriores"
+msgid "Profile"
+msgstr "Perfil"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Video"
+msgstr "Videu"
 
-#. Tab Label
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "Guetar"
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:20
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "_File"
+msgstr "_Ficheru"
 
-#. Searching *for* something
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "_Pa:"
+msgid "page 2"
+msgstr "pa�xina 2"
 
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
 msgid "Contact ID:"
 msgstr "ID del contautu:"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:171
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
 msgid "C_hat"
 msgstr "C_harra"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:181
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
 msgstr "Conversación nueva"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:252
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
 msgid "Send _Video"
-msgstr "Unviar _vídeu"
+msgstr "Unviar _videu"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:260
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
 msgid "C_all"
 msgstr "_Llamar"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:270
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "New Call"
 msgstr "Llamada nueva"
 
@@ -2023,7 +2563,7 @@ msgid ""
 "Enter your password for account\n"
 "<b>%s</b>"
 msgstr ""
-"Introduz la contraseña pa la cuenta\n"
+"Introduz la to contraseña pa la cuenta\n"
 "<b>%s</b>"
 
 #. COL_STATUS_TEXT
@@ -2032,34 +2572,34 @@ msgstr ""
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Message…"
 msgstr "Mensaxe personalizáu…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messages…"
 msgstr "Editar mensaxes personalizaos…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
 msgstr "Calque pa desaniciar esti estáu de los favoritos"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
 msgstr "Calque pa facer esti estáu un favoritu"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
 msgstr "Afitar estáu"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:948
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
 msgid "Set your presence and current status"
 msgstr "Afitar la so presencia y estáu actual"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1136
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
 msgid "Custom messages…"
 msgstr "Mensaxes personalizaos…"
 
@@ -2072,18 +2612,26 @@ msgstr "Mensaxes personalizaos…"
 msgid "New %s account"
 msgstr "Cuenta de %s nueva"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "Guetar:"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "Sensible mayúscules"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Mat_ch case"
+msgstr "_Concasar Mayúscules/minúscules"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
 msgid "Phrase not found"
 msgstr "Frase nun atopada"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "_Next"
+msgstr "Siguie_nte"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+msgid "_Previous"
+msgstr "_Anterior"
+
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
 msgstr "Recibióse un mensax nel intre"
@@ -2124,35 +2672,32 @@ msgstr "Llamada de voz saliente"
 msgid "Voice call ended"
 msgstr "Finó la llamada de voz"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "Introducir mensaxe personalizáu"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
 msgstr "Editar mensaxes personalizaos"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr "Guardar mensaxe d'estáu _nuevu"
+#: ../libempathy-gtk/empathy-theme-adium.c:1030
+#, c-format
+msgid "Message edited at %s"
+msgstr "Mensaxe editáu a les %s"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Status Messages"
-msgstr "Mensaxes d'estáu guardaos"
+#: ../libempathy-gtk/empathy-theme-adium.c:1720
+msgid "Normal"
+msgstr "Normal"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "Clásicu"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "Simple"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "Llimpiu"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "Azul"
 
@@ -2178,14 +2723,16 @@ msgstr "El certificáu nun tien la buelga esperada"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:170
 msgid "The hostname verified by the certificate doesn't match the server name."
-msgstr "El nome de host comprobáu pol certificáu nun concasa col nome del sirvidor"
+msgstr ""
+"El nome de host comprobáu pol certificáu nun concasa col nome del sirvidor"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:174
 msgid "The certificate is self-signed."
 msgstr "El certificáu ta auto-robláu"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:177
-msgid "The certificate has been revoked by the issuing Certification Authority."
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
 msgstr "El certificáu ta revocáu pola Autoridá de Certificación que lu asoleyó"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:181
@@ -2210,31 +2757,44 @@ msgstr "Nome de host esperáu: %s"
 msgid "Certificate hostname: %s"
 msgstr "Nome de host del certificáu: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:271
+#: ../libempathy-gtk/empathy-tls-dialog.c:281
 msgid "Continue"
 msgstr "Continuar"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:277
+#: ../libempathy-gtk/empathy-tls-dialog.c:287
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Esta conexón nun ye de confianza. ¿Quies continuar de toles maneres?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:294
+#: ../libempathy-gtk/empathy-tls-dialog.c:297
 msgid "Remember this choice for future connections"
 msgstr "Recordar esta eleición pa conexones futures"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:302
+#: ../libempathy-gtk/empathy-tls-dialog.c:303
 msgid "Certificate Details"
 msgstr "Detalles del certificáu"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1707
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
 msgstr "Nun pudo abrise'l URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1802
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
 msgstr "Esbillar un ficheru"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1871
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
+msgid "Insufficient free space to save file"
+msgstr "Nun hai suficiente espaciu llibre pa guardar el ficheru"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#, c-format
+msgid ""
+"%s of free space are required to save this file, but only %s is available. "
+"Please choose another location."
+msgstr ""
+"Necesítase %s d'espaciu llibre pa guardar esti ficheru, pero namái hai "
+"disponible %s. Escueyi otra llocalización."
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Ficheru entrante de %s"
@@ -2422,44 +2982,68 @@ msgstr "Dengún mensax de fallu"
 msgid "Instant Message (Empathy)"
 msgstr "Mensaxe nel intre (Empathy)"
 
-#: ../src/empathy.c:310
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "Nun coneutase automáticamente al aniciu"
 
-#: ../src/empathy.c:314
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Nun amosar la llista de contautos o cualesquier otru diálogu nel aniciu"
 
-#: ../src/empathy.c:322
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr "- Veceru de Mensaxería nel Intre Empathy"
 
-#: ../src/empathy.c:501
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
 msgstr "Error al contautar col Xestor de cuentes"
 
-#: ../src/empathy.c:503
+#: ../src/empathy.c:639
 #, c-format
 msgid ""
-"There was an error while trying to connect to the Telepathy Account Manager. The error was:\n"
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
 "\n"
 "%s"
 msgstr ""
-"Hebo un fallu al intentar coneutar col Xestor de cuentes Telelepathy. El fallu foi:\n"
+"Hebo un fallu al intentar coneutar col Xestor de cuentes Telelepathy. El "
+"fallu foi:\n"
 "\n"
 "%s"
 
 #: ../src/empathy-about-dialog.c:81
-msgid "Empathy is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version."
-msgstr "Empathy ye software llibre; puedes redistribuyilu y /o camudalu baxo los términos de la Llicencia Pública Xeneral tal como la publica la Free Software Foundation; yá seya na versión 2 de la Llicencia, o (si te peta) cualquier versión posterior."
+msgid ""
+"Empathy is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version."
+msgstr ""
+"Empathy ye software llibre; puedes redistribuyilu y /o camudalu baxo los "
+"términos de la Llicencia Pública Xeneral tal como la publica la Free "
+"Software Foundation; yá seya na versión 2 de la Llicencia, o (si te peta) "
+"cualquier versión posterior."
 
 #: ../src/empathy-about-dialog.c:85
-msgid "Empathy 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."
-msgstr "Empathy distribúyese cola esperanza de que te seya útil, pero ENSIN DENGUNA GARANT�A; ensin incluso la garantía implícita de MERCANTILID� o AFAYAMIENTU PA UN PROPÓSITU PARTICULAR. Mira la Llicencia Pública Xeneral de GNU pa más detalles."
+msgid ""
+"Empathy 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."
+msgstr ""
+"Empathy distribúyese cola esperanza de que te seya útil, pero ENSIN DENGUNA "
+"GARANT�A; ensin incluso la garantía implícita de MERCANTILID� o AFAYAMIENTU "
+"PA UN PROPÓSITU PARTICULAR. Mira la Llicencia Pública Xeneral de GNU pa más "
+"detalles."
 
 #: ../src/empathy-about-dialog.c:89
-msgid "You should have received a copy of the GNU General Public License along with Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
-msgstr "Deberíes de tener recibío una copia de la Llicencia Pública Xeneral GNU xunto con Gossip ; si non, escribi a la Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 EE. UU."
+msgid ""
+"You should have received a copy of the GNU General Public License along with "
+"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-130159 USA"
+msgstr ""
+"Deberíes de tener recibío una copia de la Llicencia Pública Xeneral GNU "
+"xunto con Gossip ; si non, escribi a la Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-130159 EE. UU."
 
 #: ../src/empathy-about-dialog.c:107
 msgid "An Instant Messaging client for GNOME"
@@ -2472,7 +3056,6 @@ msgstr ""
 "  Costales https://launchpad.net/~costales\n"
 "  Iñigo Varela https://launchpad.net/~ivarela\n"
 "  Xandru https://launchpad.net/~xandruarmesto\n"
-"  Xandru Martino https://launchpad.net/~xandru-martino\n"
 "  Xuacu Saturio https://launchpad.net/~xuacusk8"
 
 #: ../src/empathy-account-assistant.c:167
@@ -2497,25 +3080,30 @@ msgid "The error message was: %s"
 msgstr "El mensaxe de fallu foi: %s"
 
 #: ../src/empathy-account-assistant.c:183
-msgid "You can either go back and try to enter your accounts' details again or quit this assistant and add accounts later from the Edit menu."
-msgstr "Puedes volverp' atrás ya intentar introducir los detalles de la to cuenta otra vegada, o colar d'esti asistente y amestar cuentes más sero dende'l menú Editar."
+msgid ""
+"You can either go back and try to enter your accounts' details again or quit "
+"this assistant and add accounts later from the Edit menu."
+msgstr ""
+"Puedes volverp' atrás ya intentar introducir los detalles de la to cuenta "
+"otra vegada, o colar d'esti asistente y amestar cuentes más sero dende'l "
+"menú Editar."
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1268
+#: ../src/empathy-account-assistant.c:1271
 msgid "An error occurred"
 msgstr "Hebo un fallu"
 
 #: ../src/empathy-account-assistant.c:467
 msgid "What kind of chat account do you have?"
-msgstr "¿Qué clase de cuenta tien?"
+msgstr "¿Qué clas de cuenta tienes?"
 
 #: ../src/empathy-account-assistant.c:473
 msgid "Do you have any other chat accounts you want to set up?"
-msgstr "¿Tien dalguna otra cuenta de charra que deseye configurar?"
+msgstr "¿Tienes dalguna otra cuenta de chat que quieras configurar?"
 
 #: ../src/empathy-account-assistant.c:479
 msgid "Enter your account details"
-msgstr "Introduza los detalles de la cuenta"
+msgstr "Introduz los detalles de la cuenta"
 
 #: ../src/empathy-account-assistant.c:484
 msgid "What kind of chat account do you want to create?"
@@ -2527,15 +3115,23 @@ msgstr "¿Deseya facer cuentes de charra?"
 
 #: ../src/empathy-account-assistant.c:497
 msgid "Enter the details for the new account"
-msgstr "Introduza los detalles de la cuenta nueva"
+msgstr "Introduz los detalles de la cuenta nueva"
 
 #: ../src/empathy-account-assistant.c:612
-msgid "With Empathy you can chat with people online nearby and with friends and colleagues who use Google Talk, AIM, Windows Live and many other chat programs. With a microphone or a webcam you can also have audio or video calls."
-msgstr "Con Empathy puede charrar con xente en llinia cercano y con collacios y conocíos qu'usen Google Tlak, AIM, Windows Live y otros programes de charra. Con un micrófonu o una cámara web tamién puede tener llamaes d'audio y vídeo."
+msgid ""
+"With Empathy you can chat with people online nearby and with friends and "
+"colleagues who use Google Talk, AIM, Windows Live and many other chat "
+"programs. With a microphone or a webcam you can also have audio or video "
+"calls."
+msgstr ""
+"Con Empathy pues charrar con xente en llinia cercano y con collacios y "
+"conocíos qu'usen Google Tlak, AIM, Windows Live y otros programes de charra. "
+"Con un micrófonu o una cámara web tamién pues tener llamaes d'audio y "
+"videu."
 
 #: ../src/empathy-account-assistant.c:629
 msgid "Do you have an account you've been using with another chat program?"
-msgstr "¿Tien una cuenta que tenga usao con otru programa de charra?"
+msgstr "¿Tienes una cuenta que tengas usao n'otru programa de chat?"
 
 #: ../src/empathy-account-assistant.c:652
 msgid "Yes, import my account details from "
@@ -2557,50 +3153,67 @@ msgstr "Non. Per agora namái quiero ver la xente que ta en llinia"
 msgid "Select the accounts you want to import:"
 msgstr "Esbille les cuentes que deseya importar:"
 
-#: ../src/empathy-account-assistant.c:810
-#: ../src/empathy-new-chatroom-dialog.c:567
-#: ../src/empathy-new-chatroom-dialog.c:568
+#: ../src/empathy-account-assistant.c:813
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "Yes"
 msgstr "Sí"
 
-#: ../src/empathy-account-assistant.c:817
+#: ../src/empathy-account-assistant.c:820
 msgid "No, that's all for now"
 msgstr "Non, esto ye tou pel momentu."
 
-#: ../src/empathy-account-assistant.c:1082
-msgid "Empathy can automatically discover and chat with the people connected on the same network as you. If you want to use this feature, please check that the details below are correct. You can easily change these details later or disable this feature by using the 'Accounts' dialog"
-msgstr "Empathy puede descubrir automáticamente les persones coneutaes na to mesma rede pa poder chatear con elles. Si quies usar esta carauterística comprueba que los detalles d'abaxo son correutos. Puedes camudar cenciellamente estos detalles postreramente o desactivar esta carauterística usando'l diálogu «Cuentes»."
-
-#: ../src/empathy-account-assistant.c:1088
-#: ../src/empathy-account-assistant.c:1144
+#: ../src/empathy-account-assistant.c:1085
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct. You can easily change these details later or "
+"disable this feature by using the 'Accounts' dialog"
+msgstr ""
+"Empathy puede descubrir automáticamente les persones coneutaes na to mesma "
+"rede pa poder chatear con elles. Si quies usar esta carauterística comprueba "
+"que los detalles d'abaxo son correutos. Puedes camudar cenciellamente estos "
+"detalles postreramente o desactivar esta carauterística usando'l diálogu "
+"«Cuentes»."
+
+#: ../src/empathy-account-assistant.c:1091
+#: ../src/empathy-account-assistant.c:1147
 msgid "Edit->Accounts"
 msgstr "Editar->Cuentes"
 
-#: ../src/empathy-account-assistant.c:1104
-msgid "I don't want to enable this feature for now"
-msgstr "Nun quiero activar esta carauterística per agora"
+#: ../src/empathy-account-assistant.c:1107
+msgid "I do _not want to enable this feature for now"
+msgstr "_Nun quiero activar esta carauterística per agora"
 
-#: ../src/empathy-account-assistant.c:1140
-msgid "You won't be able to chat with people connected to your local network, as telepathy-salut is not installed. If you want to enable this feature, please install the telepathy-salut package and create a People Nearby account from the Accounts dialog"
-msgstr "Nun vas poder charrar coles persones coneutaes na to rede llocal, darréu que telepathy-salut nun ta instaláu. Si quies activar esta carauterística instala'l paquete telepathy-salut y crea una cuenta de Xente Cerca dende'l diálogu Cuentes."
+#: ../src/empathy-account-assistant.c:1143
+msgid ""
+"You won't be able to chat with people connected to your local network, as "
+"telepathy-salut is not installed. If you want to enable this feature, please "
+"install the telepathy-salut package and create a People Nearby account from "
+"the Accounts dialog"
+msgstr ""
+"Nun vas poder charrar coles persones coneutaes na to rede llocal, darréu que "
+"telepathy-salut nun ta instaláu. Si quies activar esta carauterística "
+"instala'l paquete telepathy-salut y crea una cuenta de Xente Cerca dende'l "
+"diálogu Cuentes."
 
-#: ../src/empathy-account-assistant.c:1146
+#: ../src/empathy-account-assistant.c:1149
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut nun ta instaláu"
 
-#: ../src/empathy-account-assistant.c:1192
+#: ../src/empathy-account-assistant.c:1195
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "Asistente de cuentes de mensaxería y Voz IP"
 
-#: ../src/empathy-account-assistant.c:1226
+#: ../src/empathy-account-assistant.c:1229
 msgid "Welcome to Empathy"
 msgstr "Bienllegáu/ada a Empathy"
 
-#: ../src/empathy-account-assistant.c:1235
+#: ../src/empathy-account-assistant.c:1238
 msgid "Import your existing accounts"
 msgstr "Importar les sos cuentes esistentes"
 
-#: ../src/empathy-account-assistant.c:1253
+#: ../src/empathy-account-assistant.c:1256
 msgid "Please enter personal details"
 msgstr "Introduz los detalles personales"
 
@@ -2617,34 +3230,35 @@ msgstr "Esisten modificaciones ensin guardar na to cuenta %s."
 msgid "Your new account has not been saved yet."
 msgstr "Entá nun se guardó la cuenta nueva."
 
-#: ../src/empathy-accounts-dialog.c:286
-#: ../src/empathy-streamed-media-window.c:809
+#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1164
 msgid "Connecting…"
 msgstr "Coneutando…"
 
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:386
 #, c-format
 msgid "Offline — %s"
 msgstr "Desconeutáu: %s"
 
-#: ../src/empathy-accounts-dialog.c:339
+#: ../src/empathy-accounts-dialog.c:398
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Desconeutáu: %s"
 
-#: ../src/empathy-accounts-dialog.c:350
+#: ../src/empathy-accounts-dialog.c:409
 msgid "Offline — No Network Connection"
 msgstr "Desconeutáu: ensin conexón de rede"
 
-#: ../src/empathy-accounts-dialog.c:357
+#: ../src/empathy-accounts-dialog.c:416
 msgid "Unknown Status"
 msgstr "Estáu desconocíu"
 
-#: ../src/empathy-accounts-dialog.c:369
+#: ../src/empathy-accounts-dialog.c:428
 msgid "Offline — Account Disabled"
 msgstr "Desconeutáu: cuenta desactivada"
 
-#: ../src/empathy-accounts-dialog.c:772
+#: ../src/empathy-accounts-dialog.c:831
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2652,16 +3266,16 @@ msgstr ""
 "Vas facer una cuenta nueva, que descartará los tos cambeos.\n"
 "¿Daveres quies siguir?"
 
-#: ../src/empathy-accounts-dialog.c:1133
+#: ../src/empathy-accounts-dialog.c:1192
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "¿Quier desaniciar %s del equipu?"
 
-#: ../src/empathy-accounts-dialog.c:1137
+#: ../src/empathy-accounts-dialog.c:1196
 msgid "This will not remove your account on the server."
 msgstr "Esto nun desaniciará la cuenta del sirvidor."
 
-#: ../src/empathy-accounts-dialog.c:1375
+#: ../src/empathy-accounts-dialog.c:1432
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2670,15 +3284,15 @@ msgstr ""
 "¿Daveres quies siguir?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1571
+#: ../src/empathy-accounts-dialog.c:1643
 msgid "_Enable"
 msgstr "_Activar"
 
-#: ../src/empathy-accounts-dialog.c:1572
+#: ../src/empathy-accounts-dialog.c:1644
 msgid "_Disable"
 msgstr "_Desactivar"
 
-#: ../src/empathy-accounts-dialog.c:2073
+#: ../src/empathy-accounts-dialog.c:2154
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2687,34 +3301,38 @@ msgstr ""
 "¿Daveres quies siguir?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Amestar…"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
 msgid "Loading account information"
 msgstr "Cargando información de la cuenta"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "No protocol installed"
 msgstr "Nun hai protocolos instalaos"
 
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Protocol:"
 msgstr "Protocolu:"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "To add a new account, you first have to install a backend for each protocol you want to use."
-msgstr "P'amestar una nueva cuenta tien d'instalar primero un «backend» pa cada protocolu que quiera usar."
-
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add…"
-msgstr "_Amestar…"
-
 #: ../src/empathy-accounts-dialog.ui.h:6
+msgid ""
+"To add a new account, you first have to install a backend for each protocol "
+"you want to use."
+msgstr ""
+"P'amestar una nueva cuenta tien d'instalar primero un «backend» pa cada "
+"protocolu que quiera usar."
+
+#: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Import…"
 msgstr "_Importar…"
 
-#: ../src/empathy-auth-client.c:243
+#: ../src/empathy-auth-client.c:249
 msgid " - Empathy authentication client"
 msgstr " - Veceru d'identificación Empathy"
 
-#: ../src/empathy-auth-client.c:259
+#: ../src/empathy-auth-client.c:265
 msgid "Empathy authentication client"
 msgstr "Veceru d'identificación Empathy"
 
@@ -2722,268 +3340,369 @@ msgstr "Veceru d'identificación Empathy"
 msgid "People nearby"
 msgstr "Xente cerca"
 
-#: ../src/empathy-av.c:118
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:127
 msgid "- Empathy Audio/Video Client"
-msgstr "- Veceru de soníu/vídeu Empathy"
+msgstr "- Veceru de soníu/videu Empathy"
 
-#: ../src/empathy-av.c:134
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:152
 msgid "Empathy Audio/Video Client"
-msgstr "Veceru de soníu/vídeu Empathy"
+msgstr "Veceru de soníu/videu Empathy"
 
-#: ../src/empathy-streamed-media-window.c:479
+#: ../src/empathy-streamed-media-window.c:431
 msgid "Contrast"
 msgstr "Contraste"
 
-#: ../src/empathy-streamed-media-window.c:482
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Brightness"
 msgstr "Rellumu"
 
-#: ../src/empathy-streamed-media-window.c:485
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:590
+#: ../src/empathy-streamed-media-window.c:542
 msgid "Volume"
 msgstr "Volume"
 
-#: ../src/empathy-streamed-media-window.c:1165
+#: ../src/empathy-streamed-media-window.c:1110
 msgid "_Sidebar"
 msgstr "Barra _llateral"
 
-#: ../src/empathy-streamed-media-window.c:1185
+#: ../src/empathy-streamed-media-window.c:1130
 msgid "Audio input"
 msgstr "Entrada de soníu"
 
-#: ../src/empathy-streamed-media-window.c:1189
+#: ../src/empathy-streamed-media-window.c:1134
 msgid "Video input"
-msgstr "Entrada de vídeu"
+msgstr "Entrada de videu"
 
-#: ../src/empathy-streamed-media-window.c:1193
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Dialpad"
 msgstr "Tecláu de llamada"
 
-#: ../src/empathy-streamed-media-window.c:1198
+#: ../src/empathy-streamed-media-window.c:1151
 msgid "Details"
 msgstr "Detalles"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1267
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1672
 #, c-format
 msgid "Call with %s"
-msgstr "Llamar con %s"
+msgstr "Falar con %s"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-streamed-media-window.c:1346
-msgid "Call"
-msgstr "Llamar"
-
-#: ../src/empathy-streamed-media-window.c:1500
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:1916
 msgid "The IP address as seen by the machine"
 msgstr "La direición IP como la ve la máquina"
 
-#: ../src/empathy-streamed-media-window.c:1502
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:1918
 msgid "The IP address as seen by a server on the Internet"
 msgstr "La direición IP como la ve'l sirvidor d'Internet"
 
-#: ../src/empathy-streamed-media-window.c:1504
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:1920
 msgid "The IP address of the peer as seen by the other side"
 msgstr "La direición IP del par como la ve la otra parte"
 
-#: ../src/empathy-streamed-media-window.c:1506
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:1922
 msgid "The IP address of a relay server"
 msgstr "La direición IP d'un sirvidor d'esvíu"
 
-#: ../src/empathy-streamed-media-window.c:1508
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:1924
 msgid "The IP address of the multicast group"
 msgstr "La direición IP del grupu multicast"
 
+#: ../src/empathy-streamed-media-window.c:1843
+msgctxt "encoding video codec"
+msgid "Unknown"
+msgstr "Desconocíu"
+
+#: ../src/empathy-streamed-media-window.c:1846
+msgctxt "encoding audio codec"
+msgid "Unknown"
+msgstr "Desconocíu"
+
+#: ../src/empathy-streamed-media-window.c:1849
+msgctxt "decoding video codec"
+msgid "Unknown"
+msgstr "Desconocíu"
+
+#: ../src/empathy-streamed-media-window.c:1852
+msgctxt "decoding audio codec"
+msgid "Unknown"
+msgstr "Desconocíu"
+
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-streamed-media-window.c:2144
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Coneutáu — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2320
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2674
 msgid "Technical Details"
 msgstr "Detalles Téunicos"
 
-#: ../src/empathy-streamed-media-window.c:2358
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2712
 #, c-format
-msgid "%s's software does not understand any of the audio formats supported by your computer"
-msgstr "El software de «%s» nun atalanta dengún de los formatos de vídeu soportaos pol equipu"
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
+msgstr ""
+"El software de «%s» nun atalanta dengún de los formatos de videu soportaos "
+"pol equipu"
 
-#: ../src/empathy-streamed-media-window.c:2363
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2717
 #, c-format
-msgid "%s's software does not understand any of the video formats supported by your computer"
-msgstr "El software de «%s» nun atalanta dengún de los formatos de vídeu soportaos pol equipu"
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
+msgstr ""
+"El software de «%s» nun atalanta dengún de los formatos de videu soportaos "
+"pol equipu"
 
-#: ../src/empathy-streamed-media-window.c:2369
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2723
 #, c-format
-msgid "Can't establish a connection to %s. One of you might be on a network that does not allow direct connections."
-msgstr "Nun puede afitase una conexón con %s. Ún de los dos puede tar nuna rede que nun aceuta conexones direutes."
+msgid ""
+"Can't establish a connection to %s. One of you might be on a network that "
+"does not allow direct connections."
+msgstr ""
+"Nun puede afitase una conexón con %s. Ún de los dos puede tar nuna rede que "
+"nun aceuta conexones direutes."
 
-#: ../src/empathy-streamed-media-window.c:2375
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2729
 msgid "There was a failure on the network"
 msgstr "Hebo un fallu na rede"
 
-#: ../src/empathy-streamed-media-window.c:2379
-msgid "The audio formats necessary for this call are not installed on your computer"
-msgstr "L'equipu nun tien instalaos los formatos de soníu necesarios pa esta llamada"
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2733
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
+msgstr ""
+"L'equipu nun tien instalaos los formatos de soníu necesarios pa esta llamada"
 
-#: ../src/empathy-streamed-media-window.c:2382
-msgid "The video formats necessary for this call are not installed on your computer"
-msgstr "L'equipu nun tien instalaos los formatos de vídeu necesarios pa esta llamada"
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2736
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr ""
+"L'equipu nun tien instalaos los formatos de videu necesarios pa esta llamada"
 
-#: ../src/empathy-streamed-media-window.c:2392
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2748
 #, c-format
-msgid "Something unexpected happened in a Telepathy component. Please <a href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' window in the Help menu."
-msgstr "Asocedió daqué inesperao nun componente de Telepathy. <a href=\"%s\">Informa d'esti fallu</a> y amiesta los rexistros obteníos de la ventana de «Depuración» nel menú d'Ayuda."
+msgid ""
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+msgstr ""
+"Asocedió daqué inesperao nun componente de Telepathy. <a href=\"%s\">Informa "
+"d'esti fallu</a> y amiesta los rexistros obteníos de la ventana de "
+"«Depuración» nel menú d'Ayuda."
 
-#: ../src/empathy-streamed-media-window.c:2400
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2757
 msgid "There was a failure in the call engine"
 msgstr "Hebo un fallu nel motor de llamaes"
 
-#: ../src/empathy-streamed-media-window.c:2403
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2760
 msgid "The end of the stream was reached"
 msgstr "Aportóse al final del fluxu"
 
-#: ../src/empathy-streamed-media-window.c:2443
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2800
 msgid "Can't establish audio stream"
 msgstr "Nun puede afitase'l fluxu de soníu"
 
-#: ../src/empathy-streamed-media-window.c:2453
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2810
 msgid "Can't establish video stream"
-msgstr "Nun puede afitase'l fluxu de vídeu"
+msgstr "Nun puede afitase'l fluxu de videu"
 
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "Audio"
 msgstr "Soníu"
 
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Llamar al contautu otra vegada"
-
 #: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "Cámara apagada"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "Códec de decodificación:"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "Cámara encesa"
+msgid "Disable camera"
+msgstr "Desactivar cámara"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Códec de decodificación:"
+msgid "Display the dialpad"
+msgstr "Amosar el tecláu de llamada"
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Desactivar la cámara y dexar d'unviar vídeu"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "Códec de codificación:"
 
 #: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Activar la cámara y unviar vídeu"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Hang up"
+msgstr "Colingar"
 
 #: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Activar la cámara pero nun unviar vídeu"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Hang up current call"
+msgstr "Colingar la llamada actual"
 
 #: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Códec de codificación:"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "Candidatu llocal:"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "Colingar"
+msgid "Maximise me"
+msgstr "Maximizáime"
 
 #: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Colingar la llamada actual"
+msgid "Minimise me"
+msgstr "Minimizáime"
 
 #: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Candidatu llocal:"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "Candidatu remotu:"
 
 #: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "Vista previa"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Send Audio"
+msgstr "Unviar soníu"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "Volver a llamar"
+msgid "Send Video"
+msgstr "Unviar videu"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Candidatu remotu:"
+msgid "Show dialpad"
+msgstr "Amosar tecláu de llamada"
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "Unviar soníu"
+msgid "Start a video call"
+msgstr "Aniciar una llamada de videu"
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Conmutar la tresmisión de soníu"
+msgid "Start an audio call"
+msgstr "Aniciar una llamada de voz"
+
+#: ../src/empathy-call-window.ui.h:18
+msgid "Swap camera"
+msgstr "Intercambiar cámara"
 
 #: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "Ví_deu"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr "Conmutar la tresmisión de soníu"
 
 #: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "Vídeu"
+msgid "Toggle video transmission"
+msgstr "Conmutar la transmisión de videu"
 
 #: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "Vídeu apagáu"
-
-#: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "Vídeu encesu"
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:2307 ../src/empathy-call-window.c:2308
+#: ../src/empathy-call-window.c:2309 ../src/empathy-call-window.c:2310
+msgid "Unknown"
+msgstr "Desconocíu"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "Vista preliminar del vídeu"
+msgid "Video call"
+msgstr "Llamada de videu"
 
 #: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "_Llamar"
 
 #: ../src/empathy-call-window.ui.h:25
-#: ../src/empathy-main-window.ui.h:28
+msgid "_Camera"
+msgstr "_Ca�mara"
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:18
+msgid "_Contents"
+msgstr "�nd_iz"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
+msgid "_Debug"
+msgstr "_Depurar"
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:22
+msgid "_Help"
+msgstr "Ay_uda"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Microphone"
+msgstr "_Micro�fonu"
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "_Settings"
+msgstr "_Axustes"
+
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_Ver"
 
-#: ../src/empathy-chat-window.c:476
-#: ../src/empathy-chat-window.c:496
+#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d ensin lleer)"
 msgstr[1] "%s (%d ensin lleer)"
 
-#: ../src/empathy-chat-window.c:488
+#: ../src/empathy-chat-window.c:493
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (y otru)"
 msgstr[1] "%s (y otros %u)"
 
-#: ../src/empathy-chat-window.c:504
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d ensin lleer d'otros)"
 msgstr[1] "%s (%d ensin lleer d'otros)"
 
-#: ../src/empathy-chat-window.c:513
+#: ../src/empathy-chat-window.c:518
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d ensin lleer de toos)"
 msgstr[1] "%s (%d ensin lleer de toos)"
 
-#: ../src/empathy-chat-window.c:715
+#: ../src/empathy-chat-window.c:733
+msgid "SMS:"
+msgstr "SMS:"
+
+#: ../src/empathy-chat-window.c:743
+#, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "Unviando %d mensaxe"
+msgstr[1] "Unviando %d mensaxes"
+
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
 msgstr "Tecleando un mensaxe."
 
@@ -2995,10 +3714,6 @@ msgstr "_Llimpiar"
 msgid "C_ontact"
 msgstr "C_ontautu"
 
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Charra"
-
 #: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
 msgstr "Inxertar _fustax"
@@ -3019,11 +3734,6 @@ msgstr "Mover llingüeta a la _drecha"
 msgid "Notify for All Messages"
 msgstr "Notificar pa tolos mensaxes"
 
-#: ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window.ui.h:16
-msgid "_Contents"
-msgstr "�nd_iz"
-
 #: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "_Conversación"
@@ -3032,20 +3742,10 @@ msgstr "_Conversación"
 msgid "_Detach Tab"
 msgstr "_Desacoplar llingüeta"
 
-#: ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window.ui.h:18
-msgid "_Edit"
-msgstr "_Editar"
-
 #: ../src/empathy-chat-window.ui.h:13
 msgid "_Favorite Chat Room"
 msgstr "Sala de charra _favorita"
 
-#: ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window.ui.h:20
-msgid "_Help"
-msgstr "Ay_uda"
-
 #: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "Llingüeta _siguiente"
@@ -3054,8 +3754,7 @@ msgstr "Llingüeta _siguiente"
 msgid "_Previous Tab"
 msgstr "Llingüeta _anterior"
 
-#: ../src/empathy-chat-window.ui.h:17
-#: ../src/empathy-status-icon.ui.h:5
+#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
 msgid "_Show Contact List"
 msgstr "_Amosar llista de contautos"
 
@@ -3067,15 +3766,15 @@ msgstr "_Llingüetes"
 msgid "_Undo Close Tab"
 msgstr "_Desfacer Zarrar Llingüeta"
 
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
 msgstr "Sala"
 
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "Autoconeutar"
 
@@ -3083,92 +3782,95 @@ msgstr "Autoconeutar"
 msgid "Manage Favorite Rooms"
 msgstr "Xestionar sales favorites"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming video call"
-msgstr "Llamada de vídeu entrante"
+msgstr "Llamada de videu entrante"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming call"
 msgstr "Llamada entrante"
 
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:525
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
-msgstr "%s ta llamándote con vídeu. ¿Quies responder?"
+msgstr "%s ta llamándote con videu. ¿Quies responder?"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s ta llamándote. ¿Quies responder?"
 
-#: ../src/empathy-event-manager.c:515
-#: ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Llamada entrante de %s"
 
-#: ../src/empathy-event-manager.c:540
+#: ../src/empathy-event-manager.c:554
 msgid "_Reject"
 msgstr "_Refugar"
 
-#: ../src/empathy-event-manager.c:546
+#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
 msgid "_Answer"
 msgstr "Re_mpuesta"
 
-#: ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:570
+msgid "_Answer with video"
+msgstr "_Responder con videu"
+
+#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
 #, c-format
 msgid "Incoming video call from %s"
-msgstr "Llamada de vídeu entrante de %s"
+msgstr "Llamada de videu entrante de %s"
 
-#: ../src/empathy-event-manager.c:737
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
 msgstr "Invitación a una sala"
 
-#: ../src/empathy-event-manager.c:739
+#: ../src/empathy-event-manager.c:838
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Invitación pa xunise a %s"
 
-#: ../src/empathy-event-manager.c:746
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s ta invitándote a xunite a %s"
 
-#: ../src/empathy-event-manager.c:754
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
 msgstr "_Refugar"
 
-#: ../src/empathy-event-manager.c:759
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Xunise"
 
-#: ../src/empathy-event-manager.c:786
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s invitóte a xunite a %s"
 
-#: ../src/empathy-event-manager.c:792
+#: ../src/empathy-event-manager.c:891
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Invitaronte a xunite a %s"
 
-#: ../src/empathy-event-manager.c:843
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Tresferencia de ficheru entrante de %s"
 
-#: ../src/empathy-event-manager.c:1013
-#: ../src/empathy-main-window.c:367
+#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
 msgid "Password required"
-msgstr "Requierse contraseña"
+msgstr "Necesítase contraseña"
 
-#: ../src/empathy-event-manager.c:1069
+#: ../src/empathy-event-manager.c:1190
 #, c-format
 msgid "%s would like permission to see when you are online"
-msgstr "%s quier que-y deas permisu pa ver cuando tas disponible"
+msgstr "%s quier tener permisu pa ver cuándo tas en llinia"
 
-#: ../src/empathy-event-manager.c:1073
+#: ../src/empathy-event-manager.c:1194
 #, c-format
 msgid ""
 "\n"
@@ -3178,108 +3880,101 @@ msgstr ""
 "Mensax: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:100
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:102
+#: ../src/empathy-ft-manager.c:103
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:179
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Desconocíu"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s de %s en %s/s"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:275
 #, c-format
 msgid "%s of %s"
 msgstr "%s de %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:305
+#: ../src/empathy-ft-manager.c:306
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Recibiendo «%s» de %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:309
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Unviando «%s» a %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:338
+#: ../src/empathy-ft-manager.c:339
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Fallu al recibir «%s» de %s"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:342
 msgid "Error receiving a file"
 msgstr "Fallu al recibir un ficheru"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:347
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Fallu al unviar «%s» a %s"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:350
 msgid "Error sending a file"
 msgstr "Fallu al unviar un ficheru"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:489
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "«%s» recibíu de %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:493
+#: ../src/empathy-ft-manager.c:494
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "«%s» unviáu a %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:497
 msgid "File transfer completed"
 msgstr "Transferencia de ficheru completada"
 
-#: ../src/empathy-ft-manager.c:615
-#: ../src/empathy-ft-manager.c:782
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
 msgid "Waiting for the other participant's response"
 msgstr "Esperando la rempuesta del otru participante"
 
-#: ../src/empathy-ft-manager.c:641
-#: ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Comprobando la integridá de «%s»"
 
-#: ../src/empathy-ft-manager.c:644
-#: ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Obteniendo'l «hash» de «%s»"
 
-#: ../src/empathy-ft-manager.c:1016
-msgid "%"
-msgstr "%"
-
-#: ../src/empathy-ft-manager.c:1028
+#: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "Ficheru"
 
-#: ../src/empathy-ft-manager.c:1050
+#: ../src/empathy-ft-manager.c:1060
 msgid "Remaining"
 msgstr "Restantes"
 
@@ -3289,11 +3984,17 @@ msgstr "Tresferencies de ficheros"
 
 #: ../src/empathy-ft-manager.ui.h:2
 msgid "Remove completed, canceled and failed file transfers from the list"
-msgstr "Desaniciar tresferencies de ficheru completaes, encaboxaes y fallíes de la llista"
+msgstr ""
+"Desaniciar tresferencies de ficheru completaes, encaboxaes y fallíes de la "
+"llista"
 
 #: ../src/empathy-import-dialog.c:84
-msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin."
-msgstr "Nun pudo atopase denguna cuenta qu'importar. Anguaño Empathy namái sofita importar cuentes dende Pidgin."
+msgid ""
+"No accounts to import could be found. Empathy currently only supports "
+"importing accounts from Pidgin."
+msgstr ""
+"Nun pudo atopase denguna cuenta qu'importar. Anguaño Empathy namái sofita "
+"importar cuentes dende Pidgin."
 
 #: ../src/empathy-import-dialog.c:199
 msgid "Import Accounts"
@@ -3312,127 +4013,142 @@ msgstr "Protocolu"
 msgid "Source"
 msgstr "Orixe"
 
-#: ../src/empathy-main-window.c:384
+#: ../src/empathy-main-window.c:392
 msgid "Provide Password"
-msgstr "Escribi la contraseña"
+msgstr "Introduz la contraseña"
 
-#: ../src/empathy-main-window.c:390
+#: ../src/empathy-main-window.c:398
 msgid "Disconnect"
 msgstr "Desconeutar"
 
-#: ../src/empathy-main-window.c:530
+#: ../src/empathy-main-window.c:622
 msgid "No match found"
 msgstr "Nun s'alcontró denguna coincidencia"
 
-#: ../src/empathy-main-window.c:685
+#: ../src/empathy-main-window.c:777
 msgid "Reconnect"
 msgstr "Reconeutar"
 
-#: ../src/empathy-main-window.c:691
+#: ../src/empathy-main-window.c:783
 msgid "Edit Account"
 msgstr "Editar cuenta"
 
-#: ../src/empathy-main-window.c:697
+#: ../src/empathy-main-window.c:789
 msgid "Close"
 msgstr "Zarrar"
 
-#: ../src/empathy-main-window.c:1414
+#. Translators: this string will be something like:
+#. *   Top up My Account ($1.23)..."
+#: ../src/empathy-main-window.c:928
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr "Recargar %s (%s)…"
+
+#: ../src/empathy-main-window.c:975
+msgid "Top up account credit"
+msgstr "Recargar el saldu de la cuenta"
+
+#. top up button
+#: ../src/empathy-main-window.c:1046
+msgid "Top Up..."
+msgstr "Recargar…"
+
+#: ../src/empathy-main-window.c:1789
 msgid "Contact"
 msgstr "Contautu"
 
-#: ../src/empathy-main-window.c:1748
+#: ../src/empathy-main-window.c:2119
 msgid "Contact List"
 msgstr "Llista de contautos"
 
-#: ../src/empathy-main-window.c:1862
-msgid "Show and edit accounts"
-msgstr "Amosar y editar cuentes"
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "Contautos nel _mapa"
 
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-main-window-menubar.ui.h:2
+msgid "Credit Balance"
+msgstr "Créditu"
+
+#: ../src/empathy-main-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "Guetar na_llista de contautos"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "Xunise a _favorites"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "Xestionar favoritos"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "Tamañ_u normal"
 
-#: ../src/empathy-main-window.ui.h:6
-#: ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "_Llamada nueva..."
 
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "Tamañu normal con _avatares"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "_Preferencies"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "Amosar p_rotocolos"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "Axeitar por _Nome"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "Axeitar por _estáu"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Cuentes"
 
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window-menubar.ui.h:15
+msgid "_Blocked Contacts"
+msgstr "Contautos _bloquiaos"
+
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "Tamañu _compautu"
 
-#: ../src/empathy-main-window.ui.h:17
-msgid "_Debug"
-msgstr "_Depurar"
-
-#: ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "Tres_ferencies de ficheros"
 
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "_Xunise…"
 
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window-menubar.ui.h:24
 #: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "Conversación _nueva…"
 
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "Contautos _desconeutaos"
 
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "Información p_ersonal"
 
-#: ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "_Sala"
 
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:29
 msgid "_Search for Contacts…"
-msgstr "_Guetar contautos…"
+msgstr "Guetar contauto_s…"
 
 #: ../src/empathy-new-chatroom-dialog.c:337
 msgid "Chat Room"
@@ -3444,7 +4160,7 @@ msgstr "Miembros"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:565
+#: ../src/empathy-new-chatroom-dialog.c:553
 #, c-format
 msgid ""
 "%s\n"
@@ -3457,16 +4173,16 @@ msgstr ""
 "Necesita contraseña: %s\n"
 "Miembros: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:567
-#: ../src/empathy-new-chatroom-dialog.c:568
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "No"
 msgstr "Non"
 
-#: ../src/empathy-new-chatroom-dialog.c:596
+#: ../src/empathy-new-chatroom-dialog.c:584
 msgid "Could not start room listing"
 msgstr "Nun pudo aniciase la llista de la sala"
 
-#: ../src/empathy-new-chatroom-dialog.c:606
+#: ../src/empathy-new-chatroom-dialog.c:594
 msgid "Could not stop room listing"
 msgstr "Nun pudo parase la llista de la sala"
 
@@ -3475,12 +4191,19 @@ msgid "Couldn't load room list"
 msgstr "Nun pudo cargase la llista de la sala"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
-msgid "Enter the room name to join here or click on one or more rooms in the list."
-msgstr "Introduza'l nome de la sala a la que xunise o calca una o más sales de la llista."
+msgid ""
+"Enter the room name to join here or click on one or more rooms in the list."
+msgstr ""
+"Introduz el nome de la sala a la que xunise o calca nuna o más sales de la "
+"llista."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
-msgid "Enter the server which hosts the room, or leave it empty if the room is on the current account's server"
-msgstr "Introduza'l sirvidor qu'agospia la sala o déxelu baleru si la sala ta na cuenta del sirvidor actual"
+msgid ""
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account's server"
+msgstr ""
+"Introduz el sirvidor qu'agospia la sala o déxalu baleru si la sala ta na "
+"cuenta del sirvidor actual"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid "Join Room"
@@ -3494,39 +4217,79 @@ msgstr "Llista de sales"
 msgid "_Room:"
 msgstr "_Sala:"
 
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr "Mensax recibíu"
 
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr "Mensax unviáu"
 
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
 msgstr "Conversación nueva"
 
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
 msgstr "El contautu conéutase"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
 msgstr "El contautu desconéutase"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
 msgstr "Cuenta coneutada"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
 msgstr "Cuenta desconeutada"
 
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr "Llingua"
 
-#: ../src/empathy-preferences.c:875
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:734
+msgid "Juliet"
+msgstr "Xulieta"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:741
+msgid "Romeo"
+msgstr "Roméu"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:747
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr "¡Oh, Roméu, Roméu!, ¿Au tas que nun te veo?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:750
+msgid "Deny thy father and refuse thy name;"
+msgstr "Niega a to padre y refuga'l so nome;"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:753
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr "O, si nun quies, namái xúrame que m'ames"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:756
+msgid "And I'll no longer be a Capulet."
+msgstr "Y dexaré yo de ser una Capuleto"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:759
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr "¿Tengo d'oyir más o retrucar a lo dicho?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:762
+msgid "Juliet has disconnected"
+msgstr "Xulieta desconeutóse"
+
+#: ../src/empathy-preferences.c:1166
 msgid "Preferences"
 msgstr "Preferencies"
 
@@ -3534,128 +4297,150 @@ msgstr "Preferencies"
 msgid "Appearance"
 msgstr "Aspeutu"
 
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
 msgstr "Furrulamientu"
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
 msgid "Chat Th_eme:"
 msgstr "_Tema de la charra:"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
 msgid "Disable notifications when _away or busy"
 msgstr "Desactivar notificaciones al _ausentase o tar ocupáu"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
 msgid "Disable sounds when _away or busy"
 msgstr "Desactivar soníos al _ausentase o tar ocupáu"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
-msgstr "Amsar los eventos entrantes nel área de notificación"
+msgstr "Amosar los eventos entrantes nel área de notificación"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
 msgid "Enable notifications when a contact comes online"
 msgstr "Activar notificaciones cuando un contautu se coneuta"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact goes offline"
 msgstr "Activar notificaciones cuando un contautu se desconeuta"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Activar notificaciones cuando la _charra nun tea el focu"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable spell checking for languages:"
 msgstr "Activar la igua ortográfica pa idiomes:"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:13
 msgid "General"
 msgstr "Xeneral"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
+msgid "Input level"
+msgstr "Nivel d'entrada"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input volume"
+msgstr "Volume d'entrada"
+
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location sources:"
 msgstr "Oríxenes de los allugamientos:"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:18
 msgid "Log conversations"
 msgstr "Rexistrar conversaciones"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:19
 msgid "Notifications"
 msgstr "Notificaciones"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:20
 msgid "Play sound for events"
 msgstr "Reproducir soníu pa eventos"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:21
 msgid "Privacy"
 msgstr "Privacidá"
 
-#: ../src/empathy-preferences.ui.h:18
-msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published.  GPS coordinates will be accurate to 1 decimal place."
-msgstr "Amenorgar la precisión de l'allugamientu significa que nun s'espublizará res más preciso que la so ciudá, estáu y país. Les coordenaes GPS tendrán un valor al debalu amestando 1 llugar decimal."
+#: ../src/empathy-preferences.ui.h:22
+msgid ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
+msgstr ""
+"Amenorgar la precisión de l'allugamientu significa que nun s'espublizará res "
+"más preciso que la so ciudá, estáu y país. Les coordenaes GPS tendrán un "
+"valor al debalu amestando 1 llugar decimal."
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:23
 msgid "Show _smileys as images"
 msgstr "Amosar los _fustaxes como imáxenes"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show contact _list in rooms"
 msgstr "Amosar _llista de contautos en sales"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:25
 msgid "Sounds"
 msgstr "Soníos"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:26
 msgid "Spell Checking"
 msgstr "Revisión ortográfica"
 
-#: ../src/empathy-preferences.ui.h:23
-msgid "The list of languages reflects only the languages for which you have a dictionary installed."
-msgstr "La llista d'idiomes amuesa sólo los idiomes pa los que tienes un diccionariu instaláu."
+#: ../src/empathy-preferences.ui.h:27
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"La llista d'idiomes amuesa sólo los idiomes pa los que tienes un diccionariu "
+"instaláu."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:28
 msgid "Themes"
 msgstr "Temes"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:29
+msgid "Variant:"
+msgstr "Variante:"
+
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Automatically connect on startup"
 msgstr "C_oneutase automáticamente al entamu"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Cellphone"
 msgstr "Teléfonu _móvil"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Enable bubble notifications"
 msgstr "_Activar notificaciones de burbuxa"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable sound notifications"
 msgstr "_Activar notificaciones de soníu"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:34
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:35
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Rede (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Open new chats in separate windows"
 msgstr "_Abrir charres nueves en ventanes separtaes"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Publish location to my contacts"
 msgstr "_Espublizar la mio ubicación a los mios contautos"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:39
 msgid "_Reduce location accuracy"
 msgstr "_Amenorgar la precisión de la ubicación"
 
@@ -3667,158 +4452,398 @@ msgstr "Estáu"
 msgid "_Quit"
 msgstr "_Colar"
 
-#: ../src/empathy-map-view.c:453
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "Llamar al contautu otra vegada"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "Cámara apagada"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "Cámara encesa"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "Desactivar la cámara y dexar d'unviar videu"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "Activar la cámara y unviar videu"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "Activar la cámara pero nun unviar videu"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "Vista previa"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "Volver a llamar"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "Vi_deu"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "Videu apagáu"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "Videu encesu"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "Vista preliminar del videu"
+
+#: ../src/empathy-map-view.c:448
 msgid "Contact Map View"
 msgstr "Vista del mapa de contautos"
 
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
 msgid "Save"
 msgstr "Guardar"
 
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
 msgstr "Depurar ventana"
 
-#: ../src/empathy-debug-window.c:1474
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
 msgstr "Posar"
 
-#: ../src/empathy-debug-window.c:1486
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
 msgstr "Nivel "
 
-#: ../src/empathy-debug-window.c:1506
+#: ../src/empathy-debug-window.c:1549
 msgid "Debug"
 msgstr "Depurar"
 
-#: ../src/empathy-debug-window.c:1512
+#: ../src/empathy-debug-window.c:1555
 msgid "Info"
 msgstr "Información"
 
-#: ../src/empathy-debug-window.c:1518
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
 msgid "Message"
 msgstr "Mensax"
 
-#: ../src/empathy-debug-window.c:1524
+#: ../src/empathy-debug-window.c:1567
 msgid "Warning"
 msgstr "Avisu"
 
-#: ../src/empathy-debug-window.c:1530
+#: ../src/empathy-debug-window.c:1573
 msgid "Critical"
 msgstr "Críticu"
 
-#: ../src/empathy-debug-window.c:1536
+#: ../src/empathy-debug-window.c:1579
 msgid "Error"
 msgstr "Error"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:1598
 msgid "Time"
 msgstr "Hora"
 
-#: ../src/empathy-debug-window.c:1558
+#: ../src/empathy-debug-window.c:1601
 msgid "Domain"
 msgstr "Dominiu"
 
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
 msgstr "Categoría"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "Nivel"
 
-#: ../src/empathy-debug-window.c:1599
-msgid "The selected connection manager does not support the remote debugging extension."
-msgstr "El xestor de conexones escoyíu nun sofita la estensión de depuración remota."
+#: ../src/empathy-debug-window.c:1642
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr ""
+"El xestor de conexones escoyíu nun sofita la estensión de depuración remota."
 
-#: ../src/empathy-invite-participant-dialog.c:34
-#: ../src/empathy-invite-participant-dialog.c:48
+#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:231
 msgid "Invite Participant"
 msgstr "Convidar participante"
 
-#: ../src/empathy-invite-participant-dialog.c:35
+#: ../src/empathy-invite-participant-dialog.c:206
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Escoyer un contautu pa convidalu a la conversación:"
 
-#: ../src/empathy-invite-participant-dialog.c:45
+#: ../src/empathy-invite-participant-dialog.c:227
 msgid "Invite"
 msgstr "Invitar"
 
-#: ../src/empathy-accounts.c:178
+#: ../src/empathy-accounts.c:183
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr "Nun amosar dengún diálogu; facer cualesquier trabayuo (ex. importar) y colar"
+msgstr ""
+"Nun amosar dengún diálogu; facer cualesquier trabayuo (ex. importar) y colar"
 
-#: ../src/empathy-accounts.c:182
-msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
-msgstr "Nun amosar dengún diálogu a nun ser que sólo esistan cuentes «Xente cerca»"
+#: ../src/empathy-accounts.c:187
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr ""
+"Nun amosar dengún diálogu a nun ser que sólo esistan cuentes «Xente cerca»"
 
-#: ../src/empathy-accounts.c:186
+#: ../src/empathy-accounts.c:191
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr "Cuenta proporcionada inicialmente, seleicionada (ej. gabble/jabber/exemplu)"
+msgstr ""
+"Cuenta proporcionada inicialmente, seleicionada (ej. gabble/jabber/exemplu)"
 
-#: ../src/empathy-accounts.c:188
+#: ../src/empathy-accounts.c:193
 msgid "<account-id>"
 msgstr "<id-de-cuenta>"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:198
 msgid "- Empathy Accounts"
 msgstr ": Cuentes en Empathy"
 
-#: ../src/empathy-accounts.c:232
+#: ../src/empathy-accounts.c:237
 msgid "Empathy Accounts"
 msgstr "Cuentes n'Empathy"
 
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr "Amosar un serviciu en particular"
+
+#: ../src/empathy-debugger.c:75
+msgid "- Empathy Debugger"
+msgstr "- Depurador d'Empathy"
+
+#: ../src/empathy-debugger.c:114
 msgid "Empathy Debugger"
 msgstr "Depurador d'Empathy"
 
-#: ../src/empathy-chat.c:104
+#: ../src/empathy-chat.c:107
 msgid "- Empathy Chat Client"
 msgstr "- Veceru de Chat Empathy"
 
-#: ../src/empathy-notifications-approver.c:184
+#: ../src/empathy-notifications-approver.c:203
 msgid "Respond"
 msgstr "Responder"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:217
 msgid "Reject"
 msgstr "Refugar"
 
-#: ../src/empathy-notifications-approver.c:194
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:227
 msgid "Answer"
 msgstr "Rempuesta"
 
-#: ../src/empathy-notifications-approver.c:201
-#: ../src/empathy-notifications-approver.c:211
+#: ../src/empathy-notifications-approver.c:227
+msgid "Answer with video"
+msgstr "Responder con videu"
+
+#: ../src/empathy-notifications-approver.c:235
+#: ../src/empathy-notifications-approver.c:245
 msgid "Decline"
 msgstr "Refugar"
 
-#: ../src/empathy-notifications-approver.c:205
-#: ../src/empathy-notifications-approver.c:216
+#: ../src/empathy-notifications-approver.c:239
+#: ../src/empathy-notifications-approver.c:250
 msgid "Accept"
 msgstr "Aceutar"
 
+#: ../src/empathy-notifications-approver.c:260
+msgid "Provide"
+msgstr "Apurrir"
+
+#: ../src/empathy-call-observer.c:134
+#, c-format
+msgid "%s just tried to call you, but you were in another call."
+msgstr "%s intentó llamate, pero tabes n'otra llamada."
+
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1036 ../src/empathy-call-window.c:1059
+msgid "i"
+msgstr "i"
+
+#: ../src/empathy-call-window.c:2603
+msgid "On hold"
+msgstr "N'espera"
+
+#: ../src/empathy-call-window.c:2606
+msgid "Mute"
+msgstr "Silenciar"
+
+#: ../src/empathy-call-window.c:2608
+msgid "Duration"
+msgstr "Duracio�n"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2611
+#, c-format
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02dm"
+
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "Concasar _Mayúscules"
+
+#~ msgid "%s is sending you a file. Do you want to accept it?"
+#~ msgstr "%s ta unviándote un ficheru. ¿Quies aceutalu?"
+
+#~ msgid "_Accept"
+#~ msgstr "_Aceutar"
+
 #~ msgid "Empathy has asked about importing accounts"
 #~ msgstr "Empathy entrugó-y tocante a importar cuentes"
-#~ msgid ""
-#~ "Whether Empathy has asked about importing accounts from other programs."
-#~ msgstr ""
-#~ "Indica si Empathy entrugó tocante a importar cuentes d'otros programes."
+
 #~ msgid "The hash of the received file and the sent one do not match"
 #~ msgstr "El «hash» del ficheru recibíu y del unviáu no concasen"
+
+#~ msgid "All"
+#~ msgstr "Too"
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ msgid "Conversations"
+#~ msgstr "Conversaciones"
+
+#~ msgid "Previous Conversations"
+#~ msgstr "Conversaciones anteriores"
+
+#~ msgid "_For:"
+#~ msgstr "_Pa:"
+
+#~ msgid "Enter Custom Message"
+#~ msgstr "Introducir mensaxe personalizáu"
+
 #~ msgid "Add _New Preset"
 #~ msgstr "Amestar está_u guardáu"
+
 #~ msgid "Saved Presets"
 #~ msgstr "Estaos guardaos"
-#~ msgid "%s is now offline."
-#~ msgstr "Agora %s ta desconeutáu."
-#~ msgid "%s is now online."
-#~ msgstr "Agora %s ta coneutáu."
-#~ msgid "Context"
-#~ msgstr "Contestu"
+
+#~ msgid "Show and edit accounts"
+#~ msgstr "Amosar y editar cuentes"
+
+#~ msgid ""
+#~ "Whether Empathy has asked about importing accounts from other programs."
+#~ msgstr ""
+#~ "Indica si Empathy entrugó tocante a importar cuentes d'otros programes."
+
+#~ msgid "Match case"
+#~ msgstr "Sensible mayúscules"
+
 #~ msgid "Show incoming messages in the messaging menu"
 #~ msgstr "Amuesa los mensaxes entrantes nel menú de mensaxes"
-#~ msgid "Subscription requested by %s"
-#~ msgstr "Petición de soscrición de %s"
 
+#~ msgid "_Add…"
+#~ msgstr "_Amestar…"
+
+#~ msgid "_Enabled"
+#~ msgstr "_Activáu"
+
+#~ msgid "Meta-contact containing %u contact"
+#~ msgid_plural "Meta-contact containing %u contacts"
+#~ msgstr[0] "Meta-contautu que contien %u contautu"
+#~ msgstr[1] "Meta-contautu que contien %u contautos"
+
+#~ msgid "Find Next"
+#~ msgstr "Guetar siguiente"
+
+#~ msgid "Find Previous"
+#~ msgstr "Guetar anterior"
+
+#~ msgid "The identity provided by the chat server cannot be verified.\n"
+#~ msgstr "La identidá que conseñó'l sirvidor de charres nun pue verificase.\n"
+
+#~ msgid "The certificate does not have the expected fingerprint"
+#~ msgstr "El certificáu nun tien la buelga esperada"
+
+#~ msgid "The certificate hasn't yet been activated"
+#~ msgstr "El certificáu entá nun s'activó"
+
+#~ msgid "The certificate has expired"
+#~ msgstr "El certificáu caducó"
+
+#~ msgid "The certificate is cryptographically weak"
+#~ msgstr "El certificáu ye feble criptográficamente"
+
+#~ msgid ""
+#~ "The certificate has been revoked by the issuing Certification Authority"
+#~ msgstr ""
+#~ "El certificáu ta revocáu pola Autoridá de Certificación que lu asoleyó"
+
+#~ msgid "The certificate is self-signed"
+#~ msgstr "El certificáu ta auto-robláu"
+
+#~ msgid ""
+#~ "The hostname verified by the certificate doesn't match the server name"
+#~ msgstr ""
+#~ "El nome de host comprobáu pol certificáu nun concasa col nome del sirvidor"
+
+#~ msgid "Don't display any dialogs if there are any non-Salut accounts"
+#~ msgstr "Nun amosar dengún diálogu si hai dalguna cuenta non-Salut"
+
+#~ msgid "The certificate is malformed"
+#~ msgstr "El certificáu ta mal formáu"
+
+#~ msgid "The certificate length exceeds verifiable limits"
+#~ msgstr "La llonxitú del certificáu perpasa les llendes comprobables"
+
+#~ msgid ""
+#~ "Completely split the displayed meta-contact into the contacts it contains."
+#~ msgstr ""
+#~ "Separtar dafechu la información de los metacontautos nos contautos que "
+#~ "contién."
+
+#~ msgid ""
+#~ "Are you sure you want to unlink this meta-contact? This will completely "
+#~ "split the meta-contact into the contacts it contains."
+#~ msgstr ""
+#~ "¿Daveres quies desenllazar esti metacontautu? Esto va separtar dafechu la "
+#~ "información del metacontautu nos contautos que contién."
+
+#~ msgid "The certificate is not signed by a Certification Authority"
+#~ msgstr "El certificáu nun ta robláu por una Autoridá de certificación"
+
+#~ msgid "Unlink meta-contact '%s'?"
+#~ msgstr "¿Desenllazar el metacontautu «%s»?"
+
+#~ msgid "Call with %d participants"
+#~ msgstr "Llamar con %d participantes"
+
+#~ msgid "Your software is too old"
+#~ msgstr "El software ye enforma antiguu"
+
+#~ msgid "Are you sure you want to remove '%s' from your contacts?"
+#~ msgstr "¿De xuru que quies desaniciar a «%s» de los tos contautos?"
+
+#~ msgid "Update software..."
+#~ msgstr "Anovar software..."
+
+#~ msgid "Unavailable"
+#~ msgstr "Non disponible"
+
+#~ msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+#~ msgstr "Nun puen usase %s cuentes hasta que'l software %s nun tea anováu."
+
+#~ msgid "Off"
+#~ msgstr "Desactiváu"
+
+#~ msgid "On"
+#~ msgstr "Activáu"
+
+#~ msgid ""
+#~ "Blocking will only block calls and chats on the following account: %s. It "
+#~ "will not block calls and chats on %s."
+#~ msgid_plural ""
+#~ "Blocking will only block calls and chats on the following accounts: %s. "
+#~ "It will not block calls and chats on %s."
+#~ msgstr[0] ""
+#~ "El bloquéu, namái va bloquiar les llamaes y charres na siguiente cuenta: "
+#~ "%s. Esto nun va bloquiar llamaes y charres en %s."
+#~ msgstr[1] ""
+#~ "El bloquéu, namái va bloquiar les llamaes y charres nes siguientes "
+#~ "cuentes: %s. Esto nun va bloquiar llamaes y charres en %s."
diff --git a/po/be.po b/po/be.po
index 6b2af739b..cb142d2b7 100644
--- a/po/be.po
+++ b/po/be.po
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-25 19:13+0300\n"
-"PO-Revision-Date: 2011-08-25 19:12+0300\n"
+"POT-Creation-Date: 2011-09-17 23:46+0300\n"
+"PO-Revision-Date: 2011-09-17 23:46+0300\n"
 "Last-Translator: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>\n"
 "Language-Team: Belarusian <be-i18n-gnome@googlegroups.com>\n"
 "Language: be\n"
@@ -26,15 +26,15 @@ msgstr "Empathy"
 
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
-msgstr "Праграма абмену паведамленн�мі Empathy"
+msgstr "Інт�рн�т-камунікатар Empathy"
 
 #: ../data/empathy.desktop.in.in.h:4
 msgid "IM Client"
-msgstr "Кліент абмену паведамленн�мі"
+msgstr "Інт�рн�т-камунікатар"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
-msgstr "Заў�ёды адчын�ць новае акно дл� новага чату."
+msgstr "Заў�ёды адкрываць новае акно дл� новага чату."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
 msgid "Call volume"
@@ -49,6 +49,10 @@ msgid "Camera device"
 msgstr "Пры�та�аванне від�акамеры"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "Разм�шч�нне від�акамеры"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -56,56 +60,56 @@ msgstr ""
 "Знак, �кі тр�ба ў�таўл�ць па�л� м�нушкі пры �е дапаўненні клавішай Тab у "
 "групавым чаце."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "Матыў акна чату"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Chat window theme variant"
 msgstr "�дмена матыва акна чату"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "Спі� моў дл� праверкі арфаграфіі, падзеленых ко�камі (напрыклад, \"en, be, ru"
 "\")."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "Кампактны �пі� кантактаў"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "Тр�ба выкары�тоўваць кіраўнікоў злуч�нн�ў"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "Крыт�рый �артаванн� �пі�а кантактаў"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr ""
 "Прадвызначанае пры�та�аванне від�акамеры дл� від�аразмоў, напрыклад \"/dev/"
 "video0\"."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
 msgstr "Прадвызначаны каталог дл� выбару аватар"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr "�е паказваць выплыўны� апав�шч�нні ў р�жыме ад�утна�ці"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr "�е ўжываць гукавы� �ігналы ў р�жыме ад�утна�ці"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
 msgstr "Паказваць уваходны� падзеі ў абшары �тану"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -113,246 +117,250 @@ msgstr ""
 "Паказваць уваходны� падзеі ў абшары �тану. Калі выключана, адразу паказваць "
 "іх кары�тальніку."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Echo cancellation support"
 msgstr "Падтрымка фільтрацыі р�ха"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr "Empathy можа публікаваць ме�цазнаходжанне кары�тальніка"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy можа выкары�тоўваць GPS дл� вызнач�нн� ме�цазнаходжанн�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr ""
 "Empathy можа выкары�тоўваць �отавую �етку дл� вызнач�нн� ме�цазнаходжанн�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy можа выкары�тоўваць �етку дл� вызнач�нн� ме�цазнаходжанн�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr "Прадвызначана� папка дл� �ц�гнутых файлаў"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
 msgstr "Empathy выканала міграцыю журналаў Butterfly (кіраўніка злуч�нн�ў MSN)"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr ""
 "Empathy му�іць аўтаматычна пераходзіць у р�жым ад�утна�ці пры б�здзейна�ці"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy му�іць аўтаматычна злучацца пры запу�ку"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy му�іць пагаршаць дакладна�ць ме�цазнаходжанн�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy му�іць выкары�тоўваць аватару кантакта �к значок дл� акна чату"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr "Уключыць прылады ра�працоўшчыка WebKit"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "Ужываць выплыўны� апав�шч�нні дл� новых паведамленн�ў"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "Прав�раць арфаграфію"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "Схаваць галоўнае акно"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "Схаваць галоўнае акно."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "Знак па�л� дапоўненай м�нушкі"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
-msgstr "�дчын�ць новы� чаты ў а�обных вокнах"
+msgstr "�дкрываць новы� чаты ў а�обных вокнах"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "Сцежка да патр�бнага матыва Adium"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "Сцежка да патр�бнага матыва Adium, калі дл� чату ўжыты матыў Adium."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "�гучваць уваходны� паведамленні"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "�гучваць з'�ўленне новых размоў"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "�гучваць выхадны� паведамленні"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "�гучваць уваход кантакта ў �етку"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "�гучваць выхад кантакта з �еткі"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "�гучваць злуч�нне з �еткай"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "�гучваць адлуч�нне ад �еткі"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Ужываць выплыўны� апав�шч�нні, калі чат не мае фоку�у"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "Ужываць выплыўны� апав�шч�нні дл� ўваходу кантакта ў �етку"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "Ужываць выплыўны� апав�шч�нні дл� выхаду кантакта з �еткі"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr "Разм�шч�нне карцінкі з від�акамеры падча� званка."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Show Balance in contact list"
 msgstr "Паказваць балан� рахунку у �пі�е кантактаў"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "Паказваць аватары"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "Паказваць �пі� кантактаў у пако�х"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
-msgstr "Паказваць падказку пры зачыненні галоўнага акна"
+msgstr "Паказваць падказку пры закрыцці галоўнага акна"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr "Паказваць паза�еткавы� кантакты"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
-msgstr "Паказваць пратаколы"
+msgstr "Паказваць інфармацыю аб пратаколе"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "Мовы дл� праверкі арфаграфіі"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr "Прадвызначана� папка дл� захаванн� атрыманых файлаў."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
 msgstr "�пошні каталог, з �кога была выбрана аватара."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
 msgstr "Разм�шч�нне бакавога абшару ў акне чату"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "Захаванае разм�шч�нне бакавога абшару ў акне чату (у пік�елах)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Матыў афармленн� размоў у вокнах чату."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr "�дмена матыва афармленн� размоў у вокнах чату."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Ужываць графічны� �майлікі"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "�гучваць апав�шч�нні"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "Ужываць матыў дл� пако�ў чату"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr ""
 "Ці можа Empathy паведамл�ць аб ме�цазнаходжанні кары�тальніка �го кантактам."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Ці можа Empathy выкары�тоўваць GPS дл� вызнач�нн� ме�цазнаходжанн�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
 "Ці можа Empathy выкары�тоўваць �отавую �етку дл� вызнач�нн� ме�цазнаходжанн�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Ці можа Empathy выкары�тоўваць �етку дл� вызнач�нн� ме�цазнаходжанн�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr ""
 "Ці выканаў Empathy міграцыю журналаў Butterfly (кіраўніка злуч�нн�ў MSN)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Ці му�іць Empathy аўтаматычна злучацца з �еткамі пры запу�ку."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
 "Ці му�іць Empathy аўтаматычна пераходзіць у р�жым ад�утна�ці пры "
 "б�здзейна�ці кары�тальніка."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 "Ці му�іць Empathy пагаршаць дакладна�ць ме�цазнаходжанн� кары�тальніка дзел� "
 "абароны �го права на прыватна�ць."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "Ці му�іць Empathy выкары�тоўваць аватару кантакта �к значок акна чату."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Ці тр�ба ўключыць прылады ра�працоўшчыка WebKit (напрыклад, Web Inspector)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
@@ -360,122 +368,122 @@ msgstr ""
 "Ці тр�ба выкары�тоўваць кіраўнікоў злуч�нн�ў дл� аўтаматычнага адлуч�нн�/"
 "перазлуч�нн�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr ""
 "Ці тр�ба прав�раць арфаграфію напі�аных �лоў па �пі�е магчымых моў т�к�ту."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "Ці тр�ба пераўтвараць �майлікі ў графічны� вы�вы ў т�к�це размоў."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr "Ці тр�ба ўключыць фільтрацыю р�ха Pulseaudio."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "Ці тр�ба агучваць уваход кантактаў у �етку."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "Ці тр�ба агучваць выхад кантактаў з �еткі."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "Ці тр�ба агучваць падзеі."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Ці тр�ба агучваць уваходны� паведамленні."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Ці тр�ба агучваць з'�ўленне новых размоў."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Ці тр�ба агучваць выхадны� паведамленні."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "Ці тр�ба агучваць злуч�нне з �еткай."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Ці тр�ба агучваць адлуч�нне ад �еткі."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr "Ці тр�ба ўжываць гукавы� �ігналы ў р�жыме ад�утна�ці ці зан�та�ці."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "Ці тр�ба паказваць выплыўны� апав�шч�нні пры выхадзе кантакта з �еткі."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr ""
 "Ці тр�ба паказваць выплыўны� апав�шч�нні пры ўваходзе кантакта ў �етку."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
 msgstr ""
 "Ці тр�ба паказваць выплыўны� апав�шч�нні пры атрыманні новага паведамленн�, "
-"нават калі акно чату ўжо адчынена, хоць і не мае фоку�у."
+"нават калі акно чату ўжо адкрыта, хоць і не мае фоку�у."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr ""
 "Ці тр�ба паказваць выплыўны� апав�шч�нні пры атрыманні новага паведамленн�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show account balances in the contact list."
 msgstr "Ці тр�ба паказваць балан� контаў у �пі�е кантактаў."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "Ці тр�ба паказваць аватары ў �пі�е кантактаў і вокнах чату."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "Ці тр�ба паказваць паза�еткавы� кантакты ў �пі�е кантактаў."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
 msgstr ""
 "Ці тр�ба паказваць выплыўны� апав�шч�нні ў р�жыме ад�утна�ці ці зан�та�ці."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Ці тр�ба паказваць пратаколы кантактаў у �пі�е кантактаў."
+msgstr "Ці тр�ба паказваць інфармацыю аб пратаколе ў �пі�е кантактаў."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Ці тр�ба паказваць �пі� кантактаў у пако�х чату."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "Ці тр�ба паказваць �пі� кантактаў у кампактным р�жыме."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
 msgstr ""
-"Ці тр�ба паказваць ды�логавае акенца пры зачыненні галоўнага акна з "
-"дапамогай кнопкі \"x\" у загалоўнай �тужцы."
+"Ці тр�ба паказваць ды�логавае акенца пры закрыцці галоўнага акна з дапамогай "
+"кнопкі \"x\" у загалоўнай �тужцы."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "Ці тр�ба ўжываць г�ты матыў дл� пако�ў чату."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -487,13 +495,13 @@ msgstr ""
 
 #: ../data/empathy-accounts.desktop.in.in.h:1
 msgid "Manage Messaging and VoIP accounts"
-msgstr "Кіраванне контамі абмену паведамленн�мі і VoIP"
+msgstr "Кіраванне контамі камунікатара і VoIP"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
 #: ../src/empathy-accounts-dialog.c:2324
 msgid "Messaging and VoIP Accounts"
-msgstr "Конты абмену паведамленн�мі і VoIP"
+msgstr "Конты камунікатара і VoIP"
 
 #: ../libempathy/empathy-ft-handler.c:825
 msgid "File transfer completed, but the file was corrupted"
@@ -765,71 +773,81 @@ msgstr[2] "%d ме��цаў таму"
 msgid "in the future"
 msgstr "у будучыні"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:539
+#: ../libempathy-gtk/empathy-account-chooser.c:540
 msgid "All accounts"
 msgstr "У�е конты"
 
-#: ../libempathy-gtk/empathy-account-widget.c:693
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "Конт"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "Пароль"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Сервер"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Порт"
 
-#: ../libempathy-gtk/empathy-account-widget.c:768
-#: ../libempathy-gtk/empathy-account-widget.c:825
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1166
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "My Web Accounts"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "�а�тройкі конта %s зменены з дапамогай My Web Accounts."
+msgid "The account %s is edited via %s."
+msgstr "Конт %s зменены з дапамогай %s."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1172
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "Empathy не ўмее зм�н�ць на�тройкі конта %s."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
 msgstr "Запу�ціць My Web Accounts"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1532
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "Р�дагаваць %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Ім� кары�тальніка:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1850
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "У_жыць"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1880
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
 msgstr "_Увай�ці"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1954
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "Такі конт ужо і�нуе на г�тым �ерверы"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1957
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "Стварыць новы конт на г�тым �ерверы"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2149
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "_Ска�аваць"
 
@@ -838,19 +856,19 @@ msgstr "_Ска�аваць"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2427
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s на %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2453
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "Конт %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2457
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "�овы конт"
 
@@ -1268,36 +1286,36 @@ msgstr "Yahoo!-ід_�нтыфікатар:"
 msgid "_Room List locale:"
 msgstr "_�а�тройкі м��цова�ці дл� �пі�а пако�ў:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:470
-#: ../libempathy-gtk/empathy-avatar-chooser.c:555
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "�е ўдало�� пераўтварыць вы�ву"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "�і адзін з магчымых фарматаў вы�ў не падтрымліваецца г�тай �і�т�май"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:818
-msgid "Couldn't save pixbuf to png"
-msgstr "�е ўдало�� захаваць ра�травы буфер у фармаце PNG"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+msgid "Couldn't save picture to file"
+msgstr "�е ўдало�� захаваць вы�ву ў файле"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:934
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "Выбар вы�вы дл� �ваёй аватары"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
 msgstr "Зрабіць здымак..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:941
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "��ма вы�вы"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "Вы�вы"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "У�е файлы"
 
@@ -1343,23 +1361,23 @@ msgstr "Ð’Ñ‹ не маеце дазволу на змÑ�ненне Ñ‚Ñ�мы раÐ
 msgid "“%s� is not a valid contact ID"
 msgstr "\"%s\" не з'�ўл�ецца прыдатным ід�нтыфікатарам кантакта"
 
-#: ../libempathy-gtk/empathy-chat.c:1030
+#: ../libempathy-gtk/empathy-chat.c:1058
 msgid "/clear: clear all messages from the current conversation"
-msgstr "/clear: ачы�ціць у�е паведамленні ў адчыненым акне размовы"
+msgstr "/clear: ачы�ціць у�е паведамленні ў адкрытым акне размовы"
 
-#: ../libempathy-gtk/empathy-chat.c:1033
+#: ../libempathy-gtk/empathy-chat.c:1061
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <т�ма>: прызначыць т�му дл� актыўнай размовы"
 
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1064
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ід�нтыфікатар пако�>: далучыцца да групавога чату ў пакоі"
 
-#: ../libempathy-gtk/empathy-chat.c:1039
+#: ../libempathy-gtk/empathy-chat.c:1067
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ід�нтыфікатар пако�>: далучыцца да групавога чату ў пакоі"
 
-#: ../libempathy-gtk/empathy-chat.c:1043
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1367,39 +1385,39 @@ msgstr ""
 "/part [<ід�нтыфікатар пако�>] [<прычына>]: пакінуць групавы чат, звычайна "
 "актыўны"
 
-#: ../libempathy-gtk/empathy-chat.c:1047
+#: ../libempathy-gtk/empathy-chat.c:1075
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <кантакт> [<паведамленне>]: ра�пачаць прыватны чат"
 
-#: ../libempathy-gtk/empathy-chat.c:1050
+#: ../libempathy-gtk/empathy-chat.c:1078
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <кантакт> <паведамленне>: ра�пачаць прыватны чат"
 
-#: ../libempathy-gtk/empathy-chat.c:1053
+#: ../libempathy-gtk/empathy-chat.c:1081
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <м�нушка>: зм�ніць �ваю м�нушку на актыўным �ерверы"
 
-#: ../libempathy-gtk/empathy-chat.c:1056
+#: ../libempathy-gtk/empathy-chat.c:1084
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr ""
-"/me <паведамленне>: па�лаць ACTION-паведамленне ў адчыненае акно размовы"
+"/me <паведамленне>: па�лаць ACTION-паведамленне ў адкрытае акно размовы"
 
-#: ../libempathy-gtk/empathy-chat.c:1059
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 msgstr ""
-"/say <паведамленне>: па�лаць <паведамленне> ў адчыненае акно размовы. Г�ты "
+"/say <паведамленне>: па�лаць <паведамленне> ў адкрытае акно размовы. Г�ты "
 "загад выкары�тоўваецца дл� па�ылкі паведамленн�, �кое пачынаецца знакам \"/"
 "\". �апрыклад: \"/say /join выкары�тоўваецца дл� далуч�нн� да новага "
 "групавога чату ў пакоі\""
 
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <кантакт>: паказаць інфармацыю аб кантакце"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1407,114 +1425,114 @@ msgstr ""
 "/help [<загад>]: паказаць у�е в�домы� загады. Калі пададзены <загад>, "
 "паказаць правілы �го выкары�танн�."
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1112
 #, c-format
 msgid "Usage: %s"
 msgstr "Правілы кары�танн�: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1116
+#: ../libempathy-gtk/empathy-chat.c:1157
 msgid "Unknown command"
 msgstr "�ев�домы загад"
 
-#: ../libempathy-gtk/empathy-chat.c:1242
+#: ../libempathy-gtk/empathy-chat.c:1283
 msgid "Unknown command; see /help for the available commands"
 msgstr ""
 "�ев�домы загад. Каб пагл�дзець �пі� у�іх в�домых загадаў, выканайце /help"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1412
+#: ../libempathy-gtk/empathy-chat.c:1453
 msgid "insufficient balance to send message"
 msgstr "не �тае грошай дл� па�ылкі паведамленн�"
 
-#: ../libempathy-gtk/empathy-chat.c:1414
+#: ../libempathy-gtk/empathy-chat.c:1455
 msgid "not capable"
 msgstr "не падтрымліваецца"
 
-#: ../libempathy-gtk/empathy-chat.c:1421
+#: ../libempathy-gtk/empathy-chat.c:1462
 msgid "offline"
 msgstr "па-за �еткай"
 
-#: ../libempathy-gtk/empathy-chat.c:1424
+#: ../libempathy-gtk/empathy-chat.c:1465
 msgid "invalid contact"
 msgstr "хібны кантакт"
 
-#: ../libempathy-gtk/empathy-chat.c:1427
+#: ../libempathy-gtk/empathy-chat.c:1468
 msgid "permission denied"
 msgstr "адмоўлена ў дазволе"
 
-#: ../libempathy-gtk/empathy-chat.c:1430
+#: ../libempathy-gtk/empathy-chat.c:1471
 msgid "too long message"
 msgstr "надта доўгае паведамленне"
 
-#: ../libempathy-gtk/empathy-chat.c:1433
+#: ../libempathy-gtk/empathy-chat.c:1474
 msgid "not implemented"
 msgstr "не р�алізавана"
 
-#: ../libempathy-gtk/empathy-chat.c:1437
+#: ../libempathy-gtk/empathy-chat.c:1478
 msgid "unknown"
 msgstr "нев�дома"
 
-#: ../libempathy-gtk/empathy-chat.c:1443
+#: ../libempathy-gtk/empathy-chat.c:1484
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Памылка па�ылкі паведамленн� \"%s\": %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1447
+#: ../libempathy-gtk/empathy-chat.c:1488
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Памылка па�ылкі паведамленн�: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1508 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1549 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Т�ма:"
 
-#: ../libempathy-gtk/empathy-chat.c:1520
+#: ../libempathy-gtk/empathy-chat.c:1561
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Т�ма вызначана �к: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1563
 msgid "No topic defined"
 msgstr "Т�ма не вызначана"
 
-#: ../libempathy-gtk/empathy-chat.c:2031
+#: ../libempathy-gtk/empathy-chat.c:2072
 msgid "(No Suggestions)"
 msgstr "(н�ма прапаноў)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2099
+#: ../libempathy-gtk/empathy-chat.c:2140
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Дадаць \"%s\" у �лоўнік"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2136
+#: ../libempathy-gtk/empathy-chat.c:2177
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Дадаць \"%s\" у �лоўнік (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2206
+#: ../libempathy-gtk/empathy-chat.c:2247
 msgid "Insert Smiley"
 msgstr "У�тавіць �майлік"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2224
+#: ../libempathy-gtk/empathy-chat.c:2265
 #: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "_Па�лаць"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2278
+#: ../libempathy-gtk/empathy-chat.c:2319
 msgid "_Spelling Suggestions"
 msgstr "Прапанаваны� _вары�нты выпраўленн�"
 
-#: ../libempathy-gtk/empathy-chat.c:2367
+#: ../libempathy-gtk/empathy-chat.c:2408
 msgid "Failed to retrieve recent logs"
 msgstr "�е ўдало�� атрымаць �вежы� журналы"
 
-#: ../libempathy-gtk/empathy-chat.c:2504
+#: ../libempathy-gtk/empathy-chat.c:2545
 #, c-format
 msgid "%s has disconnected"
 msgstr "Удзельнік %s ц�пер па-за �еткай"
@@ -1522,12 +1540,12 @@ msgstr "Удзельнік %s ц�пер па-за �еткай"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2511
+#: ../libempathy-gtk/empathy-chat.c:2552
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "Удзельнік %2$s выпхнуў удзельніка %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2514
+#: ../libempathy-gtk/empathy-chat.c:2555
 #, c-format
 msgid "%s was kicked"
 msgstr "Удзельніка %s выпхнулі з пако�"
@@ -1535,17 +1553,17 @@ msgstr "Удзельніка %s выпхнулі з пако�"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2522
+#: ../libempathy-gtk/empathy-chat.c:2563
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "Удзельнік %2$s забаніў удзельніка %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2525
+#: ../libempathy-gtk/empathy-chat.c:2566
 #, c-format
 msgid "%s was banned"
 msgstr "Удзельніка %s забанілі"
 
-#: ../libempathy-gtk/empathy-chat.c:2529
+#: ../libempathy-gtk/empathy-chat.c:2570
 #, c-format
 msgid "%s has left the room"
 msgstr "Удзельнік %s пакінуў пакой"
@@ -1555,68 +1573,72 @@ msgstr "Удзельнік %s пакінуў пакой"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2538
+#: ../libempathy-gtk/empathy-chat.c:2579
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2604
 #, c-format
 msgid "%s has joined the room"
 msgstr "Удзельнік %s увайшоў у пакой"
 
-#: ../libempathy-gtk/empathy-chat.c:2588
+#: ../libempathy-gtk/empathy-chat.c:2629
 #, c-format
 msgid "%s is now known as %s"
 msgstr "Удзельнік %s ц�пер называецца %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2727
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2768
 #: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:2328
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1391
+#: ../src/empathy-call-window.c:1441 ../src/empathy-call-window.c:2479
 msgid "Disconnected"
 msgstr "�длучаны"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3374
+#: ../libempathy-gtk/empathy-chat.c:3415
 msgid "Would you like to store this password?"
 msgstr "Ці вы хочаце захаваць г�ты пароль?"
 
-#: ../libempathy-gtk/empathy-chat.c:3380
+#: ../libempathy-gtk/empathy-chat.c:3421
 msgid "Remember"
 msgstr "Запомніць"
 
-#: ../libempathy-gtk/empathy-chat.c:3390
+#: ../libempathy-gtk/empathy-chat.c:3431
 msgid "Not now"
 msgstr "�е зараз"
 
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3475
 msgid "Retry"
 msgstr "Паўтарыць"
 
-#: ../libempathy-gtk/empathy-chat.c:3438
+#: ../libempathy-gtk/empathy-chat.c:3479
 msgid "Wrong password; please try again:"
 msgstr "Хібны пароль. Паўтарыце �пробу:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3568
+#: ../libempathy-gtk/empathy-chat.c:3609
 msgid "This room is protected by a password:"
 msgstr "Г�ты пакой абаронены паролем:"
 
-#: ../libempathy-gtk/empathy-chat.c:3595
+#: ../libempathy-gtk/empathy-chat.c:3636
 msgid "Join"
 msgstr "Далучыцца"
 
-#: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:3838 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "Злучаны"
 
-#: ../libempathy-gtk/empathy-chat.c:3852
+#: ../libempathy-gtk/empathy-chat.c:3893
 msgid "Conversation"
 msgstr "Размова"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3857
+#: ../libempathy-gtk/empathy-chat.c:3898
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1649,7 +1671,7 @@ msgstr "РÑ�дагаванне Ñ�піÑ�а блакіраваных кантакÑ
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:512
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1485
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
@@ -1677,7 +1699,7 @@ msgstr "_Скапіраваць адра� �па�ылкі"
 #: ../libempathy-gtk/empathy-chat-text-view.c:327
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
-msgstr "_�дчыніць �па�ылку"
+msgstr "_�дкрыць �па�ылку"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
@@ -1743,7 +1765,7 @@ msgstr "Без групы"
 
 #: ../libempathy-gtk/empathy-contact-list-store.h:72
 msgid "Favorite People"
-msgstr "Улюбёны� �уразмоўцы"
+msgstr "Упадабаны� �уразмоўцы"
 
 #: ../libempathy-gtk/empathy-contact-list-view.c:1986
 #: ../libempathy-gtk/empathy-individual-view.c:2376
@@ -1785,48 +1807,48 @@ msgid "_Block Contact"
 msgstr "_Блакіраваць кантакт"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:551
+#: ../libempathy-gtk/empathy-individual-menu.c:758
 #: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "_Чат"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:642
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_�ўды�званок"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:687
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Від�азванок"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:740
+#: ../libempathy-gtk/empathy-individual-menu.c:947
 #: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "_Пап�р�дні� размовы"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:781
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "Па�лаць файл"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:823
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
 msgstr "Падз�ліцца до�тупам да �тала"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:525
 #: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:858
-#: ../libempathy-gtk/empathy-individual-widget.c:1373
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
-msgstr "Улюбёны"
+msgstr "Упадабаны"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:886
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "_Зве�ткі"
 
@@ -1836,13 +1858,13 @@ msgid "_Edit"
 msgstr "_Р�дагаваць"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1076
+#: ../libempathy-gtk/empathy-individual-menu.c:1283
 #: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "Запрашаю ва� у г�ты пакой"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1122
+#: ../libempathy-gtk/empathy-individual-menu.c:1329
 msgid "_Invite to Chat Room"
 msgstr "_Запра�іць у пакой групавога чату"
 
@@ -1865,7 +1887,7 @@ msgstr "Кантактаў не знойдзена"
 
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:627
 msgid "Your message introducing yourself:"
-msgstr "Ваша прывітальнае паведамленне:"
+msgstr "Прывітальнае паведамленне:"
 
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:635
 msgid "Please let me see when you're online. Thanks!"
@@ -1917,7 +1939,7 @@ msgstr "�азва камп'ютара:"
 #.
 #: ../libempathy-gtk/empathy-contact-widget.c:353
 msgid "Away message:"
-msgstr "Развітальнае паведамленне:"
+msgstr "Паведамленне пры ад�утна�ці:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:606
 msgid "Channels:"
@@ -2047,7 +2069,7 @@ msgstr "Вышын�:"
 #: ../libempathy-gtk/empathy-contact-widget.c:1011
 #: ../libempathy-gtk/empathy-individual-widget.c:607
 #: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "Ме�цазнаходжанне"
 
@@ -2099,7 +2121,7 @@ msgstr "Падраб�зна�ці аб кантакце"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1515
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "Ід�нтыфікатар:"
 
@@ -2176,25 +2198,50 @@ msgstr "Кантакты, вылучаныÑ� Ñž левым Ñ�піÑ�е, будуÑ
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:141
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "Выберыце конт дл� перанакіраванн� званка"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "Званок"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+msgid "Mobile"
+msgstr "Мабільны т�лефон"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "Працоўны т�лефон"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "Хатні т�лефон"
+
 #. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:597
+#: ../libempathy-gtk/empathy-individual-menu.c:804
 #: ../libempathy-gtk/empathy-new-message-dialog.c:215
 msgid "_SMS"
 msgstr "П_а�лаць SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:934
+#: ../libempathy-gtk/empathy-individual-menu.c:1141
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Р�дагаваць"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:960
+#: ../libempathy-gtk/empathy-individual-menu.c:1167
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "_�б'�днаць кантакты..."
@@ -2212,7 +2259,7 @@ msgstr ""
 "Ці вы �апраўды хочаце выдаліць аб'�днальны кантакт \"%s\"? Г�та аперацы� "
 "так�ама выдаліць �го �кладовы� кантакты."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1662
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2296,128 +2343,137 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "_Раз'�днаць"
 
-#: ../libempathy-gtk/empathy-log-window.c:633
+#: ../libempathy-gtk/empathy-log-window.c:634
 msgid "History"
 msgstr "Журнал"
 
-#: ../libempathy-gtk/empathy-log-window.c:685
+#: ../libempathy-gtk/empathy-log-window.c:689
 msgid "Show"
 msgstr "Паказаць"
 
-#: ../libempathy-gtk/empathy-log-window.c:707
+#: ../libempathy-gtk/empathy-log-window.c:711
 msgid "Search"
 msgstr "Пошук"
 
-#: ../libempathy-gtk/empathy-log-window.c:1155
+#: ../libempathy-gtk/empathy-log-window.c:1159
 #, c-format
 msgid "Chat in %s"
 msgstr "Чат у %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1157
+#: ../libempathy-gtk/empathy-log-window.c:1161
 #, c-format
 msgid "Chat with %s"
 msgstr "Чат з %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1207
-#: ../libempathy-gtk/empathy-log-window.c:1354
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %d %B %Y"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1296
+#: ../libempathy-gtk/empathy-log-window.c:1300
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1302
+#: ../libempathy-gtk/empathy-log-window.c:1306
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
-#: ../libempathy-gtk/empathy-log-window.c:1375
-#: ../src/empathy-ft-manager.c:1026
-msgid "%"
-msgstr "%"
-
 #: ../libempathy-gtk/empathy-log-window.c:1382
 #, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s �екунда"
+msgstr[1] "%s �екунды"
+msgstr[2] "%s �екунд"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s хвіліна"
+msgstr[1] "%s хвіліны"
+msgstr[2] "%s хвілін"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
+#, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Званок прац�гваў�� %s, �кончаны ў %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1714
+#: ../libempathy-gtk/empathy-log-window.c:1729
 msgid "Today"
 msgstr "Сённ�"
 
-#: ../libempathy-gtk/empathy-log-window.c:1718
+#: ../libempathy-gtk/empathy-log-window.c:1733
 msgid "Yesterday"
 msgstr "Учора"
 
-#: ../libempathy-gtk/empathy-log-window.c:1734
-msgctxt ""
-"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1815
-#: ../libempathy-gtk/empathy-log-window.c:3396
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3425
 msgid "Anytime"
 msgstr "За ўве�ь ча�"
 
-#: ../libempathy-gtk/empathy-log-window.c:1895
-#: ../libempathy-gtk/empathy-log-window.c:2325
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2353
 msgid "Anyone"
 msgstr "У�е"
 
-#: ../libempathy-gtk/empathy-log-window.c:2637
+#: ../libempathy-gtk/empathy-log-window.c:2666
 msgid "Who"
 msgstr "Хто"
 
-#: ../libempathy-gtk/empathy-log-window.c:2841
+#: ../libempathy-gtk/empathy-log-window.c:2870
 msgid "When"
 msgstr "Калі"
 
-#: ../libempathy-gtk/empathy-log-window.c:2957
+#: ../libempathy-gtk/empathy-log-window.c:2986
 msgid "Anything"
 msgstr "У�ё"
 
-#: ../libempathy-gtk/empathy-log-window.c:2959
+#: ../libempathy-gtk/empathy-log-window.c:2988
 msgid "Text chats"
 msgstr "Т�к�тавы� чаты"
 
-#: ../libempathy-gtk/empathy-log-window.c:2961
+#: ../libempathy-gtk/empathy-log-window.c:2990
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "Званкі"
 
-#: ../libempathy-gtk/empathy-log-window.c:2966
+#: ../libempathy-gtk/empathy-log-window.c:2995
 msgid "Incoming calls"
 msgstr "Уваходны� званкі"
 
-#: ../libempathy-gtk/empathy-log-window.c:2967
+#: ../libempathy-gtk/empathy-log-window.c:2996
 msgid "Outgoing calls"
 msgstr "Выхадны� званкі"
 
-#: ../libempathy-gtk/empathy-log-window.c:2968
+#: ../libempathy-gtk/empathy-log-window.c:2997
 msgid "Missed calls"
 msgstr "Прапушчаны� званкі"
 
-#: ../libempathy-gtk/empathy-log-window.c:2990
+#: ../libempathy-gtk/empathy-log-window.c:3019
 msgid "What"
 msgstr "Што"
 
-#: ../libempathy-gtk/empathy-log-window.c:3699
+#: ../libempathy-gtk/empathy-log-window.c:3728
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Ці вы �апраўды хочаце выдаліць у�е журналы мінулых размоў?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3703
+#: ../libempathy-gtk/empathy-log-window.c:3732
 msgid "Clear All"
 msgstr "�чы�ціць у�ё"
 
-#: ../libempathy-gtk/empathy-log-window.c:3710
+#: ../libempathy-gtk/empathy-log-window.c:3739
 msgid "Delete from:"
 msgstr "Выдаліць дл�:"
 
@@ -2425,14 +2481,6 @@ msgstr "Выдаліць дл�:"
 msgid "<span size=\"x-large\">Loading...</span>"
 msgstr "<span size=\"x-large\">Загрузка...</span>"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call"
-msgstr "Званок"
-
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
 #: ../src/empathy-chat-window.ui.h:3
 msgid "Chat"
@@ -2572,11 +2620,11 @@ msgstr "�а_зад"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
-msgstr "�трымана імгненнае паведамленне"
+msgstr "�трыманне імгненнага паведамленн�"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:53
 msgid "Sent an instant message"
-msgstr "Вы�лана імгненнае паведамленне"
+msgstr "Па�ылка імгненнага паведамленн�"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:55
 msgid "Incoming chat request"
@@ -2614,12 +2662,12 @@ msgstr "Гала�авы званок �кончаны"
 msgid "Edit Custom Messages"
 msgstr "Р�дагаванне ўла�ных паведамленн�ў"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1030
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
 #, c-format
 msgid "Message edited at %s"
 msgstr "Паведамленне зменена ў %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1720
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
 msgid "Normal"
 msgstr "Звычайны"
 
@@ -2713,7 +2761,7 @@ msgstr "Падраб�зна�ці аб �ертыфікаце"
 
 #: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
-msgstr "�е ўдало�� адчыніць URI-адра�"
+msgstr "�е ўдало�� адкрыць URI-адра�"
 
 #: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
@@ -2920,23 +2968,23 @@ msgstr "��ма паведамленн� аб памылцы"
 msgid "Instant Message (Empathy)"
 msgstr "Імгненнае паведамленне (Empathy)"
 
-#: ../src/empathy.c:354
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "�е злучацца пры запу�ку"
 
-#: ../src/empathy.c:358
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "�е паказваць �пі� кантактаў ды іншы� акенцы пры запу�ку"
 
-#: ../src/empathy.c:373
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
-msgstr "- Кліент абмену паведамленн�мі Empathy"
+msgstr "- Інт�рн�т-камунікатар Empathy"
 
-#: ../src/empathy.c:560
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
 msgstr "Памылка �ув�зі з кіраўніком контаў"
 
-#: ../src/empathy.c:562
+#: ../src/empathy.c:639
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2983,7 +3031,7 @@ msgstr ""
 
 #: ../src/empathy-about-dialog.c:107
 msgid "An Instant Messaging client for GNOME"
-msgstr "Кліент абмену паведамленн�мі дл� GNOME"
+msgstr "Інт�рн�т-камунікатар дл� GNOME"
 
 #: ../src/empathy-about-dialog.c:113
 msgid "translator-credits"
@@ -3018,7 +3066,7 @@ msgid ""
 "this assistant and add accounts later from the Edit menu."
 msgstr ""
 "Вы можаце альбо в�рнуцца назад і паўтарыць увод падраб�зна�ц�ў аб вашых "
-"контах, альбо зачыніць г�тага памочніка і дадаць конты пазней з дапамогай "
+"контах, альбо закрыць г�тага памочніка і дадаць конты пазней з дапамогай "
 "меню Праўка."
 
 #: ../src/empathy-account-assistant.c:220
@@ -3165,7 +3213,7 @@ msgstr "Ваш новы конт �шч� не захаваны."
 
 #: ../src/empathy-accounts-dialog.c:345
 #: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1152
+#: ../src/empathy-call-window.c:1175
 msgid "Connecting…"
 msgstr "Злуч�нне..."
 
@@ -3230,7 +3278,7 @@ msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgstr ""
-"Вы зачын�еце г�та акно, што прыв�дзе да �траты\n"
+"Вы закрываеце г�та акно, што прыв�дзе да �траты\n"
 "вашых змен. Ці вы �апраўды хочаце прац�гнуць прац�дуру?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
@@ -3243,7 +3291,7 @@ msgstr "Загрузка зве�так аб конце"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
 msgid "No protocol installed"
-msgstr "Модул�ў пратаколаў не ў�тал�вана"
+msgstr "Модулі дл� працы з пратаколамі не ў�тал�ваны�"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Protocol:"
@@ -3273,11 +3321,11 @@ msgstr "Ід�нтыфікацыйны кліент Empathy"
 msgid "People nearby"
 msgstr "Людзі паблізу"
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:127
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr "- �ўды�- і від�акліент Empathy"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:152
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "�ўды�- і від�акліент Empathy"
 
@@ -3320,33 +3368,33 @@ msgstr "Падраб�зна�ці"
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1660
+#: ../src/empathy-call-window.c:1782
 #, c-format
 msgid "Call with %s"
 msgstr "Званок: %s"
 
 #: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:1904
+#: ../src/empathy-call-window.c:2026
 msgid "The IP address as seen by the machine"
 msgstr "IP-адра�, �кі бачыць машына"
 
 #: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:1906
+#: ../src/empathy-call-window.c:2028
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP-адра�, �кі бачыць �ервер у інт�рн�це"
 
 #: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:1908
+#: ../src/empathy-call-window.c:2030
 msgid "The IP address of the peer as seen by the other side"
 msgstr "IP-адра� �уразмоўцы, бачны з іншага боку злуч�нн�"
 
 #: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:1910
+#: ../src/empathy-call-window.c:2032
 msgid "The IP address of a relay server"
 msgstr "IP-адра� р�тран�л�тарнага �ервера"
 
 #: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:1912
+#: ../src/empathy-call-window.c:2034
 msgid "The IP address of the multicast group"
 msgstr "IP-адра� мультыка�т-групы"
 
@@ -3377,12 +3425,12 @@ msgid "Connected — %d:%02dm"
 msgstr "Прац�гла�ць злуч�нн� - %d:%02d хв"
 
 #: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2647
+#: ../src/empathy-call-window.c:2798
 msgid "Technical Details"
 msgstr "Т�хнічны� падраб�зна�ці"
 
 #: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2685
+#: ../src/empathy-call-window.c:2836
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3392,7 +3440,7 @@ msgstr ""
 "�кі� падтрымлівае ваш камп'ютар"
 
 #: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2690
+#: ../src/empathy-call-window.c:2841
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3402,7 +3450,7 @@ msgstr ""
 "�кі� падтрымлівае ваш камп'ютар"
 
 #: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2696
+#: ../src/empathy-call-window.c:2847
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3412,12 +3460,12 @@ msgstr ""
 "�еткі, �ка� не дазвал�е непа�р�днае злуч�нне."
 
 #: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2702
+#: ../src/empathy-call-window.c:2853
 msgid "There was a failure on the network"
 msgstr "У �етцы ўзнікла памылка"
 
 #: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2706
+#: ../src/empathy-call-window.c:2857
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
@@ -3425,7 +3473,7 @@ msgstr ""
 "не ў�тал�вана на г�тым камп'ютары"
 
 #: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2709
+#: ../src/empathy-call-window.c:2860
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
@@ -3433,7 +3481,7 @@ msgstr ""
 "не ў�тал�вана на г�тым камп'ютары"
 
 #: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2721
+#: ../src/empathy-call-window.c:2872
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3445,22 +3493,22 @@ msgstr ""
 "акенца \"�дладка\" ў меню \"Дапамога\"."
 
 #: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2730
+#: ../src/empathy-call-window.c:2881
 msgid "There was a failure in the call engine"
 msgstr "У рухавіку званкоў узнікла памылка"
 
 #: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2733
+#: ../src/empathy-call-window.c:2884
 msgid "The end of the stream was reached"
 msgstr "Да��гнуты канец �трумен�"
 
 #: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2773
+#: ../src/empathy-call-window.c:2924
 msgid "Can't establish audio stream"
 msgstr "�е ўдало�� ра�пачаць аўды��трумен�ванне"
 
 #: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2783
+#: ../src/empathy-call-window.c:2934
 msgid "Can't establish video stream"
 msgstr "�е ўдало�� ра�пачаць від�а�трумен�ванне"
 
@@ -3551,8 +3599,8 @@ msgstr "Пераключыць перадачу від�а�ігналу"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2280 ../src/empathy-call-window.c:2281
-#: ../src/empathy-call-window.c:2282 ../src/empathy-call-window.c:2283
+#: ../src/empathy-call-window.c:2431 ../src/empathy-call-window.c:2432
+#: ../src/empathy-call-window.c:2433 ../src/empathy-call-window.c:2434
 msgid "Unknown"
 msgstr "�ев�дома"
 
@@ -3684,7 +3732,7 @@ msgstr "_�дчапіць картку"
 
 #: ../src/empathy-chat-window.ui.h:13
 msgid "_Favorite Chat Room"
-msgstr "_Улюбёны пакой дл� групавога чату"
+msgstr "_Упадабаны пакой дл� групавога чату"
 
 #: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
@@ -3704,7 +3752,7 @@ msgstr "_Карткі"
 
 #: ../src/empathy-chat-window.ui.h:19
 msgid "_Undo Close Tab"
-msgstr "_В�рнуць зачыненую картку"
+msgstr "_В�рнуць закрытую картку"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3716,17 +3764,17 @@ msgstr "Пакой"
 
 #: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
-msgstr "�ўтаматычна злуч�нне"
+msgstr "�ўтаматычнае злуч�нне"
 
 #: ../src/empathy-chatrooms-window.ui.h:2
 msgid "Manage Favorite Rooms"
-msgstr "Кіраванне �пі�ам улюбёных пако�ў дл� групавога чату"
+msgstr "Кіраванне �пі�ам упадабаных пако�ў дл� групавога чату"
 
 #: ../src/empathy-event-manager.c:521
 msgid "Incoming video call"
 msgstr "Уваходны від�азванок"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1408
 msgid "Incoming call"
 msgstr "Уваходны званок"
 
@@ -3741,7 +3789,7 @@ msgid "%s is calling you. Do you want to answer?"
 msgstr "%s·про�іць размовы. �дкажаце?"
 
 #: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1414
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Уваходны званок ад %s"
@@ -3759,6 +3807,7 @@ msgid "_Answer with video"
 msgstr "_�дказаць з від�а"
 
 #: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1414
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Уваходны від�азванок ад %s"
@@ -3910,6 +3959,10 @@ msgstr "Праверка ц�ла�ці \"%s\""
 msgid "Hashing \"%s\""
 msgstr "Падлік х�шу \"%s\""
 
+#: ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "%"
+
 #: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "Файл"
@@ -3974,7 +4027,7 @@ msgstr "Зм�ніць на�тройкі конта"
 
 #: ../src/empathy-main-window.c:789
 msgid "Close"
-msgstr "Зачыніць"
+msgstr "Закрыць"
 
 #. Translators: this string will be something like:
 #. *   Top up My Account ($1.23)..."
@@ -3996,7 +4049,7 @@ msgstr "Папоўніць..."
 msgid "Contact"
 msgstr "Кантакт"
 
-#: ../src/empathy-main-window.c:2119
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "Спі� кантактаў"
 
@@ -4010,19 +4063,19 @@ msgstr "Грашовы балан� конта"
 
 #: ../src/empathy-main-window-menubar.ui.h:3
 msgid "Find in Contact _List"
-msgstr "_Шукаць у �пі�е кантактаў"
+msgstr "_Пошук у �пі�е кантактаў"
 
 #: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
-msgstr "_Далучыцца да ўлюбёных пако�ў"
+msgstr "_Далучыцца да ўпадабаных пако�ў"
 
 #: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
-msgstr "�а�тройка �пі�а ўлюбёных пако�ў"
+msgstr "�а�тройка �пі�а ўпадабаных пако�ў"
 
 #: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
-msgstr "_Звычайны памер"
+msgstr "_Звычайны памер акна"
 
 #: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
@@ -4030,7 +4083,7 @@ msgstr "�овы _званок..."
 
 #: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
-msgstr "Звычайны памер з _аватарамі"
+msgstr "Звычайны памер акна з _аватарамі"
 
 #: ../src/empathy-main-window-menubar.ui.h:9
 msgid "P_references"
@@ -4038,7 +4091,7 @@ msgstr "_�а�тройкі"
 
 #: ../src/empathy-main-window-menubar.ui.h:10
 msgid "Show P_rotocols"
-msgstr "_Паказваць пратаколы"
+msgstr "_Паказваць інфармацыю аб пратаколе"
 
 #: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
@@ -4058,7 +4111,7 @@ msgstr "_Блакіраваны� кантакты"
 
 #: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
-msgstr "_Кампактны памер"
+msgstr "_Кампактны памер акна"
 
 #: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
@@ -4075,7 +4128,7 @@ msgstr "_�ова� размова..."
 
 #: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
-msgstr "_Кантакты па-за �еткай"
+msgstr "Паказваць _кантакты па-за �еткай"
 
 #: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
@@ -4087,7 +4140,7 @@ msgstr "Пак_ой"
 
 #: ../src/empathy-main-window-menubar.ui.h:29
 msgid "_Search for Contacts…"
-msgstr "_Шукаць кантакты..."
+msgstr "_Пошук кантактаў..."
 
 #: ../src/empathy-new-chatroom-dialog.c:337
 msgid "Chat Room"
@@ -4158,11 +4211,11 @@ msgstr "Пак_ой:"
 
 #: ../src/empathy-preferences.c:169
 msgid "Message received"
-msgstr "�трымана паведамленне"
+msgstr "�трыманне паведамленн�"
 
 #: ../src/empathy-preferences.c:170
 msgid "Message sent"
-msgstr "Вы�лана паведамленне"
+msgstr "Па�ылка паведамленн�"
 
 #: ../src/empathy-preferences.c:171
 msgid "New conversation"
@@ -4170,19 +4223,19 @@ msgstr "�ова� размова"
 
 #: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
-msgstr "Кантакт злучыў�� з �еткай"
+msgstr "Уваход кантакту ў �етку"
 
 #: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
-msgstr "Кантакт адлучыў�� ад �еткі"
+msgstr "Выхад кантакту з �еткі"
 
 #: ../src/empathy-preferences.c:174
 msgid "Account connected"
-msgstr "Конт злучаны з �еткай"
+msgstr "Злуч�нне конта"
 
 #: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
-msgstr "Конт адлучаны ад �еткі"
+msgstr "�длуч�нне конта"
 
 #: ../src/empathy-preferences.c:484
 msgid "Language"
@@ -4246,11 +4299,11 @@ msgstr "Паводзіны"
 
 #: ../src/empathy-preferences.ui.h:5
 msgid "Chat Th_eme:"
-msgstr "_Матыў чату:"
+msgstr "_Матыў аздабленн� чату:"
 
 #: ../src/empathy-preferences.ui.h:6
 msgid "Disable notifications when _away or busy"
-msgstr "Выключыць апав�шч�нні ў р�жыме _ад�утна�ці ці зан�та�ці"
+msgstr "Выключаць апав�шч�нні ў р�жыме _ад�утна�ці ці зан�та�ці"
 
 #: ../src/empathy-preferences.ui.h:7
 msgid "Disable sounds when _away or busy"
@@ -4258,57 +4311,69 @@ msgstr "Выключыць гукавы� �ігналы ў р�жыме _ад�
 
 #: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
-msgstr "Паказваць уваходны� падзеі ў абшары апав�шч�нн�ў"
+msgstr "Паказваць уваходны� паведамленні ў абшары апав�шч�нн�ў"
 
 #: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"Фільтрацы� р�ха дапамагае палепшыць �ка�ць гучанн� вашага гола�у дл� "
+"�уразмоўцы, але можа выклікаць на некаторых камп'ютарах п�ўны� праблемы. "
+"Калі вы ці ваш �уразмоўца падча� размовы чуеце дзіўны шум ці шчаўчкі, "
+"па�прабуйце выключыць фільтрацыю р�ха і паўтарыць званок."
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "�пав�шчаць, калі кантакт уваходзіць у �етку"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "�пав�шчаць, калі кантакт выходзіць з �еткі"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "�пав�шчаць, калі акно _чату не мае фоку�у"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "Прав�раць арфаграфію дл� на�тупных моў:"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "�гульнае"
 
-#: ../src/empathy-preferences.ui.h:14
-msgid "Input level"
-msgstr "Узровень уводу"
-
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input volume"
-msgstr "Гучна�ць уводу"
+msgid "Input level:"
+msgstr "Узровень уводу:"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "Гучна�ць уводу:"
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "Крыніцы даных аб ме�цазнаходжанні:"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "Ве�ці журнал размоў"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "�пав�шч�нні"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "�гучваць падзеі"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "Прыватна�ць"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -4318,70 +4383,70 @@ msgstr ""
 "будуць толькі даны� аб горадзе, штаце і краіне вашага ме�цазнаходжанн�. GPS-"
 "каардынаты будуць акруглены да 1 знака па�л� ко�кі."
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "Паказваць вы�вы _заме�т �майлікаў"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "_Паказваць �пі� кантактаў у пако�х"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "Гукі"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "Праверка арфаграфіі"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "Спі� моў паказвае толькі мовы, дл� �кіх вы маеце ў�тал�ваны� �лоўнікі."
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "Матывы"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
-msgstr "�дмена:"
+msgstr "Вары�нт:"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "_�ўтаматычна злучацца пры запу�ку"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Мабільны т�лефон"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "_Уключыць апав�шч�нні ў вына�ках"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "_�гучваць апав�шч�нні"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Сетка (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
-msgstr "_�дчын�ць новы� размовы ў а�обных вокнах"
+msgstr "_�дкрываць новы� размовы ў а�обных вокнах"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "_Паведамл�ць маім кантактам аб ме�цазнаходжанні"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "Па_гаршаць дакладна�ць ме�цазнаходжанн�"
 
@@ -4508,16 +4573,16 @@ msgid ""
 msgstr ""
 "Выбраны кіраўнік злуч�нн�ў не падтрымлівае пашыр�нне аддаленай адладкі."
 
+#: ../src/empathy-invite-participant-dialog.c:179
 #: ../src/empathy-invite-participant-dialog.c:205
-#: ../src/empathy-invite-participant-dialog.c:231
 msgid "Invite Participant"
 msgstr "Запра�іць удзельніка"
 
-#: ../src/empathy-invite-participant-dialog.c:206
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Выберыце кантакт, каб запра�іць �го да размовы:"
 
-#: ../src/empathy-invite-participant-dialog.c:227
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "Запра�іць"
 
@@ -4573,11 +4638,13 @@ msgid "Respond"
 msgstr "�дказаць"
 
 #: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1418
 msgid "Reject"
 msgstr "Скінуць"
 
 #: ../src/empathy-notifications-approver.c:222
 #: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1419
 msgid "Answer"
 msgstr "�дказаць"
 
@@ -4595,6 +4662,9 @@ msgstr "�дмовіцца"
 msgid "Accept"
 msgstr "Прын�ць"
 
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
 #: ../src/empathy-notifications-approver.c:260
 msgid "Provide"
 msgstr "Падаць пароль"
@@ -4607,24 +4677,24 @@ msgstr ""
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1026 ../src/empathy-call-window.c:1049
+#: ../src/empathy-call-window.c:1047 ../src/empathy-call-window.c:1070
 msgid "i"
 msgstr "Ñ–"
 
-#: ../src/empathy-call-window.c:2576
+#: ../src/empathy-call-window.c:2727
 msgid "On hold"
 msgstr "У чаканні"
 
-#: ../src/empathy-call-window.c:2579
+#: ../src/empathy-call-window.c:2730
 msgid "Mute"
 msgstr "�б�згучана"
 
-#: ../src/empathy-call-window.c:2581
+#: ../src/empathy-call-window.c:2732
 msgid "Duration"
 msgstr "Прац�гла�ць"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2584
+#: ../src/empathy-call-window.c:2735
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02d хв"
diff --git a/po/bg.po b/po/bg.po
index 613fc459e..53a377f9b 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-26 06:39+0200\n"
-"PO-Revision-Date: 2011-03-26 06:39+0200\n"
+"POT-Creation-Date: 2011-09-25 18:00+0300\n"
+"PO-Revision-Date: 2011-09-25 18:00+0300\n"
 "Last-Translator: Krasimir Chonov <mk2616@abv.bg>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
@@ -46,6 +46,22 @@ msgid "Always open a separate chat window for new chats."
 msgstr "�овите разговори да �е отвар�т в отделни прозорци."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr "Сила на звука при повикване"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr "Сила на звука при повикване в проценти."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Camera device"
+msgstr "Уеб камера"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "Позици� на камерата"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -53,46 +69,54 @@ msgstr ""
 "Знак, който да �е добави �лед п�евдонима при ползване на допи�ване на "
 "п�евдоними (� табулатор) в прозореца за групови разговори."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "Графична тема за прозореца за разговори"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+msgid "Chat window theme variant"
+msgstr "Графична тема за прозореца за разговори"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "Спи�ък от двубуквените �ъкращени� на езиците � проверка за правопи� "
 "разделени �ъ� запета� (напр. „bg, en, ru“)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "Стегнат �пи�ък � контакти"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "Да �е използва управление на връзката"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "Критерий за подредбата на �пи�ъка � контактите"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Стандартна уеб камера за видео разговори, например /dev/video0."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
 msgstr "Стандартна папка, в ко�то да �е тър��т изображени� за аватари"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr "Без изве�т�ване � из�качащи прозорци в �ъ�то�ние „От�ъ�тващ“"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr "Без звуци звуци в �ъ�то�ние „От�ъ�тващ“"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
 msgstr "Показване на вход�щи �ъбити� в обла�тта за �ъ�то�нието"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -100,239 +124,257 @@ msgstr ""
 "Показване на вход�щите �ъбити� в обла�тта за �ъ�то�нието. �ко е лъжа, "
 "�ъбити�та �е пред�тав�т незабавно на потребител�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+msgid "Echo cancellation support"
+msgstr "Премахване на ехо"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr "Empathy може да публикува ме�тоположението на потребител�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy може да ползва GPS, за да отгатне ме�тоположението"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr ""
 "Empathy може да използва мобилна телефонна мрежа, за да отгатне "
 "ме�тоположението"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy може да ползва мрежата, за да отгатне ме�тоположението"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr "Стандартна папка за получените файлове от Empathy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
 msgstr "Empathy извърши миграци� на данните от butterfly"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr "�втоматично преминаване в �ъ�то�ние „От�ъ�тващ“ при бездей�твие"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "�втоматично �вързване при �тартиране"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "�амал�ване на точно�тта на ме�тоположението"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Иконата на прозореца за разговори да е аватарът на контакта"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr "Включване на ин�трументите за разработка на WebKit"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "Изве�т�ване � из�качащи прозорци при нови �ъобщени�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "Да �е ползва проверка на правопи�а"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "Скриване на о�новни� прозорец"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "Скриване на о�новни� прозорец."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "Знак за допи�ване на п�евдоними"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "Отвар�не на разговорите в отделни прозорци"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "Път до темата на Adium, ко�то да �е ползва"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
 "Път до темата на Adium, ко�то да �е ползва, ако темата за разговори е Adium."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Изве�т�ване �ъ� звук при при�тигане на �ъобщение"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "Изве�т�ване �ъ� звук при нов разговор"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Изве�т�ване �ъ� звук при изпращане на �ъобщение"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "Изве�т�ване �ъ� звук при влизане на контакт в мрежата"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "Изве�т�ване �ъ� звук при излизане на контакт от мрежата"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "Изве�т�ване �ъ� звук при влизането ви в мрежата"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "Изве�т�ване �ъ� звук при излизането ви от мрежата"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Изве�т�ване � из�качащи прозорци, когато разговорът не е на фоку�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "Изве�т�ване � из�качащи прозорци, когато контакт влезе в мрежата"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "Изве�т�ване � из�качащи прозорци, когато контакт излезе извън мрежата"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr ""
+"Позиционирането на изображението от камерата да �тава по време на разговор."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+msgid "Show Balance in contact list"
+msgstr "Показване на кредита в �пи�ъка � контакти"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "Показване на аватари"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "Показване на �пи�ъка � контакти в �таите"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr "Под�казване за затвар�нето на о�новни� прозорец"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr "Показване на контактите, които не �а в мрежата"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
 msgstr "Показване на протокола"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "Езици � проверка на правопи�а"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr "Стандартната папка, в ко�то да �е запазват получените файлове."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
 msgstr "По�ледната папка, от ко�то е взето изображение за аватар."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
 msgstr "Разположение на �траничната лента в прозореца за разговори"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr ""
 "Запомненото разположение (в пик�ели) на �траничната лента в прозореца за "
 "разговори."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Графичната тема за прозорците за разговори."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "Графичната тема за прозорците за разговори."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Изображени� за емотикони"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "Изве�т�ване �ъ� звуци"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "Графична тема за прозорците за разговори"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr ""
 "Дали Empathy да публикува ме�тоположението на потребител� към контактите."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Дали Empathy да използва GPS за изчи�л�ване на ме�тоположението."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
 "Дали Empathy да използва мрежа за мобилни телефони за изчи�л�ване на "
 "ме�тоположението."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Дали Empathy да използва мрежата за изчи�л�ване на ме�тоположението."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "Дали програмата Empathy е извършила миграци� на данните от butterfly"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Дали Empathy автоматично да включва реги�трациите ви при �тартиране."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
 "Дали Empathy автоматично да преминава в �ъ�то�ние „От�ъ�тващ“ при "
 "бездей�твие на потребител�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 "Дали Empathy да намал�ва точно�тта на ме�тоположението, за да защитава "
 "личните данни."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 "Дали Empathy да ползва аватара на контакта за икона на прозореца за "
 "разговори."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Дали ин�трументите към WebKit за разработка (напр. уеб ин�пекторът) да �е "
 "включат."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
@@ -340,66 +382,70 @@ msgstr ""
 "Дали да �е използват програми за управление на връзките за автоматичното им "
 "прекъ�ване и въз�танов�ване."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr ""
 "Дали да �е прави проверка на правопи�а на въведени� тек�т �пр�мо избраните "
 "езици."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "Дали емотиконите да �е преобразуват от ASCII в картинки."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Дали да �е използва филтърът за премахване на шумове в Pulseaudio."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "Дали влизането на контакти в мрежата да �е изве�т�ва �ъ� звук."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "Дали излизането на контакти от мрежата да �е изве�т�ва �ъ� звук."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "Дали �ъбити�та да �е изве�т�ват �ъ� звук."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Дали при�тигането на �ъобщени� да �е изве�т�ва �ъ� звук."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Дали новите разговори да �е изве�т�ват �ъ� звук."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Дали изпращането на �ъобщени� да �е изве�т�ва �ъ� звук."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "Дали влизането ви в мрежата да �е изве�т�ва �ъ� звук."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Дали излизането ви от мрежата да �е изве�т�ва �ъ� звук."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr "Дали в �ъ�то�ние „Зает“ или „От�ъ�тващ“ да �е изве�т�ва �ъ� звук."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr ""
 "Дали излизането на контакт извън мрежата да �е изве�т�ва � из�качащи "
 "прозорци."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr ""
 "Дали влизането на контакт в мрежата да �е изве�т�ва � из�качащи прозорци."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -407,41 +453,46 @@ msgstr ""
 "Дали получаването на ново �ъобщение, когато отворени�т прозорец за разговори "
 "не е на фоку�, да �е изве�т�ва � из�качащи прозорци."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr ""
 "Дали получаването на ново �ъобщение да �е изве�т�ва � из�качащи прозорци."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+msgid "Whether to show account balances in the contact list."
+msgstr ""
+"Дали да �е показва о�таващи�т кредит на реги�траци�та в �пи�ъка за контакти."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 "Дали да �е показват аватари в �пи�ъците за контакти и прозорците за "
 "разговори."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr ""
 "Дали контактите, които в момента не �а включени да �е показват в �пи�ъка."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
 msgstr ""
 "Дали в �ъ�то�ние „Зает“ или „От�ъ�тващ“ да �е изве�т�ва � из�качащи прозорци."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "Дали да �е показват протоколите в �пи�ъците за контакти."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Дали �пи�ъкът � контакти да �е показва в �таите за разговори."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "Дали да �е ползва �тегнат изглед за �пи�ъка � контактите."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -449,11 +500,11 @@ msgstr ""
 "Дали да �е показва �ъобщение за затвар�нето на о�новни� прозорец при "
 "нати�кане на бутона „×“ в заглавната лента."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "Дали да �е ползва графична тема за �таите за разговори."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -469,26 +520,42 @@ msgstr "Управление на реги�трациите за �ъобщен
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2269
+#: ../src/empathy-accounts-dialog.c:2324
 msgid "Messaging and VoIP Accounts"
-msgstr "Реги�трации за �ъобщени� и телефони� през Интернет"
+msgstr "Съобщени� и телефони�"
 
 #: ../libempathy/empathy-ft-handler.c:825
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Прехвърл�нето на файл завърши, но файлът е повреден"
 
-#: ../libempathy/empathy-ft-handler.c:1113
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
 msgstr "Отдалечени�т контакт не поддържа прехвърл�не на файлове"
 
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is not a regular file"
 msgstr "Избрани�т файл не е обикновен файл"
 
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1176
 msgid "The selected file is empty"
 msgstr "Избрани�т файл е празен"
 
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#, c-format
+msgid "Missed call from %s"
+msgstr "Пропу�нато повикване от %s"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, c-format
+msgid "Called %s"
+msgstr "%s ви потър�и"
+
+#: ../libempathy/empathy-message.c:422
+#, c-format
+msgid "Call from %s"
+msgstr "Повикване от %s"
+
 #: ../libempathy/empathy-tp-file.c:268
 msgid "Socket type not supported"
 msgstr "Този вид гнездо не �е поддържа"
@@ -517,143 +584,141 @@ msgstr "Грешка по време на прехвърл�нето на фай
 msgid "The other participant is unable to transfer the file"
 msgstr "От�рещната �трана не може да прехвърл� файл"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:382
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
 msgid "Unknown reason"
 msgstr "�еизве�тна причина"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:232
 msgid "Available"
 msgstr "�а лини�"
 
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:234
 msgid "Busy"
 msgstr "Зает"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:237
 msgid "Away"
 msgstr "От�ъ�тващ"
 
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:239
 msgid "Invisible"
 msgstr "�евидим"
 
-#: ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-utils.c:241
 msgid "Offline"
 msgstr "Извън мрежата"
 
-#: ../libempathy/empathy-utils.c:315
-#: ../src/empathy-streamed-media-window.c:1904
-#: ../src/empathy-streamed-media-window.c:1905
-#: ../src/empathy-streamed-media-window.c:1906
-#: ../src/empathy-streamed-media-window.c:1907
-#: ../src/empathy-call-window.ui.h:18
+#. translators: presence type is unknown
+#: ../libempathy/empathy-utils.c:244
+msgctxt "presence"
 msgid "Unknown"
 msgstr "�еизве�тно"
 
-#: ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:284
 msgid "No reason specified"
 msgstr "�е е указана причина"
 
-#: ../libempathy/empathy-utils.c:356 ../libempathy/empathy-utils.c:412
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
 msgid "Status is set to offline"
 msgstr "Съ�то�нието е „Извън мрежата“."
 
-#: ../libempathy/empathy-utils.c:358 ../libempathy/empathy-utils.c:392
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "Мрежова грешка"
 
-#: ../libempathy/empathy-utils.c:360 ../libempathy/empathy-utils.c:394
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
 msgid "Authentication failed"
 msgstr "�еу�пешно идентифициране"
 
-#: ../libempathy/empathy-utils.c:362 ../libempathy/empathy-utils.c:396
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
 msgid "Encryption error"
 msgstr "Грешка в шифрирането"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:294
 msgid "Name in use"
 msgstr "Името е заето"
 
-#: ../libempathy/empathy-utils.c:366 ../libempathy/empathy-utils.c:398
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate not provided"
 msgstr "�е е предо�тавен �ертификат"
 
-#: ../libempathy/empathy-utils.c:368 ../libempathy/empathy-utils.c:400
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate untrusted"
 msgstr "Сертификатът не е доверен"
 
-#: ../libempathy/empathy-utils.c:370 ../libempathy/empathy-utils.c:402
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
 msgid "Certificate expired"
 msgstr "Сертификатът е изтекъл"
 
-#: ../libempathy/empathy-utils.c:372 ../libempathy/empathy-utils.c:404
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
 msgid "Certificate not activated"
 msgstr "Сертификатът не е вл�зъл в �ила"
 
-#: ../libempathy/empathy-utils.c:374 ../libempathy/empathy-utils.c:406
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
 msgid "Certificate hostname mismatch"
 msgstr "�е�ъвпадение на името � това в �ертификата"
 
-#: ../libempathy/empathy-utils.c:376 ../libempathy/empathy-utils.c:408
+#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
 msgid "Certificate fingerprint mismatch"
 msgstr "�е�ъвпадение на отпечатъка на �ертификата"
 
-#: ../libempathy/empathy-utils.c:378 ../libempathy/empathy-utils.c:410
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
 msgid "Certificate self-signed"
 msgstr "Сертификатът е �амоподпи�ан"
 
-#: ../libempathy/empathy-utils.c:380
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate error"
 msgstr "Грешка в �ертификата"
 
-#: ../libempathy/empathy-utils.c:414
+#: ../libempathy/empathy-utils.c:344
 msgid "Encryption is not available"
 msgstr "�е е налично шифриране"
 
-#: ../libempathy/empathy-utils.c:416
+#: ../libempathy/empathy-utils.c:346
 msgid "Certificate is invalid"
 msgstr "Сертификатът е неправилен"
 
-#: ../libempathy/empathy-utils.c:418
+#: ../libempathy/empathy-utils.c:348
 msgid "Connection has been refused"
 msgstr "Връзката е отказана"
 
-#: ../libempathy/empathy-utils.c:420
+#: ../libempathy/empathy-utils.c:350
 msgid "Connection can't be established"
 msgstr "�е може да �е у�танови връзка"
 
-#: ../libempathy/empathy-utils.c:422
+#: ../libempathy/empathy-utils.c:352
 msgid "Connection has been lost"
 msgstr "Връзката прекъ�на"
 
-#: ../libempathy/empathy-utils.c:424
+#: ../libempathy/empathy-utils.c:354
 msgid "This resource is already connected to the server"
 msgstr "Ре�ур�ът вече е �вързан към �ървъра"
 
-#: ../libempathy/empathy-utils.c:426
+#: ../libempathy/empathy-utils.c:356
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Връзката бе заме�тена от нова връзка, използваща �ъщи� ре�ур�"
 
-#: ../libempathy/empathy-utils.c:429
+#: ../libempathy/empathy-utils.c:359
 msgid "The account already exists on the server"
 msgstr "�а �ървъра вече има реги�траци� � такова име."
 
-#: ../libempathy/empathy-utils.c:431
+#: ../libempathy/empathy-utils.c:361
 msgid "Server is currently too busy to handle the connection"
 msgstr ""
 "В момента �ървърът е твърде натоварен, за да обработи за�вката за �вързване"
 
-#: ../libempathy/empathy-utils.c:433
+#: ../libempathy/empathy-utils.c:363
 msgid "Certificate has been revoked"
 msgstr "Сертификатът е анулиран"
 
-#: ../libempathy/empathy-utils.c:435
+#: ../libempathy/empathy-utils.c:365
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "Сертификатът използва не�игурен шифър или �лаб алгоритъм за шифриране"
 
-#: ../libempathy/empathy-utils.c:438
+#: ../libempathy/empathy-utils.c:368
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -661,153 +726,147 @@ msgstr ""
 "Дължината на �ертификата на �ървъра или дълбочината на �ертификационната му "
 "верига надхвърл� ограничени�та на криптограф�ката библиотека"
 
-#: ../libempathy/empathy-utils.c:601
+#: ../libempathy/empathy-utils.c:529
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "Хора наблизо"
 
-#: ../libempathy/empathy-utils.c:606
+#: ../libempathy/empathy-utils.c:534
 msgid "Yahoo! Japan"
 msgstr "Yahoo! от Япони�"
 
-#: ../libempathy/empathy-utils.c:635
+#: ../libempathy/empathy-utils.c:563
 msgid "Google Talk"
 msgstr "Google Talk"
 
 # Би тр�бвало тран�литерирани� вариант „Фей�бук“ да е наложен вече
 # �поред http://www.ivosiromahov.com/2_article/a46.html.
 # Иво Сиромахов като лингви�тичен тренд�етър, мали, мали!
-#: ../libempathy/empathy-utils.c:636
+#: ../libempathy/empathy-utils.c:564
 msgid "Facebook Chat"
 msgstr "Разговор във Фей�бук"
 
-#: ../libempathy/empathy-time.c:137
+#: ../libempathy/empathy-time.c:88
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "преди %d �екунда"
 msgstr[1] "преди %d �екунди"
 
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:93
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "преди %d минута"
 msgstr[1] "преди %d минути"
 
-#: ../libempathy/empathy-time.c:147
+#: ../libempathy/empathy-time.c:98
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "преди %d ча�"
 msgstr[1] "преди %d ча�а"
 
-#: ../libempathy/empathy-time.c:152
+#: ../libempathy/empathy-time.c:103
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "преди %d ден"
 msgstr[1] "преди %d дни"
 
-#: ../libempathy/empathy-time.c:157
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "преди %d �едмица"
 msgstr[1] "преди %d �едмици"
 
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:113
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "преди %d ме�ец"
 msgstr[1] "преди %d ме�еца"
 
-#: ../libempathy/empathy-time.c:167
+#: ../libempathy/empathy-time.c:136
 msgid "in the future"
 msgstr "в бъдеще"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:491
-msgid "All"
-msgstr "В�ички"
+#: ../libempathy-gtk/empathy-account-chooser.c:540
+msgid "All accounts"
+msgstr "В�ички реги�трации"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../libempathy-gtk/empathy-log-window.c:643
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "Реги�траци�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "Парола"
 
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Сървър"
 
-#: ../libempathy-gtk/empathy-account-widget.c:685
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Порт"
 
-#: ../libempathy-gtk/empathy-account-widget.c:757
-#: ../libempathy-gtk/empathy-account-widget.c:814
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1166
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "Моите уеб реги�трации"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "Реги�траци�та %s е редактирана чрез „Моите уеб реги�трации“."
+msgid "The account %s is edited via %s."
+msgstr "Реги�траци�та %s �е редактира чрез %s."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1172
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "Реги�траци�та %s не може да �е редактира в Empathy."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
 msgstr "Стартиране на „Моите уеб реги�трации“"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1530
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "Редактиране на %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Потребител�ко име:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1897
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "_Прилагане"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1927
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
 msgstr "_Включване в мрежата"
 
-#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1993
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:520
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1481
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "Реги�траци�:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2004
-msgid "_Enabled"
-msgstr "_Включена"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2069
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "Вече има реги�траци� � такова име на �ървъра."
 
-#: ../libempathy-gtk/empathy-account-widget.c:2072
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "Създаване на нова реги�траци� на �ървъра"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2264
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "_Отказ"
 
@@ -816,19 +875,19 @@ msgstr "_Отказ"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2561
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s на %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2587
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "Реги�траци� в %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2591
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "�ова реги�траци�"
 
@@ -840,6 +899,7 @@ msgstr "<b>Пример:</b> МоетоИме"
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -853,7 +913,7 @@ msgstr "Допълнителни"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "Pass_word:"
 msgstr "П_арола:"
@@ -863,7 +923,7 @@ msgstr "П_арола:"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
 msgid "Remember Password"
 msgstr "Запомн�не"
 
@@ -873,7 +933,7 @@ msgstr "Запомн�не"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 #: ../libempathy-gtk/empathy-password-dialog.c:311
 msgid "Remember password"
@@ -949,76 +1009,84 @@ msgstr "Какъв е идентификаторът ви за ICQ?"
 msgid "What is your ICQ password?"
 msgstr "Каква е паролата ви за ICQ?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:183
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "�втоматично"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:221
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "За�вка за реги�триране"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:226
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "�а�тройки"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "Без"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Character set:"
 msgstr "Кодиране:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"Повечето IRC �ървъри н�мат нужда от парола, така че ако не �те �игурни, не "
+"въвеждайте парола."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Network"
 msgstr "Мрежа"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Network:"
 msgstr "Мрежа:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "П�евдоним:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "Парола:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "Съобщение при напу�кане:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "И�тин�ко име:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Servers"
 msgstr "Сървъри"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "What is your IRC nickname?"
 msgstr "Какво е името ви в мрежата за IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Ко� мрежа за IRC?"
 
@@ -1154,58 +1222,69 @@ msgid "Discover the STUN server automatically"
 msgstr "�втоматично откриване на �ървъра за STUN"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "Ignore TLS Errors"
+msgstr "Игнориране на TLS грешки"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Interval (seconds)"
 msgstr "Интервал [�ек.]"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
 msgid "Keep-Alive Options"
 msgstr "�а�тройки на поддържането на връзката"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
 msgid "Loose Routing"
 msgstr "Свободна маршрутизаци�"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Mechanism:"
 msgstr "Механизъм:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
 msgid "Miscellaneous Options"
 msgstr "Допълнителни на�тройки"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 msgid "NAT Traversal Options"
 msgstr "�а�тройки за преминаването през NAT"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 msgid "Port:"
 msgstr "Порт:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 msgid "Proxy Options"
 msgstr "Сървър-по�редник"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "STUN Server:"
 msgstr "Сървър за STUN:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.c:347
 msgid "Server:"
 msgstr "Сървър:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid "Transport:"
 msgstr "Тран�порт:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr ""
+"Използване на тази реги�траци� за прове_ждане на разговори � наземни и "
+"мобилни мрежи"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "Каква е паролата ви за SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Какво е потребител�кото ви име за SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "Потребител�ко _име:"
 
@@ -1231,28 +1310,36 @@ msgstr "И_дентификатор на Yahoo:"
 msgid "_Room List locale:"
 msgstr "_Локал на �пи�ъка �ъ� �таи:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:448
-#: ../libempathy-gtk/empathy-avatar-chooser.c:524
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "Изображението не може да бъде преобразувано"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "Си�темата ви не поддържа никой от приетите формати за изображени�"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:930
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+msgid "Couldn't save picture to file"
+msgstr "Изображението не може да бъде запазено"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "Избор на изображение за аватар"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
+msgid "Take a picture..."
+msgstr "За�немане…"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "Без изображение"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:995
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "Изображени�"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:999
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "В�ички файлове"
 
@@ -1260,37 +1347,63 @@ msgstr "В�ички файлове"
 msgid "Click to enlarge"
 msgstr "�ати�нете за увеличаване"
 
-#: ../libempathy-gtk/empathy-chat.c:652
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
+msgid "There was an error starting the call"
+msgstr "Възникна грешка при започването на разговор."
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact doesn't support calls"
+msgstr "Избрани�т контакт не поддържа повиквани�"
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is offline"
+msgstr "Избрани�т контакт е извън лини�"
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "The specified contact is not valid"
+msgstr "Избрани�т контакт е неправилен"
+
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "Emergency calls are not supported on this protocol"
+msgstr "С този протокол не могат да �е провеждат разговори за �пешни �лучаи"
+
+#: ../libempathy-gtk/empathy-chat.c:704
 msgid "Failed to open private chat"
 msgstr "�еу�пешно започване на личен разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:717
+#: ../libempathy-gtk/empathy-chat.c:765
 msgid "Topic not supported on this conversation"
 msgstr "В този разговор не �е поддържа тема"
 
-#: ../libempathy-gtk/empathy-chat.c:723
+#: ../libempathy-gtk/empathy-chat.c:771
 msgid "You are not allowed to change the topic"
 msgstr "��мате право да �мените темата"
 
-#: ../libempathy-gtk/empathy-chat.c:906
+#: ../libempathy-gtk/empathy-chat.c:975
+#, c-format
+msgid "“%s� is not a valid contact ID"
+msgstr "„%s“ не е правилно име на контакт"
+
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: изчи�тване на в�ички �ъобщени� в текущи� разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:909
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <тема>: задаване на темата на текущи� разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:912
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "/join <chat room ID>: join a new chat room"
 msgstr ""
 "/join <идентификатор на �та� за разговор>: влизане в нова �та� за разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:915
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid "/j <chat room ID>: join a new chat room"
 msgstr ""
 "/j <идентификатор на �та� за разговор>: влизане в нова �та� за разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:920
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1298,26 +1411,26 @@ msgstr ""
 "/part [<идентификатор на �та� за разговор>] [<причина>]: напу�кане на �та�, "
 "по подразбиране текущата"
 
-#: ../libempathy-gtk/empathy-chat.c:925
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr ""
 "/query <идентификатор на контакт> [<�ъобщение>]: започване на личен разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:928
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr ""
 "/msg <идентификатор на контакт> <�ъобщение>: започване на личен разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:931
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <пр�кор>: �м�на на пр�кора ви за текущи� �ървър"
 
-#: ../libempathy-gtk/empathy-chat.c:934
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr ""
 "/me <�ъобщение>: изпращане на �ъобщение „за дей�твие“ в текущи� разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:937
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1327,7 +1440,11 @@ msgstr ""
 "при �ъобщени� започващи � „/“. �апр.: „/say /join �е използва за влизане в "
 "нова �та� за разговор“"
 
-#: ../libempathy-gtk/empathy-chat.c:942
+#: ../libempathy-gtk/empathy-chat.c:1094
+msgid "/whois <contact ID>: display information about a contact"
+msgstr "/whois <контакт>: показва информаци� за контакта"
+
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1335,99 +1452,114 @@ msgstr ""
 "/help [<команда>]: показване на в�ички поддържани команди. �ко има такава "
 "<команда>, �е показва нейната употреба."
 
-#: ../libempathy-gtk/empathy-chat.c:952
+#: ../libempathy-gtk/empathy-chat.c:1114
 #, c-format
 msgid "Usage: %s"
 msgstr "Употреба: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:991
+#: ../libempathy-gtk/empathy-chat.c:1159
 msgid "Unknown command"
 msgstr "�еизве�тна команда"
 
-#: ../libempathy-gtk/empathy-chat.c:1117
+#: ../libempathy-gtk/empathy-chat.c:1285
 msgid "Unknown command; see /help for the available commands"
 msgstr ""
 "�еизве�тна команда. Пробвайте � „/help“ — ще �е изведат поддържаните команди"
 
-#: ../libempathy-gtk/empathy-chat.c:1254
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1455
+msgid "insufficient balance to send message"
+msgstr "недо�татъчен кредит за изпращане на �ъобщението"
+
+#: ../libempathy-gtk/empathy-chat.c:1457
+msgid "not capable"
+msgstr "лип�ва такава възможно�т"
+
+#: ../libempathy-gtk/empathy-chat.c:1464
 msgid "offline"
 msgstr "изключен"
 
-#: ../libempathy-gtk/empathy-chat.c:1257
+#: ../libempathy-gtk/empathy-chat.c:1467
 msgid "invalid contact"
 msgstr "грешен контакт"
 
-#: ../libempathy-gtk/empathy-chat.c:1260
+#: ../libempathy-gtk/empathy-chat.c:1470
 msgid "permission denied"
 msgstr "лип�ват права"
 
-#: ../libempathy-gtk/empathy-chat.c:1263
+#: ../libempathy-gtk/empathy-chat.c:1473
 msgid "too long message"
 msgstr "прекалено дълго �ъобщение"
 
-#: ../libempathy-gtk/empathy-chat.c:1266
+#: ../libempathy-gtk/empathy-chat.c:1476
 msgid "not implemented"
 msgstr "не е реализирано"
 
-#: ../libempathy-gtk/empathy-chat.c:1270
+#: ../libempathy-gtk/empathy-chat.c:1480
 msgid "unknown"
 msgstr "неизве�тна грешка"
 
-#: ../libempathy-gtk/empathy-chat.c:1274
+#: ../libempathy-gtk/empathy-chat.c:1486
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Грешка при изпращането на �ъобщението „%s“: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1335 ../src/empathy-chat-window.c:717
+#: ../libempathy-gtk/empathy-chat.c:1490
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Грешка при изпращането на �ъобщението: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Тема:"
 
-#: ../libempathy-gtk/empathy-chat.c:1347
+#: ../libempathy-gtk/empathy-chat.c:1563
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Темата вече е: „%s“"
 
-#: ../libempathy-gtk/empathy-chat.c:1349
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "No topic defined"
 msgstr "�е е зададена тема"
 
-#: ../libempathy-gtk/empathy-chat.c:1848
+#: ../libempathy-gtk/empathy-chat.c:2074
 msgid "(No Suggestions)"
 msgstr "(н�ма предложени�)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1916
+#: ../libempathy-gtk/empathy-chat.c:2142
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Добав�не на „%s“ към речник"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1953
+#: ../libempathy-gtk/empathy-chat.c:2179
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Добав�не на „%s“ към речника %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2010
+#: ../libempathy-gtk/empathy-chat.c:2249
 msgid "Insert Smiley"
 msgstr "Вмъкване на емотикон"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2028
-#: ../libempathy-gtk/empathy-ui-utils.c:1808
+#: ../libempathy-gtk/empathy-chat.c:2267
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "_Изпращане"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2063
+#: ../libempathy-gtk/empathy-chat.c:2321
 msgid "_Spelling Suggestions"
 msgstr "_Предложени� за правопи�"
 
-#: ../libempathy-gtk/empathy-chat.c:2152
+#: ../libempathy-gtk/empathy-chat.c:2410
 msgid "Failed to retrieve recent logs"
 msgstr "�еу�пех при получаването на предишните разговори"
 
-#: ../libempathy-gtk/empathy-chat.c:2263
+#: ../libempathy-gtk/empathy-chat.c:2547
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s прекъ�на връзката"
@@ -1435,12 +1567,12 @@ msgstr "%s прекъ�на връзката"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2270
+#: ../libempathy-gtk/empathy-chat.c:2554
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s бе изритан от %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2273
+#: ../libempathy-gtk/empathy-chat.c:2557
 #, c-format
 msgid "%s was kicked"
 msgstr "%s бе изритан"
@@ -1448,17 +1580,17 @@ msgstr "%s бе изритан"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2281
+#: ../libempathy-gtk/empathy-chat.c:2565
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s бе по�тавен под възбрана от %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2284
+#: ../libempathy-gtk/empathy-chat.c:2568
 #, c-format
 msgid "%s was banned"
 msgstr "%s бе по�тавен под възбрана"
 
-#: ../libempathy-gtk/empathy-chat.c:2288
+#: ../libempathy-gtk/empathy-chat.c:2572
 #, c-format
 msgid "%s has left the room"
 msgstr "%s излезе от �та�та"
@@ -1468,105 +1600,137 @@ msgstr "%s излезе от �та�та"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2297
+#: ../libempathy-gtk/empathy-chat.c:2581
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2322
+#: ../libempathy-gtk/empathy-chat.c:2606
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s влезе в �та�та"
 
-#: ../libempathy-gtk/empathy-chat.c:2347
+#: ../libempathy-gtk/empathy-chat.c:2631
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s в момента е познат като %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2486
-#: ../src/empathy-streamed-media-window.c:1949
-#: ../src/empathy-event-manager.c:1122
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2784
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
+#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
 msgid "Disconnected"
 msgstr "Изключен"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3116
+#: ../libempathy-gtk/empathy-chat.c:3428
 msgid "Would you like to store this password?"
 msgstr "И�кате ли паролата да �е запомни?"
 
-#: ../libempathy-gtk/empathy-chat.c:3122
+#: ../libempathy-gtk/empathy-chat.c:3434
 msgid "Remember"
 msgstr "Запомн�не"
 
-#: ../libempathy-gtk/empathy-chat.c:3132
+#: ../libempathy-gtk/empathy-chat.c:3444
 msgid "Not now"
 msgstr "�е �ега"
 
-#: ../libempathy-gtk/empathy-chat.c:3176
+#: ../libempathy-gtk/empathy-chat.c:3488
 msgid "Retry"
 msgstr "�ов опит"
 
-#: ../libempathy-gtk/empathy-chat.c:3180
+#: ../libempathy-gtk/empathy-chat.c:3492
 msgid "Wrong password; please try again:"
 msgstr "Паролата е грешна, пробвайте отново:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3297
+#: ../libempathy-gtk/empathy-chat.c:3622
 msgid "This room is protected by a password:"
 msgstr "Ста�та изи�ква парола:"
 
-#: ../libempathy-gtk/empathy-chat.c:3324
+#: ../libempathy-gtk/empathy-chat.c:3649
 msgid "Join"
 msgstr "При�ъедин�ване"
 
-#: ../libempathy-gtk/empathy-chat.c:3494 ../src/empathy-event-manager.c:1144
+#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "Свързан"
 
-#: ../libempathy-gtk/empathy-chat.c:3547
-#: ../libempathy-gtk/empathy-log-window.c:650
+#: ../libempathy-gtk/empathy-chat.c:3906
 msgid "Conversation"
 msgstr "Разговор"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:422
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:3911
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (SMS)"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
 msgid "Unknown or invalid identifier"
 msgstr "�епознат или неправилен идентификатор"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
 msgid "Contact blocking temporarily unavailable"
 msgstr "Блокирането на контакт временно е недо�тъпно"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
 msgid "Contact blocking unavailable"
 msgstr "Блокирането на контакт е недо�тъпно"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
 msgid "Permission Denied"
 msgstr "До�тъпът е отказан"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
 msgid "Could not block contact"
 msgstr "Контактът не може да �е блокира"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:701
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
 msgid "Edit Blocked Contacts"
 msgstr "Редактиране на блокирани контакти"
 
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Account:"
+msgstr "Реги�траци�:"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "Блокирани контакти"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Изтриване"
+
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:794
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Копиране на адре�а"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:801
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Отвар�не на адре�а"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:420
+#: ../libempathy-gtk/empathy-chat-text-view.c:415
 msgid "%A %B %d %Y"
 msgstr "%d.%m.%Y, %A"
 
@@ -1585,24 +1749,24 @@ msgid "New Contact"
 msgstr "�ов контакт"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:199
+#: ../libempathy-gtk/empathy-individual-dialogs.c:200
 #, c-format
 msgid "Block %s?"
 msgstr "Блокиране на „%s“?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:247
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Сигурни ли �те, че и�кате да забраните на „%s“ да �е �вързва � ва�?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
 msgid "_Block"
 msgstr "_Блокиране"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:278
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Докладване на този контакт за злоупотреба"
@@ -1628,241 +1792,273 @@ msgstr "Без група"
 msgid "Favorite People"
 msgstr "Любими хора"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2001
-#: ../libempathy-gtk/empathy-individual-view.c:2336
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Сигурни ли �те, че и�кате да изтриете групата „%s“?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2003
-#: ../libempathy-gtk/empathy-individual-view.c:2339
+#: ../libempathy-gtk/empathy-contact-list-view.c:1988
+#: ../libempathy-gtk/empathy-individual-view.c:2379
 msgid "Removing group"
 msgstr "Изтриване на група"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2052
-#: ../libempathy-gtk/empathy-contact-list-view.c:2129
-#: ../libempathy-gtk/empathy-individual-view.c:2394
-#: ../libempathy-gtk/empathy-individual-view.c:2588
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../libempathy-gtk/empathy-contact-list-view.c:2037
+#: ../libempathy-gtk/empathy-contact-list-view.c:2114
+#: ../libempathy-gtk/empathy-individual-view.c:2434
+#: ../libempathy-gtk/empathy-individual-view.c:2637
 msgid "_Remove"
 msgstr "_Изтриване"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2082
-#: ../libempathy-gtk/empathy-individual-view.c:2458
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
+#: ../libempathy-gtk/empathy-individual-view.c:2501
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Сигурни ли �те, че и�кате да изтриете контакта „%s“?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2084
-#: ../libempathy-gtk/empathy-individual-view.c:2479
+#: ../libempathy-gtk/empathy-contact-list-view.c:2069
+#: ../libempathy-gtk/empathy-individual-view.c:2522
 msgid "Removing contact"
 msgstr "Изтриване на контакт"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:219
-#: ../src/empathy-main-window.ui.h:13
+#: ../libempathy-gtk/empathy-contact-menu.c:220
+#: ../src/empathy-main-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "_Добав�не на контакт…"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:299
+#: ../libempathy-gtk/empathy-contact-menu.c:300
 msgid "_Block Contact"
 msgstr "_Блокиране на контакта"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:328
-#: ../libempathy-gtk/empathy-individual-menu.c:517
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:329
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "_Разговор"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:359
-#: ../libempathy-gtk/empathy-individual-menu.c:560
+#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_�удио разговор"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:390
-#: ../libempathy-gtk/empathy-individual-menu.c:602
+#: ../libempathy-gtk/empathy-contact-menu.c:394
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Видео разговор"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:436
-#: ../libempathy-gtk/empathy-individual-menu.c:645
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:440
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "_Предишни разговори"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:458
-#: ../libempathy-gtk/empathy-individual-menu.c:686
+#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "Изпращане на файл"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:481
-#: ../libempathy-gtk/empathy-individual-menu.c:728
+#: ../libempathy-gtk/empathy-contact-menu.c:485
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
 msgstr "Сподел�не на работното м��то"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:521
-#: ../libempathy-gtk/empathy-contact-widget.c:1763
-#: ../libempathy-gtk/empathy-individual-menu.c:763
+#: ../libempathy-gtk/empathy-contact-menu.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:1886
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
 #: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "Любимо"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:550
-#: ../libempathy-gtk/empathy-individual-menu.c:791
+#: ../libempathy-gtk/empathy-contact-menu.c:554
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "_Данни за контакта"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:596
+#: ../libempathy-gtk/empathy-contact-menu.c:600
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "_Редактиране"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:650
-#: ../libempathy-gtk/empathy-individual-menu.c:972
-#: ../src/empathy-chat-window.c:935
+#: ../libempathy-gtk/empathy-contact-menu.c:654
+#: ../libempathy-gtk/empathy-individual-menu.c:1284
+#: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "Получена е покана за тази �та�"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:681
-#: ../libempathy-gtk/empathy-individual-menu.c:1019
+#: ../libempathy-gtk/empathy-contact-menu.c:685
+#: ../libempathy-gtk/empathy-individual-menu.c:1330
 msgid "_Invite to Chat Room"
 msgstr "Изпращане на _покана за �та�та"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:513
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
 msgid "Search contacts"
 msgstr "Тър�ене на контакти"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:543
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
 msgid "Search: "
 msgstr "Контакт:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:601
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
 msgid "_Add Contact"
 msgstr "_Добав�не на контакт"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:619
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
 msgid "No contacts found"
 msgstr "��ма намерени контакти"
 
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr "Съобщение � което �е пред�тав�те:"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
+msgstr ""
+"Позволете ми да виждам когато �те на лини�. Благодар�!\n"
+"Please let me see when you're online. Thanks!"
+
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "Избор на контакт"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:295
+#: ../libempathy-gtk/empathy-contact-widget.c:336
 #: ../libempathy-gtk/empathy-individual-widget.c:153
 msgid "Full name:"
 msgstr "Пълно име:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:296
+#: ../libempathy-gtk/empathy-contact-widget.c:337
 #: ../libempathy-gtk/empathy-individual-widget.c:154
 msgid "Phone number:"
 msgstr "Телефонен номер:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:297
+#: ../libempathy-gtk/empathy-contact-widget.c:338
 #: ../libempathy-gtk/empathy-individual-widget.c:155
 msgid "E-mail address:"
 msgstr "�дре� на е-поща:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:298
+#: ../libempathy-gtk/empathy-contact-widget.c:339
 #: ../libempathy-gtk/empathy-individual-widget.c:156
 msgid "Website:"
 msgstr "Уеб�айт:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:299
+#: ../libempathy-gtk/empathy-contact-widget.c:340
 #: ../libempathy-gtk/empathy-individual-widget.c:157
 msgid "Birthday:"
 msgstr "Рожден ден:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:346
+msgid "Last seen:"
+msgstr "По�ледно вид�н:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:348
+msgid "Connected from:"
+msgstr "Свързан от:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:353
+msgid "Away message:"
+msgstr "Съобщение при напу�кане:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+msgid "Channels:"
+msgstr "Канали:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
 msgstr "Код на държавата по ISO:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Country:"
 msgstr "Държава:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "State:"
 msgstr "Щат:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:768
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "City:"
 msgstr "Град:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:770
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Area:"
 msgstr "Обла�т:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:772
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
 msgstr "Пощен�ки код:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:774
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Street:"
 msgstr "Улица:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:776
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
 msgstr "Сграда:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:778
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Floor:"
 msgstr "Етаж:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:780
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Room:"
 msgstr "Ста�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:782
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Text:"
 msgstr "Тек�т:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:784
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Description:"
 msgstr "Опи�ание:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:786
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
 msgstr "�дре� в Интернет:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
 msgstr "�иво на точно�т:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:790
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr "Грешка:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:792
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
 msgstr "Вертикална грешка (метри):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:794
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
 msgstr "Хоризонтална грешка (метри):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr "Скоро�т:"
 
@@ -1870,63 +2066,63 @@ msgstr "Скоро�т:"
 # дадената позици�.  От друга �трана, пеленг може би е прекалено т��но
 # терминологично в �ферата на мор�ката/въздушната навигаци�.
 # Пеленг �тава
-#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Bearing:"
 msgstr "Пеленг:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:800
-#: ../libempathy-gtk/empathy-individual-widget.c:526
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
 msgstr "Скоро�т на изкачване:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:802
-#: ../libempathy-gtk/empathy-individual-widget.c:528
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
 msgstr "По�ледно обнов�ване на:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:804
-#: ../libempathy-gtk/empathy-individual-widget.c:530
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
 msgstr "Дължина:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:806
-#: ../libempathy-gtk/empathy-individual-widget.c:532
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
 msgstr "Широчина:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:808
-#: ../libempathy-gtk/empathy-individual-widget.c:534
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
 msgstr "Ви�очина:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:871
-#: ../libempathy-gtk/empathy-contact-widget.c:888
-#: ../libempathy-gtk/empathy-individual-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:633
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "Ме�тоположение"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:890
-#: ../libempathy-gtk/empathy-individual-widget.c:635
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:942
-#: ../libempathy-gtk/empathy-individual-widget.c:684
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e %B, %Y в %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1024
-#: ../libempathy-gtk/empathy-individual-widget.c:919
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
 msgid "Save Avatar"
 msgstr "Запазване на аватар"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1080
-#: ../libempathy-gtk/empathy-individual-widget.c:977
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
 msgid "Unable to save avatar"
 msgstr "�еу�пех при запазването на аватар"
 
@@ -1936,7 +2132,7 @@ msgstr "<b>Ме�тоположение</b> на (дата)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1307
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr "П�евдоним:"
 
@@ -1956,7 +2152,7 @@ msgstr "Подробни данни за контакта"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "Идентификатор:"
 
@@ -1973,11 +2169,11 @@ msgstr "ОС:"
 msgid "Version:"
 msgstr "Вер�и�:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:332
+#: ../libempathy-gtk/empathy-groups-widget.c:333
 msgid "Groups"
 msgstr "Групи"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:344
+#: ../libempathy-gtk/empathy-groups-widget.c:345
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -1985,74 +2181,105 @@ msgstr ""
 "Изберете групите, в които контактът да �е по�в�ва. Можете да изберете 0 или "
 "повече групи."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:363
+#: ../libempathy-gtk/empathy-groups-widget.c:364
 msgid "_Add Group"
 msgstr "_Добав�не на група"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:398
+#: ../libempathy-gtk/empathy-groups-widget.c:399
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Избор"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1436
+#: ../libempathy-gtk/empathy-groups-widget.c:409
+#: ../src/empathy-main-window.c:1807
 msgid "Group"
 msgstr "Група"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Следни�т контакт ще бъде блокиран:"
 msgstr[1] "Следните контакти ще бъдат блокирани:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:259
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Следни�т контакт не може да бъде блокирана:"
 msgstr[1] "Следните контакти не могат да бъдат блокирани:"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
 msgstr "Свързани контакти"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:354
+#: ../libempathy-gtk/empathy-individual-linker.c:370
 msgid "Select contacts to link"
 msgstr "Изберете контакти за �вързване"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:428
+#: ../libempathy-gtk/empathy-individual-linker.c:444
 msgid "New contact preview"
 msgstr "Преглед на нов контакт"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:472
+#: ../libempathy-gtk/empathy-individual-linker.c:488
 msgid "Contacts selected in the list on the left will be linked together."
 msgstr "Избраните контакти от �пи�ъка вл�во ще бъдат �вързани."
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:131
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:839
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "Изберете реги�траци� за провеждане на разговора"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "Разговор"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+msgid "Mobile"
+msgstr "Мобилен"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "Зает"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "��Ч�ЛО"
+
+#. add an SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+msgid "_SMS"
+msgstr "_SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1142
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Пром�на"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:865
+#: ../libempathy-gtk/empathy-individual-menu.c:1168
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "_Свързване на контакти…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2301
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 msgid "Delete and _Block"
 msgstr "Изтриване и _блокиране"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2467
+#: ../libempathy-gtk/empathy-individual-view.c:2510
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2061,7 +2288,7 @@ msgstr ""
 "�аи�тина ли и�кате да изтриете �ъбирателни� контакт „%s“? В�ички контакти, "
 "които имат връзка � него, ще бъдат �ъщо изтрити."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2144,65 +2371,201 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "_Раздел�не"
 
-#: ../libempathy-gtk/empathy-log-window.c:660
-msgid "Date"
-msgstr "Дата"
+#: ../libempathy-gtk/empathy-log-window.c:634
+msgid "History"
+msgstr "И�тори�"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
+#: ../libempathy-gtk/empathy-log-window.c:689
+msgid "Show"
+msgstr "Показване"
+
+#: ../libempathy-gtk/empathy-log-window.c:711
+msgid "Search"
+msgstr "Тър�ене"
+
+#: ../libempathy-gtk/empathy-log-window.c:1159
+#, c-format
+msgid "Chat in %s"
+msgstr "Разговор в %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1161
+#, c-format
+msgid "Chat with %s"
+msgstr "Разговор � %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%e %B %Y, %A, %X"
+
+#. Translators: this is an emote: '* Danielle waves'
+#: ../libempathy-gtk/empathy-log-window.c:1300
+#, c-format
+msgid "<i>* %s %s</i>"
+msgstr "<i>* %s %s</i>"
+
+#. Translators: this is a message: 'Danielle: hello'
+#. * The string in bold is the sender's name
+#: ../libempathy-gtk/empathy-log-window.c:1306
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1382
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s �екунда"
+msgstr[1] "%s �екунди"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s минута"
+msgstr[1] "%s минути"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "Разговорът продължи %s, приключи в %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1729
+msgid "Today"
+msgstr "Дне�"
+
+#: ../libempathy-gtk/empathy-log-window.c:1733
+msgid "Yesterday"
+msgstr "Вчера"
+
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
+msgid "%e %B %Y"
+msgstr "%e %B %Y"
+
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3444
+msgid "Anytime"
+msgstr "По в��ко време"
+
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2372
+msgid "Anyone"
+msgstr "В�еки"
+
+#: ../libempathy-gtk/empathy-log-window.c:2685
+msgid "Who"
+msgstr "Кой"
+
+#: ../libempathy-gtk/empathy-log-window.c:2889
+msgid "When"
+msgstr "Кога"
+
+#: ../libempathy-gtk/empathy-log-window.c:3005
+msgid "Anything"
+msgstr "В�ичко"
+
+#: ../libempathy-gtk/empathy-log-window.c:3007
+msgid "Text chats"
+msgstr "Тек�тови разговори"
+
+#: ../libempathy-gtk/empathy-log-window.c:3009
+#: ../src/empathy-preferences.ui.h:4
+msgid "Calls"
 msgstr "Разговори"
 
+#: ../libempathy-gtk/empathy-log-window.c:3014
+msgid "Incoming calls"
+msgstr "Вход�щи повиквани�"
+
+#: ../libempathy-gtk/empathy-log-window.c:3015
+msgid "Outgoing calls"
+msgstr "Изход�щи повиквани�"
+
+#: ../libempathy-gtk/empathy-log-window.c:3016
+msgid "Missed calls"
+msgstr "Пропу�нати повиквани�"
+
+#: ../libempathy-gtk/empathy-log-window.c:3038
+msgid "What"
+msgstr "Какво"
+
+#: ../libempathy-gtk/empathy-log-window.c:3747
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr "Сигурни ли �те, че и�кате да изтриете хронологи�та?"
+
+#: ../libempathy-gtk/empathy-log-window.c:3751
+msgid "Clear All"
+msgstr "Изчи�тване"
+
+#: ../libempathy-gtk/empathy-log-window.c:3758
+msgid "Delete from:"
+msgstr "Изтриване от:"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Зареждане…</span>"
+
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "Тър�ене напред"
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Chat"
+msgstr "Разговор"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "Тър�ене назад"
+msgid "Delete All History..."
+msgstr "Изтриване на и�тори�та…"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr "Предишни разговори"
+msgid "Profile"
+msgstr "Профил"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Video"
+msgstr "Видео"
 
-#. Tab Label
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "Тър�ене"
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:20
+msgid "_Edit"
+msgstr "Р_едактиране"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "_File"
+msgstr "_Файл"
 
-#. Searching *for* something
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "_За:"
+msgid "page 2"
+msgstr "�тр. 2"
 
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
 msgid "Contact ID:"
 msgstr "Идентификатор:"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:171
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
 msgid "C_hat"
 msgstr "_Разговор"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:181
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
 msgstr "�ов разговор"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:253
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
 msgid "Send _Video"
 msgstr "Изпращане на _видео"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:261
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
 msgid "C_all"
 msgstr "_Разговор"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:271
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "New Call"
 msgstr "�ов разговор"
 
@@ -2221,34 +2584,34 @@ msgstr ""
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Message…"
 msgstr "Друго �ъобщение…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messages…"
 msgstr "Редактиране на другите �ъобщени�…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
 msgstr "�ати�нете, за да премахнете това �ъ�то�ние като любимо"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
 msgstr "�ати�нете, за да направите това �ъ�то�ние любимо"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
 msgstr "Задаване на �ъ�то�ние"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:946
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
 msgid "Set your presence and current status"
 msgstr "Задайте при�ъ�твието и текущото �и �ъ�то�ние"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1134
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
 msgid "Custom messages…"
 msgstr "Други �ъобщени�…"
 
@@ -2261,18 +2624,26 @@ msgstr "Други �ъобщени�…"
 msgid "New %s account"
 msgstr "�ова реги�траци� в %s"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "Тър�ене:"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "Зачитане на главни/малки"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Mat_ch case"
+msgstr "Зачита_не на главни/малки"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
 msgid "Phrase not found"
 msgstr "Фразата не е открита"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "_Next"
+msgstr "_Следващ"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+msgid "_Previous"
+msgstr "_Предишен"
+
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
 msgstr "Получено е бързо �ъобщение"
@@ -2313,35 +2684,32 @@ msgstr "Изход�щ аудио разговор"
 msgid "Voice call ended"
 msgstr "�удио разговорът завърши"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "Въвеждане на друго �ъобщение"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
 msgstr "Редактиране на други �ъобщени�"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr "_�ово �ъобщение за �ъ�то�ние"
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#, c-format
+msgid "Message edited at %s"
+msgstr "Редактирано в %s"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Status Messages"
-msgstr "Запазени �ъобщени� за �ъ�то�ние"
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
+msgid "Normal"
+msgstr "�ормално"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "Кла�иче�ка"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "Опро�тена"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "Изчи�тена"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "Син�"
 
@@ -2417,19 +2785,19 @@ msgstr "Запомн�не на избора за бъдещи връзки"
 msgid "Certificate Details"
 msgstr "Информаци� за �ертификата"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1705
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
 msgstr "�дре�ът не може да бъде отворен"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1800
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
 msgstr "Избор на файл"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
 msgid "Insufficient free space to save file"
 msgstr "�едо�татъчно �вободно м��то за запазване на файла"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2438,7 +2806,7 @@ msgstr ""
 "За запазването на файла �а необхоими %s, но �вободни �а едва %s. Изберете "
 "друго ме�тоположение."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1924
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Вход�щ файл от %s"
@@ -2626,23 +2994,23 @@ msgstr "Лип�ва �ъобщение за грешка"
 msgid "Instant Message (Empathy)"
 msgstr "Бързо �ъобщение (Empathy)"
 
-#: ../src/empathy.c:308
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "Без автоматично �вързване при �тартиране"
 
-#: ../src/empathy.c:312
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Без показване на �пи�ъка � контакти и други прозорци при �тартиране"
 
-#: ../src/empathy.c:320
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr "— моментни �ъобщени� � Empathy"
 
-#: ../src/empathy.c:499
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
 msgstr "Грешка при �вързване � управлението на реги�трации"
 
-#: ../src/empathy.c:501
+#: ../src/empathy.c:639
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2802,8 +3170,8 @@ msgid "Select the accounts you want to import:"
 msgstr "Изберете реги�трациите за вна��не:"
 
 #: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "Yes"
 msgstr "Да"
 
@@ -2878,35 +3246,36 @@ msgstr "Има незапазени промени отно�но реги�тр
 msgid "Your new account has not been saved yet."
 msgstr "Реги�траци�та ви в�е още не е запазена."
 
-#: ../src/empathy-accounts-dialog.c:286
-#: ../src/empathy-streamed-media-window.c:809
+#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1216
 msgid "Connecting…"
 msgstr "Свързване…"
 
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:386
 #, c-format
 msgid "Offline — %s"
 msgstr "Извън мрежата — %s"
 
-#: ../src/empathy-accounts-dialog.c:339
+#: ../src/empathy-accounts-dialog.c:398
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Изключен — %s"
 
-#: ../src/empathy-accounts-dialog.c:350
+#: ../src/empathy-accounts-dialog.c:409
 msgid "Offline — No Network Connection"
 msgstr "Извън мрежата — лип�ва връзка"
 
 # FIXME: термини за offine и disconnected
-#: ../src/empathy-accounts-dialog.c:357
+#: ../src/empathy-accounts-dialog.c:416
 msgid "Unknown Status"
 msgstr "�еизве�тно �ъ�то�ние"
 
-#: ../src/empathy-accounts-dialog.c:369
+#: ../src/empathy-accounts-dialog.c:428
 msgid "Offline — Account Disabled"
 msgstr "Извън мрежата — реги�траци�та е изключена"
 
-#: ../src/empathy-accounts-dialog.c:772
+#: ../src/empathy-accounts-dialog.c:831
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2914,16 +3283,16 @@ msgstr ""
 "�а път �те да �ъздадете нова реги�траци�, което ще анулира\n"
 "промените ви. И�кате ли да продължите?"
 
-#: ../src/empathy-accounts-dialog.c:1133
+#: ../src/empathy-accounts-dialog.c:1192
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Сигурни ли �те, че и�кате да изтриете реги�траци�та „%s“?"
 
-#: ../src/empathy-accounts-dialog.c:1137
+#: ../src/empathy-accounts-dialog.c:1196
 msgid "This will not remove your account on the server."
 msgstr "Това н�ма да изтрие реги�траци�та ви от �ървъра."
 
-#: ../src/empathy-accounts-dialog.c:1375
+#: ../src/empathy-accounts-dialog.c:1432
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2932,15 +3301,15 @@ msgstr ""
 "промените ви. И�кате ли да продължите?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1593
+#: ../src/empathy-accounts-dialog.c:1643
 msgid "_Enable"
 msgstr "_Включване"
 
-#: ../src/empathy-accounts-dialog.c:1594
+#: ../src/empathy-accounts-dialog.c:1644
 msgid "_Disable"
 msgstr "_Изключване"
 
-#: ../src/empathy-accounts-dialog.c:2113
+#: ../src/empathy-accounts-dialog.c:2154
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2949,18 +3318,22 @@ msgstr ""
 "промените ви. И�кате ли да продължите?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Добав�не…"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
 msgid "Loading account information"
 msgstr "Зареждане на данните за контакта"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "No protocol installed"
 msgstr "�е е ин�талиран протокол"
 
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Protocol:"
 msgstr "Протокол:"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -2968,19 +3341,15 @@ msgstr ""
 "За да добавите нова реги�траци�, тр�бва да имате модул, който поддържа "
 "нейни� протокол."
 
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add…"
-msgstr "_Добав�не…"
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Import…"
 msgstr "_Вна��не…"
 
-#: ../src/empathy-auth-client.c:250
+#: ../src/empathy-auth-client.c:249
 msgid " - Empathy authentication client"
 msgstr " — идентифициране � Empathy"
 
-#: ../src/empathy-auth-client.c:266
+#: ../src/empathy-auth-client.c:265
 msgid "Empathy authentication client"
 msgstr "Идентифициране � Empathy"
 
@@ -2992,94 +3361,116 @@ msgstr "Идентифициране � Empathy"
 msgid "People nearby"
 msgstr "Хора наблизо"
 
-#: ../src/empathy-av.c:118
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr " — телефонна/видео връзка � Empathy"
 
-#: ../src/empathy-av.c:134
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "Телефонна/видео връзка � Empathy"
 
-#: ../src/empathy-streamed-media-window.c:479
+#: ../src/empathy-streamed-media-window.c:431
 msgid "Contrast"
 msgstr "Контра�т"
 
-#: ../src/empathy-streamed-media-window.c:482
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Brightness"
 msgstr "Ярко�т"
 
-#: ../src/empathy-streamed-media-window.c:485
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Gamma"
 msgstr "Гама корекци�"
 
-#: ../src/empathy-streamed-media-window.c:590
+#: ../src/empathy-streamed-media-window.c:542
 msgid "Volume"
 msgstr "Сила на звука"
 
-#: ../src/empathy-streamed-media-window.c:1166
+#: ../src/empathy-streamed-media-window.c:1110
 msgid "_Sidebar"
 msgstr "_Странична лента"
 
-#: ../src/empathy-streamed-media-window.c:1186
+#: ../src/empathy-streamed-media-window.c:1130
 msgid "Audio input"
 msgstr "�удио вход"
 
-#: ../src/empathy-streamed-media-window.c:1190
+#: ../src/empathy-streamed-media-window.c:1134
 msgid "Video input"
 msgstr "Видео вход"
 
-#: ../src/empathy-streamed-media-window.c:1194
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Dialpad"
 msgstr "Циферблат"
 
-#: ../src/empathy-streamed-media-window.c:1205
+#: ../src/empathy-streamed-media-window.c:1151
 msgid "Details"
 msgstr "Подробно�ти"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1274
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1825
 #, c-format
 msgid "Call with %s"
 msgstr "Разговор � %s"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-streamed-media-window.c:1353
-msgid "Call"
-msgstr "Разговор"
-
-#: ../src/empathy-streamed-media-window.c:1507
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:2069
 msgid "The IP address as seen by the machine"
 msgstr "Ме�тен адре�, както �е вижда оттук"
 
-#: ../src/empathy-streamed-media-window.c:1509
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:2071
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Ме�тен адре�, както �е вижда от �ървър в Интернет"
 
-#: ../src/empathy-streamed-media-window.c:1511
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:2073
 msgid "The IP address of the peer as seen by the other side"
 msgstr "�дре� на от�рещната �трана, както �е вижда оттам"
 
-#: ../src/empathy-streamed-media-window.c:1513
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:2075
 msgid "The IP address of a relay server"
 msgstr "�дре� на препредаващи� �ървър"
 
-#: ../src/empathy-streamed-media-window.c:1515
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:2077
 msgid "The IP address of the multicast group"
 msgstr "�дре� на групата за разпръ�кване (multicast)"
 
+#: ../src/empathy-streamed-media-window.c:1843
+msgctxt "encoding video codec"
+msgid "Unknown"
+msgstr "�еизве�тно"
+
+#: ../src/empathy-streamed-media-window.c:1846
+msgctxt "encoding audio codec"
+msgid "Unknown"
+msgstr "�еизве�тно"
+
+#: ../src/empathy-streamed-media-window.c:1849
+msgctxt "decoding video codec"
+msgid "Unknown"
+msgstr "�еизве�тно"
+
+#: ../src/empathy-streamed-media-window.c:1852
+msgctxt "decoding audio codec"
+msgid "Unknown"
+msgstr "�еизве�тно"
+
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2266
+#: ../src/empathy-streamed-media-window.c:2144
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Връзка — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2327
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2846
 msgid "Technical Details"
 msgstr "Техниче�ки данни"
 
-#: ../src/empathy-streamed-media-window.c:2365
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2884
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3088,7 +3479,8 @@ msgstr ""
 "Софтуерът на %s не поддържа никой от аудио форматите, поддържани на ваши� "
 "компютър"
 
-#: ../src/empathy-streamed-media-window.c:2370
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2889
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3097,7 +3489,8 @@ msgstr ""
 "Софтуерът на %s не поддържа никой от видео форматите, поддържани на ваши� "
 "компютър"
 
-#: ../src/empathy-streamed-media-window.c:2376
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2895
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3106,25 +3499,29 @@ msgstr ""
 "�е може да �е о�ъще�тви връзка � %s, чи�то мрежа, веро�тно, не поддържа "
 "преки връзки."
 
-#: ../src/empathy-streamed-media-window.c:2382
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2901
 msgid "There was a failure on the network"
 msgstr "Мрежова грешка"
 
-#: ../src/empathy-streamed-media-window.c:2386
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2905
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Програмите за аудио форматите, изи�квани за този разговор, не �а ин�талирани "
 "на компютъра ви"
 
-#: ../src/empathy-streamed-media-window.c:2389
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2908
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Програмите за видео форматите, изи�квани за този разговор, не �а ин�талирани "
 "на компютъра ви"
 
-#: ../src/empathy-streamed-media-window.c:2399
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2920
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3135,147 +3532,200 @@ msgstr ""
 "\">докладвайте този проблем</a> и прикачете журналните файлове указани в "
 "прозореца „Изчи�тване на грешки“ от менюто „Помощ“."
 
-#: ../src/empathy-streamed-media-window.c:2407
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2929
 msgid "There was a failure in the call engine"
 msgstr "Грешка в модула за разговори"
 
-#: ../src/empathy-streamed-media-window.c:2410
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2932
 msgid "The end of the stream was reached"
 msgstr "До�тигнат е кра�т на потока"
 
-#: ../src/empathy-streamed-media-window.c:2450
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2972
 msgid "Can't establish audio stream"
 msgstr "Потокът на аудио връзката не може да бъде о�ъще�твен"
 
-#: ../src/empathy-streamed-media-window.c:2460
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2982
 msgid "Can't establish video stream"
 msgstr "Потокът на видео връзката не може да бъде о�ъще�твен"
 
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "Audio"
 msgstr "Звук"
 
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "�ов разговор � контакта"
-
 #: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "Включване на камерата"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "Декодиращ модул:"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "Изключване на камерата"
+msgid "Disable camera"
+msgstr "Спиране на камерата"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Декодиращ модул:"
+msgid "Display the dialpad"
+msgstr "Циферблат"
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Изключване на камерата и пращането на видео"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "Кодиращ модул:"
 
 #: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Включване на камерата и пращането на видео"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Hang up"
+msgstr "Затвар�не"
 
 #: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Включване на камерата без пращане на видео"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Hang up current call"
+msgstr "Затвар�не на текущи� разговор"
 
 #: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Кодиращ модул:"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "Ме�тен кандидат:"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "Затвар�не"
+msgid "Maximise me"
+msgstr "Уголем�ване"
 
 #: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Затвар�не на текущи� разговор"
+msgid "Minimise me"
+msgstr "Смал�ване"
 
 #: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Ме�тен кандидат:"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "Отдалечен кандидат:"
 
 #: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "Преглед"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Send Audio"
+msgstr "Изпращане на аудио"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "Повторно набиране"
+msgid "Send Video"
+msgstr "Изпращане на видео"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Отдалечен кандидат:"
+msgid "Show dialpad"
+msgstr "Циферблат"
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "Изпращане на аудио"
+msgid "Start a video call"
+msgstr "Провеждане на видео разговор"
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Превключване на пращането на аудио"
+msgid "Start an audio call"
+msgstr "Провеждане на аудио разговор"
+
+#: ../src/empathy-call-window.ui.h:18
+msgid "Swap camera"
+msgstr "Разм�на на камерата"
 
 #: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "_Видео"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr "Превключване на пращането на аудио"
 
 #: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "Видео"
+msgid "Toggle video transmission"
+msgstr "Превключване на пращането на видео"
 
 #: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "Изключване на видеото"
-
-#: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "Включване на видеото"
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
+#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
+msgid "Unknown"
+msgstr "�еизве�тно"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "Преглед на видеото"
+msgid "Video call"
+msgstr "Видео разговор"
 
 #: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "_Разговор"
 
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:25
+msgid "_Camera"
+msgstr "_Камера"
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:18
+msgid "_Contents"
+msgstr "_Ръковод�тво"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
+msgid "_Debug"
+msgstr "_Изчи�тване на грешки"
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:22
+msgid "_Help"
+msgstr "Помо_щ"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Microphone"
+msgstr "_Микрофон"
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "_Settings"
+msgstr "_�а�тройки"
+
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_Преглед"
 
-#: ../src/empathy-chat-window.c:474 ../src/empathy-chat-window.c:494
+#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d непрочетено)"
 msgstr[1] "%s (%d непрочетени)"
 
-#: ../src/empathy-chat-window.c:486
+#: ../src/empathy-chat-window.c:493
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (и %u друго)"
 msgstr[1] "%s (и %u други)"
 
-#: ../src/empathy-chat-window.c:502
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d непрочетено от други)"
 msgstr[1] "%s (%d непрочетени от други)"
 
-#: ../src/empathy-chat-window.c:511
+#: ../src/empathy-chat-window.c:518
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d непрочетено от в�ички)"
 msgstr[1] "%s (%d непрочетени от в�ички)"
 
-#: ../src/empathy-chat-window.c:721
+#: ../src/empathy-chat-window.c:733
+msgid "SMS:"
+msgstr "SMS:"
+
+#: ../src/empathy-chat-window.c:743
+#, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "Изпращане на %d �ъобщение"
+msgstr[1] "Изпращане на %d �ъобщени�"
+
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
 msgstr "Пише �ъобщение."
 
@@ -3287,10 +3737,6 @@ msgstr "_Изчи�тване на прозореца"
 msgid "C_ontact"
 msgstr "_Контакт"
 
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Разговор"
-
 #: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
 msgstr "_Вмъкване на емотикон"
@@ -3311,10 +3757,6 @@ msgstr "Преме�тване на подпрозореца на_д��но"
 msgid "Notify for All Messages"
 msgstr "Изве�т�ване за в�ички �ъобщени�"
 
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
-msgid "_Contents"
-msgstr "_Ръковод�тво"
-
 #: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "_Разговор"
@@ -3323,18 +3765,10 @@ msgstr "_Разговор"
 msgid "_Detach Tab"
 msgstr "_Отдел�не на подпрозореца"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
-msgid "_Edit"
-msgstr "Р_едактиране"
-
 #: ../src/empathy-chat-window.ui.h:13
 msgid "_Favorite Chat Room"
 msgstr "_Любима �та� за разговор"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
-msgid "_Help"
-msgstr "Помо_щ"
-
 #: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "_Следващ подпрозорец"
@@ -3355,15 +3789,15 @@ msgstr "_Подпрозорци"
 msgid "_Undo Close Tab"
 msgstr "_Отм�на на затвар�нето на подпрозорец"
 
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "Име"
 
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
 msgstr "Ста�"
 
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "�втоматично �вързване"
 
@@ -3371,90 +3805,96 @@ msgstr "�втоматично �вързване"
 msgid "Manage Favorite Rooms"
 msgstr "Управление на �таите в отметките"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming video call"
 msgstr "Вход�щ видео разговор"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
 msgid "Incoming call"
 msgstr "Вход�щ разговор"
 
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:525
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s ви тър�и � видео, и�кате ли да отговорите?"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s ви тър�и, и�кате ли да отговорите?"
 
-#: ../src/empathy-event-manager.c:515 ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Вход�щ разговор от %s"
 
-#: ../src/empathy-event-manager.c:540
+#: ../src/empathy-event-manager.c:554
 msgid "_Reject"
 msgstr "От_казване"
 
-#: ../src/empathy-event-manager.c:546
+#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
 msgid "_Answer"
 msgstr "_Отговар�не"
 
-#: ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:570
+msgid "_Answer with video"
+msgstr "_Отговор � видео"
+
+#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Вход�щ видео разговор от %s"
 
-#: ../src/empathy-event-manager.c:737
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
 msgstr "Покана за �та�"
 
-#: ../src/empathy-event-manager.c:739
+#: ../src/empathy-event-manager.c:838
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Покана за при�ъедин�ване към %s"
 
-#: ../src/empathy-event-manager.c:746
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s ви кани да �е при�ъедините към %s"
 
-#: ../src/empathy-event-manager.c:754
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
 msgstr "_Отказване"
 
-#: ../src/empathy-event-manager.c:759
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_При�ъедин�ване"
 
-#: ../src/empathy-event-manager.c:786
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s ви кани да �е при�ъедините към %s"
 
-#: ../src/empathy-event-manager.c:792
+#: ../src/empathy-event-manager.c:891
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Кан�т ви да �е при�ъедините към %s"
 
-#: ../src/empathy-event-manager.c:843
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Вход�щ файл от %s"
 
-#: ../src/empathy-event-manager.c:1013 ../src/empathy-main-window.c:370
+#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
 msgid "Password required"
 msgstr "Парола"
 
-#: ../src/empathy-event-manager.c:1069
+#: ../src/empathy-event-manager.c:1190
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s и�ка разрешение да вижда дали �те в мрежата"
 
-#: ../src/empathy-event-manager.c:1073
+#: ../src/empathy-event-manager.c:1194
 #, c-format
 msgid ""
 "\n"
@@ -3464,105 +3904,105 @@ msgstr ""
 "Съобщение: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:100
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u ч., %02u м. и %02u �ек."
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:102
+#: ../src/empathy-ft-manager.c:103
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u м. и %02u �ек."
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:179
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "�еизве�тно"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s от общо %s, � %s/�ек."
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:275
 #, c-format
 msgid "%s of %s"
 msgstr "%s от общо %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:305
+#: ../src/empathy-ft-manager.c:306
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Получаване на файла „%s“ от %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:309
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Изпращане на файла „%s“ до %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:338
+#: ../src/empathy-ft-manager.c:339
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Грешка при получаване на „%s“ от %s"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:342
 msgid "Error receiving a file"
 msgstr "Грешка при получаване на файл"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:347
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Грешка при изпращане на „%s“ до %s"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:350
 msgid "Error sending a file"
 msgstr "Грешка при изпращане на файл"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:489
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "„%s“ получен от %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:493
+#: ../src/empathy-ft-manager.c:494
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "„%s“ изпратен до %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:497
 msgid "File transfer completed"
 msgstr "Прехвърл�нето на файл завърши"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
 msgid "Waiting for the other participant's response"
 msgstr "Изчакване на отговора на други� уча�тник"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Проверка на цело�тта на „%s“"
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Изчи�л�ване на извадката на „%s“"
 
-#: ../src/empathy-ft-manager.c:1016
+#: ../src/empathy-ft-manager.c:1026
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1028
+#: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "Файл"
 
-#: ../src/empathy-ft-manager.c:1050
+#: ../src/empathy-ft-manager.c:1060
 msgid "Remaining"
 msgstr "О�тават"
 
@@ -3601,127 +4041,140 @@ msgstr "Протокол"
 msgid "Source"
 msgstr "Източник"
 
-#: ../src/empathy-main-window.c:387
+#: ../src/empathy-main-window.c:392
 msgid "Provide Password"
 msgstr "Паролата ви"
 
-#: ../src/empathy-main-window.c:393
+#: ../src/empathy-main-window.c:398
 msgid "Disconnect"
 msgstr "Прекъ�ване"
 
-#: ../src/empathy-main-window.c:533
+#: ../src/empathy-main-window.c:622
 msgid "No match found"
 msgstr "�е е намерено �ъвпадение"
 
-#: ../src/empathy-main-window.c:688
+#: ../src/empathy-main-window.c:777
 msgid "Reconnect"
 msgstr "�ово �вързване"
 
-#: ../src/empathy-main-window.c:694
+#: ../src/empathy-main-window.c:783
 msgid "Edit Account"
 msgstr "Редактиране на реги�траци�"
 
-#: ../src/empathy-main-window.c:700
+#: ../src/empathy-main-window.c:789
 msgid "Close"
 msgstr "Затвар�не"
 
-#: ../src/empathy-main-window.c:1418
+#. Translators: this string will be something like:
+#. *   Top up My Account ($1.23)..."
+#: ../src/empathy-main-window.c:928
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr "Захранване на %s (%s)…"
+
+#: ../src/empathy-main-window.c:975
+msgid "Top up account credit"
+msgstr "Захранване на кредита"
+
+#. top up button
+#: ../src/empathy-main-window.c:1046
+msgid "Top Up..."
+msgstr "Захранване…"
+
+#: ../src/empathy-main-window.c:1789
 msgid "Contact"
 msgstr "Контакт"
 
-#: ../src/empathy-main-window.c:1765
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "Спи�ък � контакти"
 
-#: ../src/empathy-main-window.c:1881
-msgid "Show and edit accounts"
-msgstr "Показване и редактиране на реги�трации"
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "_Контакти на карта"
 
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-main-window-menubar.ui.h:2
+msgid "Credit Balance"
+msgstr "Кредит"
+
+#: ../src/empathy-main-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "_Тър�ене в �пи�ъка � контакти"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "_Добав�не към отметките"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "Редактиране на отметките"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "_�ормален размер"
 
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "�ов _разговор…"
 
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "�ормален размер � _аватари"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "_�а�тройки"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "_Показване на протокола"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "Подреждане по _име"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "Подреждане по _�ъ�то�ние"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Реги�трации"
 
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "_Блокирани контакти"
 
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "_Стегнат режим"
 
-#: ../src/empathy-main-window.ui.h:18
-msgid "_Debug"
-msgstr "_Изчи�тване на грешки"
-
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "_Прехвърл�ни� на файлове"
 
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "_При�ъедин�ване…"
 
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "_�ов разговор…"
 
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "_Изключени контакти"
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "_Лични данни"
 
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "_Ста�"
 
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window-menubar.ui.h:29
 msgid "_Search for Contacts…"
 msgstr "_Тър�ене на контакти…"
 
@@ -3735,7 +4188,7 @@ msgstr "Уча�тници"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:560
+#: ../src/empathy-new-chatroom-dialog.c:553
 #, c-format
 msgid ""
 "%s\n"
@@ -3751,16 +4204,16 @@ msgstr ""
 # �алага �е � главни букви, защото „да“ �е използва в помощника за нови
 # реги�трации, където има и отговори под формата на пълни изречени� като
 # „�е, това е в�ичко за�ега“.
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "No"
 msgstr "�е"
 
-#: ../src/empathy-new-chatroom-dialog.c:591
+#: ../src/empathy-new-chatroom-dialog.c:584
 msgid "Could not start room listing"
 msgstr "Избро�ването на �таите не може да започне"
 
-#: ../src/empathy-new-chatroom-dialog.c:601
+#: ../src/empathy-new-chatroom-dialog.c:594
 msgid "Could not stop room listing"
 msgstr "Избро�ването на �таите не може да �пре"
 
@@ -3795,39 +4248,79 @@ msgstr "Спи�ък �ъ� �таи"
 msgid "_Room:"
 msgstr "_Ста�:"
 
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr "Съобщението е получено"
 
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr "Съобщението е изпратено"
 
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
 msgstr "�ов разговор"
 
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
 msgstr "Контактът е в мрежата"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
 msgstr "Контактът е извън мрежата"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
 msgstr "Реги�траци�та е включена"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
 msgstr "Реги�траци�та е изключена"
 
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr "Език"
 
-#: ../src/empathy-preferences.c:875
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:734
+msgid "Juliet"
+msgstr "Жулиета"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:741
+msgid "Romeo"
+msgstr "Ромео"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:747
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr "Ромео! О, защо �и ти Ромео?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:750
+msgid "Deny thy father and refuse thy name;"
+msgstr "От род и име отречи �е или"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:753
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr "ако не щеш, любовна клетва дай ми"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:756
+msgid "And I'll no longer be a Capulet."
+msgstr "и аз не ще �ъм вече Капулети!"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:759
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr "Да � отвърна ли или да �лушам?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:762
+msgid "Juliet has disconnected"
+msgstr "Жулиета прекъ�на връзката"
+
+#: ../src/empathy-preferences.c:1166
 msgid "Preferences"
 msgstr "�а�тройки"
 
@@ -3835,67 +4328,87 @@ msgstr "�а�тройки"
 msgid "Appearance"
 msgstr "Изглед"
 
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
 msgstr "Поведение"
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
 msgid "Chat Th_eme:"
 msgstr "_Тема за прозорците за разговори:"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
 msgid "Disable notifications when _away or busy"
 msgstr "Без _изве�т�ване в �ъ�то�ние „Зает“ или „От�ъ�тващ“"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
 msgid "Disable sounds when _away or busy"
 msgstr "Без _звуци в �ъ�то�ние „Зает“ или „От�ъ�тващ“"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Показване на вход�щи �ъбити� в обла�тта за уведом�ване"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"Премахването на ехото може да изчи�ти гла�а ви за от�рещната �трана, но при "
+"н�кои компютри �ъздава проблеми. �ко н�кой от �ъбе�едниците �е оплаче, че "
+"чува �транни шумове или прекъ�вани� по време на разговора, изключете "
+"премахването на ехото и проведете наново разговор."
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "Изве�т�ване, когато контактът влезе в мрежата"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "Изве�т�ване, когато контактът излезе извън мрежата"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Изве�т�ване, когато прозорецът за разговори не е на _фоку�"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "Езици � проверка на правопи�а:"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "Общи"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input level:"
+msgstr "�иво на вход�щи� звук:"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "Сила на вход�щи� звук:"
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "Датчик за ме�тоположение:"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "�рхив на разговорите"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "Изве�т�ване"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Звуци при �ъбити�"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "Лични данни"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -3905,66 +4418,74 @@ msgstr ""
 "точни данни от град, щат, държава. Координатите от GPS ще �а точни до едно "
 "м��то зад де�етичната запета�."
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "Използване на _картинки за емотикони"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "_Показване на контактите в �таите"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "Звуци"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "Проверка на правопи�а"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "В �пи�ъка �а �амо езиците, за които е ин�талиран речник."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "Графични теми"
 
-#: ../src/empathy-preferences.ui.h:25
+# Това е пеленг.  По�ока е неточно, защото не е релативно �пр�мо
+# дадената позици�.  От друга �трана, пеленг може би е прекалено т��но
+# терминологично в �ферата на мор�ката/въздушната навигаци�.
+# Пеленг �тава
+#: ../src/empathy-preferences.ui.h:30
+msgid "Variant:"
+msgstr "Пеленг:"
+
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "_�втоматично �вързване при �тартиране"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Мобилен телефон"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "Включване на изве�т�ването � _прозорци"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "Включване на уведом�ването �ъ� _звук"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Мрежа (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "_Отвар�не на разговорите в отделни прозорци"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "_Публикуване на ме�тоположението ви към контактите ви"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "_�и�ка точно�т на ме�тоположението"
 
@@ -3976,67 +4497,115 @@ msgstr "Съ�то�ние"
 msgid "_Quit"
 msgstr "_Спиране на програмата"
 
-#: ../src/empathy-map-view.c:442
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "�ов разговор � контакта"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "Включване на камерата"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "Изключване на камерата"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "Изключване на камерата и пращането на видео"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "Включване на камерата и пращането на видео"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "Включване на камерата без пращане на видео"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "Преглед"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "Повторно набиране"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "_Видео"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "Изключване на видеото"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "Включване на видеото"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "Преглед на видеото"
+
+#: ../src/empathy-map-view.c:448
 msgid "Contact Map View"
 msgstr "Карта � контактите"
 
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
 msgid "Save"
 msgstr "Запазване"
 
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
 msgstr "Прозорец за изчи�тване на грешки"
 
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
 msgstr "�иво"
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
 msgid "Debug"
 msgstr "Подробно�т"
 
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
 msgid "Info"
 msgstr "Информаци�"
 
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
 msgid "Message"
 msgstr "Съобщение"
 
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
 msgid "Critical"
 msgstr "Критична"
 
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
 msgid "Error"
 msgstr "Грешка"
 
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
 msgid "Time"
 msgstr "Време"
 
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
 msgid "Domain"
 msgstr "Обла�т"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
 msgstr "Категори�"
 
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "�иво"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4044,16 +4613,16 @@ msgstr ""
 "Избраната програма за управление на връзките не поддържа разширението за "
 "отдалечено изчи�тване на грешки."
 
-#: ../src/empathy-invite-participant-dialog.c:34
-#: ../src/empathy-invite-participant-dialog.c:48
+#: ../src/empathy-invite-participant-dialog.c:179
+#: ../src/empathy-invite-participant-dialog.c:205
 msgid "Invite Participant"
 msgstr "Поканване на уча�тник"
 
-#: ../src/empathy-invite-participant-dialog.c:35
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Избор на контакт, за поканване в разговора:"
 
-#: ../src/empathy-invite-participant-dialog.c:45
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "Покана"
 
@@ -4087,7 +4656,15 @@ msgstr "— Реги�трации на Empathy"
 msgid "Empathy Accounts"
 msgstr "Реги�трации на Empathy"
 
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr "Само избрана у�луга"
+
+#: ../src/empathy-debugger.c:75
+msgid "- Empathy Debugger"
+msgstr "— изчи�тване на грешки към Empathy"
+
+#: ../src/empathy-debugger.c:114
 msgid "Empathy Debugger"
 msgstr "Изчи�тване на грешки към Empathy"
 
@@ -4095,34 +4672,71 @@ msgstr "Изчи�тване на грешки към Empathy"
 msgid "- Empathy Chat Client"
 msgstr "— моментни �ъобщени� � Empathy"
 
-#: ../src/empathy-notifications-approver.c:184
+#: ../src/empathy-notifications-approver.c:203
 msgid "Respond"
 msgstr "Отговар�не"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1459
 msgid "Reject"
 msgstr "Отхвърл�не"
 
-#: ../src/empathy-notifications-approver.c:194
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1460
 msgid "Answer"
 msgstr "Отговор"
 
-#: ../src/empathy-notifications-approver.c:201
-#: ../src/empathy-notifications-approver.c:211
+#: ../src/empathy-notifications-approver.c:227
+msgid "Answer with video"
+msgstr "Отговор � видео"
+
+#: ../src/empathy-notifications-approver.c:235
+#: ../src/empathy-notifications-approver.c:245
 msgid "Decline"
 msgstr "Отклон�ване"
 
-#: ../src/empathy-notifications-approver.c:205
-#: ../src/empathy-notifications-approver.c:216
+#: ../src/empathy-notifications-approver.c:239
+#: ../src/empathy-notifications-approver.c:250
 msgid "Accept"
 msgstr "Приемане"
 
-#: ../src/empathy-call-observer.c:130
-#, c-format
-msgid "Missed call from %s"
-msgstr "Пропу�нато повикване от %s"
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:260
+msgid "Provide"
+msgstr "Въвеждане"
 
-#: ../src/empathy-call-observer.c:133
+#: ../src/empathy-call-observer.c:134
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s току-що �е опита да ви позвъни, но провеждахте друг разговор."
+
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+msgid "i"
+msgstr "инф."
+
+#: ../src/empathy-call-window.c:2775
+msgid "On hold"
+msgstr "Задържане"
+
+#: ../src/empathy-call-window.c:2778
+msgid "Mute"
+msgstr "Без звук"
+
+#: ../src/empathy-call-window.c:2780
+msgid "Duration"
+msgstr "Времетраене"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2783
+#, c-format
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02dм"
+
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "Зачита_не на главни/малки"
diff --git a/po/ca.po b/po/ca.po
index 4235814d3..9fd61966e 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -2,21 +2,21 @@
 # Copyright © 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This file is distributed under the same licence as the gossip package.
 # Jordi Mallach <jordi@sindominio.net>, 2003, 2004, 2005, 2006, 2007.
-# Gil Forcada  <gilforcada@guifi.net>, 2008, 2009, 2010, 2011.
+# Gil Forcada <gilforcada@guifi.net>, 2008, 2009, 2010, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-02 20:42+0200\n"
-"PO-Revision-Date: 2011-04-02 20:42+0200\n"
+"POT-Creation-Date: 2011-09-25 23:21+0200\n"
+"PO-Revision-Date: 2011-09-25 21:46+0200\n"
 "Last-Translator: Gil Forcada <gilforcada@guifi.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n!=1;\n"
+"Content-Transfer-Encoding: 8bits\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
@@ -41,6 +41,22 @@ msgid "Always open a separate chat window for new chats."
 msgstr "Obre sempre una finestra de xat separada per a xats nous."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr "Volum de la trucada"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr "Volum de la trucada, en percentatge."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Camera device"
+msgstr "Dispositiu de la càmera"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "Posició de la càmera"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -48,46 +64,56 @@ msgstr ""
 "Caràcter que s'afegirà després del sobrenom quan s'utilitzi la compleció de "
 "sobrenom (tabulació) en els xats de grup."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "Tema de la finestra de xat"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+msgid "Chat window theme variant"
+msgstr "Variant del tema de la finestra de xat"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "Llista separada per comes de les llengües del verificador ortogràfic a "
 "utilitzar (p. ex. «ca, en, es, fr»)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "Llista de contactes compacta"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "S'haurien d'utilitzar gestors de connexions"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "Criteri d'ordenació de la llista de contactes"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr ""
+"Dispositiu de càmera per defecte a utilitzar en les trucades de vídeo, per "
+"exemple /dev/video0."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
 msgstr "El directori predeterminat des d'on seleccionar una imatge d'avatar"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr "Inhabilita les notificacions quan s'estigui absent"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr "Inhabilita els sons quan s'estigui absent"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
 msgstr "Mostra els esdeveniments d'entrada en l'àrea d'estat"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -95,239 +121,260 @@ msgstr ""
 "Mostra els esdeveniments d'entrada en l'àrea d'estat. Si és «false» (fals) "
 "mostra'ls immediatament a l'usuari."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+msgid "Echo cancellation support"
+msgstr "Utilitza la cancel·lació de l'eco"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr "L'Empathy pot publicar la ubicació de l'usuari"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "L'Empathy pot utilitzar el GPS per determinar la ubicació"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr ""
 "L'Empathy pot utilitzar la xarxa de telefonia mòbil per determinar la "
 "ubicació"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr "L'Empathy pot utilitzar la xarxa per determinar la ubicació"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr "Carpeta predeterminada de les baixades de l'Empathy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
 msgstr "L'Empathy ha migrat dels registres de la Butterfly"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr "Fes que l'Empathy canviï automàticament a absent quan estigui inactiu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "Fes que l'Empathy es connecti automàticament en iniciar-se"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "L'Empathy hauria de reduir la precisió de la ubicació"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
 "Fes que l'Empathy utilitzi l'avatar del contacte com a icona de la finestra "
 "de xat"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr "Habilita les eines de desenvolupador del WebKit"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "Habilita les notificacions per als missatges nous"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "Habilita el verificador ortogràfic"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "Oculta la finestra principal"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "Oculta la finestra principal."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "Caràcter de compleció de sobrenom"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "Obre les finestres de xat noves en finestres separades"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "Camí al tema Adium a utilitzar"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
 "Camí al tema Adium a utilitzar si el tema utilitzat per al xat és l'Adium."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Reprodueix un so quan arribin missatges"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "Reprodueix un so per a les converses noves"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Reprodueix un so per als missatges de sortida"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "Reprodueix un so quan entri algun contacte"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "Reprodueix un so quan surti algun contacte"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "Reprodueix un so en entrar"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "Reprodueix un so en sortir"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Mostra notificacions si el xat no és la finestra activa"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "Mostra notificacions si entra un contacte"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "Mostra notificacions si surt un contacte"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr ""
+"Posició on s'hauria de mostrar la previsualització de la càmera durant una "
+"trucada."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+msgid "Show Balance in contact list"
+msgstr "Mostra el saldo a la llista de contactes"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "Mostra els avatars"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "Mostra la llista de contactes a les sales"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr "Mostra un consell sobre el tancament de la finestra principal"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr "Mostra els contactes fora de línia"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
 msgstr "Mostra els protocols"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "Llengües per a la verificació ortogràfica"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr "La carpeta predeterminada on es desaran els fitxers transferits."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
 msgstr "L'últim directori des d'on es va seleccionar una imatge d'avatar."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
 msgstr "La posició per la subfinestra lateral de la finestra de xat"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr ""
 "La posició emmagatzemada (en píxels) de la subfinestra lateral de la "
 "finestra de xat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "El tema que s'utilitza per mostrar la conversa a les finestres de xat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr ""
+"La variant del tema que s'utilitza per mostrar la conversa a les finestres "
+"de xat."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Utilitza emoticones gràfiques"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "Utilitza sons de notificació"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "Utilitza el tema per a les sales de xat"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr ""
 "Si l'Empathy ha de publicar la ubicació de l'usuari als seus contactes."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Si l'Empathy ha d'utilitzar el GPS per determinar la ubicació."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
 "Si l'Empathy ha d'utilitzar la xarxa de mòbils per determinar la ubicació."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Si l'Empathy ha d'utilitzar la xarxa per determinar la ubicació."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "Si l'Empathy ha migrat els registres de la Butterfly."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Si l'Empathy ha d'entrar en els comptes automàticament en iniciar-se."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
 "Si l'Empathy ha de canviar automàticament al mode absent quan l'usuari està "
 "inactiu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 "Si l'Empathy ha de reduir la precisió de la ubicació per motius de privadesa."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 "Si l'Empathy ha d'utilitzar l'avatar del contacte com a icona de la finestra "
 "de xat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Si s'han d'habilitar les eines de desenvolupament del WebKit, com ara "
 "l'inspector web."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
@@ -335,70 +382,75 @@ msgstr ""
 "Si s'ha d'utilitzar el gestor de connexions per desconnectar/tornar a "
 "connectar automàticament."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr ""
 "Si s'han de verificar les paraules introduïdes comparant-les amb les "
 "llengües triades per a la verificació ortogràfica."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr ""
 "Si s'han de convertir les emoticones a imatges gràfiques a les converses."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr ""
+"Si s'hauria d'habilitar el filtre de cancel·lació de l'eco del Pulseaudio."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr ""
 "Si s'ha de reproduir un so per notificar que els contactes entren a la xarxa."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
 "Si s'ha de reproduir un so per notificar que els contactes surten de la "
 "xarxa."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "Si s'ha de reproduir un so per notificar esdeveniments."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Si s'ha de reproduir un so quan arribin missatges."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Si s'ha de reproduir un so quan s'iniciïn converses noves."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Si s'ha de reproduir un so quan s'enviïn missatges."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "Si s'ha de reproduir un so quan s'entri a una xarxa."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Si s'ha de reproduir un so quan se surti d'una xarxa."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr ""
 "Si s'han de reproduir notificacions de so quan s'estigui absent o ocupat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr ""
 "Si s'ha de mostrar una notificació emergent quan es desconnecti un contacte."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr ""
 "Si s'ha de mostrar una notificació emergent quan es connecti un contacte."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -406,43 +458,47 @@ msgstr ""
 "Si s'han de mostrar notificacions emergents quan es rebi un esdeveniment de "
 "missatge nou i el xat ja estigui obert però no tingui el focus."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr ""
 "Si s'ha de mostrar una notificació emergent quan es rebin missatges nous."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+msgid "Whether to show account balances in the contact list."
+msgstr "Si s'han de mostrar els saldos dels comptes a la llista de contactes."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 "Si s'han de mostrar els avatars per als contactes a la llista de contactes i "
 "les finestres de xat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr ""
 "Si s'han de mostrar els contactes que estan fora de línia a la llista de "
 "contactes."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
 msgstr ""
 "Si s'han de mostrar notificacions emergents quan s'estigui absent o ocupat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr ""
 "Si s'han de mostrar els protocols dels contactes a la llista de contactes."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Si s'ha de mostrar la llista de contactes a les sales de xat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "Si s'ha de mostrar la llista de contactes en mode compacte."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -450,11 +506,11 @@ msgstr ""
 "Si s'ha de mostrar el diàleg de missatge sobre el tancament de la finestra "
 "principal amb el botó «x» de la barra de títol."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "Si s'ha d'utilitzar el tema per a les sales de xat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -471,7 +527,7 @@ msgstr "Gestiona els comptes de missatgeria i VoIP"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2242
+#: ../src/empathy-accounts-dialog.c:2324
 msgid "Messaging and VoIP Accounts"
 msgstr "Comptes de missatgeria i VoIP"
 
@@ -479,18 +535,34 @@ msgstr "Comptes de missatgeria i VoIP"
 msgid "File transfer completed, but the file was corrupted"
 msgstr "S'ha completat la transferència però el fitxer és malmès"
 
-#: ../libempathy/empathy-ft-handler.c:1113
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
 msgstr "El contacte remot no admet la transferència de fitxers"
 
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is not a regular file"
 msgstr "El fitxer seleccionat no és un fitxer normal"
 
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1176
 msgid "The selected file is empty"
 msgstr "El fitxer seleccionat és buit"
 
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#, c-format
+msgid "Missed call from %s"
+msgstr "Us ha trucat %s però no hi éreu"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, c-format
+msgid "Called %s"
+msgstr "Trucada de %s"
+
+#: ../libempathy/empathy-message.c:422
+#, c-format
+msgid "Call from %s"
+msgstr "Trucada des de %s"
+
 #: ../libempathy/empathy-tp-file.c:268
 msgid "Socket type not supported"
 msgstr "No està implementat aquest tipus de sòcol"
@@ -519,146 +591,144 @@ msgstr "S'ha produït un error en enviar el fitxer"
 msgid "The other participant is unable to transfer the file"
 msgstr "L'interlocutor no pot enviar el fitxer"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:382
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
 msgid "Unknown reason"
 msgstr "Motiu desconegut"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:232
 msgid "Available"
 msgstr "Disponible"
 
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:234
 msgid "Busy"
 msgstr "Ocupat"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:237
 msgid "Away"
 msgstr "Absent"
 
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:239
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-utils.c:241
 msgid "Offline"
 msgstr "Fora de línia"
 
-#: ../libempathy/empathy-utils.c:315
-#: ../src/empathy-streamed-media-window.c:1904
-#: ../src/empathy-streamed-media-window.c:1905
-#: ../src/empathy-streamed-media-window.c:1906
-#: ../src/empathy-streamed-media-window.c:1907
-#: ../src/empathy-call-window.ui.h:18
+#. translators: presence type is unknown
+#: ../libempathy/empathy-utils.c:244
+msgctxt "presence"
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:284
 msgid "No reason specified"
 msgstr "No s'ha especificat el motiu"
 
-#: ../libempathy/empathy-utils.c:356 ../libempathy/empathy-utils.c:412
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
 msgid "Status is set to offline"
 msgstr "S'ha establert l'estat a desconnectat"
 
-#: ../libempathy/empathy-utils.c:358 ../libempathy/empathy-utils.c:392
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "Error de la xarxa"
 
-#: ../libempathy/empathy-utils.c:360 ../libempathy/empathy-utils.c:394
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
 msgid "Authentication failed"
 msgstr "Ha fallat l'autenticació"
 
-#: ../libempathy/empathy-utils.c:362 ../libempathy/empathy-utils.c:396
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
 msgid "Encryption error"
 msgstr "Error de xifratge"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:294
 msgid "Name in use"
 msgstr "Nom ja utilitzat"
 
-#: ../libempathy/empathy-utils.c:366 ../libempathy/empathy-utils.c:398
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate not provided"
 msgstr "No s'ha proporcionat el certificat"
 
-#: ../libempathy/empathy-utils.c:368 ../libempathy/empathy-utils.c:400
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate untrusted"
 msgstr "El certificat no és de confiança"
 
-#: ../libempathy/empathy-utils.c:370 ../libempathy/empathy-utils.c:402
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
 msgid "Certificate expired"
 msgstr "El certificat ha vençut"
 
-#: ../libempathy/empathy-utils.c:372 ../libempathy/empathy-utils.c:404
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
 msgid "Certificate not activated"
 msgstr "El certificat no està activat"
 
-#: ../libempathy/empathy-utils.c:374 ../libempathy/empathy-utils.c:406
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
 msgid "Certificate hostname mismatch"
 msgstr "No coincideix el nom de la màquina del certificat"
 
-#: ../libempathy/empathy-utils.c:376 ../libempathy/empathy-utils.c:408
+#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
 msgid "Certificate fingerprint mismatch"
 msgstr "No coincideix l'empremta digital del certificat"
 
-#: ../libempathy/empathy-utils.c:378 ../libempathy/empathy-utils.c:410
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
 msgid "Certificate self-signed"
 msgstr "Certificat signat per un mateix"
 
-#: ../libempathy/empathy-utils.c:380
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate error"
 msgstr "Error en el certificat"
 
-#: ../libempathy/empathy-utils.c:414
+#: ../libempathy/empathy-utils.c:344
 msgid "Encryption is not available"
 msgstr "L'encriptació no està disponible"
 
-#: ../libempathy/empathy-utils.c:416
+#: ../libempathy/empathy-utils.c:346
 msgid "Certificate is invalid"
 msgstr "El certificat no és vàlid"
 
-#: ../libempathy/empathy-utils.c:418
+#: ../libempathy/empathy-utils.c:348
 msgid "Connection has been refused"
 msgstr "S'ha rebutjat la connexió"
 
-#: ../libempathy/empathy-utils.c:420
+#: ../libempathy/empathy-utils.c:350
 msgid "Connection can't be established"
 msgstr "No es pot establir la connexió"
 
-#: ../libempathy/empathy-utils.c:422
+#: ../libempathy/empathy-utils.c:352
 msgid "Connection has been lost"
 msgstr "S'ha perdut la connexió"
 
-#: ../libempathy/empathy-utils.c:424
+#: ../libempathy/empathy-utils.c:354
 msgid "This resource is already connected to the server"
 msgstr "Aquest recurs ja està connectat al servidor"
 
-#: ../libempathy/empathy-utils.c:426
+#: ../libempathy/empathy-utils.c:356
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "S'ha reemplaçat la connexió per una altra de nova fent servir el mateix "
 "recurs"
 
-#: ../libempathy/empathy-utils.c:429
+#: ../libempathy/empathy-utils.c:359
 msgid "The account already exists on the server"
 msgstr "Ja existeix aquest compte al servidor"
 
-#: ../libempathy/empathy-utils.c:431
+#: ../libempathy/empathy-utils.c:361
 msgid "Server is currently too busy to handle the connection"
 msgstr "El servidor està massa ocupat per gestionar la connexió"
 
-#: ../libempathy/empathy-utils.c:433
+#: ../libempathy/empathy-utils.c:363
 msgid "Certificate has been revoked"
 msgstr "S'ha revocat el certificat"
 
-#: ../libempathy/empathy-utils.c:435
+#: ../libempathy/empathy-utils.c:365
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "El certificat utilitza un algorisme criptògraf no segur o la seva fortalesa "
 "criptogràfica és feble"
 
-#: ../libempathy/empathy-utils.c:438
+#: ../libempathy/empathy-utils.c:368
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -666,150 +736,144 @@ msgstr ""
 "La llargada del certificat del servidor o la profunditat de la cadena de "
 "certificació excedeix els límits de la biblioteca criptogràfica"
 
-#: ../libempathy/empathy-utils.c:601
+#: ../libempathy/empathy-utils.c:529
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "Gent propera"
 
-#: ../libempathy/empathy-utils.c:606
+#: ../libempathy/empathy-utils.c:534
 msgid "Yahoo! Japan"
 msgstr "Yahoo! del Japó"
 
-#: ../libempathy/empathy-utils.c:635
+#: ../libempathy/empathy-utils.c:563
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:636
+#: ../libempathy/empathy-utils.c:564
 msgid "Facebook Chat"
 msgstr "Xat del Facebook"
 
-#: ../libempathy/empathy-time.c:137
+#: ../libempathy/empathy-time.c:88
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "fa %d segon"
 msgstr[1] "fa %d segons"
 
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:93
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "fa %d minut"
 msgstr[1] "fa %d minuts"
 
-#: ../libempathy/empathy-time.c:147
+#: ../libempathy/empathy-time.c:98
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "fa %d hora"
 msgstr[1] "fa %d hores"
 
-#: ../libempathy/empathy-time.c:152
+#: ../libempathy/empathy-time.c:103
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "fa %d dia"
 msgstr[1] "fa %d dies"
 
-#: ../libempathy/empathy-time.c:157
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "fa %d setmana"
 msgstr[1] "fa %d setmanes"
 
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:113
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "fa %d mes"
 msgstr[1] "fa %d mesos"
 
-#: ../libempathy/empathy-time.c:167
+#: ../libempathy/empathy-time.c:136
 msgid "in the future"
 msgstr "en el futur"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:491
-msgid "All"
-msgstr "Tots"
+#: ../libempathy-gtk/empathy-account-chooser.c:540
+msgid "All accounts"
+msgstr "Tots els comptes"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../libempathy-gtk/empathy-log-window.c:643
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "Compte"
 
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "Contrasenya"
 
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:685
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:757
-#: ../libempathy-gtk/empathy-account-widget.c:814
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1166
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "Els comptes web"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "S'està editant el compte %s a través dels comptes web."
+msgid "The account %s is edited via %s."
+msgstr "S'està editant el compte %s a través de %s."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1172
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "No es pot editar el compte %s a través de l'Empathy."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
 msgstr "Inicia els comptes web"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1530
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "Edita %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Nom d'usuari:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1897
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "_Aplica"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1927
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
 msgstr "_Entra"
 
-#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1993
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:520
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1481
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "Compte:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2004
-msgid "_Enabled"
-msgstr "_Habilitat"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2069
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "Ja existeix aquest compte al servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2072
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "Crea un compte nou al servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2264
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "Ca_ncel·la"
 
@@ -818,19 +882,19 @@ msgstr "Ca_ncel·la"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2561
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s a %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2587
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "Compte %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2591
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "Compte nou"
 
@@ -842,6 +906,7 @@ msgstr "<b>Exemple:</b> ElMeuNomPúblic"
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -855,7 +920,7 @@ msgstr "Avançat"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "Pass_word:"
 msgstr "Con_trasenya:"
@@ -865,7 +930,7 @@ msgstr "Con_trasenya:"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
 msgid "Remember Password"
 msgstr "Recorda la contrasenya?"
 
@@ -875,7 +940,7 @@ msgstr "Recorda la contrasenya?"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 #: ../libempathy-gtk/empathy-password-dialog.c:311
 msgid "Remember password"
@@ -951,76 +1016,84 @@ msgstr "Quin és el vostre UIN de l'ICQ?"
 msgid "What is your ICQ password?"
 msgstr "Quina és la vostra contrasenya de l'ICQ?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:183
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "Automàtic"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:221
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "Registre"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:226
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "Opcions"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "Cap"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Character set:"
 msgstr "Joc de caràcters:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"La majoria de servidors d'IRC no necessiten contrasenya, si no n'esteu "
+"segurs no introduïu cap contrasenya."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Network"
 msgstr "Xarxa"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Network:"
 msgstr "Xarxa:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Sobrenom:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "Missatge de desconnexió:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "Nom real:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Servers"
 msgstr "Servidors"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "What is your IRC nickname?"
 msgstr "Quin és el vostre sobrenom a l'IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Quina xarxa d'IRC?"
 
@@ -1154,58 +1227,67 @@ msgid "Discover the STUN server automatically"
 msgstr "Descobreix automàticament el servidor STUN"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "Ignore TLS Errors"
+msgstr "Ignora els errors de la TLS"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Interval (seconds)"
 msgstr "Interval (segons)"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
 msgid "Keep-Alive Options"
 msgstr "Opcions del manteniment de la connexió oberta"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
 msgid "Loose Routing"
 msgstr "Encaminament flexible"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Mechanism:"
 msgstr "Mecanisme:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
 msgid "Miscellaneous Options"
 msgstr "Opcions diverses"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 msgid "NAT Traversal Options"
 msgstr "Opcions del travessament del NAT"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 msgid "Port:"
 msgstr "Port:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 msgid "Proxy Options"
 msgstr "Opcions del servidor intermediari"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "STUN Server:"
 msgstr "Servidor STUN:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.c:347
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid "Transport:"
 msgstr "Transport:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Utilitza aquest compte per fer trucades a _fixes i a mòbils"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "Quina és la vostra contrasenya del compte de SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Quin és el vostre identificador d'entrada de SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "N_om d'usuari:"
 
@@ -1229,28 +1311,36 @@ msgstr "I_D del Yahoo!:"
 msgid "_Room List locale:"
 msgstr "_Localització de la llista de la sala:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:448
-#: ../libempathy-gtk/empathy-avatar-chooser.c:524
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "No s'ha pogut convertir la imatge"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "El vostre sistema no sap gestionar cap dels formats d'imatge acceptats"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:930
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+msgid "Couldn't save picture to file"
+msgstr "No s'ha pogut desar la imatge en un fitxer"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "Seleccioneu la vostra imatge d'avatar"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
+msgid "Take a picture..."
+msgstr "Fes una foto..."
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "Cap imatge"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:995
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "Imatges"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:999
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "Tots els fitxers"
 
@@ -1258,35 +1348,61 @@ msgstr "Tots els fitxers"
 msgid "Click to enlarge"
 msgstr "Feu clic per fer-la més gran"
 
-#: ../libempathy-gtk/empathy-chat.c:652
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
+msgid "There was an error starting the call"
+msgstr "S'ha produït un error en iniciar la trucada"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact doesn't support calls"
+msgstr "El contacte que heu seleccionat no permet trucades"
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is offline"
+msgstr "El contacte seleccionat està fora de línia"
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "The specified contact is not valid"
+msgstr "El contacte seleccionat no és vàlid"
+
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "Emergency calls are not supported on this protocol"
+msgstr "Aquest protocol no permet fer trucades d'emergència"
+
+#: ../libempathy-gtk/empathy-chat.c:704
 msgid "Failed to open private chat"
 msgstr "No s'ha pogut obrir un xat privat"
 
-#: ../libempathy-gtk/empathy-chat.c:717
+#: ../libempathy-gtk/empathy-chat.c:765
 msgid "Topic not supported on this conversation"
 msgstr "No es pot establir el tema en aquesta conversa"
 
-#: ../libempathy-gtk/empathy-chat.c:723
+#: ../libempathy-gtk/empathy-chat.c:771
 msgid "You are not allowed to change the topic"
 msgstr "No podeu canviar el tema"
 
-#: ../libempathy-gtk/empathy-chat.c:906
+#: ../libempathy-gtk/empathy-chat.c:975
+#, c-format
+msgid "“%s� is not a valid contact ID"
+msgstr "«%s» no és un identificador de contacte vàlid"
+
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: neteja tots els missatges de la conversa actual"
 
-#: ../libempathy-gtk/empathy-chat.c:909
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <tema>: estableix el tema de la conversa actual"
 
-#: ../libempathy-gtk/empathy-chat.c:912
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ID sala de xat>: entra a una sala de xat nova"
 
-#: ../libempathy-gtk/empathy-chat.c:915
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ID sala de xat>: entra a una sala de xat nova"
 
-#: ../libempathy-gtk/empathy-chat.c:920
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1294,23 +1410,23 @@ msgstr ""
 "/part [<identificador de la sala de xat>] [<motiu>]: sortiu de la sala de "
 "xat, si no s'indica el contrari, l'actual"
 
-#: ../libempathy-gtk/empathy-chat.c:925
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ID d'un contacte> [missatge]: obre un xat privat"
 
-#: ../libempathy-gtk/empathy-chat.c:928
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ID d'un contacte> <missatge>: obre un xat privat"
 
-#: ../libempathy-gtk/empathy-chat.c:931
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <sobrenom>: canvieu el vostre sobrenom en el servidor actual"
 
-#: ../libempathy-gtk/empathy-chat.c:934
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <missatge>: envia un missatge d'ACCIÓ a la conversa actual"
 
-#: ../libempathy-gtk/empathy-chat.c:937
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1320,7 +1436,12 @@ msgstr ""
 "enviar un missatge que comenci per «/». Per exemple: «/say /join s'utilitza "
 "per entrar a una sala de xat nova»"
 
-#: ../libempathy-gtk/empathy-chat.c:942
+#: ../libempathy-gtk/empathy-chat.c:1094
+msgid "/whois <contact ID>: display information about a contact"
+msgstr ""
+"/whois <identificador del contacte>: mostra informació sobre el contacte"
+
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1328,98 +1449,113 @@ msgstr ""
 "/help [<ordre>]: mostra totes les ordres possibles. Si s'indica una <ordre> "
 "es mostra com s'ha d'utilitzar."
 
-#: ../libempathy-gtk/empathy-chat.c:952
+#: ../libempathy-gtk/empathy-chat.c:1114
 #, c-format
 msgid "Usage: %s"
 msgstr "Forma d'ús: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:991
+#: ../libempathy-gtk/empathy-chat.c:1159
 msgid "Unknown command"
 msgstr "Ordre desconeguda"
 
-#: ../libempathy-gtk/empathy-chat.c:1117
+#: ../libempathy-gtk/empathy-chat.c:1285
 msgid "Unknown command; see /help for the available commands"
 msgstr "Ordre desconeguda, vegeu /help per a la llista d'ordres disponibles"
 
-#: ../libempathy-gtk/empathy-chat.c:1254
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1455
+msgid "insufficient balance to send message"
+msgstr "no hi ha prou saldo per enviar el missatge"
+
+#: ../libempathy-gtk/empathy-chat.c:1457
+msgid "not capable"
+msgstr "no es pot realitzar"
+
+#: ../libempathy-gtk/empathy-chat.c:1464
 msgid "offline"
 msgstr "desconnectat"
 
-#: ../libempathy-gtk/empathy-chat.c:1257
+#: ../libempathy-gtk/empathy-chat.c:1467
 msgid "invalid contact"
 msgstr "contacte no vàlid"
 
-#: ../libempathy-gtk/empathy-chat.c:1260
+#: ../libempathy-gtk/empathy-chat.c:1470
 msgid "permission denied"
 msgstr "s'ha denegat el permís"
 
-#: ../libempathy-gtk/empathy-chat.c:1263
+#: ../libempathy-gtk/empathy-chat.c:1473
 msgid "too long message"
 msgstr "el missatge és massa llarg"
 
-#: ../libempathy-gtk/empathy-chat.c:1266
+#: ../libempathy-gtk/empathy-chat.c:1476
 msgid "not implemented"
 msgstr "no implementat"
 
-#: ../libempathy-gtk/empathy-chat.c:1270
+#: ../libempathy-gtk/empathy-chat.c:1480
 msgid "unknown"
 msgstr "desconegut"
 
-#: ../libempathy-gtk/empathy-chat.c:1274
+#: ../libempathy-gtk/empathy-chat.c:1486
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "S'ha produït un error en enviar el missatge «%s»: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1335 ../src/empathy-chat-window.c:717
+#: ../libempathy-gtk/empathy-chat.c:1490
+#, c-format
+msgid "Error sending message: %s"
+msgstr "S'ha produït un error en enviar el missatge: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Tema:"
 
-#: ../libempathy-gtk/empathy-chat.c:1347
+#: ../libempathy-gtk/empathy-chat.c:1563
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Tema establert a: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1349
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "No topic defined"
 msgstr "No s'ha definit cap tema"
 
-#: ../libempathy-gtk/empathy-chat.c:1848
+#: ../libempathy-gtk/empathy-chat.c:2074
 msgid "(No Suggestions)"
 msgstr "(Cap suggeriment)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1916
+#: ../libempathy-gtk/empathy-chat.c:2142
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Afegeix «%s» al diccionari"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1953
+#: ../libempathy-gtk/empathy-chat.c:2179
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Afegeix «%s» al diccionari %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2010
+#: ../libempathy-gtk/empathy-chat.c:2249
 msgid "Insert Smiley"
 msgstr "Insereix una emoticona"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2028
-#: ../libempathy-gtk/empathy-ui-utils.c:1808
+#: ../libempathy-gtk/empathy-chat.c:2267
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "_Envia"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2063
+#: ../libempathy-gtk/empathy-chat.c:2321
 msgid "_Spelling Suggestions"
 msgstr "_Suggeriments d'ortografia"
 
-#: ../libempathy-gtk/empathy-chat.c:2152
+#: ../libempathy-gtk/empathy-chat.c:2410
 msgid "Failed to retrieve recent logs"
 msgstr "No s'han pogut recuperar els registres recents"
 
-#: ../libempathy-gtk/empathy-chat.c:2263
+#: ../libempathy-gtk/empathy-chat.c:2547
 #, c-format
 msgid "%s has disconnected"
 msgstr "En/na %s s'ha desconnectat"
@@ -1427,12 +1563,12 @@ msgstr "En/na %s s'ha desconnectat"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2270
+#: ../libempathy-gtk/empathy-chat.c:2554
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "En/na %2$s ha expulsat en/na %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2273
+#: ../libempathy-gtk/empathy-chat.c:2557
 #, c-format
 msgid "%s was kicked"
 msgstr "S'ha expulsat en/na %s"
@@ -1440,17 +1576,17 @@ msgstr "S'ha expulsat en/na %s"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2281
+#: ../libempathy-gtk/empathy-chat.c:2565
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "En/na %2$s ha bandejat en/na %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2284
+#: ../libempathy-gtk/empathy-chat.c:2568
 #, c-format
 msgid "%s was banned"
 msgstr "s'ha bandejat en/na %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2288
+#: ../libempathy-gtk/empathy-chat.c:2572
 #, c-format
 msgid "%s has left the room"
 msgstr "En/na %s ha sortit de la sala"
@@ -1460,105 +1596,137 @@ msgstr "En/na %s ha sortit de la sala"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2297
+#: ../libempathy-gtk/empathy-chat.c:2581
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2322
+#: ../libempathy-gtk/empathy-chat.c:2606
 #, c-format
 msgid "%s has joined the room"
 msgstr "En/na %s ha entrat a la sala"
 
-#: ../libempathy-gtk/empathy-chat.c:2347
+#: ../libempathy-gtk/empathy-chat.c:2631
 #, c-format
 msgid "%s is now known as %s"
 msgstr "En/na %s ara es diu %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2486
-#: ../src/empathy-streamed-media-window.c:1949
-#: ../src/empathy-event-manager.c:1122
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2784
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
+#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
 msgid "Disconnected"
 msgstr "Fora de línia"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3116
+#: ../libempathy-gtk/empathy-chat.c:3428
 msgid "Would you like to store this password?"
 msgstr "Voleu emmagatzemar aquesta contrasenya?"
 
-#: ../libempathy-gtk/empathy-chat.c:3122
+#: ../libempathy-gtk/empathy-chat.c:3434
 msgid "Remember"
 msgstr "Recorda-la"
 
-#: ../libempathy-gtk/empathy-chat.c:3132
+#: ../libempathy-gtk/empathy-chat.c:3444
 msgid "Not now"
 msgstr "Ara no"
 
-#: ../libempathy-gtk/empathy-chat.c:3176
+#: ../libempathy-gtk/empathy-chat.c:3488
 msgid "Retry"
 msgstr "Torna-ho a intentar"
 
-#: ../libempathy-gtk/empathy-chat.c:3180
+#: ../libempathy-gtk/empathy-chat.c:3492
 msgid "Wrong password; please try again:"
 msgstr "Contrasenya errònia, torneu-ho a intentar:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3297
+#: ../libempathy-gtk/empathy-chat.c:3622
 msgid "This room is protected by a password:"
 msgstr "Aquesta sala és protegida per una contrasenya:"
 
-#: ../libempathy-gtk/empathy-chat.c:3324
+#: ../libempathy-gtk/empathy-chat.c:3649
 msgid "Join"
-msgstr "Uneix-te"
+msgstr "Uneix-m'hi"
 
-#: ../libempathy-gtk/empathy-chat.c:3494 ../src/empathy-event-manager.c:1144
+#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "Connectat"
 
-#: ../libempathy-gtk/empathy-chat.c:3547
-#: ../libempathy-gtk/empathy-log-window.c:650
+#: ../libempathy-gtk/empathy-chat.c:3906
 msgid "Conversation"
 msgstr "Conversa"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:422
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:3911
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (SMS)"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
 msgid "Unknown or invalid identifier"
 msgstr "Identificador desconegut o no vàlid"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
 msgid "Contact blocking temporarily unavailable"
 msgstr "No està disponible, temporalment, el blocatge de contactes"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
 msgid "Contact blocking unavailable"
 msgstr "No es poden blocar contactes"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
 msgid "Permission Denied"
 msgstr "S'ha denegat el permís"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
 msgid "Could not block contact"
 msgstr "No s'ha pogut blocar el contacte"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:701
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
 msgid "Edit Blocked Contacts"
 msgstr "Editeu els contactes blocats"
 
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Account:"
+msgstr "Compte:"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "Contactes blocats"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Suprimeix"
+
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:794
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Copia l'adreça de l'enllaç"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:801
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Obre l'enllaç"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:420
+#: ../libempathy-gtk/empathy-chat-text-view.c:415
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
@@ -1576,25 +1744,25 @@ msgstr "Informació personal"
 msgid "New Contact"
 msgstr "Contacte nou"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:532
-#: ../libempathy-gtk/empathy-individual-dialogs.c:199
+#: ../libempathy-gtk/empathy-contact-dialogs.c:533
+#: ../libempathy-gtk/empathy-individual-dialogs.c:200
 #, c-format
 msgid "Block %s?"
 msgstr "Voleu blocar %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:537
-#: ../libempathy-gtk/empathy-individual-dialogs.c:247
+#: ../libempathy-gtk/empathy-contact-dialogs.c:538
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Segur que voleu blocar «%s» perquè no us contacti més?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:542
-#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-contact-dialogs.c:543
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
 msgid "_Block"
 msgstr "_Bloca"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:552
-#: ../libempathy-gtk/empathy-individual-dialogs.c:278
+#: ../libempathy-gtk/empathy-contact-dialogs.c:559
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Informa que aquest contacte es comporta incorrectament"
@@ -1620,301 +1788,331 @@ msgstr "Sense grup"
 msgid "Favorite People"
 msgstr "Persones preferides"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2001
-#: ../libempathy-gtk/empathy-individual-view.c:2336
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Segur que voleu suprimir el grup «%s»?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2003
-#: ../libempathy-gtk/empathy-individual-view.c:2339
+#: ../libempathy-gtk/empathy-contact-list-view.c:1988
+#: ../libempathy-gtk/empathy-individual-view.c:2379
 msgid "Removing group"
 msgstr "S'està suprimint el grup"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2052
-#: ../libempathy-gtk/empathy-contact-list-view.c:2129
-#: ../libempathy-gtk/empathy-individual-view.c:2394
-#: ../libempathy-gtk/empathy-individual-view.c:2588
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../libempathy-gtk/empathy-contact-list-view.c:2037
+#: ../libempathy-gtk/empathy-contact-list-view.c:2114
+#: ../libempathy-gtk/empathy-individual-view.c:2434
+#: ../libempathy-gtk/empathy-individual-view.c:2637
 msgid "_Remove"
 msgstr "_Suprimeix"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2082
-#: ../libempathy-gtk/empathy-individual-view.c:2458
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
+#: ../libempathy-gtk/empathy-individual-view.c:2501
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Segur que voleu suprimir el contacte «%s»?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2084
-#: ../libempathy-gtk/empathy-individual-view.c:2479
+#: ../libempathy-gtk/empathy-contact-list-view.c:2069
+#: ../libempathy-gtk/empathy-individual-view.c:2522
 msgid "Removing contact"
 msgstr "Suprimeix el contacte"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:219
-#: ../src/empathy-main-window.ui.h:13
+#: ../libempathy-gtk/empathy-contact-menu.c:220
+#: ../src/empathy-main-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "_Afegeix un contacte…"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:296
+#: ../libempathy-gtk/empathy-contact-menu.c:300
 msgid "_Block Contact"
 msgstr "_Bloca el contacte"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:325
-#: ../libempathy-gtk/empathy-individual-menu.c:517
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:329
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "_Xat"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:356
-#: ../libempathy-gtk/empathy-individual-menu.c:560
+#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "Trucada de _veu"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:387
-#: ../libempathy-gtk/empathy-individual-menu.c:602
+#: ../libempathy-gtk/empathy-contact-menu.c:394
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Trucada de vídeo"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:433
-#: ../libempathy-gtk/empathy-individual-menu.c:645
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:440
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "Converses _anteriors"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:455
-#: ../libempathy-gtk/empathy-individual-menu.c:686
+#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "Envia un fitxer"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:478
-#: ../libempathy-gtk/empathy-individual-menu.c:728
+#: ../libempathy-gtk/empathy-contact-menu.c:485
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
 msgstr "Comparteix el meu escriptori"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:518
-#: ../libempathy-gtk/empathy-contact-widget.c:1763
-#: ../libempathy-gtk/empathy-individual-menu.c:763
+#: ../libempathy-gtk/empathy-contact-menu.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:1886
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
 #: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "Preferit"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:547
-#: ../libempathy-gtk/empathy-individual-menu.c:791
+#: ../libempathy-gtk/empathy-contact-menu.c:554
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "Infor_mació"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:593
+#: ../libempathy-gtk/empathy-contact-menu.c:600
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "_Edita"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:647
-#: ../libempathy-gtk/empathy-individual-menu.c:972
-#: ../src/empathy-chat-window.c:935
+#: ../libempathy-gtk/empathy-contact-menu.c:654
+#: ../libempathy-gtk/empathy-individual-menu.c:1284
+#: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "Se us està convidant a aquesta sala"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:678
-#: ../libempathy-gtk/empathy-individual-menu.c:1019
+#: ../libempathy-gtk/empathy-contact-menu.c:685
+#: ../libempathy-gtk/empathy-individual-menu.c:1330
 msgid "_Invite to Chat Room"
 msgstr "_Convida a la sala de xat"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:513
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
 msgid "Search contacts"
 msgstr "Cerca de contactes"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:543
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
 msgid "Search: "
 msgstr "Cerca: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:601
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
 msgid "_Add Contact"
 msgstr "_Afegeix un contacte"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:619
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
 msgid "No contacts found"
 msgstr "No s'ha trobat cap contacte"
 
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr "El vostre missatge d'introducció:"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
+msgstr "Permeta'm veure quan estàs en línia. Gràcies."
+
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "Seleccioneu un contacte"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:295
+#: ../libempathy-gtk/empathy-contact-widget.c:336
 #: ../libempathy-gtk/empathy-individual-widget.c:153
 msgid "Full name:"
 msgstr "Nom complet:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:296
+#: ../libempathy-gtk/empathy-contact-widget.c:337
 #: ../libempathy-gtk/empathy-individual-widget.c:154
 msgid "Phone number:"
 msgstr "Número de telèfon:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:297
+#: ../libempathy-gtk/empathy-contact-widget.c:338
 #: ../libempathy-gtk/empathy-individual-widget.c:155
 msgid "E-mail address:"
 msgstr "Adreça electrònica:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:298
+#: ../libempathy-gtk/empathy-contact-widget.c:339
 #: ../libempathy-gtk/empathy-individual-widget.c:156
 msgid "Website:"
 msgstr "Lloc web:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:299
+#: ../libempathy-gtk/empathy-contact-widget.c:340
 #: ../libempathy-gtk/empathy-individual-widget.c:157
 msgid "Birthday:"
 msgstr "Aniversari:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:346
+msgid "Last seen:"
+msgstr "Vist per últim cop:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:348
+msgid "Connected from:"
+msgstr "Connectat des de:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:353
+msgid "Away message:"
+msgstr "Missatge d'absència:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+msgid "Channels:"
+msgstr "Canals:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
 msgstr "Codi ISO del país:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Country:"
 msgstr "País:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "State:"
 msgstr "Estat:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:768
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "City:"
 msgstr "Ciutat:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:770
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Area:"
 msgstr "Àrea:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:772
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
 msgstr "Codi postal:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:774
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Street:"
 msgstr "Carrer:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:776
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
 msgstr "Edifici:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:778
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Floor:"
 msgstr "Planta:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:780
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Room:"
 msgstr "Habitació:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:782
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Text:"
 msgstr "Text:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:784
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Description:"
 msgstr "Descripció:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:786
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
 msgstr "Nivell de precisió:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:790
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr "Error:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:792
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
 msgstr "Error vertical (metres):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:794
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
 msgstr "Error horitzontal (metres):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr "Velocitat:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Bearing:"
 msgstr "Direcció:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:800
-#: ../libempathy-gtk/empathy-individual-widget.c:526
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
 msgstr "Velocitat de pujada:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:802
-#: ../libempathy-gtk/empathy-individual-widget.c:528
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
 msgstr "Última actualització a:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:804
-#: ../libempathy-gtk/empathy-individual-widget.c:530
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
 msgstr "Longitud:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:806
-#: ../libempathy-gtk/empathy-individual-widget.c:532
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
 msgstr "Latitud:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:808
-#: ../libempathy-gtk/empathy-individual-widget.c:534
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
 msgstr "Altitud:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:871
-#: ../libempathy-gtk/empathy-contact-widget.c:888
-#: ../libempathy-gtk/empathy-individual-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:633
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "Ubicació"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:890
-#: ../libempathy-gtk/empathy-individual-widget.c:635
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
 #, c-format
 msgid "%s, %s"
 msgstr "%s el %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:942
-#: ../libempathy-gtk/empathy-individual-widget.c:684
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e de %B de %Y a les %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1024
-#: ../libempathy-gtk/empathy-individual-widget.c:919
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
 msgid "Save Avatar"
 msgstr "Desa l'avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1080
-#: ../libempathy-gtk/empathy-individual-widget.c:977
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
 msgid "Unable to save avatar"
 msgstr "No s'ha pogut desar l'avatar"
 
@@ -1924,7 +2122,7 @@ msgstr "<b>Ubicació</b> a (data)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1307
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr "Àlies:"
 
@@ -1944,7 +2142,7 @@ msgstr "Detalls del contacte"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "Identificador:"
 
@@ -1961,11 +2159,11 @@ msgstr "SO:"
 msgid "Version:"
 msgstr "Versió:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:332
+#: ../libempathy-gtk/empathy-groups-widget.c:333
 msgid "Groups"
 msgstr "Grups"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:344
+#: ../libempathy-gtk/empathy-groups-widget.c:345
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -1973,74 +2171,105 @@ msgstr ""
 "Seleccioneu els grups en els quals voleu que hi hagi aquest contacte. Podeu "
 "seleccionar-ne més d'un o bé cap."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:363
+#: ../libempathy-gtk/empathy-groups-widget.c:364
 msgid "_Add Group"
 msgstr "_Afegeix un grup"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:398
+#: ../libempathy-gtk/empathy-groups-widget.c:399
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Seleccioneu"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1436
+#: ../libempathy-gtk/empathy-groups-widget.c:409
+#: ../src/empathy-main-window.c:1807
 msgid "Group"
 msgstr "Grup"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Es blocarà la identitat següent:"
 msgstr[1] "Es blocaran les identitats següents:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:259
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "No es pot blocar la identitat següent:"
 msgstr[1] "No es poden blocar les identitats següents:"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
 msgstr "Metacontactes"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:354
+#: ../libempathy-gtk/empathy-individual-linker.c:370
 msgid "Select contacts to link"
 msgstr "Seleccioneu els contactes a enllaçar"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:428
+#: ../libempathy-gtk/empathy-individual-linker.c:444
 msgid "New contact preview"
 msgstr "Previsualització del contacte nou"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:472
+#: ../libempathy-gtk/empathy-individual-linker.c:488
 msgid "Contacts selected in the list on the left will be linked together."
 msgstr "S'enllaçaran els contactes seleccionats a la llista de l'esquerra."
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:131
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:839
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "Seleccioneu el compte amb el que voleu fer la trucada"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "Trucada"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+msgid "Mobile"
+msgstr "Mòbil"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "Feina"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "Casa"
+
+#. add an SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+msgid "_SMS"
+msgstr "_SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1142
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Edita"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:865
+#: ../libempathy-gtk/empathy-individual-menu.c:1168
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "_Enllaça els contactes…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2301
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 msgid "Delete and _Block"
 msgstr "Suprimeix i _bloca"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2467
+#: ../libempathy-gtk/empathy-individual-view.c:2510
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2049,7 +2278,7 @@ msgstr ""
 "Segur que voleu suprimir el metacontacte «%s»? Tingueu en compte que es "
 "suprimiran tots els contactes que formen aquest metacontacte."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2133,65 +2362,202 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "_Desenllaça"
 
-#: ../libempathy-gtk/empathy-log-window.c:660
-msgid "Date"
-msgstr "Data"
+#: ../libempathy-gtk/empathy-log-window.c:634
+msgid "History"
+msgstr "Historial"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
-msgstr "Converses"
+#: ../libempathy-gtk/empathy-log-window.c:689
+msgid "Show"
+msgstr "Mostra"
+
+#: ../libempathy-gtk/empathy-log-window.c:711
+msgid "Search"
+msgstr "Cerca"
+
+#: ../libempathy-gtk/empathy-log-window.c:1159
+#, c-format
+msgid "Chat in %s"
+msgstr "Xat a %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1161
+#, c-format
+msgid "Chat with %s"
+msgstr "Xat amb %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%A %e de %B de %Y a les %X"
+
+#. Translators: this is an emote: '* Danielle waves'
+#: ../libempathy-gtk/empathy-log-window.c:1300
+#, c-format
+msgid "<i>* %s %s</i>"
+msgstr "<i>* %s %s</i>"
+
+#. Translators: this is a message: 'Danielle: hello'
+#. * The string in bold is the sender's name
+#: ../libempathy-gtk/empathy-log-window.c:1306
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1382
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s segon"
+msgstr[1] "%s segons"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s minut"
+msgstr[1] "%s minuts"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "La trucada va durar %s i es va acabar a les %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1729
+msgid "Today"
+msgstr "Avui"
+
+#: ../libempathy-gtk/empathy-log-window.c:1733
+msgid "Yesterday"
+msgstr "Ahir"
+
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
+msgid "%e %B %Y"
+msgstr "%e de %B de %Y"
+
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3444
+msgid "Anytime"
+msgstr "En qualsevol moment"
+
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2372
+msgid "Anyone"
+msgstr "Qualsevol"
+
+#: ../libempathy-gtk/empathy-log-window.c:2685
+msgid "Who"
+msgstr "Qui"
+
+#: ../libempathy-gtk/empathy-log-window.c:2889
+msgid "When"
+msgstr "Quan"
+
+#: ../libempathy-gtk/empathy-log-window.c:3005
+msgid "Anything"
+msgstr "El que sigui"
+
+#: ../libempathy-gtk/empathy-log-window.c:3007
+msgid "Text chats"
+msgstr "Xats de text"
+
+#: ../libempathy-gtk/empathy-log-window.c:3009
+#: ../src/empathy-preferences.ui.h:4
+msgid "Calls"
+msgstr "Trucades"
+
+#: ../libempathy-gtk/empathy-log-window.c:3014
+msgid "Incoming calls"
+msgstr "Trucades entrants"
+
+#: ../libempathy-gtk/empathy-log-window.c:3015
+msgid "Outgoing calls"
+msgstr "Trucades de sortida"
+
+#: ../libempathy-gtk/empathy-log-window.c:3016
+msgid "Missed calls"
+msgstr "Trucades perdudes"
+
+#: ../libempathy-gtk/empathy-log-window.c:3038
+msgid "What"
+msgstr "Què"
+
+#: ../libempathy-gtk/empathy-log-window.c:3747
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr ""
+"Segur que voleu suprimir tots els registres de les converses anteriors?"
+
+#: ../libempathy-gtk/empathy-log-window.c:3751
+msgid "Clear All"
+msgstr "Neteja-ho tot"
+
+#: ../libempathy-gtk/empathy-log-window.c:3758
+msgid "Delete from:"
+msgstr "Suprimeix a partir de:"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">S'està carregant...</span>"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "Cerca el següent"
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Chat"
+msgstr "Xat"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "Cerca l'anterior"
+msgid "Delete All History..."
+msgstr "Suprimeix tot l'historial..."
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr "Converses anteriors"
+msgid "Profile"
+msgstr "Perfil"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Video"
+msgstr "Vídeo"
 
-#. Tab Label
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "Cerca"
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:20
+msgid "_Edit"
+msgstr "_Edita"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "_File"
+msgstr "_Fitxer"
 
-#. Searching *for* something
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "_Per a:"
+msgid "page 2"
+msgstr "pàgina 2"
 
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
 msgid "Contact ID:"
 msgstr "ID del contacte:"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:171
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
 msgid "C_hat"
 msgstr "_Xat"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:181
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
 msgstr "Conversa nova"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:253
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
 msgid "Send _Video"
 msgstr "Envia _vídeo"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:261
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
 msgid "C_all"
 msgstr "_Trucada"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:271
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "New Call"
 msgstr "Trucada nova"
 
@@ -2210,34 +2576,34 @@ msgstr ""
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Message…"
 msgstr "Missatge personalitzat…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messages…"
 msgstr "Edita els missatges personalitzats…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
 msgstr "Feu clic per suprimir aquest estat com a preferit"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
 msgstr "Feu clic per fer que aquest estat sigui un preferit"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
 msgstr "Estableix l'estat"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:946
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
 msgid "Set your presence and current status"
 msgstr "Establiu la presència i l'estat actual"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1134
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
 msgid "Custom messages…"
 msgstr "Missatges personalitzats…"
 
@@ -2250,18 +2616,26 @@ msgstr "Missatges personalitzats…"
 msgid "New %s account"
 msgstr "Compte de %s nou"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "Cerca:"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "Coincidència de majúscules i minúscules:"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Mat_ch case"
+msgstr "_Coincidència de majúscules i minúscules"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
 msgid "Phrase not found"
 msgstr "No s'ha trobat la frase"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "_Next"
+msgstr "Següe_nt"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+msgid "_Previous"
+msgstr "_Anterior"
+
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
 msgstr "Heu rebut un missatge instantani"
@@ -2302,35 +2676,32 @@ msgstr "Trucada de veu de sortida"
 msgid "Voice call ended"
 msgstr "La trucada de veu ha finalitzat"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "Introduïu un missatge personalitzat"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
 msgstr "Edita els missatges personalitzats"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr "_Desa el missatge d'estat nou"
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#, c-format
+msgid "Message edited at %s"
+msgstr "S'ha editat el missatge a les %s"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Status Messages"
-msgstr "Missatges d'estat desats"
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
+msgid "Normal"
+msgstr "Normal"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "Clàssic"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "Simple"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "Net"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "Blau"
 
@@ -2408,19 +2779,19 @@ msgstr "Recorda aquesta decisió per a connexions futures"
 msgid "Certificate Details"
 msgstr "Dades del certificat"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1705
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
 msgstr "No s'ha pogut obrir l'URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1800
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
 msgstr "Seleccioneu un fitxer"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
 msgid "Insufficient free space to save file"
 msgstr "No hi ha prou espai lliure per desar el fitxer"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2429,7 +2800,7 @@ msgstr ""
 "Es necessita %s d'espai lliure per desar el fitxer, però només hi ha %s."
 "Seleccioneu una altra ubicació."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1924
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid "Incoming file from %s"
 msgstr "%s us envia un fitxer"
@@ -2617,23 +2988,23 @@ msgstr "No hi ha missatge d'error"
 msgid "Instant Message (Empathy)"
 msgstr "Missatgeria instantània (Empathy)"
 
-#: ../src/empathy.c:308
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "No connectis en iniciar"
 
-#: ../src/empathy.c:312
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "No mostris la llista de contactes ni  cap altre diàleg en iniciar"
 
-#: ../src/empathy.c:320
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr "- Client de missatgeria instantània Empathy"
 
-#: ../src/empathy.c:499
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
 msgstr "S'ha produït un error en contactar amb el gestor de comptes"
 
-#: ../src/empathy.c:501
+#: ../src/empathy.c:639
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2789,8 +3160,8 @@ msgid "Select the accounts you want to import:"
 msgstr "Seleccioneu els comptes que voleu importar:"
 
 #: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "Yes"
 msgstr "Sí"
 
@@ -2865,34 +3236,35 @@ msgstr "Hi ha modificacions no desades en el compte %s."
 msgid "Your new account has not been saved yet."
 msgstr "Encara no heu desat el vostre compte nou."
 
-#: ../src/empathy-accounts-dialog.c:286
-#: ../src/empathy-streamed-media-window.c:809
+#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1216
 msgid "Connecting…"
 msgstr "S'està connectant…"
 
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:386
 #, c-format
 msgid "Offline — %s"
 msgstr "Fora de línia — %s"
 
-#: ../src/empathy-accounts-dialog.c:339
+#: ../src/empathy-accounts-dialog.c:398
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Fora de línia — %s"
 
-#: ../src/empathy-accounts-dialog.c:350
+#: ../src/empathy-accounts-dialog.c:409
 msgid "Offline — No Network Connection"
 msgstr "Fora de línia — No hi ha connexió de xarxa"
 
-#: ../src/empathy-accounts-dialog.c:357
+#: ../src/empathy-accounts-dialog.c:416
 msgid "Unknown Status"
 msgstr "Estat desconegut"
 
-#: ../src/empathy-accounts-dialog.c:369
+#: ../src/empathy-accounts-dialog.c:428
 msgid "Offline — Account Disabled"
 msgstr "Fora de línia — Compte inhabilitat"
 
-#: ../src/empathy-accounts-dialog.c:772
+#: ../src/empathy-accounts-dialog.c:831
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2900,16 +3272,16 @@ msgstr ""
 "Esteu a punt de crear un compte nou i perdreu els canvis\n"
 "fets fins ara. Segur que voleu continuar?"
 
-#: ../src/empathy-accounts-dialog.c:1133
+#: ../src/empathy-accounts-dialog.c:1192
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Voleu suprimir %s de l'ordinador?"
 
-#: ../src/empathy-accounts-dialog.c:1137
+#: ../src/empathy-accounts-dialog.c:1196
 msgid "This will not remove your account on the server."
 msgstr "Amb això no se suprimirà el vostre compte del servidor."
 
-#: ../src/empathy-accounts-dialog.c:1375
+#: ../src/empathy-accounts-dialog.c:1432
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2918,15 +3290,15 @@ msgstr ""
 "canvis fets fins ara. Segur que voleu continuar?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1571
+#: ../src/empathy-accounts-dialog.c:1643
 msgid "_Enable"
 msgstr "_Habilita"
 
-#: ../src/empathy-accounts-dialog.c:1572
+#: ../src/empathy-accounts-dialog.c:1644
 msgid "_Disable"
 msgstr "_Inhabilita"
 
-#: ../src/empathy-accounts-dialog.c:2086
+#: ../src/empathy-accounts-dialog.c:2154
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2935,18 +3307,22 @@ msgstr ""
 "fets fins ara. Segur que voleu continuar?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Afegeix…"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
 msgid "Loading account information"
 msgstr "S'està carregant la informació del contacte"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "No protocol installed"
 msgstr "No hi ha cap protocol instal·lat"
 
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -2954,19 +3330,15 @@ msgstr ""
 "Per afegir un compte nou, primer heu d'instal·lar el rerefons de cada "
 "protocol que vulgueu utilitzar."
 
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add…"
-msgstr "_Afegeix…"
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Import…"
 msgstr "_Importa…"
 
-#: ../src/empathy-auth-client.c:246
+#: ../src/empathy-auth-client.c:249
 msgid " - Empathy authentication client"
 msgstr " - Client d'autenticació de l'Empathy"
 
-#: ../src/empathy-auth-client.c:262
+#: ../src/empathy-auth-client.c:265
 msgid "Empathy authentication client"
 msgstr "Client d'autenticació de l'Empathy"
 
@@ -2974,94 +3346,116 @@ msgstr "Client d'autenticació de l'Empathy"
 msgid "People nearby"
 msgstr "Gent propera"
 
-#: ../src/empathy-av.c:118
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr "- Client d'àudio/vídeo de l'Empathy"
 
-#: ../src/empathy-av.c:134
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "Client d'àudio/vídeo de l'Empathy"
 
-#: ../src/empathy-streamed-media-window.c:479
+#: ../src/empathy-streamed-media-window.c:431
 msgid "Contrast"
 msgstr "Contrast"
 
-#: ../src/empathy-streamed-media-window.c:482
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Brightness"
 msgstr "Brillantor"
 
-#: ../src/empathy-streamed-media-window.c:485
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:590
+#: ../src/empathy-streamed-media-window.c:542
 msgid "Volume"
 msgstr "Volum"
 
-#: ../src/empathy-streamed-media-window.c:1166
+#: ../src/empathy-streamed-media-window.c:1110
 msgid "_Sidebar"
 msgstr "Barra _lateral"
 
-#: ../src/empathy-streamed-media-window.c:1186
+#: ../src/empathy-streamed-media-window.c:1130
 msgid "Audio input"
 msgstr "Entrada d'àudio"
 
-#: ../src/empathy-streamed-media-window.c:1190
+#: ../src/empathy-streamed-media-window.c:1134
 msgid "Video input"
 msgstr "Entrada de vídeo"
 
-#: ../src/empathy-streamed-media-window.c:1194
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Dialpad"
 msgstr "Marcador"
 
-#: ../src/empathy-streamed-media-window.c:1205
+#: ../src/empathy-streamed-media-window.c:1151
 msgid "Details"
 msgstr "Dades"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1274
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1825
 #, c-format
 msgid "Call with %s"
 msgstr "Trucada amb %s"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-streamed-media-window.c:1353
-msgid "Call"
-msgstr "Trucada"
-
-#: ../src/empathy-streamed-media-window.c:1507
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:2069
 msgid "The IP address as seen by the machine"
 msgstr "L'adreça IP des del punt de vista de la màquina"
 
-#: ../src/empathy-streamed-media-window.c:1509
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:2071
 msgid "The IP address as seen by a server on the Internet"
 msgstr "L'adreça IP des del punt de vista d'un servidor d'Internet"
 
-#: ../src/empathy-streamed-media-window.c:1511
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:2073
 msgid "The IP address of the peer as seen by the other side"
 msgstr "L'adreça IP d'un igual vist per l'altre l'igual"
 
-#: ../src/empathy-streamed-media-window.c:1513
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:2075
 msgid "The IP address of a relay server"
 msgstr "L'adreça IP d'un servidor de repetició"
 
-#: ../src/empathy-streamed-media-window.c:1515
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:2077
 msgid "The IP address of the multicast group"
 msgstr "L'adreça IP del grup de multidestinació"
 
+#: ../src/empathy-streamed-media-window.c:1843
+msgctxt "encoding video codec"
+msgid "Unknown"
+msgstr "Desconegut"
+
+#: ../src/empathy-streamed-media-window.c:1846
+msgctxt "encoding audio codec"
+msgid "Unknown"
+msgstr "Desconegut"
+
+#: ../src/empathy-streamed-media-window.c:1849
+msgctxt "decoding video codec"
+msgid "Unknown"
+msgstr "Desconegut"
+
+#: ../src/empathy-streamed-media-window.c:1852
+msgctxt "decoding audio codec"
+msgid "Unknown"
+msgstr "Desconegut"
+
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2266
+#: ../src/empathy-streamed-media-window.c:2144
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Connectat -- %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2327
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2846
 msgid "Technical Details"
 msgstr "Detalls tècnics"
 
-#: ../src/empathy-streamed-media-window.c:2365
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2884
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3070,7 +3464,8 @@ msgstr ""
 "El programari d'en/na %s no té cap format d'àudio dels que teniu en el "
 "vostre ordinador"
 
-#: ../src/empathy-streamed-media-window.c:2370
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2889
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3079,7 +3474,8 @@ msgstr ""
 "El programari d'en/na %s no té cap format de vídeo dels que teniu en el "
 "vostre ordinador"
 
-#: ../src/empathy-streamed-media-window.c:2376
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2895
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3088,25 +3484,29 @@ msgstr ""
 "No s'ha pogut connectar amb en/na %s. Algú dels dos deu estar en una xarxa "
 "que no permet connexions directes."
 
-#: ../src/empathy-streamed-media-window.c:2382
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2901
 msgid "There was a failure on the network"
 msgstr "Hi ha hagut una fallada en la xarxa"
 
-#: ../src/empathy-streamed-media-window.c:2386
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2905
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Els formats d'àudio necessaris per a aquesta trucada no estan instal·lats en "
 "aquest ordinador"
 
-#: ../src/empathy-streamed-media-window.c:2389
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2908
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Els formats de vídeo necessaris per a aquesta trucada no estan instal·lats "
 "en aquest ordinador"
 
-#: ../src/empathy-streamed-media-window.c:2399
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2920
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3117,147 +3517,200 @@ msgstr ""
 "\">Informeu d'aquesta errada</a> i adjunteu-hi els registres recollits a la "
 "finestra «Depuració» del menú Ajuda."
 
-#: ../src/empathy-streamed-media-window.c:2407
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2929
 msgid "There was a failure in the call engine"
 msgstr "Hi ha hagut una fallada en el motor de trucada"
 
-#: ../src/empathy-streamed-media-window.c:2410
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2932
 msgid "The end of the stream was reached"
 msgstr "S'ha arribat al final del flux"
 
-#: ../src/empathy-streamed-media-window.c:2450
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2972
 msgid "Can't establish audio stream"
 msgstr "No s'ha pogut establir el flux d'àudio"
 
-#: ../src/empathy-streamed-media-window.c:2460
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2982
 msgid "Can't establish video stream"
 msgstr "No s'ha pogut establir el flux de vídeo"
 
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "Audio"
 msgstr "Àudio"
 
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Torna a trucar al contacte"
-
 #: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "Càmera apagada"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "Còdec de descodificació:"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "Càmera engegada"
+msgid "Disable camera"
+msgstr "Inhabilita la càmera"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Còdec de descodificació:"
+msgid "Display the dialpad"
+msgstr "Mostra el marcador"
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Inhabilita la càmera i atura l'enviament de vídeo"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "Còdec de codificació:"
 
 #: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Habilita la càmera i envia senyal de vídeo"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Hang up"
+msgstr "Penja"
 
 #: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Habilita la càmera però no enviïs senyal de vídeo"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Hang up current call"
+msgstr "Penja la trucada actual"
 
 #: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Còdec de codificació:"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "Candidat local:"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "Penja"
+msgid "Maximise me"
+msgstr "Maximitza'm"
 
 #: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Penja la trucada actual"
+msgid "Minimise me"
+msgstr "Minimitza'm"
 
 #: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Candidat local:"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "Candidat remot:"
 
 #: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "Previsualització"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Send Audio"
+msgstr "Envia àudio"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "Torna a trucar"
+msgid "Send Video"
+msgstr "Envia vídeo"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Candidat remot:"
+msgid "Show dialpad"
+msgstr "Mostra el marcador"
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "Envia àudio"
+msgid "Start a video call"
+msgstr "Inicia una trucada de vídeo"
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Commuta la transmissió d'àudio"
+msgid "Start an audio call"
+msgstr "Inicia una trucada d'àudio"
+
+#: ../src/empathy-call-window.ui.h:18
+msgid "Swap camera"
+msgstr "Canvia la càmera"
 
 #: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ídeo"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr "Commuta la transmissió d'àudio"
 
 #: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "Vídeo"
+msgid "Toggle video transmission"
+msgstr "Commuta la transmissió de vídeo"
 
 #: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "El vídeo està apagat"
-
-#: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "El vídeo està engegat"
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
+#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
+msgid "Unknown"
+msgstr "Desconegut"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "Previsualització de vídeo"
+msgid "Video call"
+msgstr "Trucada de vídeo"
 
 #: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "Tru_ca"
 
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:25
+msgid "_Camera"
+msgstr "_Càmera"
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:18
+msgid "_Contents"
+msgstr "_Continguts"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
+msgid "_Debug"
+msgstr "_Depura"
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:22
+msgid "_Help"
+msgstr "A_juda"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Microphone"
+msgstr "_Micròfon"
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "_Settings"
+msgstr "_Paràmetres"
+
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_Visualitza"
 
-#: ../src/empathy-chat-window.c:474 ../src/empathy-chat-window.c:494
+#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d sense llegir)"
 msgstr[1] "%s (%d sense llegir)"
 
-#: ../src/empathy-chat-window.c:486
+#: ../src/empathy-chat-window.c:493
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (i %u altre)"
 msgstr[1] "%s (i %u altres)"
 
-#: ../src/empathy-chat-window.c:502
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d sense llegir d'altres)"
 msgstr[1] "%s (%d sense llegir d'altres)"
 
-#: ../src/empathy-chat-window.c:511
+#: ../src/empathy-chat-window.c:518
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d sense llegir de tots)"
 msgstr[1] "%s (%d sense llegir de tots)"
 
-#: ../src/empathy-chat-window.c:721
+#: ../src/empathy-chat-window.c:733
+msgid "SMS:"
+msgstr "SMS:"
+
+#: ../src/empathy-chat-window.c:743
+#, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "S'està enviant %d missatge"
+msgstr[1] "S'estan enviant %d missatges"
+
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
 msgstr "S'està escrivint un missatge."
 
@@ -3269,10 +3722,6 @@ msgstr "_Neteja"
 msgid "C_ontact"
 msgstr "C_ontacte"
 
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Xat"
-
 #: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
 msgstr "Insereix una e_moticona"
@@ -3293,10 +3742,6 @@ msgstr "Mou la pestanya a la d_reta"
 msgid "Notify for All Messages"
 msgstr "Notifica tots els missatges"
 
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
-msgid "_Contents"
-msgstr "_Continguts"
-
 #: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "_Conversa"
@@ -3305,18 +3750,10 @@ msgstr "_Conversa"
 msgid "_Detach Tab"
 msgstr "D_esenganxa la pestanya"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
-msgid "_Edit"
-msgstr "_Edita"
-
 #: ../src/empathy-chat-window.ui.h:13
 msgid "_Favorite Chat Room"
 msgstr "Sala de xat _preferida"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
-msgid "_Help"
-msgstr "A_juda"
-
 #: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "Pestanya següe_nt"
@@ -3337,15 +3774,15 @@ msgstr "Pes_tanyes"
 msgid "_Undo Close Tab"
 msgstr "_Desfés el tancament de la pestanya"
 
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
 msgstr "Sala"
 
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "Connecta automàticament"
 
@@ -3353,90 +3790,96 @@ msgstr "Connecta automàticament"
 msgid "Manage Favorite Rooms"
 msgstr "Gestiona les sales preferides"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming video call"
 msgstr "Trucada de vídeo entrant"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
 msgid "Incoming call"
 msgstr "Trucada entrant"
 
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:525
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "En/na %s us està trucant per videoconferència, voleu contestar?"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "En/na %s us està trucant, voleu contestar?"
 
-#: ../src/empathy-event-manager.c:515 ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Trucada entrant d'en/na %s"
 
-#: ../src/empathy-event-manager.c:540
+#: ../src/empathy-event-manager.c:554
 msgid "_Reject"
 msgstr "_Refusa"
 
-#: ../src/empathy-event-manager.c:546
+#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
 msgid "_Answer"
 msgstr "_Contesta"
 
-#: ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:570
+msgid "_Answer with video"
+msgstr "_Contesta amb vídeo"
+
+#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Trucada de videoconferència d'en/na %s"
 
-#: ../src/empathy-event-manager.c:737
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
 msgstr "Invitació a la sala"
 
-#: ../src/empathy-event-manager.c:739
+#: ../src/empathy-event-manager.c:838
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Us han convidat a entrar a %s"
 
-#: ../src/empathy-event-manager.c:746
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "En/na %s us convida a entrar a %s"
 
-#: ../src/empathy-event-manager.c:754
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
 msgstr "_Declina"
 
-#: ../src/empathy-event-manager.c:759
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Uneix-m'hi"
 
-#: ../src/empathy-event-manager.c:786
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "En/na %s us ha convidat a entrar a %s"
 
-#: ../src/empathy-event-manager.c:792
+#: ../src/empathy-event-manager.c:891
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Us han convidat a entrar a %s"
 
-#: ../src/empathy-event-manager.c:843
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Transferència de fitxers entrant d'en/na %s"
 
-#: ../src/empathy-event-manager.c:1013 ../src/empathy-main-window.c:370
+#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
 msgid "Password required"
 msgstr "Cal la contrasenya"
 
-#: ../src/empathy-event-manager.c:1069
+#: ../src/empathy-event-manager.c:1190
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s vol poder saber quan esteu en línia"
 
-#: ../src/empathy-event-manager.c:1073
+#: ../src/empathy-event-manager.c:1194
 #, c-format
 msgid ""
 "\n"
@@ -3446,105 +3889,105 @@ msgstr ""
 "Missatge: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:100
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:102
+#: ../src/empathy-ft-manager.c:103
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:179
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s de %s a %s/s"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:275
 #, c-format
 msgid "%s of %s"
 msgstr "%s de %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:305
+#: ../src/empathy-ft-manager.c:306
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "S'està rebent «%s» d'en/na %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:309
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "S'està enviant «%s» a en/na %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:338
+#: ../src/empathy-ft-manager.c:339
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "S'ha produït un error en rebre «%s» d'en/na %s"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:342
 msgid "Error receiving a file"
 msgstr "S'ha produït un error en rebre el fitxer"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:347
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "S'ha produït un error en enviar «%s» a en/na %s"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:350
 msgid "Error sending a file"
 msgstr "S'ha produït un error en enviar el fitxer"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:489
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "S'ha rebut «%s» d'en/na %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:493
+#: ../src/empathy-ft-manager.c:494
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "S'ha enviat «%s» a en/na %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:497
 msgid "File transfer completed"
 msgstr "S'ha completat la transferència"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
 msgid "Waiting for the other participant's response"
 msgstr "S'està esperant que l'interlocutor respongui"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "S'està comprovant la integritat de «%s»"
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "S'està fent el resum de «%s»"
 
-#: ../src/empathy-ft-manager.c:1016
+#: ../src/empathy-ft-manager.c:1026
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1028
+#: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "Fitxer"
 
-#: ../src/empathy-ft-manager.c:1050
+#: ../src/empathy-ft-manager.c:1060
 msgid "Remaining"
 msgstr "Restant"
 
@@ -3583,127 +4026,140 @@ msgstr "Protocol"
 msgid "Source"
 msgstr "Font"
 
-#: ../src/empathy-main-window.c:387
+#: ../src/empathy-main-window.c:392
 msgid "Provide Password"
 msgstr "Introduïu la contrasenya"
 
-#: ../src/empathy-main-window.c:393
+#: ../src/empathy-main-window.c:398
 msgid "Disconnect"
 msgstr "Desconnecta"
 
-#: ../src/empathy-main-window.c:533
+#: ../src/empathy-main-window.c:622
 msgid "No match found"
 msgstr "No s'ha trobat cap coincidència"
 
-#: ../src/empathy-main-window.c:688
+#: ../src/empathy-main-window.c:777
 msgid "Reconnect"
 msgstr "Torna a connectar"
 
-#: ../src/empathy-main-window.c:694
+#: ../src/empathy-main-window.c:783
 msgid "Edit Account"
 msgstr "Edita el compte"
 
-#: ../src/empathy-main-window.c:700
+#: ../src/empathy-main-window.c:789
 msgid "Close"
 msgstr "Tanca"
 
-#: ../src/empathy-main-window.c:1418
+#. Translators: this string will be something like:
+#. *   Top up My Account ($1.23)..."
+#: ../src/empathy-main-window.c:928
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr "Recarrega %s (%s)..."
+
+#: ../src/empathy-main-window.c:975
+msgid "Top up account credit"
+msgstr "Recarrega el saldo del compte"
+
+#. top up button
+#: ../src/empathy-main-window.c:1046
+msgid "Top Up..."
+msgstr "Recarrega..."
+
+#: ../src/empathy-main-window.c:1789
 msgid "Contact"
 msgstr "Contacte"
 
-#: ../src/empathy-main-window.c:1765
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "Llista de contactes"
 
-#: ../src/empathy-main-window.c:1881
-msgid "Show and edit accounts"
-msgstr "Mostra i edita els comptes"
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "Contactes en el _mapa"
 
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-main-window-menubar.ui.h:2
+msgid "Credit Balance"
+msgstr "Saldo disponible"
+
+#: ../src/empathy-main-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "Cerca a la _llista de contactes"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "Uneix-te als _preferits"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
-msgstr "Gestiona els preferits"
+msgstr "Gestiona les preferides"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "Mida _normal"
 
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "_Trucada nova…"
 
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "Mida normal amb els _avatars"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "P_referències"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "Mostra els _protocols"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "Ordena per _nom"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "Ordena per es_tat"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Comptes"
 
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "Contactes _blocats"
 
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "Mida _compacta"
 
-#: ../src/empathy-main-window.ui.h:18
-msgid "_Debug"
-msgstr "_Depura"
-
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "Transferències de _fitxers"
 
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "_Uneix-m'hi…"
 
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "Conversa _nova…"
 
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "Contactes _desconnectats"
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "Informació _personal"
 
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "_Sala"
 
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window-menubar.ui.h:29
 msgid "_Search for Contacts…"
 msgstr "_Cerca contactes…"
 
@@ -3717,7 +4173,7 @@ msgstr "Membres"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:560
+#: ../src/empathy-new-chatroom-dialog.c:553
 #, c-format
 msgid ""
 "%s\n"
@@ -3730,16 +4186,16 @@ msgstr ""
 "Cal contrasenya: %s\n"
 "Membres: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "No"
 msgstr "No"
 
-#: ../src/empathy-new-chatroom-dialog.c:591
+#: ../src/empathy-new-chatroom-dialog.c:584
 msgid "Could not start room listing"
 msgstr "No s'ha pogut iniciar el llistat de sales"
 
-#: ../src/empathy-new-chatroom-dialog.c:601
+#: ../src/empathy-new-chatroom-dialog.c:594
 msgid "Could not stop room listing"
 msgstr "No s'ha pogut aturar el llistat de sales"
 
@@ -3774,39 +4230,79 @@ msgstr "Llista de sales"
 msgid "_Room:"
 msgstr "Sa_la:"
 
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr "Missatge rebut"
 
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr "Missatge enviat"
 
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
 msgstr "Conversa nova"
 
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
 msgstr "El contacte s'ha connectat"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
 msgstr "El contacte s'ha desconnectat"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
 msgstr "Compte connectat"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
 msgstr "Compte desconnectat"
 
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr "Llengua"
 
-#: ../src/empathy-preferences.c:875
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:734
+msgid "Juliet"
+msgstr "Julieta"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:741
+msgid "Romeo"
+msgstr "Romeu"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:747
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr "O Romeu, Romeu! Per què ets tu Romeu?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:750
+msgid "Deny thy father and refuse thy name;"
+msgstr "Nega el teu pare i rebutja el teu nom."
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:753
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr "O, si no vols, jura'm el teu amor"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:756
+msgid "And I'll no longer be a Capulet."
+msgstr "I deixaré jo de ser una Capulet."
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:759
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr "L'escolto més estona, o li responc?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:762
+msgid "Juliet has disconnected"
+msgstr "La Julieta s'ha desconnectat"
+
+#: ../src/empathy-preferences.c:1166
 msgid "Preferences"
 msgstr "Preferències"
 
@@ -3814,67 +4310,87 @@ msgstr "Preferències"
 msgid "Appearance"
 msgstr "Aparença"
 
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
 msgstr "Comportament"
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
 msgid "Chat Th_eme:"
 msgstr "T_ema de xat:"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
 msgid "Disable notifications when _away or busy"
 msgstr "Inhabilita les notificacions quan s'estigui _absent o ocupat"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
 msgid "Disable sounds when _away or busy"
 msgstr "Inhabilita els sons quan s'estigui _absent o ocupat"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Mostra els esdeveniments d'entrada a l'àrea de notificació"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"La cancel·lació de l'eco permet que l'altra persona senti la vostra veu "
+"millor, però pot no funcionar bé en alguns ordinadors. Si sentiu o senten "
+"alguns sorolls estranys o petits talls, proveu a desactivar la cancel·lació "
+"de l'eco i tornar a trucar."
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "Habilita les notificacions quan es connecti un contacte"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "Habilita les notificacions quan es desconnecti un contacte"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Habilita les notificacions quan el _xat no tingui el focus"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "Habilita la verificació ortogràfica per a les llengües:"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "General"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input level:"
+msgstr "Nivell d'entrada:"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "Volum d'entrada:"
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "Fonts d'ubicació:"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "Enregistra les converses"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "Notificacions"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Reprodueix un so per als esdeveniments"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "Privadesa"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -3884,23 +4400,23 @@ msgstr ""
 "més precís que la ciutat, el país o l'estat. Les coordenades del GPS es "
 "truncaran a una posició decimal."
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "Mo_stra les emoticones com a imatges"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "Mostra la _llista de contactes a les sales"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "Verificació ortogràfica"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
@@ -3908,44 +4424,48 @@ msgstr ""
 "La llista de llengües només mostrarà les llengües per a les quals tingueu un "
 "diccionari instal·lat."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "Temes"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:30
+msgid "Variant:"
+msgstr "Variant:"
+
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "_Connecta automàticament en iniciar"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Telèfon mòbil"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "_Habilita les notificacions"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "_Habilita les notificacions de so"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Xarxa (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "_Obre xats nous en finestres separades"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "_Publica la ubicació per als meus contactes"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "_Redueix la precisió de la ubicació"
 
@@ -3957,67 +4477,115 @@ msgstr "Estat"
 msgid "_Quit"
 msgstr "_Surt"
 
-#: ../src/empathy-map-view.c:442
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "Torna a trucar al contacte"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "Càmera apagada"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "Càmera engegada"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "Inhabilita la càmera i atura l'enviament de vídeo"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "Habilita la càmera i envia senyal de vídeo"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "Habilita la càmera però no enviïs senyal de vídeo"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "Previsualització"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "Torna a trucar"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "V_ídeo"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "El vídeo està apagat"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "El vídeo està engegat"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "Previsualització de vídeo"
+
+#: ../src/empathy-map-view.c:448
 msgid "Contact Map View"
 msgstr "Visualització de contactes en el mapa"
 
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
 msgid "Save"
 msgstr "Desa"
 
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
 msgstr "Finestra de depuració"
 
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
 msgstr "Fes una pausa"
 
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
 msgstr "Nivell "
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
 msgid "Debug"
 msgstr "Depura"
 
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
 msgid "Info"
 msgstr "Informació"
 
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
 msgid "Message"
 msgstr "Missatge"
 
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
 msgid "Warning"
 msgstr "Avís"
 
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
 msgid "Critical"
 msgstr "Crític"
 
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
 msgid "Error"
 msgstr "Error"
 
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
 msgid "Time"
 msgstr "Hora"
 
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
 msgid "Domain"
 msgstr "Domini"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
 msgstr "Categoria"
 
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "Nivell"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4025,16 +4593,16 @@ msgstr ""
 "El gestor de connexions seleccionat no permet utilitzar l'extensió de "
 "depuració remota."
 
-#: ../src/empathy-invite-participant-dialog.c:34
-#: ../src/empathy-invite-participant-dialog.c:48
+#: ../src/empathy-invite-participant-dialog.c:179
+#: ../src/empathy-invite-participant-dialog.c:205
 msgid "Invite Participant"
 msgstr "Convida un participant"
 
-#: ../src/empathy-invite-participant-dialog.c:35
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Seleccioneu un contacte per convidar-lo a la conversa:"
 
-#: ../src/empathy-invite-participant-dialog.c:45
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "Convida"
 
@@ -4065,7 +4633,15 @@ msgstr "- Comptes de l'Empathy"
 msgid "Empathy Accounts"
 msgstr "Comptes de l'Empathy"
 
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr "Mostra un servei en concret"
+
+#: ../src/empathy-debugger.c:75
+msgid "- Empathy Debugger"
+msgstr "- Depurador de l'Empathy"
+
+#: ../src/empathy-debugger.c:114
 msgid "Empathy Debugger"
 msgstr "Depurador de l'Empathy"
 
@@ -4073,38 +4649,114 @@ msgstr "Depurador de l'Empathy"
 msgid "- Empathy Chat Client"
 msgstr "- Client de xat Empathy"
 
-#: ../src/empathy-notifications-approver.c:184
+#: ../src/empathy-notifications-approver.c:203
 msgid "Respond"
 msgstr "Respon"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1459
 msgid "Reject"
 msgstr "Rebutja"
 
-#: ../src/empathy-notifications-approver.c:194
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1460
 msgid "Answer"
 msgstr "Contesta"
 
-#: ../src/empathy-notifications-approver.c:201
-#: ../src/empathy-notifications-approver.c:211
+#: ../src/empathy-notifications-approver.c:227
+msgid "Answer with video"
+msgstr "Contesta amb vídeo"
+
+#: ../src/empathy-notifications-approver.c:235
+#: ../src/empathy-notifications-approver.c:245
 msgid "Decline"
 msgstr "Declina"
 
-#: ../src/empathy-notifications-approver.c:205
-#: ../src/empathy-notifications-approver.c:216
+#: ../src/empathy-notifications-approver.c:239
+#: ../src/empathy-notifications-approver.c:250
 msgid "Accept"
 msgstr "Accepta"
 
-#: ../src/empathy-call-observer.c:130
-#, c-format
-msgid "Missed call from %s"
-msgstr "Us ha trucat %s però no hi éreu"
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:260
+msgid "Provide"
+msgstr "Proporciona"
 
-#: ../src/empathy-call-observer.c:133
+#: ../src/empathy-call-observer.c:134
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s us ha intentat trucar però estàveu en una altra conversa."
 
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+msgid "i"
+msgstr "i"
+
+#: ../src/empathy-call-window.c:2775
+msgid "On hold"
+msgstr "En espera"
+
+#: ../src/empathy-call-window.c:2778
+msgid "Mute"
+msgstr "Silenci"
+
+#: ../src/empathy-call-window.c:2780
+msgid "Duration"
+msgstr "Durada"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2783
+#, c-format
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02dm"
+
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "Coincidència de _majúscules i minúscules"
+
+#~ msgid "Find Next"
+#~ msgstr "Cerca el següent"
+
+#~ msgid "Find Previous"
+#~ msgstr "Cerca l'anterior"
+
+#~ msgid "Show and edit accounts"
+#~ msgstr "Mostra i edita els comptes"
+
+#~ msgid "Call with %d participants"
+#~ msgstr "Trucada amb %d persones"
+
+#~ msgid "All"
+#~ msgstr "Tots"
+
+#~ msgid "_Enabled"
+#~ msgstr "_Habilitat"
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ msgid "Conversations"
+#~ msgstr "Converses"
+
+#~ msgid "Previous Conversations"
+#~ msgstr "Converses anteriors"
+
+#~ msgid "_For:"
+#~ msgstr "_Per a:"
+
+#~ msgid "Enter Custom Message"
+#~ msgstr "Introduïu un missatge personalitzat"
+
+#~ msgid "Save _New Status Message"
+#~ msgstr "_Desa el missatge d'estat nou"
+
+#~ msgid "Saved Status Messages"
+#~ msgstr "Missatges d'estat desats"
+
 #~ msgid "Empathy has asked about importing accounts"
 #~ msgstr "Si l'Empathy ha preguntat sobre la importació de comptes"
 
@@ -4214,9 +4866,6 @@ msgstr "%s us ha intentat trucar però estàveu en una altra conversa."
 #~ msgid " Accounts"
 #~ msgstr " Comptes"
 
-#~ msgid "Salut account is created"
-#~ msgstr "S'ha creat el compte del Salut"
-
 #~ msgid "Whether the Salut account has been created on the first Empathy run."
 #~ msgstr ""
 #~ "Si s'ha creat el compte del Salut en la primera execució de l'Empathy."
@@ -4264,9 +4913,6 @@ msgstr "%s us ha intentat trucar però estàveu en una altra conversa."
 #~ msgid "The contact's avatar token. Empty means contact has no avatar."
 #~ msgstr "L'avatar del contacte. Si està buit significa que no té avatar."
 
-#~ msgid "Megaphone"
-#~ msgstr "Megàfon"
-
 #~ msgid "Talk!"
 #~ msgstr "Parleu!"
 
@@ -4311,9 +4957,6 @@ msgstr "%s us ha intentat trucar però estàveu en una altra conversa."
 #~ "Si decidiu tornar a afegir el compte més endavant, encara estaran "
 #~ "disponibles."
 
-#~ msgid "_Next"
-#~ msgstr "Següe_nt"
-
 #~ msgid "Add new"
 #~ msgstr "Afegeix-ne un de nou"
 
@@ -4396,10 +5039,6 @@ msgstr "%s us ha intentat trucar però estàveu en una altra conversa."
 #~ msgid "Import Accounts..."
 #~ msgstr "Importació de comptes..."
 
-#, fuzzy
-#~ msgid "Settings"
-#~ msgstr "<b>Paràmetres</b>"
-
 #~ msgid "Type:"
 #~ msgstr "Tipus:"
 
@@ -4421,9 +5060,6 @@ msgstr "%s us ha intentat trucar però estàveu en una altra conversa."
 #~ msgid "_Check Word Spelling..."
 #~ msgstr "_Verifica l'ortografia de la paraula..."
 
-#~ msgid "<b>Topic:</b>"
-#~ msgstr "<b>Tema:</b>"
-
 #~ msgid "Group Chat"
 #~ msgstr "Xat en grup"
 
@@ -4518,9 +5154,6 @@ msgstr "%s us ha intentat trucar però estàveu en una altra conversa."
 #~ msgid "Join _New..."
 #~ msgstr "Uneix-me a un _nou/nova..."
 
-#~ msgid "Chat Rooms"
-#~ msgstr "Sales de xat"
-
 #~ msgid "Browse:"
 #~ msgstr "Navega:"
 
@@ -4547,9 +5180,6 @@ msgstr "%s us ha intentat trucar però estàveu en una altra conversa."
 #~ msgid "Show _avatars"
 #~ msgstr "Mostra els av_atars"
 
-#~ msgid "Show co_mpact contact list"
-#~ msgstr "_Mostra la llista de contactes compacta"
-
 #~ msgid "menuitem2"
 #~ msgstr "menuitem2"
 
@@ -4689,10 +5319,6 @@ msgstr "%s us ha intentat trucar però estàveu en una altra conversa."
 #~ msgstr "Presència"
 
 #, fuzzy
-#~ msgid "No accounts"
-#~ msgstr "Comptes"
-
-#, fuzzy
 #~ msgid "Lowmem"
 #~ msgstr "Casa"
 
@@ -4721,12 +5347,6 @@ msgstr "%s us ha intentat trucar però estàveu en una altra conversa."
 #~ msgid "Yahoo! account settings"
 #~ msgstr "paràmetres del compte Yahoo!"
 
-#~ msgid "Input"
-#~ msgstr "Entrada"
-
-#~ msgid "Mute"
-#~ msgstr "Silenci"
-
 #~ msgid "Output"
 #~ msgstr "Sortida"
 
@@ -5165,9 +5785,6 @@ msgstr "%s us ha intentat trucar però estàveu en una altra conversa."
 #~ msgid "Users"
 #~ msgstr "Usuaris"
 
-#~ msgid "Description"
-#~ msgstr "Descripció"
-
 #~ msgid "Found %d conference room"
 #~ msgid_plural "Found %d conference rooms"
 #~ msgstr[0] "S'ha trobat %d sala de xat"
@@ -5202,9 +5819,6 @@ msgstr "%s us ha intentat trucar però estàveu en una altra conversa."
 #~ msgid "Someone wants to be added to your contact list."
 #~ msgstr "Algú vol afegir-se a la vostra llista de contactes."
 
-#~ msgid "Show"
-#~ msgstr "Mostra"
-
 #~ msgid ""
 #~ "This will remove any custom messages you have added to the list of preset "
 #~ "status messages."
@@ -5233,9 +5847,6 @@ msgstr "%s us ha intentat trucar però estàveu en una altra conversa."
 #~ msgid "Try again later."
 #~ msgstr "Proveu-ho més tard."
 
-#~ msgid "Change"
-#~ msgstr "Canvia"
-
 #~ msgid "Change Na_me..."
 #~ msgstr "Canvia el no_m..."
 
@@ -5460,9 +6071,6 @@ msgstr "%s us ha intentat trucar però estàveu en una altra conversa."
 #~ msgid "Jabber"
 #~ msgstr "Jabber"
 
-#~ msgid "Edit"
-#~ msgstr "Edita"
-
 #~ msgid "Perhaps you are trying to connect to the wrong port?"
 #~ msgstr "Potser us esteu intentant connectar al port incorrecte?"
 
@@ -6090,9 +6698,6 @@ msgstr "%s us ha intentat trucar però estàveu en una altra conversa."
 #~ msgid "Payment Required"
 #~ msgstr "Es requereix pagament"
 
-#~ msgid "Not Acceptable"
-#~ msgstr "No acceptable"
-
 #~ msgid "Request Timeout"
 #~ msgstr "Temps d'espera esgotat per a la petició"
 
@@ -6385,9 +6990,6 @@ msgstr "%s us ha intentat trucar però estàveu en una altra conversa."
 #~ msgid "About to leave..."
 #~ msgstr "Estic a punt de sortir..."
 
-#~ msgid "Autoaway message"
-#~ msgstr "Missatge d'absència automàtica"
-
 #~ msgid "Busy messages"
 #~ msgstr "Missatge d'ocupat"
 
@@ -6469,9 +7071,6 @@ msgstr "%s us ha intentat trucar però estàveu en una altra conversa."
 #~ msgid "[Eating,Sleeping]"
 #~ msgstr "[Menjant,Dormint]"
 
-#~ msgid "[Working]"
-#~ msgstr "[Treballant]"
-
 #~ msgid "Custom Away Message..."
 #~ msgstr "Missatge d'absència personalitzat..."
 
@@ -6532,9 +7131,6 @@ msgstr "%s us ha intentat trucar però estàveu en una altra conversa."
 #~ msgid "Timestamp messages"
 #~ msgstr "Posa marques de temps als missatges"
 
-#~ msgid "Free to chat"
-#~ msgstr "Disponible per xatejar"
-
 #~ msgid "Extended away"
 #~ msgstr "Absent fa estona"
 
diff --git a/po/ca@valencia.po b/po/ca@valencia.po
index 7889eec06..7a04dbb13 100644
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
@@ -2,21 +2,21 @@
 # Copyright © 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This file is distributed under the same licence as the gossip package.
 # Jordi Mallach <jordi@sindominio.net>, 2003, 2004, 2005, 2006, 2007.
-# Gil Forcada  <gilforcada@guifi.net>, 2008, 2009, 2010, 2011.
+# Gil Forcada <gilforcada@guifi.net>, 2008, 2009, 2010, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-29 17:55+0200\n"
-"PO-Revision-Date: 2011-04-02 20:42+0200\n"
+"POT-Creation-Date: 2011-09-26 14:34+0200\n"
+"PO-Revision-Date: 2011-09-25 21:46+0200\n"
 "Last-Translator: Gil Forcada <gilforcada@guifi.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
-"Language: ca\n"
+"Language: ca-XV\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n!=1;\n"
+"Content-Transfer-Encoding: 8bits\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
@@ -41,6 +41,22 @@ msgid "Always open a separate chat window for new chats."
 msgstr "Obri sempre una finestra de xat separada per a xats nous."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr "Volum de la trucada"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr "Volum de la trucada, en percentatge."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Camera device"
+msgstr "Dispositiu de la càmera"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "Posició de la càmera"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -48,46 +64,60 @@ msgstr ""
 "Caràcter que s'afegirà després del sobrenom quan s'utilitze la compleció de "
 "sobrenom (tabulació) en els xats de grup."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "Tema de la finestra de xat"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+msgid "Chat window theme variant"
+msgstr "Variant del tema de la finestra de xat"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "Llista separada per comes de les llengües del verificador ortogràfic a "
 "utilitzar (p. ex. «ca, en, es, fr»)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "Llista de contactes compacta"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "S'haurien d'utilitzar gestors de connexions"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "Criteri d'ordenació de la llista de contactes"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr ""
+"Dispositiu de càmera per defecte a utilitzar en les trucades de vídeo, per "
+"exemple /dev/video0."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Default directory to select an avatar image from"
 msgstr "El directori predeterminat des d'on seleccionar una imatge d'avatar"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable popup notifications when away"
 msgstr "Inhabilita les notificacions quan s'estiga absent"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Disable sounds when away"
 msgstr "Inhabilita els sons quan s'estiga absent"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Display incoming events in the status area"
 msgstr "Mostra els esdeveniments d'entrada en l'àrea d'estat"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -95,244 +125,256 @@ msgstr ""
 "Mostra els esdeveniments d'entrada en l'àrea d'estat. Si és «false» (fals) "
 "mostra'ls immediatament a l'usuari."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+msgid "Echo cancellation support"
+msgstr "Utilitza la cancel·lació de l'eco"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can publish the user's location"
 msgstr "L'Empathy pot publicar la ubicació de l'usuari"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the GPS to guess the location"
 msgstr "L'Empathy pot utilitzar el GPS per determinar la ubicació"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the cellular network to guess the location"
 msgstr ""
 "L'Empathy pot utilitzar la xarxa de telefonia mòbil per determinar la "
 "ubicació"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy can use the network to guess the location"
 msgstr "L'Empathy pot utilitzar la xarxa per determinar la ubicació"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy default download folder"
 msgstr "Carpeta predeterminada de les baixades de l'Empathy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Empathy has migrated butterfly logs"
-msgstr "L'Empathy ha migrat dels registres de la Butterfly"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr "Fes que l'Empathy canvie automàticament a absent quan estiga inactiu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "Fes que l'Empathy es connecte automàticament en iniciar-se"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "L'Empathy hauria de reduir la precisió de la ubicació"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
 "Fes que l'Empathy utilitze l'avatar del contacte com a icona de la finestra "
 "de xat"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr "Habilita les eines de desenvolupador del WebKit"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "Habilita les notificacions per als missatges nous"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "Habilita el verificador ortogràfic"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "Oculta la finestra principal"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "Oculta la finestra principal."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+msgid "Last account selected in Join Room dialog"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Nick completed character"
 msgstr "Caràcter de compleció de sobrenom"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Open new chats in separate windows"
 msgstr "Obri les finestres de xat noves en finestres separades"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use"
 msgstr "Camí al tema Adium a utilitzar"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
 "Camí al tema Adium a utilitzar si el tema utilitzat per al xat és l'Adium."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for incoming messages"
 msgstr "Reprodueix un so quan arriben missatges"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for new conversations"
 msgstr "Reprodueix un so per a les converses noves"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound for outgoing messages"
 msgstr "Reprodueix un so per als missatges d'eixida"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs in"
-msgstr "Reprodueix un so quan entre algun contacte"
+msgstr "Reprodueix un so quan entri algun contacte"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when a contact logs out"
 msgstr "Reprodueix un so quan isca algun contacte"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log in"
 msgstr "Reprodueix un so en entrar"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Play a sound when we log out"
 msgstr "Reprodueix un so en eixir"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Mostra notificacions si el xat no és la finestra activa"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs in"
 msgstr "Mostra notificacions si entra un contacte"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "Pop up notifications when a contact logs out"
 msgstr "Mostra notificacions si ix un contacte"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+msgid "Position the camera preview should be during a call."
+msgstr ""
+"Posició on s'hauria de mostrar la previsualització de la càmera durant una "
+"trucada."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show Balance in contact list"
-msgstr "_Mostra la llista de contactes compacta"
+msgstr "Mostra el saldo a la llista de contactes"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show avatars"
 msgstr "Mostra els avatars"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show contact list in rooms"
 msgstr "Mostra la llista de contactes a les sales"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show hint about closing the main window"
 msgstr "Mostra un consell sobre el tancament de la finestra principal"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show offline contacts"
 msgstr "Mostra els contactes fora de línia"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Show protocols"
 msgstr "Mostra els protocols"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Spell checking languages"
 msgstr "Llengües per a la verificació ortogràfica"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The default folder to save file transfers in."
 msgstr "La carpeta predeterminada on s'alçaran els fitxers transferits."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The last directory that an avatar image was chosen from."
 msgstr "L'últim directori des d'on es va seleccionar una imatge d'avatar."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The position for the chat window side pane"
 msgstr "La posició per la subfinestra lateral de la finestra de xat"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr ""
 "La posició emmagatzemada (en píxels) de la subfinestra lateral de la "
 "finestra de xat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "El tema que s'utilitza per mostrar la conversa a les finestres de xat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr ""
+"La variant del tema que s'utilitza per mostrar la conversa a les finestres "
+"de xat."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use graphical smileys"
 msgstr "Utilitza emoticones gràfiques"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use notification sounds"
 msgstr "Utilitza sons de notificació"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Use theme for chat rooms"
 msgstr "Utilitza el tema per a les sales de xat"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr ""
 "Si l'Empathy ha de publicar la ubicació de l'usuari als seus contactes."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Si l'Empathy ha d'utilitzar el GPS per determinar la ubicació."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
 "Si l'Empathy ha d'utilitzar la xarxa de mòbils per determinar la ubicació."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Si l'Empathy ha d'utilitzar la xarxa per determinar la ubicació."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Si l'Empathy ha migrat els registres de la Butterfly."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Si l'Empathy ha d'entrar en els comptes automàticament en iniciar-se."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
 "Si l'Empathy ha de canviar automàticament al mode absent quan l'usuari està "
 "inactiu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 "Si l'Empathy ha de reduir la precisió de la ubicació per motius de privadesa."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 "Si l'Empathy ha d'utilitzar l'avatar del contacte com a icona de la finestra "
 "de xat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Si s'han d'habilitar les eines de desenvolupament del WebKit, com ara "
 "l'inspector web."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
@@ -340,69 +382,75 @@ msgstr ""
 "Si s'ha d'utilitzar el gestor de connexions per desconnectar/tornar a "
 "connectar automàticament."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr ""
 "Si s'han de verificar les paraules introduïdes comparant-les amb les "
 "llengües triades per a la verificació ortogràfica."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr ""
 "Si s'han de convertir les emoticones a imatges gràfiques a les converses."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr ""
+"Si s'hauria d'habilitar el filtre de cancel·lació de l'eco del Pulseaudio."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr ""
 "Si s'ha de reproduir un so per notificar que els contactes entren a la xarxa."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
-"Si s'ha de reproduir un so per notificar que els contactes ixen de la xarxa."
+"Si s'ha de reproduir un so per notificar que els contactes surten de la "
+"xarxa."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "Si s'ha de reproduir un so per notificar esdeveniments."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Si s'ha de reproduir un so quan arriben missatges."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Si s'ha de reproduir un so quan s'inicien converses noves."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Si s'ha de reproduir un so quan s'envien missatges."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
-msgstr "Si s'ha de reproduir un so quan s'entre a una xarxa."
+msgstr "Si s'ha de reproduir un so quan s'entri a una xarxa."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
-msgstr "Si s'ha de reproduir un so quan s'isca d'una xarxa."
+msgstr "Si s'ha de reproduir un so quan se isca d'una xarxa."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr ""
 "Si s'han de reproduir notificacions de so quan s'estiga absent o ocupat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr ""
 "Si s'ha de mostrar una notificació emergent quan es desconnecte un contacte."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr ""
 "Si s'ha de mostrar una notificació emergent quan es connecte un contacte."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -410,49 +458,47 @@ msgstr ""
 "Si s'han de mostrar notificacions emergents quan es reba un esdeveniment de "
 "missatge nou i el xat ja estiga obert però no tinga el focus."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr ""
 "Si s'ha de mostrar una notificació emergent quan es rebenn missatges nous."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show account balances in the contact list."
-msgstr ""
-"Si s'han de mostrar els protocols dels contactes a la llista de contactes."
+msgstr "Si s'han de mostrar els saldos dels comptes a la llista de contactes."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 "Si s'han de mostrar els avatars per als contactes a la llista de contactes i "
 "les finestres de xat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr ""
 "Si s'han de mostrar els contactes que estan fora de línia a la llista de "
 "contactes."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
 msgstr ""
 "Si s'han de mostrar notificacions emergents quan s'estiga absent o ocupat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr ""
 "Si s'han de mostrar els protocols dels contactes a la llista de contactes."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Si s'ha de mostrar la llista de contactes a les sales de xat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "Si s'ha de mostrar la llista de contactes en mode compacte."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -460,11 +506,11 @@ msgstr ""
 "Si s'ha de mostrar el diàleg de missatge sobre el tancament de la finestra "
 "principal amb el botó «x» de la barra de títol."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "Si s'ha d'utilitzar el tema per a les sales de xat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -481,7 +527,7 @@ msgstr "Gestiona els comptes de missatgeria i VoIP"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2320
+#: ../src/empathy-accounts-dialog.c:2324
 msgid "Messaging and VoIP Accounts"
 msgstr "Comptes de missatgeria i VoIP"
 
@@ -489,18 +535,34 @@ msgstr "Comptes de missatgeria i VoIP"
 msgid "File transfer completed, but the file was corrupted"
 msgstr "S'ha completat la transferència però el fitxer és malmés"
 
-#: ../libempathy/empathy-ft-handler.c:1113
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
 msgstr "El contacte remot no admet la transferència de fitxers"
 
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is not a regular file"
 msgstr "El fitxer seleccionat no és un fitxer normal"
 
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1176
 msgid "The selected file is empty"
 msgstr "El fitxer seleccionat és buit"
 
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#, c-format
+msgid "Missed call from %s"
+msgstr "Vos ha trucat %s però no hi éreu"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, c-format
+msgid "Called %s"
+msgstr "Trucada de %s"
+
+#: ../libempathy/empathy-message.c:422
+#, c-format
+msgid "Call from %s"
+msgstr "Trucada des de %s"
+
 #: ../libempathy/empathy-tp-file.c:268
 msgid "Socket type not supported"
 msgstr "No està implementat este tipus de sòcol"
@@ -529,144 +591,144 @@ msgstr "S'ha produït un error en enviar el fitxer"
 msgid "The other participant is unable to transfer the file"
 msgstr "L'interlocutor no pot enviar el fitxer"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:384
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
 msgid "Unknown reason"
 msgstr "Motiu desconegut"
 
-#: ../libempathy/empathy-utils.c:305
+#: ../libempathy/empathy-utils.c:232
 msgid "Available"
 msgstr "Disponible"
 
-#: ../libempathy/empathy-utils.c:307
+#: ../libempathy/empathy-utils.c:234
 msgid "Busy"
 msgstr "Ocupat"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:237
 msgid "Away"
 msgstr "Absent"
 
-#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:239
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:241
 msgid "Offline"
 msgstr "Fora de línia"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:317
-#, fuzzy
+#: ../libempathy/empathy-utils.c:244
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:284
 msgid "No reason specified"
 msgstr "No s'ha especificat el motiu"
 
-#: ../libempathy/empathy-utils.c:358 ../libempathy/empathy-utils.c:414
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
 msgid "Status is set to offline"
 msgstr "S'ha establit l'estat a desconnectat"
 
-#: ../libempathy/empathy-utils.c:360 ../libempathy/empathy-utils.c:394
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "Error de la xarxa"
 
-#: ../libempathy/empathy-utils.c:362 ../libempathy/empathy-utils.c:396
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
 msgid "Authentication failed"
 msgstr "Ha fallat l'autenticació"
 
-#: ../libempathy/empathy-utils.c:364 ../libempathy/empathy-utils.c:398
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
 msgid "Encryption error"
 msgstr "Error de xifratge"
 
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:294
 msgid "Name in use"
 msgstr "Nom ja utilitzat"
 
-#: ../libempathy/empathy-utils.c:368 ../libempathy/empathy-utils.c:400
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate not provided"
 msgstr "No s'ha proporcionat el certificat"
 
-#: ../libempathy/empathy-utils.c:370 ../libempathy/empathy-utils.c:402
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate untrusted"
 msgstr "El certificat no és de confiança"
 
-#: ../libempathy/empathy-utils.c:372 ../libempathy/empathy-utils.c:404
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
 msgid "Certificate expired"
 msgstr "El certificat ha vençut"
 
-#: ../libempathy/empathy-utils.c:374 ../libempathy/empathy-utils.c:406
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
 msgid "Certificate not activated"
 msgstr "El certificat no està activat"
 
-#: ../libempathy/empathy-utils.c:376 ../libempathy/empathy-utils.c:408
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
 msgid "Certificate hostname mismatch"
 msgstr "No coincideix el nom de la màquina del certificat"
 
-#: ../libempathy/empathy-utils.c:378 ../libempathy/empathy-utils.c:410
+#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
 msgid "Certificate fingerprint mismatch"
 msgstr "No coincideix l'empremta digital del certificat"
 
-#: ../libempathy/empathy-utils.c:380 ../libempathy/empathy-utils.c:412
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
 msgid "Certificate self-signed"
 msgstr "Certificat signat per un mateix"
 
-#: ../libempathy/empathy-utils.c:382
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate error"
 msgstr "Error en el certificat"
 
-#: ../libempathy/empathy-utils.c:416
+#: ../libempathy/empathy-utils.c:344
 msgid "Encryption is not available"
 msgstr "L'encriptació no està disponible"
 
-#: ../libempathy/empathy-utils.c:418
+#: ../libempathy/empathy-utils.c:346
 msgid "Certificate is invalid"
 msgstr "El certificat no és vàlid"
 
-#: ../libempathy/empathy-utils.c:420
+#: ../libempathy/empathy-utils.c:348
 msgid "Connection has been refused"
 msgstr "S'ha rebutjat la connexió"
 
-#: ../libempathy/empathy-utils.c:422
+#: ../libempathy/empathy-utils.c:350
 msgid "Connection can't be established"
 msgstr "No es pot establir la connexió"
 
-#: ../libempathy/empathy-utils.c:424
+#: ../libempathy/empathy-utils.c:352
 msgid "Connection has been lost"
 msgstr "S'ha perdut la connexió"
 
-#: ../libempathy/empathy-utils.c:426
+#: ../libempathy/empathy-utils.c:354
 msgid "This resource is already connected to the server"
 msgstr "Este recurs ja està connectat al servidor"
 
-#: ../libempathy/empathy-utils.c:428
+#: ../libempathy/empathy-utils.c:356
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "S'ha reemplaçat la connexió per una altra de nova fent servir el mateix "
 "recurs"
 
-#: ../libempathy/empathy-utils.c:431
+#: ../libempathy/empathy-utils.c:359
 msgid "The account already exists on the server"
 msgstr "Ja existeix este compte al servidor"
 
-#: ../libempathy/empathy-utils.c:433
+#: ../libempathy/empathy-utils.c:361
 msgid "Server is currently too busy to handle the connection"
 msgstr "El servidor està massa ocupat per gestionar la connexió"
 
-#: ../libempathy/empathy-utils.c:435
+#: ../libempathy/empathy-utils.c:363
 msgid "Certificate has been revoked"
 msgstr "S'ha revocat el certificat"
 
-#: ../libempathy/empathy-utils.c:437
+#: ../libempathy/empathy-utils.c:365
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "El certificat utilitza un algorisme criptògraf no segur o la seua fortalesa "
 "criptogràfica és feble"
 
-#: ../libempathy/empathy-utils.c:440
+#: ../libempathy/empathy-utils.c:368
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -674,20 +736,20 @@ msgstr ""
 "La llargada del certificat del servidor o la profunditat de la cadena de "
 "certificació excedeix els límits de la biblioteca criptogràfica"
 
-#: ../libempathy/empathy-utils.c:603
+#: ../libempathy/empathy-utils.c:529
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "Gent propera"
 
-#: ../libempathy/empathy-utils.c:608
+#: ../libempathy/empathy-utils.c:534
 msgid "Yahoo! Japan"
 msgstr "Yahoo! del Japó"
 
-#: ../libempathy/empathy-utils.c:637
+#: ../libempathy/empathy-utils.c:563
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:638
+#: ../libempathy/empathy-utils.c:564
 msgid "Facebook Chat"
 msgstr "Xat del Facebook"
 
@@ -737,71 +799,81 @@ msgstr[1] "fa %d mesos"
 msgid "in the future"
 msgstr "en el futur"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:491
-msgid "All"
-msgstr "Tots"
+#: ../libempathy-gtk/empathy-account-chooser.c:540
+msgid "All accounts"
+msgstr "Tots els comptes"
 
-#: ../libempathy-gtk/empathy-account-widget.c:681
-#: ../libempathy-gtk/empathy-log-window.c:643
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "Compte"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "Contrasenya"
 
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:756
-#: ../libempathy-gtk/empathy-account-widget.c:813
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1154
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "Els comptes web"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "S'està editant el compte %s a través dels comptes web."
+msgid "The account %s is edited via %s."
+msgstr "S'està editant el compte %s a través de %s."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1160
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "No es pot editar el compte %s a través de l'Empathy."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1180
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
 msgstr "Inicia els comptes web"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1518
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "Edita %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Nom d'usuari:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1836
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "_Aplica"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1866
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
 msgstr "_Entra"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "Ja existeix este compte al servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1943
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "Crea un compte nou al servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2135
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "Ca_ncel·la"
 
@@ -810,19 +882,19 @@ msgstr "Ca_ncel·la"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2413
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s a %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2439
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "Compte %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2443
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "Compte nou"
 
@@ -834,6 +906,7 @@ msgstr "<b>Exemple:</b> ElMeuNomPúblic"
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -943,76 +1016,84 @@ msgstr "Quin és el vostre UIN de l'ICQ?"
 msgid "What is your ICQ password?"
 msgstr "Quina és la vostra contrasenya de l'ICQ?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:184
-#: ../libempathy-gtk/empathy-account-widget-sip.c:217
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "Automàtic"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:187
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:193
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:222
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "Registre"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:227
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "Opcions"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "Cap"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Character set:"
 msgstr "Joc de caràcters:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"La majoria de servidors d'IRC no necessiten contrasenya, si no n'esteu "
+"segurs no introduïu cap contrasenya."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Network"
 msgstr "Xarxa"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Network:"
 msgstr "Xarxa:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Sobrenom:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "Missatge de desconnexió:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "Nom real:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Servers"
 msgstr "Servidors"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "What is your IRC nickname?"
 msgstr "Quin és el vostre sobrenom a l'IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Quina xarxa d'IRC?"
 
@@ -1147,7 +1228,7 @@ msgstr "Descobreix automàticament el servidor STUN"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
 msgid "Ignore TLS Errors"
-msgstr ""
+msgstr "Ignora els errors de la TLS"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Interval (seconds)"
@@ -1195,14 +1276,18 @@ msgid "Transport:"
 msgstr "Transport:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Utilitza este compte per fer trucades a _fixes i a mòbils"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "Quina és la vostra contrasenya del compte de SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Quin és el vostre identificador d'entrada de SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "N_om d'usuari:"
 
@@ -1226,36 +1311,36 @@ msgstr "I_D del Yahoo!:"
 msgid "_Room List locale:"
 msgstr "_Localització de la llista de la sala:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:465
-#: ../libempathy-gtk/empathy-avatar-chooser.c:541
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "No s'ha pogut convertir la imatge"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:466
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "El vostre sistema no sap gestionar cap dels formats d'imatge acceptats"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:750
-msgid "Couldn't save pixbuf to png"
-msgstr ""
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+msgid "Couldn't save picture to file"
+msgstr "No s'ha pogut alçar la imatge en un fitxer"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1018
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "Seleccioneu la vostra imatge d'avatar"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1022
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
-msgstr ""
+msgstr "Fes una foto..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1025
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "Cap imatge"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1087
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "Imatges"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1091
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "Tots els fitxers"
 
@@ -1263,40 +1348,61 @@ msgstr "Tots els fitxers"
 msgid "Click to enlarge"
 msgstr "Feu clic per fer-la més gran"
 
-#: ../libempathy-gtk/empathy-chat.c:699
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
+msgid "There was an error starting the call"
+msgstr "S'ha produït un error en iniciar la trucada"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact doesn't support calls"
+msgstr "El contacte que heu seleccionat no permet trucades"
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is offline"
+msgstr "El contacte seleccionat està fora de línia"
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "The specified contact is not valid"
+msgstr "El contacte seleccionat no és vàlid"
+
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "Emergency calls are not supported on this protocol"
+msgstr "Este protocol no permet fer trucades d'emergència"
+
+#: ../libempathy-gtk/empathy-chat.c:705
 msgid "Failed to open private chat"
 msgstr "No s'ha pogut obrir un xat privat"
 
-#: ../libempathy-gtk/empathy-chat.c:760
+#: ../libempathy-gtk/empathy-chat.c:766
 msgid "Topic not supported on this conversation"
 msgstr "No es pot establir el tema en esta conversa"
 
-#: ../libempathy-gtk/empathy-chat.c:766
+#: ../libempathy-gtk/empathy-chat.c:772
 msgid "You are not allowed to change the topic"
 msgstr "No podeu canviar el tema"
 
-#: ../libempathy-gtk/empathy-chat.c:970
-#, fuzzy, c-format
+#: ../libempathy-gtk/empathy-chat.c:976
+#, c-format
 msgid "“%s� is not a valid contact ID"
-msgstr "contacte no vàlid"
+msgstr "«%s» no és un identificador de contacte vàlid"
 
-#: ../libempathy-gtk/empathy-chat.c:1027
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: neteja tots els missatges de la conversa actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1030
+#: ../libempathy-gtk/empathy-chat.c:1074
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <tema>: estableix el tema de la conversa actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1033
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ID sala de xat>: entra a una sala de xat nova"
 
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ID sala de xat>: entra a una sala de xat nova"
 
-#: ../libempathy-gtk/empathy-chat.c:1040
+#: ../libempathy-gtk/empathy-chat.c:1084
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1304,23 +1410,23 @@ msgstr ""
 "/part [<identificador de la sala de xat>] [<motiu>]: eixiu de la sala de "
 "xat, si no s'indica el contrari, l'actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1044
+#: ../libempathy-gtk/empathy-chat.c:1088
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ID d'un contacte> [missatge]: obri un xat privat"
 
-#: ../libempathy-gtk/empathy-chat.c:1047
+#: ../libempathy-gtk/empathy-chat.c:1091
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ID d'un contacte> <missatge>: obri un xat privat"
 
-#: ../libempathy-gtk/empathy-chat.c:1050
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <sobrenom>: canvieu el vostre sobrenom en el servidor actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1053
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <missatge>: envia un missatge d'ACCIÓ a la conversa actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1056
+#: ../libempathy-gtk/empathy-chat.c:1100
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1330,11 +1436,12 @@ msgstr ""
 "enviar un missatge que comence per «/». Per exemple: «/say /join s'utilitza "
 "per entrar a una sala de xat nova»"
 
-#: ../libempathy-gtk/empathy-chat.c:1061
+#: ../libempathy-gtk/empathy-chat.c:1105
 msgid "/whois <contact ID>: display information about a contact"
 msgstr ""
+"/whois <identificador del contacte>: mostra informació sobre el contacte"
 
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1108
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1342,115 +1449,113 @@ msgstr ""
 "/help [<orde>]: mostra totes les ordes possibles. Si s'indica una <orde> es "
 "mostra com s'ha d'utilitzar."
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1127
 #, c-format
 msgid "Usage: %s"
 msgstr "Forma d'ús: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1113
+#: ../libempathy-gtk/empathy-chat.c:1172
 msgid "Unknown command"
 msgstr "Orde desconeguda"
 
-#: ../libempathy-gtk/empathy-chat.c:1239
+#: ../libempathy-gtk/empathy-chat.c:1298
 msgid "Unknown command; see /help for the available commands"
 msgstr "Orde desconeguda, vegeu /help per a la llista d'ordes disponibles"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1397
-#, fuzzy
+#: ../libempathy-gtk/empathy-chat.c:1468
 msgid "insufficient balance to send message"
-msgstr "No hi ha prou espai lliure per alçar el fitxer"
+msgstr "no hi ha prou saldo per enviar el missatge"
 
-#: ../libempathy-gtk/empathy-chat.c:1399
-#, fuzzy
+#: ../libempathy-gtk/empathy-chat.c:1470
 msgid "not capable"
-msgstr "No acceptable"
+msgstr "no es pot realitzar"
 
-#: ../libempathy-gtk/empathy-chat.c:1406
+#: ../libempathy-gtk/empathy-chat.c:1477
 msgid "offline"
 msgstr "desconnectat"
 
-#: ../libempathy-gtk/empathy-chat.c:1409
+#: ../libempathy-gtk/empathy-chat.c:1480
 msgid "invalid contact"
 msgstr "contacte no vàlid"
 
-#: ../libempathy-gtk/empathy-chat.c:1412
+#: ../libempathy-gtk/empathy-chat.c:1483
 msgid "permission denied"
 msgstr "s'ha denegat el permís"
 
-#: ../libempathy-gtk/empathy-chat.c:1415
+#: ../libempathy-gtk/empathy-chat.c:1486
 msgid "too long message"
 msgstr "el missatge és massa llarg"
 
-#: ../libempathy-gtk/empathy-chat.c:1418
+#: ../libempathy-gtk/empathy-chat.c:1489
 msgid "not implemented"
 msgstr "no implementat"
 
-#: ../libempathy-gtk/empathy-chat.c:1422
+#: ../libempathy-gtk/empathy-chat.c:1493
 msgid "unknown"
 msgstr "desconegut"
 
-#: ../libempathy-gtk/empathy-chat.c:1428
+#: ../libempathy-gtk/empathy-chat.c:1499
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "S'ha produït un error en enviar el missatge «%s»: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1432
-#, fuzzy, c-format
+#: ../libempathy-gtk/empathy-chat.c:1503
+#, c-format
 msgid "Error sending message: %s"
-msgstr "S'ha produït un error en enviar el missatge «%s»: %s"
+msgstr "S'ha produït un error en enviar el missatge: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1493 ../src/empathy-chat-window.c:760
+#: ../libempathy-gtk/empathy-chat.c:1564 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Tema:"
 
-#: ../libempathy-gtk/empathy-chat.c:1505
+#: ../libempathy-gtk/empathy-chat.c:1576
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Tema establit a: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1507
+#: ../libempathy-gtk/empathy-chat.c:1578
 msgid "No topic defined"
 msgstr "No s'ha definit cap tema"
 
-#: ../libempathy-gtk/empathy-chat.c:2014
+#: ../libempathy-gtk/empathy-chat.c:2087
 msgid "(No Suggestions)"
 msgstr "(Cap suggeriment)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2082
+#: ../libempathy-gtk/empathy-chat.c:2155
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Afig «%s» al diccionari"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2119
+#: ../libempathy-gtk/empathy-chat.c:2192
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Afig «%s» al diccionari %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2176
+#: ../libempathy-gtk/empathy-chat.c:2262
 msgid "Insert Smiley"
 msgstr "Insereix una emoticona"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2194
-#: ../libempathy-gtk/empathy-ui-utils.c:1755
+#: ../libempathy-gtk/empathy-chat.c:2280
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "_Envia"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2229
+#: ../libempathy-gtk/empathy-chat.c:2334
 msgid "_Spelling Suggestions"
 msgstr "_Suggeriments d'ortografia"
 
-#: ../libempathy-gtk/empathy-chat.c:2318
+#: ../libempathy-gtk/empathy-chat.c:2423
 msgid "Failed to retrieve recent logs"
 msgstr "No s'han pogut recuperar els registres recents"
 
-#: ../libempathy-gtk/empathy-chat.c:2429
+#: ../libempathy-gtk/empathy-chat.c:2560
 #, c-format
 msgid "%s has disconnected"
 msgstr "En/na %s s'ha desconnectat"
@@ -1458,12 +1563,12 @@ msgstr "En/na %s s'ha desconnectat"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2436
+#: ../libempathy-gtk/empathy-chat.c:2567
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "En/na %2$s ha expulsat en/na %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2439
+#: ../libempathy-gtk/empathy-chat.c:2570
 #, c-format
 msgid "%s was kicked"
 msgstr "S'ha expulsat en/na %s"
@@ -1471,17 +1576,17 @@ msgstr "S'ha expulsat en/na %s"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2447
+#: ../libempathy-gtk/empathy-chat.c:2578
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "En/na %2$s ha bandejat en/na %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2450
+#: ../libempathy-gtk/empathy-chat.c:2581
 #, c-format
 msgid "%s was banned"
 msgstr "s'ha bandejat en/na %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2454
+#: ../libempathy-gtk/empathy-chat.c:2585
 #, c-format
 msgid "%s has left the room"
 msgstr "En/na %s ha eixit de la sala"
@@ -1491,117 +1596,131 @@ msgstr "En/na %s ha eixit de la sala"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2463
+#: ../libempathy-gtk/empathy-chat.c:2594
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2488
+#: ../libempathy-gtk/empathy-chat.c:2619
 #, c-format
 msgid "%s has joined the room"
 msgstr "En/na %s ha entrat a la sala"
 
-#: ../libempathy-gtk/empathy-chat.c:2513
+#: ../libempathy-gtk/empathy-chat.c:2644
 #, c-format
 msgid "%s is now known as %s"
 msgstr "En/na %s ara es diu %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2652
-#: ../src/empathy-streamed-media-window.c:1957
-#: ../src/empathy-event-manager.c:1126
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2797
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1546
+#: ../src/empathy-call-window.c:1596 ../src/empathy-call-window.c:2641
 msgid "Disconnected"
 msgstr "Fora de línia"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3320
+#: ../libempathy-gtk/empathy-chat.c:3441
 msgid "Would you like to store this password?"
 msgstr "Voleu emmagatzemar esta contrasenya?"
 
-#: ../libempathy-gtk/empathy-chat.c:3326
+#: ../libempathy-gtk/empathy-chat.c:3447
 msgid "Remember"
 msgstr "Recorda-la"
 
-#: ../libempathy-gtk/empathy-chat.c:3336
+#: ../libempathy-gtk/empathy-chat.c:3457
 msgid "Not now"
 msgstr "Ara no"
 
-#: ../libempathy-gtk/empathy-chat.c:3380
+#: ../libempathy-gtk/empathy-chat.c:3501
 msgid "Retry"
 msgstr "Torna-ho a intentar"
 
-#: ../libempathy-gtk/empathy-chat.c:3384
+#: ../libempathy-gtk/empathy-chat.c:3505
 msgid "Wrong password; please try again:"
 msgstr "Contrasenya errònia, torneu-ho a intentar:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3513
+#: ../libempathy-gtk/empathy-chat.c:3635
 msgid "This room is protected by a password:"
 msgstr "Esta sala és protegida per una contrasenya:"
 
-#: ../libempathy-gtk/empathy-chat.c:3540
+#: ../libempathy-gtk/empathy-chat.c:3662
 msgid "Join"
-msgstr "Uneix-te"
+msgstr "Uneix-m'hi"
 
-#: ../libempathy-gtk/empathy-chat.c:3741 ../src/empathy-event-manager.c:1147
+#: ../libempathy-gtk/empathy-chat.c:3864 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "Connectat"
 
-#: ../libempathy-gtk/empathy-chat.c:3796
-#: ../libempathy-gtk/empathy-log-window.c:650
+#: ../libempathy-gtk/empathy-chat.c:3919
 msgid "Conversation"
 msgstr "Conversa"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3801
-#, fuzzy, c-format
+#: ../libempathy-gtk/empathy-chat.c:3924
+#, c-format
 msgid "%s (SMS)"
-msgstr "%s (%s)"
+msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:423
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
 msgid "Unknown or invalid identifier"
 msgstr "Identificador desconegut o no vàlid"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:425
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
 msgid "Contact blocking temporarily unavailable"
 msgstr "No està disponible, temporalment, el blocatge de contactes"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:427
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
 msgid "Contact blocking unavailable"
 msgstr "No es poden blocar contactes"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:429
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
 msgid "Permission Denied"
 msgstr "S'ha denegat el permís"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:433
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
 msgid "Could not block contact"
 msgstr "No s'ha pogut blocar el contacte"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:702
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
 msgid "Edit Blocked Contacts"
 msgstr "Editeu els contactes blocats"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:521
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1479
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid "Account:"
 msgstr "Compte:"
 
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "Contactes blocats"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Suprimeix"
+
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:1245
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Copia l'adreça de l'enllaç"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:1252
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Obri l'enllaç"
 
@@ -1626,24 +1745,24 @@ msgid "New Contact"
 msgstr "Contacte nou"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:199
+#: ../libempathy-gtk/empathy-individual-dialogs.c:200
 #, c-format
 msgid "Block %s?"
 msgstr "Voleu blocar %s?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:247
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Segur que voleu blocar «%s» perquè no vos contacti més?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
 msgid "_Block"
 msgstr "_Bloca"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:278
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Informa que este contacte es comporta incorrectament"
@@ -1669,125 +1788,132 @@ msgstr "Sense grup"
 msgid "Favorite People"
 msgstr "Persones preferides"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1983
-#: ../libempathy-gtk/empathy-individual-view.c:2386
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Segur que voleu suprimir el grup «%s»?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1985
-#: ../libempathy-gtk/empathy-individual-view.c:2389
+#: ../libempathy-gtk/empathy-contact-list-view.c:1988
+#: ../libempathy-gtk/empathy-individual-view.c:2379
 msgid "Removing group"
 msgstr "S'està suprimint el grup"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2034
-#: ../libempathy-gtk/empathy-contact-list-view.c:2111
-#: ../libempathy-gtk/empathy-individual-view.c:2444
+#: ../libempathy-gtk/empathy-contact-list-view.c:2037
+#: ../libempathy-gtk/empathy-contact-list-view.c:2114
+#: ../libempathy-gtk/empathy-individual-view.c:2434
 #: ../libempathy-gtk/empathy-individual-view.c:2637
-#: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Remove"
 msgstr "_Suprimeix"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2064
-#: ../libempathy-gtk/empathy-individual-view.c:2508
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
+#: ../libempathy-gtk/empathy-individual-view.c:2501
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Segur que voleu suprimir el contacte «%s»?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2066
-#: ../libempathy-gtk/empathy-individual-view.c:2529
+#: ../libempathy-gtk/empathy-contact-list-view.c:2069
+#: ../libempathy-gtk/empathy-individual-view.c:2522
 msgid "Removing contact"
 msgstr "Suprimeix el contacte"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:219
-#: ../src/empathy-main-window.ui.h:14
+#: ../libempathy-gtk/empathy-contact-menu.c:220
+#: ../src/empathy-main-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "_Afig un contacte…"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:299
+#: ../libempathy-gtk/empathy-contact-menu.c:300
 msgid "_Block Contact"
 msgstr "_Bloca el contacte"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:328
-#: ../libempathy-gtk/empathy-individual-menu.c:536
-#: ../src/empathy-main-window.ui.h:16
+#: ../libempathy-gtk/empathy-contact-menu.c:329
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "_Xat"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:358
-#: ../libempathy-gtk/empathy-individual-menu.c:625
+#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
-msgstr "Cridada de _veu"
+msgstr "Trucada de _veu"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:389
-#: ../libempathy-gtk/empathy-individual-menu.c:667
+#: ../libempathy-gtk/empathy-contact-menu.c:394
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
-msgstr "_Cridada de vídeo"
+msgstr "_Trucada de vídeo"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:435
-#: ../libempathy-gtk/empathy-individual-menu.c:710
-#: ../src/empathy-main-window.ui.h:27
+#: ../libempathy-gtk/empathy-contact-menu.c:440
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "Converses _anteriors"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:457
-#: ../libempathy-gtk/empathy-individual-menu.c:751
+#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "Envia un fitxer"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:480
-#: ../libempathy-gtk/empathy-individual-menu.c:793
+#: ../libempathy-gtk/empathy-contact-menu.c:485
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
 msgstr "Comparteix el meu escriptori"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:520
-#: ../libempathy-gtk/empathy-contact-widget.c:1890
-#: ../libempathy-gtk/empathy-individual-menu.c:828
-#: ../libempathy-gtk/empathy-individual-widget.c:1370
+#: ../libempathy-gtk/empathy-contact-menu.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:1887
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "Preferit"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:549
-#: ../libempathy-gtk/empathy-individual-menu.c:856
+#: ../libempathy-gtk/empathy-contact-menu.c:554
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "Infor_mació"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:595
+#: ../libempathy-gtk/empathy-contact-menu.c:600
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "_Edita"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:649
-#: ../libempathy-gtk/empathy-individual-menu.c:1037
-#: ../src/empathy-chat-window.c:1010
+#: ../libempathy-gtk/empathy-contact-menu.c:654
+#: ../libempathy-gtk/empathy-individual-menu.c:1284
+#: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "Se vos està convidant a esta sala"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:680
-#: ../libempathy-gtk/empathy-individual-menu.c:1084
+#: ../libempathy-gtk/empathy-contact-menu.c:685
+#: ../libempathy-gtk/empathy-individual-menu.c:1330
 msgid "_Invite to Chat Room"
 msgstr "_Convida a la sala de xat"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:514
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
 msgid "Search contacts"
 msgstr "Cerca de contactes"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:544
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
 msgid "Search: "
 msgstr "Cerca: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:602
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
 msgid "_Add Contact"
 msgstr "_Afig un contacte"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:620
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
 msgid "No contacts found"
 msgstr "No s'ha trobat cap contacte"
 
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr "El vostre missatge d'introducció:"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
+msgstr "Permeta'm veure quan estàs en línia. Gràcies."
+
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "Seleccioneu un contacte"
@@ -1822,175 +1948,171 @@ msgstr "Aniversari:"
 #. * with their IM client.
 #.
 #: ../libempathy-gtk/empathy-contact-widget.c:346
-#, fuzzy
 msgid "Last seen:"
-msgstr "Co_gnoms:"
+msgstr "Vist per últim cop:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:348
-#, fuzzy
 msgid "Connected from:"
-msgstr "Connectat"
+msgstr "Connectat des de:"
 
 #. FIXME: once Idle implements SimplePresence using this information, we can
 #. * and should bin this.
 #.
 #: ../libempathy-gtk/empathy-contact-widget.c:353
-#, fuzzy
 msgid "Away message:"
-msgstr "Missatge d'absència automàtica"
+msgstr "Missatge d'absència:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:606
-#, fuzzy
 msgid "Channels:"
-msgstr "Canvia"
+msgstr "Canals:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
 msgstr "Codi ISO del país:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Country:"
 msgstr "País:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "State:"
 msgstr "Estat:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "City:"
 msgstr "Ciutat:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Area:"
 msgstr "Àrea:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
 msgstr "Codi postal:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Street:"
 msgstr "Carrer:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
 msgstr "Edifici:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Floor:"
 msgstr "Planta:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Room:"
 msgstr "Habitació:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Text:"
 msgstr "Text:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Description:"
 msgstr "Descripció:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
 msgstr "Nivell de precisió:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr "Error:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
 msgstr "Error vertical (metres):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
 msgstr "Error horitzontal (metres):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr "Velocitat:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Bearing:"
 msgstr "Direcció:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:526
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
 msgstr "Velocitat de pujada:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:528
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
 msgstr "Última actualització a:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:530
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
 msgstr "Longitud:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:945
-#: ../libempathy-gtk/empathy-individual-widget.c:532
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
 msgstr "Latitud:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:947
-#: ../libempathy-gtk/empathy-individual-widget.c:534
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
 msgstr "Altitud:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1000
-#: ../libempathy-gtk/empathy-contact-widget.c:1015
-#: ../libempathy-gtk/empathy-individual-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:631
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "Ubicació"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1017
-#: ../libempathy-gtk/empathy-individual-widget.c:633
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
 #, c-format
 msgid "%s, %s"
 msgstr "%s el %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1069
-#: ../libempathy-gtk/empathy-individual-widget.c:682
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e de %B de %Y a les %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1151
-#: ../libempathy-gtk/empathy-individual-widget.c:917
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
 msgid "Save Avatar"
 msgstr "Alça l'avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1207
-#: ../libempathy-gtk/empathy-individual-widget.c:975
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
 msgid "Unable to save avatar"
 msgstr "No s'ha pogut alçar l'avatar"
 
@@ -2000,7 +2122,7 @@ msgstr "<b>Ubicació</b> a (data)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1305
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr "Àlies:"
 
@@ -2020,7 +2142,7 @@ msgstr "Detalls del contacte"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1509
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "Identificador:"
 
@@ -2037,11 +2159,11 @@ msgstr "SO:"
 msgid "Version:"
 msgstr "Versió:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:332
+#: ../libempathy-gtk/empathy-groups-widget.c:333
 msgid "Groups"
 msgstr "Grups"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:344
+#: ../libempathy-gtk/empathy-groups-widget.c:345
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2049,80 +2171,105 @@ msgstr ""
 "Seleccioneu els grups en els quals voleu que hi haja este contacte. Podeu "
 "seleccionar-ne més d'un o bé cap."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:363
+#: ../libempathy-gtk/empathy-groups-widget.c:364
 msgid "_Add Group"
 msgstr "_Afig un grup"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:398
+#: ../libempathy-gtk/empathy-groups-widget.c:399
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Seleccioneu"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1781
+#: ../libempathy-gtk/empathy-groups-widget.c:409
+#: ../src/empathy-main-window.c:1833
 msgid "Group"
 msgstr "Grup"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Es blocarà la identitat següent:"
 msgstr[1] "Es blocaran les identitats següents:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:259
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "No es pot blocar la identitat següent:"
 msgstr[1] "No es poden blocar les identitats següents:"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
 msgstr "Metacontactes"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:354
+#: ../libempathy-gtk/empathy-individual-linker.c:370
 msgid "Select contacts to link"
 msgstr "Seleccioneu els contactes a enllaçar"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:428
+#: ../libempathy-gtk/empathy-individual-linker.c:444
 msgid "New contact preview"
 msgstr "Previsualització del contacte nou"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:472
+#: ../libempathy-gtk/empathy-individual-linker.c:488
 msgid "Contacts selected in the list on the left will be linked together."
 msgstr "S'enllaçaran els contactes seleccionats a la llista de l'esquerra."
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:131
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "Seleccioneu el compte amb el que voleu fer la trucada"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "Trucada"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+msgid "Mobile"
+msgstr "Mòbil"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "Faena"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "Casa"
+
 #. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:582
-#: ../libempathy-gtk/empathy-new-message-dialog.c:248
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
 msgid "_SMS"
-msgstr ""
+msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:904
+#: ../libempathy-gtk/empathy-individual-menu.c:1142
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Edita"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:930
+#: ../libempathy-gtk/empathy-individual-menu.c:1168
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "_Enllaça els contactes…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2351
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 msgid "Delete and _Block"
 msgstr "Suprimeix i _bloca"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2517
+#: ../libempathy-gtk/empathy-individual-view.c:2510
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2131,7 +2278,7 @@ msgstr ""
 "Segur que voleu suprimir el metacontacte «%s»? Tingueu en compte que es "
 "suprimiran tots els contactes que formen este metacontacte."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1650
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2215,67 +2362,204 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "_Desenllaça"
 
-#: ../libempathy-gtk/empathy-log-window.c:660
-msgid "Date"
-msgstr "Data"
+#: ../libempathy-gtk/empathy-log-window.c:634
+msgid "History"
+msgstr "Historial"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
-msgstr "Converses"
+#: ../libempathy-gtk/empathy-log-window.c:689
+msgid "Show"
+msgstr "Mostra"
+
+#: ../libempathy-gtk/empathy-log-window.c:711
+msgid "Search"
+msgstr "Cerca"
+
+#: ../libempathy-gtk/empathy-log-window.c:1159
+#, c-format
+msgid "Chat in %s"
+msgstr "Xat a %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1161
+#, c-format
+msgid "Chat with %s"
+msgstr "Xat amb %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%A %e de %B de %Y a les %X"
+
+#. Translators: this is an emote: '* Danielle waves'
+#: ../libempathy-gtk/empathy-log-window.c:1300
+#, c-format
+msgid "<i>* %s %s</i>"
+msgstr "<i>* %s %s</i>"
+
+#. Translators: this is a message: 'Danielle: hello'
+#. * The string in bold is the sender's name
+#: ../libempathy-gtk/empathy-log-window.c:1306
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1382
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s segon"
+msgstr[1] "%s segons"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s minut"
+msgstr[1] "%s minuts"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "La trucada va durar %s i es va acabar a les %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1729
+msgid "Today"
+msgstr "Hui"
+
+#: ../libempathy-gtk/empathy-log-window.c:1733
+msgid "Yesterday"
+msgstr "Ahir"
+
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
+msgid "%e %B %Y"
+msgstr "%e de %B de %Y"
+
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3444
+msgid "Anytime"
+msgstr "En qualsevol moment"
+
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2372
+msgid "Anyone"
+msgstr "Qualsevol"
+
+#: ../libempathy-gtk/empathy-log-window.c:2685
+msgid "Who"
+msgstr "Qui"
+
+#: ../libempathy-gtk/empathy-log-window.c:2889
+msgid "When"
+msgstr "Quan"
+
+#: ../libempathy-gtk/empathy-log-window.c:3005
+msgid "Anything"
+msgstr "El que siga"
+
+#: ../libempathy-gtk/empathy-log-window.c:3007
+msgid "Text chats"
+msgstr "Xats de text"
+
+#: ../libempathy-gtk/empathy-log-window.c:3009
+#: ../src/empathy-preferences.ui.h:4
+msgid "Calls"
+msgstr "Trucades"
+
+#: ../libempathy-gtk/empathy-log-window.c:3014
+msgid "Incoming calls"
+msgstr "Trucades entrants"
+
+#: ../libempathy-gtk/empathy-log-window.c:3015
+msgid "Outgoing calls"
+msgstr "Trucades d'eixida"
+
+#: ../libempathy-gtk/empathy-log-window.c:3016
+msgid "Missed calls"
+msgstr "Trucades perdudes"
+
+#: ../libempathy-gtk/empathy-log-window.c:3038
+msgid "What"
+msgstr "Què"
+
+#: ../libempathy-gtk/empathy-log-window.c:3747
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr ""
+"Segur que voleu suprimir tots els registres de les converses anteriors?"
+
+#: ../libempathy-gtk/empathy-log-window.c:3751
+msgid "Clear All"
+msgstr "Neteja-ho tot"
+
+#: ../libempathy-gtk/empathy-log-window.c:3758
+msgid "Delete from:"
+msgstr "Suprimeix a partir de:"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">S'està carregant...</span>"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "Cerca el següent"
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Chat"
+msgstr "Xat"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "Cerca l'anterior"
+msgid "Delete All History..."
+msgstr "Suprimeix tot l'historial..."
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr "Converses anteriors"
+msgid "Profile"
+msgstr "Perfil"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Video"
+msgstr "Vídeo"
 
-#. Tab Label
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "Cerca"
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:20
+msgid "_Edit"
+msgstr "_Edita"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "_File"
+msgstr "_Fitxer"
 
-#. Searching *for* something
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "_Per a:"
+msgid "page 2"
+msgstr "pàgina 2"
 
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
 msgid "Contact ID:"
 msgstr "ID del contacte:"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:258
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
 msgid "C_hat"
 msgstr "_Xat"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:277
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
 msgstr "Conversa nova"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:254
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
 msgid "Send _Video"
 msgstr "Envia _vídeo"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:262
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
 msgid "C_all"
-msgstr "_Cridada"
+msgstr "_Trucada"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:272
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "New Call"
-msgstr "Cridada nova"
+msgstr "Trucada nova"
 
 #: ../libempathy-gtk/empathy-password-dialog.c:274
 #, c-format
@@ -2292,34 +2576,34 @@ msgstr ""
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Message…"
 msgstr "Missatge personalitzat…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messages…"
 msgstr "Edita els missatges personalitzats…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
 msgstr "Feu clic per suprimir este estat com a preferit"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
 msgstr "Feu clic per fer que este estat siga un preferit"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
 msgstr "Estableix l'estat"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:946
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
 msgid "Set your presence and current status"
 msgstr "Establiu la presència i l'estat actual"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1134
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
 msgid "Custom messages…"
 msgstr "Missatges personalitzats…"
 
@@ -2332,18 +2616,26 @@ msgstr "Missatges personalitzats…"
 msgid "New %s account"
 msgstr "Compte de %s nou"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "Cerca:"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "Coincidència de majúscules i minúscules:"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Mat_ch case"
+msgstr "_Coincidència de majúscules i minúscules"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
 msgid "Phrase not found"
 msgstr "No s'ha trobat la frase"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "_Next"
+msgstr "Següe_nt"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+msgid "_Previous"
+msgstr "_Anterior"
+
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
 msgstr "Heu rebut un missatge instantani"
@@ -2374,50 +2666,42 @@ msgstr "Desconnectat del servidor"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:65
 msgid "Incoming voice call"
-msgstr "Cridada de veu entrant"
+msgstr "Trucada de veu entrant"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:67
 msgid "Outgoing voice call"
-msgstr "Cridada de veu d'eixida"
+msgstr "Trucada de veu d'eixida"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:69
 msgid "Voice call ended"
-msgstr "La cridada de veu ha finalitzat"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "Introduïu un missatge personalitzat"
+msgstr "La trucada de veu ha finalitzat"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
 msgstr "Edita els missatges personalitzats"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr "Al_ça el missatge d'estat nou"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Status Messages"
-msgstr "Missatges d'estat alçats"
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#, c-format
+msgid "Message edited at %s"
+msgstr "S'ha editat el missatge a les %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1717
-#, fuzzy
+#: ../libempathy-gtk/empathy-theme-adium.c:1740
 msgid "Normal"
-msgstr "Mida _normal"
+msgstr "Normal"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "Clàssic"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "Simple"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "Net"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:71
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "Blau"
 
@@ -2495,19 +2779,19 @@ msgstr "Recorda esta decisió per a connexions futures"
 msgid "Certificate Details"
 msgstr "Dades del certificat"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1652
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
 msgstr "No s'ha pogut obrir l'URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1747
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
 msgstr "Seleccioneu un fitxer"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1819
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
 msgid "Insufficient free space to save file"
 msgstr "No hi ha prou espai lliure per alçar el fitxer"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1827
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2516,7 +2800,7 @@ msgstr ""
 "Es necessita %s d'espai lliure per alçar el fitxer, però només hi ha %s."
 "Seleccioneu una altra ubicació."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1871
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid "Incoming file from %s"
 msgstr "%s vos envia un fitxer"
@@ -2704,23 +2988,23 @@ msgstr "No hi ha missatge d'error"
 msgid "Instant Message (Empathy)"
 msgstr "Missatgeria instantània (Empathy)"
 
-#: ../src/empathy.c:307
+#: ../src/empathy.c:434
 msgid "Don't connect on startup"
 msgstr "No connectes en iniciar"
 
-#: ../src/empathy.c:311
+#: ../src/empathy.c:438
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "No mostres la llista de contactes ni  cap altre diàleg en iniciar"
 
-#: ../src/empathy.c:319
+#: ../src/empathy.c:453
 msgid "- Empathy IM Client"
 msgstr "- Client de missatgeria instantània Empathy"
 
-#: ../src/empathy.c:498
+#: ../src/empathy.c:640
 msgid "Error contacting the Account Manager"
 msgstr "S'ha produït un error en contactar amb el gestor de comptes"
 
-#: ../src/empathy.c:500
+#: ../src/empathy.c:642
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2845,7 +3129,7 @@ msgid ""
 msgstr ""
 "Amb l'Empathy podeu parlar en línia amb persones que estiguen a prop així "
 "com també amb amics que utilitzen el Google Talk, l'AIM, el Windows Live i "
-"molts altres tipus de programes de xat. També podreu fer cridades de veu o "
+"molts altres tipus de programes de xat. També podreu fer trucades de veu o "
 "vídeo si teniu un micròfon o una càmera web."
 
 #: ../src/empathy-account-assistant.c:629
@@ -2876,8 +3160,8 @@ msgid "Select the accounts you want to import:"
 msgstr "Seleccioneu els comptes que voleu importar:"
 
 #: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:625
+#: ../src/empathy-new-chatroom-dialog.c:626
 msgid "Yes"
 msgstr "Sí"
 
@@ -2952,7 +3236,8 @@ msgid "Your new account has not been saved yet."
 msgstr "Encara no heu alçat el vostre compte nou."
 
 #: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:809
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1330
 msgid "Connecting…"
 msgstr "S'està connectant…"
 
@@ -3021,18 +3306,22 @@ msgstr ""
 "fets fins ara. Segur que voleu continuar?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Afig…"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
 msgid "Loading account information"
 msgstr "S'està carregant la informació del contacte"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "No protocol installed"
 msgstr "No hi ha cap protocol instal·lat"
 
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3040,11 +3329,7 @@ msgstr ""
 "Per afegir un compte nou, primer heu d'instal·lar el rerefons de cada "
 "protocol que vulgueu utilitzar."
 
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add…"
-msgstr "_Afig…"
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Import…"
 msgstr "_Importa…"
 
@@ -3060,118 +3345,105 @@ msgstr "Client d'autenticació de l'Empathy"
 msgid "People nearby"
 msgstr "Gent propera"
 
-#: ../src/empathy-av.c:118
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr "- Client d'àudio/vídeo de l'Empathy"
 
-#: ../src/empathy-av.c:134
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "Client d'àudio/vídeo de l'Empathy"
 
-#: ../src/empathy-streamed-media-window.c:479
+#: ../src/empathy-streamed-media-window.c:431
 msgid "Contrast"
 msgstr "Contrast"
 
-#: ../src/empathy-streamed-media-window.c:482
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Brightness"
 msgstr "Brillantor"
 
-#: ../src/empathy-streamed-media-window.c:485
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:590
+#: ../src/empathy-streamed-media-window.c:542
 msgid "Volume"
 msgstr "Volum"
 
-#: ../src/empathy-streamed-media-window.c:1166
+#: ../src/empathy-streamed-media-window.c:1110
 msgid "_Sidebar"
 msgstr "Barra _lateral"
 
-#: ../src/empathy-streamed-media-window.c:1186
+#: ../src/empathy-streamed-media-window.c:1130
 msgid "Audio input"
 msgstr "Entrada d'àudio"
 
-#: ../src/empathy-streamed-media-window.c:1190
+#: ../src/empathy-streamed-media-window.c:1134
 msgid "Video input"
 msgstr "Entrada de vídeo"
 
-#: ../src/empathy-streamed-media-window.c:1194
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Dialpad"
 msgstr "Marcador"
 
-#: ../src/empathy-streamed-media-window.c:1205
+#: ../src/empathy-streamed-media-window.c:1151
 msgid "Details"
 msgstr "Dades"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1274
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1939
 #, c-format
 msgid "Call with %s"
-msgstr "Cridada amb %s"
+msgstr "Trucada amb %s"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-streamed-media-window.c:1353
-msgid "Call"
-msgstr "Cridada"
-
-#: ../src/empathy-streamed-media-window.c:1507
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:2183
 msgid "The IP address as seen by the machine"
 msgstr "L'adreça IP des del punt de vista de la màquina"
 
-#: ../src/empathy-streamed-media-window.c:1509
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:2185
 msgid "The IP address as seen by a server on the Internet"
 msgstr "L'adreça IP des del punt de vista d'un servidor d'Internet"
 
-#: ../src/empathy-streamed-media-window.c:1511
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:2187
 msgid "The IP address of the peer as seen by the other side"
 msgstr "L'adreça IP d'un igual vist per l'altre l'igual"
 
-#: ../src/empathy-streamed-media-window.c:1513
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:2189
 msgid "The IP address of a relay server"
 msgstr "L'adreça IP d'un servidor de repetició"
 
-#: ../src/empathy-streamed-media-window.c:1515
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:2191
 msgid "The IP address of the multicast group"
 msgstr "L'adreça IP del grup de multidestinació"
 
-#: ../src/empathy-streamed-media-window.c:1906
-#, fuzzy
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "Desconegut"
-
-#: ../src/empathy-streamed-media-window.c:1909
-#, fuzzy
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "Desconegut"
-
-#: ../src/empathy-streamed-media-window.c:1912
+#: ../src/empathy-streamed-media-window.c:1843
+#: ../src/empathy-streamed-media-window.c:1846
+#: ../src/empathy-streamed-media-window.c:1849
+#: ../src/empathy-streamed-media-window.c:1852
 #, fuzzy
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "Desconegut"
-
-#: ../src/empathy-streamed-media-window.c:1915
-#, fuzzy
-msgctxt "decoding audio codec"
+msgctxt "codec"
 msgid "Unknown"
 msgstr "Desconegut"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2274
+#: ../src/empathy-streamed-media-window.c:2144
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Connectat -- %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2335
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2960
 msgid "Technical Details"
 msgstr "Detalls tècnics"
 
-#: ../src/empathy-streamed-media-window.c:2373
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2998
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3180,7 +3452,8 @@ msgstr ""
 "El programari d'en/na %s no té cap format d'àudio dels que teniu en el "
 "vostre ordinador"
 
-#: ../src/empathy-streamed-media-window.c:2378
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3003
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3189,7 +3462,8 @@ msgstr ""
 "El programari d'en/na %s no té cap format de vídeo dels que teniu en el "
 "vostre ordinador"
 
-#: ../src/empathy-streamed-media-window.c:2384
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3009
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3198,25 +3472,29 @@ msgstr ""
 "No s'ha pogut connectar amb en/na %s. Algú dels dos deu estar en una xarxa "
 "que no permet connexions directes."
 
-#: ../src/empathy-streamed-media-window.c:2390
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:3015
 msgid "There was a failure on the network"
 msgstr "Hi ha hagut una fallada en la xarxa"
 
-#: ../src/empathy-streamed-media-window.c:2394
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:3019
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
-"Els formats d'àudio necessaris per a esta cridada no estan instal·lats en "
+"Els formats d'àudio necessaris per a esta trucada no estan instal·lats en "
 "este ordinador"
 
-#: ../src/empathy-streamed-media-window.c:2397
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:3022
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
-"Els formats de vídeo necessaris per a esta cridada no estan instal·lats en "
+"Els formats de vídeo necessaris per a esta trucada no estan instal·lats en "
 "este ordinador"
 
-#: ../src/empathy-streamed-media-window.c:2407
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:3034
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3227,162 +3505,200 @@ msgstr ""
 "\">Informeu d'esta errada</a> i adjunteu-hi els registres recollits a la "
 "finestra «Depuració» del menú Ajuda."
 
-#: ../src/empathy-streamed-media-window.c:2415
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure in the call engine"
-msgstr "Hi ha hagut una fallada en el motor de cridada"
+msgstr "Hi ha hagut una fallada en el motor de trucada"
 
-#: ../src/empathy-streamed-media-window.c:2418
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:3046
 msgid "The end of the stream was reached"
 msgstr "S'ha arribat al final del flux"
 
-#: ../src/empathy-streamed-media-window.c:2458
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:3086
 msgid "Can't establish audio stream"
 msgstr "No s'ha pogut establir el flux d'àudio"
 
-#: ../src/empathy-streamed-media-window.c:2468
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:3096
 msgid "Can't establish video stream"
 msgstr "No s'ha pogut establir el flux de vídeo"
 
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "Audio"
 msgstr "Àudio"
 
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Torna a cridar al contacte"
-
 #: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "Càmera apagada"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "Còdec de descodificació:"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "Càmera engegada"
+msgid "Disable camera"
+msgstr "Inhabilita la càmera"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Còdec de descodificació:"
+msgid "Display the dialpad"
+msgstr "Mostra el marcador"
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Inhabilita la càmera i para l'enviament de vídeo"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "Còdec de codificació:"
 
 #: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Habilita la càmera i envia senyal de vídeo"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Hang up"
+msgstr "Penja"
 
 #: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Habilita la càmera però no envies senyal de vídeo"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Hang up current call"
+msgstr "Penja la trucada actual"
 
 #: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Còdec de codificació:"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "Candidat local:"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "Penja"
+msgid "Maximise me"
+msgstr "Maximitza'm"
 
 #: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Penja la cridada actual"
+msgid "Minimise me"
+msgstr "Minimitza'm"
 
 #: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Candidat local:"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "Candidat remot:"
 
 #: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "Previsualització"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Send Audio"
+msgstr "Envia àudio"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "Torna a cridar"
+msgid "Send Video"
+msgstr "Envia vídeo"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Candidat remot:"
+msgid "Show dialpad"
+msgstr "Mostra el marcador"
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "Envia àudio"
+msgid "Start a video call"
+msgstr "Inicia una trucada de vídeo"
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Commuta la transmissió d'àudio"
+msgid "Start an audio call"
+msgstr "Inicia una trucada d'àudio"
 
 #: ../src/empathy-call-window.ui.h:18
-msgid "Unknown"
-msgstr "Desconegut"
+msgid "Swap camera"
+msgstr "Canvia la càmera"
 
 #: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ídeo"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr "Commuta la transmissió d'àudio"
 
 #: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "Vídeo"
+msgid "Toggle video transmission"
+msgstr "Commuta la transmissió de vídeo"
 
 #: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "El vídeo està apagat"
-
-#: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "El vídeo està engegat"
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:2590 ../src/empathy-call-window.c:2591
+#: ../src/empathy-call-window.c:2592 ../src/empathy-call-window.c:2593
+msgid "Unknown"
+msgstr "Desconegut"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "Previsualització de vídeo"
+msgid "Video call"
+msgstr "Trucada de vídeo"
 
 #: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "Tru_ca"
 
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:30
+#: ../src/empathy-call-window.ui.h:25
+msgid "_Camera"
+msgstr "_Càmera"
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:18
+msgid "_Contents"
+msgstr "_Continguts"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
+msgid "_Debug"
+msgstr "_Depura"
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:22
+msgid "_Help"
+msgstr "A_juda"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Microphone"
+msgstr "_Micròfon"
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "_Settings"
+msgstr "_Paràmetres"
+
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_Visualitza"
 
-#: ../src/empathy-chat-window.c:480 ../src/empathy-chat-window.c:500
+#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d sense llegir)"
 msgstr[1] "%s (%d sense llegir)"
 
-#: ../src/empathy-chat-window.c:492
+#: ../src/empathy-chat-window.c:493
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (i %u altre)"
 msgstr[1] "%s (i %u altres)"
 
-#: ../src/empathy-chat-window.c:508
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d sense llegir d'altres)"
 msgstr[1] "%s (%d sense llegir d'altres)"
 
-#: ../src/empathy-chat-window.c:517
+#: ../src/empathy-chat-window.c:518
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d sense llegir de tots)"
 msgstr[1] "%s (%d sense llegir de tots)"
 
-#: ../src/empathy-chat-window.c:732
+#: ../src/empathy-chat-window.c:733
 msgid "SMS:"
-msgstr ""
+msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:742
-#, fuzzy, c-format
+#: ../src/empathy-chat-window.c:743
+#, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
-msgstr[0] "S'està escrivint un missatge."
-msgstr[1] "S'està escrivint un missatge."
+msgstr[0] "S'està enviant %d missatge"
+msgstr[1] "S'estan enviant %d missatges"
 
-#: ../src/empathy-chat-window.c:764
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
 msgstr "S'està escrivint un missatge."
 
@@ -3394,10 +3710,6 @@ msgstr "_Neteja"
 msgid "C_ontact"
 msgstr "C_ontacte"
 
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Xat"
-
 #: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
 msgstr "Insereix una e_moticona"
@@ -3418,10 +3730,6 @@ msgstr "Mou la pestanya a la d_reta"
 msgid "Notify for All Messages"
 msgstr "Notifica tots els missatges"
 
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:18
-msgid "_Contents"
-msgstr "_Continguts"
-
 #: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "_Conversa"
@@ -3430,18 +3738,10 @@ msgstr "_Conversa"
 msgid "_Detach Tab"
 msgstr "D_esenganxa la pestanya"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:20
-msgid "_Edit"
-msgstr "_Edita"
-
 #: ../src/empathy-chat-window.ui.h:13
 msgid "_Favorite Chat Room"
 msgstr "Sala de xat _preferida"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:22
-msgid "_Help"
-msgstr "A_juda"
-
 #: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "Pestanya següe_nt"
@@ -3462,15 +3762,15 @@ msgstr "Pes_tanyes"
 msgid "_Undo Close Tab"
 msgstr "_Desfés el tancament de la pestanya"
 
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
 msgstr "Sala"
 
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "Connecta automàticament"
 
@@ -3478,90 +3778,96 @@ msgstr "Connecta automàticament"
 msgid "Manage Favorite Rooms"
 msgstr "Gestiona les sales preferides"
 
-#: ../src/empathy-event-manager.c:506
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming video call"
-msgstr "Cridada de vídeo entrant"
+msgstr "Trucada de vídeo entrant"
 
-#: ../src/empathy-event-manager.c:506
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1563
 msgid "Incoming call"
-msgstr "Cridada entrant"
+msgstr "Trucada entrant"
 
-#: ../src/empathy-event-manager.c:510
+#: ../src/empathy-event-manager.c:525
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
-msgstr "En/na %s vos està cridant per videoconferència, voleu contestar?"
+msgstr "En/na %s vos està trucant per videoconferència, voleu contestar?"
 
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
-msgstr "En/na %s vos està cridant, voleu contestar?"
+msgstr "En/na %s vos està trucant, voleu contestar?"
 
-#: ../src/empathy-event-manager.c:514 ../src/empathy-event-manager.c:663
+#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1569
 #, c-format
 msgid "Incoming call from %s"
-msgstr "Cridada entrant d'en/na %s"
+msgstr "Trucada entrant d'en/na %s"
 
-#: ../src/empathy-event-manager.c:539
+#: ../src/empathy-event-manager.c:554
 msgid "_Reject"
 msgstr "_Refusa"
 
-#: ../src/empathy-event-manager.c:545
+#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
 msgid "_Answer"
 msgstr "_Contesta"
 
-#: ../src/empathy-event-manager.c:663
+#: ../src/empathy-event-manager.c:570
+msgid "_Answer with video"
+msgstr "_Contesta amb vídeo"
+
+#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1569
 #, c-format
 msgid "Incoming video call from %s"
-msgstr "Cridada de videoconferència d'en/na %s"
+msgstr "Trucada de videoconferència d'en/na %s"
 
-#: ../src/empathy-event-manager.c:736
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
 msgstr "Invitació a la sala"
 
-#: ../src/empathy-event-manager.c:738
+#: ../src/empathy-event-manager.c:838
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Vos han convidat a entrar a %s"
 
-#: ../src/empathy-event-manager.c:745
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "En/na %s vos convida a entrar a %s"
 
-#: ../src/empathy-event-manager.c:753
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
 msgstr "_Declina"
 
-#: ../src/empathy-event-manager.c:758
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Uneix-m'hi"
 
-#: ../src/empathy-event-manager.c:785
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "En/na %s vos ha convidat a entrar a %s"
 
-#: ../src/empathy-event-manager.c:791
+#: ../src/empathy-event-manager.c:891
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Vos han convidat a entrar a %s"
 
-#: ../src/empathy-event-manager.c:842
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Transferència de fitxers entrant d'en/na %s"
 
-#: ../src/empathy-event-manager.c:1020 ../src/empathy-main-window.c:377
+#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:378
 msgid "Password required"
 msgstr "Cal la contrasenya"
 
-#: ../src/empathy-event-manager.c:1076
+#: ../src/empathy-event-manager.c:1190
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s vol poder saber quan esteu en línia"
 
-#: ../src/empathy-event-manager.c:1080
+#: ../src/empathy-event-manager.c:1194
 #, c-format
 msgid ""
 "\n"
@@ -3649,7 +3955,7 @@ msgstr "S'ha completat la transferència"
 
 #: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
 msgid "Waiting for the other participant's response"
-msgstr "S'està esperant que l'interlocutor responga"
+msgstr "S'està esperant que l'interlocutor respongui"
 
 #: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
 #, c-format
@@ -3680,7 +3986,7 @@ msgstr "Transferències de fitxers"
 #: ../src/empathy-ft-manager.ui.h:2
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr ""
-"Trau de la llista les transferències de fitxers completades, cancel·lades i "
+"Treu de la llista les transferències de fitxers completades, cancel·lades i "
 "fallades"
 
 #: ../src/empathy-import-dialog.c:84
@@ -3708,162 +4014,154 @@ msgstr "Protocol"
 msgid "Source"
 msgstr "Font"
 
-#: ../src/empathy-main-window.c:394
+#: ../src/empathy-main-window.c:395
 msgid "Provide Password"
 msgstr "Introduïu la contrasenya"
 
-#: ../src/empathy-main-window.c:400
+#: ../src/empathy-main-window.c:401
 msgid "Disconnect"
 msgstr "Desconnecta"
 
-#: ../src/empathy-main-window.c:540
+#: ../src/empathy-main-window.c:642
 msgid "No match found"
 msgstr "No s'ha trobat cap coincidència"
 
-#: ../src/empathy-main-window.c:695
+#: ../src/empathy-main-window.c:803
 msgid "Reconnect"
 msgstr "Torna a connectar"
 
-#: ../src/empathy-main-window.c:701
+#: ../src/empathy-main-window.c:809
 msgid "Edit Account"
 msgstr "Edita el compte"
 
-#: ../src/empathy-main-window.c:707
+#: ../src/empathy-main-window.c:815
 msgid "Close"
 msgstr "Tanca"
 
 #. Translators: this string will be something like:
 #. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:849
+#: ../src/empathy-main-window.c:954
 #, c-format
 msgid "Top up %s (%s)..."
-msgstr ""
+msgstr "Recarrega %s (%s)..."
 
-#: ../src/empathy-main-window.c:924
-#, fuzzy
+#: ../src/empathy-main-window.c:1001
 msgid "Top up account credit"
-msgstr "S'ha creat el compte del Salut"
+msgstr "Recarrega el saldo del compte"
 
 #. top up button
-#: ../src/empathy-main-window.c:999
+#: ../src/empathy-main-window.c:1072
 msgid "Top Up..."
-msgstr ""
+msgstr "Recarrega..."
 
-#: ../src/empathy-main-window.c:1763
+#: ../src/empathy-main-window.c:1815
 msgid "Contact"
 msgstr "Contacte"
 
-#: ../src/empathy-main-window.c:2115
+#: ../src/empathy-main-window.c:2190
 msgid "Contact List"
 msgstr "Llista de contactes"
 
-#: ../src/empathy-main-window.c:2233
-msgid "Show and edit accounts"
-msgstr "Mostra i edita els comptes"
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "Contactes en el _mapa"
 
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-main-window-menubar.ui.h:2
 msgid "Credit Balance"
-msgstr ""
+msgstr "Saldo disponible"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "Cerca a la _llista de contactes"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "Uneix-te als _preferits"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
-msgstr "Gestiona els preferits"
+msgstr "Gestiona les preferides"
 
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "Mida _normal"
 
-#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
-msgstr "_Cridada nova…"
+msgstr "_Trucada nova…"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "Mida normal amb els _avatars"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "P_referències"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "Mostra els _protocols"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "Ordena per _nom"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "Ordena per es_tat"
 
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Comptes"
 
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "Contactes _blocats"
 
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "Mida _compacta"
 
-#: ../src/empathy-main-window.ui.h:19
-msgid "_Debug"
-msgstr "_Depura"
-
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "Transferències de _fitxers"
 
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "_Uneix-m'hi…"
 
-#: ../src/empathy-main-window.ui.h:24 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "Conversa _nova…"
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "Contactes _desconnectats"
 
-#: ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "Informació _personal"
 
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "_Sala"
 
-#: ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-main-window-menubar.ui.h:29
 msgid "_Search for Contacts…"
 msgstr "_Cerca contactes…"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Sala de xat"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "Membres"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:623
 #, c-format
 msgid ""
 "%s\n"
@@ -3876,18 +4174,18 @@ msgstr ""
 "Cal contrasenya: %s\n"
 "Membres: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:625
+#: ../src/empathy-new-chatroom-dialog.c:626
 msgid "No"
 msgstr "No"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:654
 msgid "Could not start room listing"
 msgstr "No s'ha pogut iniciar el llistat de sales"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:664
 msgid "Could not stop room listing"
-msgstr "No s'ha pogut parar el llistat de sales"
+msgstr "No s'ha pogut aturar el llistat de sales"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "Couldn't load room list"
@@ -3920,80 +4218,79 @@ msgstr "Llista de sales"
 msgid "_Room:"
 msgstr "Sa_la:"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr "Missatge rebut"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr "Missatge enviat"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
 msgstr "Conversa nova"
 
-#: ../src/empathy-preferences.c:150
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
 msgstr "El contacte s'ha connectat"
 
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
 msgstr "El contacte s'ha desconnectat"
 
-#: ../src/empathy-preferences.c:152
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
 msgstr "Compte connectat"
 
-#: ../src/empathy-preferences.c:153
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
 msgstr "Compte desconnectat"
 
-#: ../src/empathy-preferences.c:450
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr "Llengua"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:700
+#: ../src/empathy-preferences.c:734
 msgid "Juliet"
-msgstr ""
+msgstr "Julieta"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:707
+#: ../src/empathy-preferences.c:741
 msgid "Romeo"
-msgstr ""
+msgstr "Romeu"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:713
+#: ../src/empathy-preferences.c:747
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
-msgstr ""
+msgstr "O Romeu, Romeu! Per què ets tu Romeu?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:716
+#: ../src/empathy-preferences.c:750
 msgid "Deny thy father and refuse thy name;"
-msgstr ""
+msgstr "Nega el teu pare i rebutja el teu nom."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:719
+#: ../src/empathy-preferences.c:753
 msgid "Or if thou wilt not, be but sworn my love"
-msgstr ""
+msgstr "O, si no vols, jura'm el teu amor"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:722
+#: ../src/empathy-preferences.c:756
 msgid "And I'll no longer be a Capulet."
-msgstr ""
+msgstr "I deixaré jo de ser una Capulet."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:759
 msgid "Shall I hear more, or shall I speak at this?"
-msgstr ""
+msgstr "L'escolto més estona, o li responc?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:728
-#, fuzzy
+#: ../src/empathy-preferences.c:762
 msgid "Juliet has disconnected"
-msgstr "En/na %s s'ha desconnectat"
+msgstr "La Julieta s'ha desconnectat"
 
-#: ../src/empathy-preferences.c:962
+#: ../src/empathy-preferences.c:1166
 msgid "Preferences"
 msgstr "Preferències"
 
@@ -4001,67 +4298,87 @@ msgstr "Preferències"
 msgid "Appearance"
 msgstr "Aparença"
 
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
 msgstr "Comportament"
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
 msgid "Chat Th_eme:"
 msgstr "T_ema de xat:"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
 msgid "Disable notifications when _away or busy"
 msgstr "Inhabilita les notificacions quan s'estiga _absent o ocupat"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
 msgid "Disable sounds when _away or busy"
 msgstr "Inhabilita els sons quan s'estiga _absent o ocupat"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Mostra els esdeveniments d'entrada a l'àrea de notificació"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"La cancel·lació de l'eco permet que l'altra persona senti la vostra veu "
+"millor, però pot no funcionar bé en alguns ordinadors. Si sentiu o senten "
+"alguns sorolls estranys o petits talls, proveu a desactivar la cancel·lació "
+"de l'eco i tornar a trucar."
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "Habilita les notificacions quan es connecte un contacte"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "Habilita les notificacions quan es desconnecte un contacte"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Habilita les notificacions quan el _xat no tinga el focus"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "Habilita la verificació ortogràfica per a les llengües:"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "General"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input level:"
+msgstr "Nivell d'entrada:"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "Volum d'entrada:"
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "Fonts d'ubicació:"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "Enregistra les converses"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "Notificacions"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Reprodueix un so per als esdeveniments"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "Privadesa"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -4071,23 +4388,23 @@ msgstr ""
 "més precís que la ciutat, el país o l'estat. Les coordenades del GPS es "
 "truncaran a una posició decimal."
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "Mo_stra les emoticones com a imatges"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "Mostra la _llista de contactes a les sales"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "Verificació ortogràfica"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
@@ -4095,48 +4412,48 @@ msgstr ""
 "La llista de llengües només mostrarà les llengües per a les quals tingueu un "
 "diccionari instal·lat."
 
-#: ../src/empathy-preferences.ui.h:24
-msgid "Theme Variant:"
-msgstr ""
-
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "Temes"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:30
+msgid "Variant:"
+msgstr "Variant:"
+
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "_Connecta automàticament en iniciar"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Telèfon mòbil"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "_Habilita les notificacions"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "_Habilita les notificacions de so"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Xarxa (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "_Obri xats nous en finestres separades"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "_Publica la ubicació per als meus contactes"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "_Redueix la precisió de la ubicació"
 
@@ -4148,67 +4465,115 @@ msgstr "Estat"
 msgid "_Quit"
 msgstr "I_x"
 
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "Torna a trucar al contacte"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "Càmera apagada"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "Càmera engegada"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "Inhabilita la càmera i atura l'enviament de vídeo"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "Habilita la càmera i envia senyal de vídeo"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "Habilita la càmera però no envies senyal de vídeo"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "Previsualització"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "Torna a trucar"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "V_ídeo"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "El vídeo està apagat"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "El vídeo està engegat"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "Previsualització de vídeo"
+
 #: ../src/empathy-map-view.c:448
 msgid "Contact Map View"
 msgstr "Visualització de contactes en el mapa"
 
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
 msgid "Save"
 msgstr "Alça"
 
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
 msgstr "Finestra de depuració"
 
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
 msgstr "Fes una pausa"
 
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
 msgstr "Nivell "
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
 msgid "Debug"
 msgstr "Depura"
 
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
 msgid "Info"
 msgstr "Informació"
 
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
 msgid "Message"
 msgstr "Missatge"
 
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
 msgid "Warning"
 msgstr "Avís"
 
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
 msgid "Critical"
 msgstr "Crític"
 
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
 msgid "Error"
 msgstr "Error"
 
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
 msgid "Time"
 msgstr "Hora"
 
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
 msgid "Domain"
 msgstr "Domini"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
 msgstr "Categoria"
 
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "Nivell"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4216,47 +4581,60 @@ msgstr ""
 "El gestor de connexions seleccionat no permet utilitzar l'extensió de "
 "depuració remota."
 
-#: ../src/empathy-invite-participant-dialog.c:239
-#: ../src/empathy-invite-participant-dialog.c:279
+#: ../src/empathy-invite-participant-dialog.c:179
+#: ../src/empathy-invite-participant-dialog.c:205
 msgid "Invite Participant"
 msgstr "Convida un participant"
 
-#: ../src/empathy-invite-participant-dialog.c:240
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Seleccioneu un contacte per convidar-lo a la conversa:"
 
-#: ../src/empathy-invite-participant-dialog.c:275
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "Convida"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:184
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "No mostres cap diàleg, realitza la tasca (p .ex. importar) i ix"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:188
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "No mostres cap diàleg si no es que només hi ha comptes de «Gent propera»"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:192
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Selecciona inicialment el compte especificat (p .ex. gabble/jabber/exemple)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:194
 msgid "<account-id>"
 msgstr "<identificador-del-compte>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:197
+#, fuzzy
+msgid "Show account assistant"
+msgstr "Mostra el diàleg dels comptes"
+
+#: ../src/empathy-accounts.c:203
 msgid "- Empathy Accounts"
 msgstr "- Comptes de l'Empathy"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:242
 msgid "Empathy Accounts"
 msgstr "Comptes de l'Empathy"
 
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr "Mostra un servei en concret"
+
+#: ../src/empathy-debugger.c:75
+msgid "- Empathy Debugger"
+msgstr "- Depurador de l'Empathy"
+
+#: ../src/empathy-debugger.c:114
 msgid "Empathy Debugger"
 msgstr "Depurador de l'Empathy"
 
@@ -4264,51 +4642,136 @@ msgstr "Depurador de l'Empathy"
 msgid "- Empathy Chat Client"
 msgstr "- Client de xat Empathy"
 
-#: ../src/empathy-notifications-approver.c:184
+#: ../src/empathy-notifications-approver.c:203
 msgid "Respond"
 msgstr "Respon"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1573
 msgid "Reject"
 msgstr "Rebutja"
 
-#: ../src/empathy-notifications-approver.c:194
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1574
 msgid "Answer"
 msgstr "Contesta"
 
-#: ../src/empathy-notifications-approver.c:201
-#: ../src/empathy-notifications-approver.c:211
+#: ../src/empathy-notifications-approver.c:227
+msgid "Answer with video"
+msgstr "Contesta amb vídeo"
+
+#: ../src/empathy-notifications-approver.c:235
+#: ../src/empathy-notifications-approver.c:245
 msgid "Decline"
 msgstr "Declina"
 
-#: ../src/empathy-notifications-approver.c:205
-#: ../src/empathy-notifications-approver.c:216
+#: ../src/empathy-notifications-approver.c:239
+#: ../src/empathy-notifications-approver.c:250
 msgid "Accept"
 msgstr "Accepta"
 
-#: ../src/empathy-notifications-approver.c:226
-#, fuzzy
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:260
 msgid "Provide"
-msgstr "Introduïu la contrasenya"
+msgstr "Proporciona"
 
-#: ../src/empathy-call-observer.c:130
+#: ../src/empathy-call-observer.c:134
 #, c-format
-msgid "Missed call from %s"
-msgstr "Vos ha cridat %s però no hi éreu"
+msgid "%s just tried to call you, but you were in another call."
+msgstr "%s vos ha intentat trucar però estàveu en una altra conversa."
+
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1183 ../src/empathy-call-window.c:1206
+msgid "i"
+msgstr "i"
+
+#: ../src/empathy-call-window.c:2889
+msgid "On hold"
+msgstr "En espera"
+
+#: ../src/empathy-call-window.c:2892
+msgid "Mute"
+msgstr "Silenci"
+
+#: ../src/empathy-call-window.c:2894
+msgid "Duration"
+msgstr "Durada"
 
-#: ../src/empathy-call-observer.c:133
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2897
 #, c-format
-msgid "%s just tried to call you, but you were in another call."
-msgstr "%s vos ha intentat cridar però estàveu en una altra conversa."
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02dm"
 
-#: ../libempathy-gtk/empathy-search-bar.c:282
-#, fuzzy
+#: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
-msgstr "Coincidència de majúscules i minúscules:"
+msgstr "Coincidència de _majúscules i minúscules"
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "L'Empathy ha migrat dels registres de la Butterfly"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Si l'Empathy ha migrat els registres de la Butterfly."
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Desconegut"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Desconegut"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Desconegut"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Desconegut"
+
+#~ msgid "Find Next"
+#~ msgstr "Cerca el següent"
+
+#~ msgid "Find Previous"
+#~ msgstr "Cerca l'anterior"
+
+#~ msgid "Show and edit accounts"
+#~ msgstr "Mostra i edita els comptes"
+
+#~ msgid "Call with %d participants"
+#~ msgstr "Trucada amb %d persones"
+
+#~ msgid "All"
+#~ msgstr "Tots"
 
 #~ msgid "_Enabled"
 #~ msgstr "_Habilitat"
 
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ msgid "Conversations"
+#~ msgstr "Converses"
+
+#~ msgid "Previous Conversations"
+#~ msgstr "Converses anteriors"
+
+#~ msgid "_For:"
+#~ msgstr "_Per a:"
+
+#~ msgid "Enter Custom Message"
+#~ msgstr "Introduïu un missatge personalitzat"
+
+#~ msgid "Save _New Status Message"
+#~ msgstr "_Desa el missatge d'estat nou"
+
+#~ msgid "Saved Status Messages"
+#~ msgstr "Missatges d'estat desats"
+
 #~ msgid "Empathy has asked about importing accounts"
 #~ msgstr "Si l'Empathy ha preguntat sobre la importació de comptes"
 
@@ -4422,9 +4885,6 @@ msgstr "Coincidència de majúscules i minúscules:"
 #~ msgstr ""
 #~ "Si s'ha creat el compte del Salut en la primera execució de l'Empathy."
 
-#~ msgid "Show the accounts dialog"
-#~ msgstr "Mostra el diàleg dels comptes"
-
 #~ msgid "Can't set an empty display name"
 #~ msgstr "No es pot establir un nom públic buit"
 
@@ -4465,9 +4925,6 @@ msgstr "Coincidència de majúscules i minúscules:"
 #~ msgid "The contact's avatar token. Empty means contact has no avatar."
 #~ msgstr "L'avatar del contacte. Si està buit significa que no té avatar."
 
-#~ msgid "Megaphone"
-#~ msgstr "Megàfon"
-
 #~ msgid "Talk!"
 #~ msgstr "Parleu!"
 
@@ -4512,9 +4969,6 @@ msgstr "Coincidència de majúscules i minúscules:"
 #~ "Si decidiu tornar a afegir el compte més endavant, encara estaran "
 #~ "disponibles."
 
-#~ msgid "_Next"
-#~ msgstr "Següe_nt"
-
 #~ msgid "Add new"
 #~ msgstr "Afegeix-ne un de nou"
 
@@ -4597,10 +5051,6 @@ msgstr "Coincidència de majúscules i minúscules:"
 #~ msgid "Import Accounts..."
 #~ msgstr "Importació de comptes..."
 
-#, fuzzy
-#~ msgid "Settings"
-#~ msgstr "<b>Paràmetres</b>"
-
 #~ msgid "Type:"
 #~ msgstr "Tipus:"
 
@@ -4622,9 +5072,6 @@ msgstr "Coincidència de majúscules i minúscules:"
 #~ msgid "_Check Word Spelling..."
 #~ msgstr "_Verifica l'ortografia de la paraula..."
 
-#~ msgid "<b>Topic:</b>"
-#~ msgstr "<b>Tema:</b>"
-
 #~ msgid "Group Chat"
 #~ msgstr "Xat en grup"
 
@@ -4719,9 +5166,6 @@ msgstr "Coincidència de majúscules i minúscules:"
 #~ msgid "Join _New..."
 #~ msgstr "Uneix-me a un _nou/nova..."
 
-#~ msgid "Chat Rooms"
-#~ msgstr "Sales de xat"
-
 #~ msgid "Browse:"
 #~ msgstr "Navega:"
 
@@ -4887,10 +5331,6 @@ msgstr "Coincidència de majúscules i minúscules:"
 #~ msgstr "Presència"
 
 #, fuzzy
-#~ msgid "No accounts"
-#~ msgstr "Comptes"
-
-#, fuzzy
 #~ msgid "Lowmem"
 #~ msgstr "Casa"
 
@@ -4919,12 +5359,6 @@ msgstr "Coincidència de majúscules i minúscules:"
 #~ msgid "Yahoo! account settings"
 #~ msgstr "paràmetres del compte Yahoo!"
 
-#~ msgid "Input"
-#~ msgstr "Entrada"
-
-#~ msgid "Mute"
-#~ msgstr "Silenci"
-
 #~ msgid "Output"
 #~ msgstr "Sortida"
 
@@ -5363,9 +5797,6 @@ msgstr "Coincidència de majúscules i minúscules:"
 #~ msgid "Users"
 #~ msgstr "Usuaris"
 
-#~ msgid "Description"
-#~ msgstr "Descripció"
-
 #~ msgid "Found %d conference room"
 #~ msgid_plural "Found %d conference rooms"
 #~ msgstr[0] "S'ha trobat %d sala de xat"
@@ -5400,9 +5831,6 @@ msgstr "Coincidència de majúscules i minúscules:"
 #~ msgid "Someone wants to be added to your contact list."
 #~ msgstr "Algú vol afegir-se a la vostra llista de contactes."
 
-#~ msgid "Show"
-#~ msgstr "Mostra"
-
 #~ msgid ""
 #~ "This will remove any custom messages you have added to the list of preset "
 #~ "status messages."
@@ -5655,9 +6083,6 @@ msgstr "Coincidència de majúscules i minúscules:"
 #~ msgid "Jabber"
 #~ msgstr "Jabber"
 
-#~ msgid "Edit"
-#~ msgstr "Edita"
-
 #~ msgid "Perhaps you are trying to connect to the wrong port?"
 #~ msgstr "Potser us esteu intentant connectar al port incorrecte?"
 
@@ -6658,9 +7083,6 @@ msgstr "Coincidència de majúscules i minúscules:"
 #~ msgid "[Eating,Sleeping]"
 #~ msgstr "[Menjant,Dormint]"
 
-#~ msgid "[Working]"
-#~ msgstr "[Treballant]"
-
 #~ msgid "Custom Away Message..."
 #~ msgstr "Missatge d'absència personalitzat..."
 
@@ -6721,9 +7143,6 @@ msgstr "Coincidència de majúscules i minúscules:"
 #~ msgid "Timestamp messages"
 #~ msgstr "Posa marques de temps als missatges"
 
-#~ msgid "Free to chat"
-#~ msgstr "Disponible per xatejar"
-
 #~ msgid "Extended away"
 #~ msgstr "Absent fa estona"
 
diff --git a/po/cs.po b/po/cs.po
index 924d7182a..82b41e4d9 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2,7 +2,6 @@
 # Copyright (C) 2003, 2004, 2008, 2009, 2010 the author(s) of empathy.
 # Copyright (C) 2003, 2004 Miloslav Trmac <mitr@volny.cz>.
 # This file is distributed under the same license as the empathy package.
-#
 # Miloslav Trmac <mitr@volny.cz>, 2003, 2004.
 # Lucas Lommer <llommer@svn.gnome.org>, 2008, 2009, 2010.
 # Adrian Guniš <andygun@seznam.cz>, 2008.
@@ -10,25 +9,23 @@
 # Jan Drábek <repli2dev@gmail.com>, 2009.
 # Lukáš Ru�ka <lukassoftwares.backup@gmail.com>, 2010.
 # Jiri Eischmann <jiri@eischmann.cz>, 2010.
-# Petr Kovar <pknbe@volny.cz>, 2008, 2009, 2010.
-# Marek Černocký <marek@manet.cz>, 2010, 2011.
+# Petr Kovar <pknbe@volny.cz>, 2008, 2009, 2010, 2011.
 # Pavel Šefránek <pavel@sefranek2.cz>, 2011.
-#
+# Marek Černocký <marek@manet.cz>, 2010, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-07-25 11:44+0000\n"
-"PO-Revision-Date: 2011-07-28 09:10+0200\n"
-"Last-Translator: Pavel Šefránek <pavel@sefranek2.cz>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-09-26 02:00+0200\n"
+"PO-Revision-Date: 2011-09-26 02:00+0200\n"
+"Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
 "Language: cs\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>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Lokalize 1.2\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
@@ -48,60 +45,82 @@ msgstr "Komunikátor"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
-msgstr "Pro nové diskuze vždy otevírat oddělená okna."
+msgstr "Pro nové konverzace vždy otevírat oddělená okna."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr "Hlasitost hovoru"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr "Hlasitost hovoru, v procentech."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Camera device"
+msgstr "Zařízení kamery"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "Poloha kamery"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 "Znak, který má být přidán za přezdívku při použití doplňování přezdívek "
-"(tabulátorem) ve skupinové diskuzi."
+"(tabulátorem) ve skupinové konverzaci."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
-msgstr "Motiv okna diskuze"
+msgstr "Motiv okna konverzace"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Chat window theme variant"
-msgstr "Motiv okna diskuze"
+msgstr "Varianta motivu okna konverzace"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "Čárkami oddělený seznam jazyků používaných ke kontrole pravopisu (např. „en, "
 "fr, nl“)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "Kompaktní seznam kontaktů"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "Měli byste používat správce připojení"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "Kritérium pro řazení seznamu kontaktů"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr ""
+"Výchozí zařízení kamery, které se má používat pro videohovory, např. /dev/"
+"video0."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
 msgstr "Výchozí adresář pro výběr obrázku avataru"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr "Zakázat vyskakující upozornění v případě mé nepřítomnosti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr "Zakázat zvuky v případě mé nepřítomnosti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
 msgstr "Zobrazovat příchozí události ve stavové oblasti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -109,240 +128,248 @@ msgstr ""
 "Zobrazovat příchozí události ve stavové oblasti. Když je něco špatně, tak se "
 "to uživatel ihned dozví."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+msgid "Echo cancellation support"
+msgstr "Podpora potla�ení ozvěny"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr "Empathy může zveřejnit polohu uživatele"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy se může pokusit ur�it vaši polohu pomocí GPS"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy se může pokusit ur�it vaši polohu pomocí mobilní sítě"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy se může pokusit ur�it vaši polohu pomocí sítě"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr "Výchozí adresář pro stahování aplikace Empathy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
 msgstr "Empathy migrovala záznamy butterfly"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy by měl při ne�innosti automaticky nastavit na nepřítomen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "Automaticky připojovat Empathy po spuštění"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Přesnost plohy by měla být omezena"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Používat avatar kontaktu jako ikonku okna diskuze"
+msgstr "Používat avatar kontaktu jako ikonku okna konverzace"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr "Povolit vývojové nástroje pro WebKit"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "Povolit vyskakující upozornění na nové zprávy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "Povolit kontrolu pravopisu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "Skrýt hlavní okno"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "Skrýt hlavní okno."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "Znak doplňování přezdívek"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
-msgstr "Otevírat nové diskuze v oddělených oknech"
+msgstr "Otevírat nové konverzace v oddělených oknech"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "Cesta k požadovanému motivu Adium"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
 "Cesta k motivu Adium, který bude v případě, že Adium používáte, vybrán."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Přehrávat zvuk pro příchozí zprávy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "Přehrát zvuk při nové konverzaci"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Přehrávat zvuk pro odchozí zprávy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "Přehrávat zvuk, když se kontakt přihlásí"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "Přehrát zvuk, pokud se kontakt odhlásí"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "Přehrávat zvuk, když se přihlásím"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "Přehrávat zvuk, když se odhlásím"
 
 # is chat different than conversation?
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
-msgstr "Vyskakující upozornění, pokud není vybrána diskuze"
+msgstr "Vyskakující upozornění, pokud není vybrána konverzace"
 
 # is chat different than conversation?
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "Vyskakující upozornění při přihlášení kontaktu"
 
 # is chat different than conversation?
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "Vyskakující upozornění při odhlášení kontaktu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr "Poloha náhledové kamery, jak by měla být během hovoru."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Show Balance in contact list"
 msgstr "Zobrazovat zůstatek kreditu v seznamu kontaktů"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "Zobrazovat avatary"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "Zobrazit seznam kontaktů v diskuzních místnostech"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr "Zobrazovat nápovědu, pokud se chystáte zavřít hlavní okno"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr "Zobrazovat odpojené kontakty"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
 msgstr "Zobrazovat protokoly"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "Jazyky s kontrolovaným pravopisem"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr "Výchozí adresář pro ukládání přenášených souborů."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Poslední adresář, ze kterého byl vybrán obrázek avataru."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
-msgstr "Poloha pro postranní panel diskuzního okna"
+msgstr "Poloha pro postranní panel okna s konverzací"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "Uložená poloha (v pixelech) postranního panelu diskuzního okna"
+msgstr "Uložená poloha (v pixelech) postranního panelu okna s konverzací"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Motiv, který je používán pro zobrazení konverzací v oknech diskuzí."
+msgstr "Motiv, který je používán pro zobrazení konverzací v oknech konverzací."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
-msgstr "Motiv, který je používán pro zobrazení konverzací v oknech diskuzí."
+msgstr "Motiv, který je používán pro zobrazení konverzací v oknech konverzací."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Používat grafické smajlíky"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "Používat zvuková upozornění"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "Používat motiv pro diskuzní místnosti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Jestli může Empathy zveřejňovat kontaktům vaši polohu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Jestli může Empathy používat GPS k ur�ení polohy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Jestli může Empathy použít mobilní síť k ur�ení polohy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Zda může Empathy použít sít k ur�ení polohy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "Jestli aplikace Empathy migrovala záznamy butterfly."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Jestli se má Empathy po spuštění automaticky připojovat k vašim ú�tům."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
 "Zda by měla aplikace Empathy při ne�innosti uživatele přepínat na stav "
 "nepřítomen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 "Jestli má Empathy omezit přesnost polohy pro lepší ochranu vašeho soukromí."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "Zda má Empathy používat avatar kontaktu jako ikonu okna diskuze."
+msgstr "Zda má Empathy používat avatar kontaktu jako ikonu okna s konverzací."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Zda mají být povoleny vývojové nástroje pro Webkit, například Web Inspektor."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
@@ -350,109 +377,113 @@ msgstr ""
 "Jestli má být používán správce připojení k automatickému připojování a "
 "odpojování."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "Jestli u zadávaných slov kontrolovat pravopis."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "Jestli v konverzacích převádět smajlíky na obrázky."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Zda zapnout filtr Pulseaudio pro potla�ení ozvěny."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr ""
 "Jestli přehrávat zvuky jako upozornění na přihlašování kontaktu k síti."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
 "Jestli přehrávat zvuky jako upozornění na odhlašování kontaktu od sítě."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "Jestli přehrávat zvuky jako upozornění na události."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Jestli přehrávat zvuk jako upozornění na příchozí zprávy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Jestli přehrávat zvuk jako upozornění na novou konverzaci."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Jestli přehrávat zvuk jako upozornění na odchozí zprávy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "Jestli přehrávat zvuk, když se přihlašuji do sítě."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Zda přehrávat zvuk, když se odhlašuji ze sítě."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr ""
 "Zda přehrávat zvuková upozornění v případě mé nepřítomnosti nebo "
 "zaneprázdněnosti."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "Jestli zobrazovat vyskakující upozornění při odpojení uživatele."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "Jestli zobrazovat vyskakující upozornění při přihlášení kontaktu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
 msgstr ""
-"Zdali zobrazovat vyskakující upozornění na novou zprávu, i když diskuze byla "
-"již otevřena, ale není vybrána."
+"Zdali zobrazovat vyskakující upozornění na novou zprávu, i když konverzace "
+"byla již otevřena, ale není vybrána."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "Zdali zobrazovat vyskakující upozornění při přijetí nové zprávy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show account balances in the contact list."
 msgstr "Jestli zobrazovat zůstatek kreditu v seznamu kontaktů."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 "Zda zobrazovat avatary kontaktů v seznamu kontaktů a oknech s konverzacemi."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "Zda v seznamu kontaktů zobrazovat odpojené kontakty."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
 msgstr ""
 "Zda zobrazovat vyskakující upozornění v případě mé nepřítomnosti nebo "
 "zaneprázdněnosti."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "Jestli zobrazovat protokoly kontaktů v seznamu kontaktů."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Jestli zobrazovat seznam kontaktů v diskuzních místnostech."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "Jestli zobrazovat seznam kontaktů v kompaktním režimu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -460,11 +491,11 @@ msgstr ""
 "Zda zobrazovat varování při uzavírání hlavního okna prostřednictvím tla�ítka "
 "„x“ (křížek) v záhlaví okna."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "Zda používat motiv pro diskuzní místnosti."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -488,30 +519,30 @@ msgstr "Ú�ty IM a VoIP"
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Přenos souboru byl dokon�en, ale soubor byl poškozen"
 
-#: ../libempathy/empathy-ft-handler.c:1113
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
 msgstr "Přenos souborů není podporován vzdálenou stranou"
 
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is not a regular file"
 msgstr "Vybraný soubor není běžným souborem"
 
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1176
 msgid "The selected file is empty"
 msgstr "Vybraný soubor je prázdný"
 
-#: ../libempathy/empathy-message.c:413 ../src/empathy-call-observer.c:132
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
 #, c-format
 msgid "Missed call from %s"
 msgstr "Zmeškaný hovor od kontaktu %s"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:417
+#: ../libempathy/empathy-message.c:419
 #, c-format
 msgid "Called %s"
 msgstr "Hovor s kontaktem %s"
 
-#: ../libempathy/empathy-message.c:420
+#: ../libempathy/empathy-message.c:422
 #, c-format
 msgid "Call from %s"
 msgstr "Příchozí hovor od kontaktu %s"
@@ -544,163 +575,163 @@ msgstr "Chyba při pokusu o odeslání souboru"
 msgid "The other participant is unable to transfer the file"
 msgstr "Protistrana není schopna přenosu souborů"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
 msgid "Unknown reason"
 msgstr "Neznámý důvod"
 
-#: ../libempathy/empathy-utils.c:212
+#: ../libempathy/empathy-utils.c:232
 msgid "Available"
 msgstr "Přítomen"
 
-#: ../libempathy/empathy-utils.c:214
+#: ../libempathy/empathy-utils.c:234
 msgid "Busy"
 msgstr "Zaneprázdněn"
 
-#: ../libempathy/empathy-utils.c:217
+#: ../libempathy/empathy-utils.c:237
 msgid "Away"
 msgstr "Nepřítomen"
 
-#: ../libempathy/empathy-utils.c:219
+#: ../libempathy/empathy-utils.c:239
 msgid "Invisible"
 msgstr "Neviditelný"
 
-#: ../libempathy/empathy-utils.c:221
+#: ../libempathy/empathy-utils.c:241
 msgid "Offline"
 msgstr "Odpojen"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:224
+#: ../libempathy/empathy-utils.c:244
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Neznámo"
 
-#: ../libempathy/empathy-utils.c:264
+#: ../libempathy/empathy-utils.c:284
 msgid "No reason specified"
 msgstr "Neudán žádný důvod"
 
-#: ../libempathy/empathy-utils.c:266 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
 msgid "Status is set to offline"
 msgstr "Stav nastaven na „Odhlášen“"
 
-#: ../libempathy/empathy-utils.c:268 ../libempathy/empathy-utils.c:302
-#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "Chyba sítě"
 
-#: ../libempathy/empathy-utils.c:270 ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
 msgid "Authentication failed"
 msgstr "Ověření selhalo"
 
-#: ../libempathy/empathy-utils.c:272 ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
 msgid "Encryption error"
 msgstr "Chyba šifrování"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:294
 msgid "Name in use"
 msgstr "Jméno používáno"
 
-#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:308
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate not provided"
 msgstr "Certifikát nebyl poskytnut"
 
-#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate untrusted"
 msgstr "Nedůvěryhodný certifikát"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
 msgid "Certificate expired"
 msgstr "Platnost certifikátu vypršela"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
 msgid "Certificate not activated"
 msgstr "Certifikát není aktivován"
 
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
 msgid "Certificate hostname mismatch"
 msgstr "Certifikát názvu po�íta�e nesouhlasí"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
 msgid "Certificate fingerprint mismatch"
 msgstr "Certifikát otisku prstu nesouhlasí"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
 msgid "Certificate self-signed"
 msgstr "Certifikát je podepsán sám sebou"
 
-#: ../libempathy/empathy-utils.c:290
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate error"
 msgstr "Chyba certifikátu"
 
-#: ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:344
 msgid "Encryption is not available"
 msgstr "Šifrování není dostupné"
 
-#: ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:346
 msgid "Certificate is invalid"
 msgstr "Certifikát je neplatný"
 
-#: ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:348
 msgid "Connection has been refused"
 msgstr "Spojení bylo odmítnuto"
 
-#: ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:350
 msgid "Connection can't be established"
-msgstr "Spojení bylo navázáno"
+msgstr "Spojení nemohlo být navázáno"
 
-#: ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:352
 msgid "Connection has been lost"
 msgstr "Spojení bylo ztraceno"
 
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:354
 msgid "This resource is already connected to the server"
 msgstr "Zdroj je již připojen k serveru"
 
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:356
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Spojení bylo nahrazeno novým spojením, které používá stejný zdroj"
 
-#: ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:359
 msgid "The account already exists on the server"
 msgstr "Takový ú�et již na serveru existuje"
 
-#: ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:361
 msgid "Server is currently too busy to handle the connection"
 msgstr "Server je právě příliš zaneprázdněn na to, aby obsloužil spojení"
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:363
 msgid "Certificate has been revoked"
 msgstr "Certifikát byl odvolán"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:365
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Certifikát používá nepříliš bezpe�ný šifrovací algoritmus nebo je z "
 "kryptografického hlediska slabý"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:368
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr ""
-"Délka certifikátu serveru, nebo délka zřetězených certifikátů serveru, "
+"Délka certifikátu serveru nebo délka zřetězených certifikátů serveru "
 "přesáhla omezení dané kryptografickou knihovnou"
 
-#: ../libempathy/empathy-utils.c:509
+#: ../libempathy/empathy-utils.c:529
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "Lidé v okolí"
 
-#: ../libempathy/empathy-utils.c:514
+#: ../libempathy/empathy-utils.c:534
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:543
+#: ../libempathy/empathy-utils.c:563
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:544
+#: ../libempathy/empathy-utils.c:564
 msgid "Facebook Chat"
 msgstr "Facebook Chat"
 
@@ -756,71 +787,81 @@ msgstr[2] "před %d měsíci"
 msgid "in the future"
 msgstr "v budoucnosti"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:539
+#: ../libempathy-gtk/empathy-account-chooser.c:540
 msgid "All accounts"
 msgstr "Všechny ú�ty"
 
-#: ../libempathy-gtk/empathy-account-widget.c:691
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "Ú�et"
 
-#: ../libempathy-gtk/empathy-account-widget.c:692
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "Heslo"
 
-#: ../libempathy-gtk/empathy-account-widget.c:693
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:766
-#: ../libempathy-gtk/empathy-account-widget.c:823
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1164
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "My Web Accounts"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "Ú�et %s je upravován přes My Web Accounts."
+msgid "The account %s is edited via %s."
+msgstr "Ú�et %s je upravován přes %s."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1170
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "Ú�et %s nelze upravovat v aplikaci Empathy."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1190
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
 msgstr "Spustit My Web Accounts"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1530
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "Upravit %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Uživatelské jméno:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1848
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "_Použít"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1878
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
 msgstr "Přip_ojit"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1952
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "Takový ú�et již existuje"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1955
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "Vytvořit nový ú�et na serveru"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2147
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "_Zrušit"
 
@@ -829,19 +870,19 @@ msgstr "_Zrušit"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2425
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s na %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2451
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "Ú�et služby %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2455
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "Nový ú�et"
 
@@ -963,36 +1004,36 @@ msgstr "Jaké je váš UIN pro ICQ?"
 msgid "What is your ICQ password?"
 msgstr "Jaké je vaše heslo k ICQ?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:184
-#: ../libempathy-gtk/empathy-account-widget-sip.c:217
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "Automaticky"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:187
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:193
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:222
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "Zaregistrovat"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:227
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "Volby"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "Žádný"
 
@@ -1224,14 +1265,18 @@ msgid "Transport:"
 msgstr "Přenos:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Používat tento ú�et pro volání na pevné _linky a mobilní telefony"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "Jaké je heslo k vašemu ú�tu SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Jaké je vaše přihlašovací ID pro SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "_Uživatelské jméno:"
 
@@ -1255,36 +1300,36 @@ msgstr "Yahoo! I_D:"
 msgid "_Room List locale:"
 msgstr "Ná_rodní prostředí seznamu místností:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:474
-#: ../libempathy-gtk/empathy-avatar-chooser.c:559
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "Nelze konvertovat obrázek"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:475
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "Váš systém neobsahuje žádný z podporovaných formátů obrázku"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:822
-msgid "Couldn't save pixbuf to png"
-msgstr "Nepodařilo se uložit pixbuf do formátu PNG"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+msgid "Couldn't save picture to file"
+msgstr "Nelze uložit obrázek do souboru"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "Vyberte si obrázek avataru"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:942
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
 msgstr "Vyfotografovat…"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:945
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "Žádný obrázek"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "Obrázky"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1009
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "VÅ¡echny soubory"
 
@@ -1292,61 +1337,61 @@ msgstr "VÅ¡echny soubory"
 msgid "Click to enlarge"
 msgstr "Kliknutím zvětšíte"
 
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:58
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Nepodařilo se navázat spojení"
 
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact doesn't support calls"
 msgstr "Tento kontakt nepodporuje volání"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is offline"
 msgstr "Vybraný kontakt je odpojen"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "The specified contact is not valid"
 msgstr "Vybraný kontakt není platný"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:57
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Tento protokol nepodporuje tísňová volání"
 
-#: ../libempathy-gtk/empathy-chat.c:697
+#: ../libempathy-gtk/empathy-chat.c:704
 msgid "Failed to open private chat"
 msgstr "Nepovedlo se otevřít soukromou konverzaci"
 
-#: ../libempathy-gtk/empathy-chat.c:758
+#: ../libempathy-gtk/empathy-chat.c:765
 msgid "Topic not supported on this conversation"
 msgstr "Tato konverzace toto téma nepodporuje"
 
-#: ../libempathy-gtk/empathy-chat.c:764
+#: ../libempathy-gtk/empathy-chat.c:771
 msgid "You are not allowed to change the topic"
 msgstr "Nemáte oprávnění potřebná pro změnu tématu"
 
-#: ../libempathy-gtk/empathy-chat.c:968
+#: ../libempathy-gtk/empathy-chat.c:975
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "„%s“ není platné ID kontaktu"
 
-#: ../libempathy-gtk/empathy-chat.c:1025
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: vymazat všechny zprávy z této konverzace"
 
-#: ../libempathy-gtk/empathy-chat.c:1028
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <téma>: nastavit téma aktuální konverzace"
 
-#: ../libempathy-gtk/empathy-chat.c:1031
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ID místnosti>: vstoupit do nové místnosti"
 
-#: ../libempathy-gtk/empathy-chat.c:1034
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ID místnosti>: vstoupit do nové místnosti"
 
-#: ../libempathy-gtk/empathy-chat.c:1038
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1354,23 +1399,23 @@ msgstr ""
 "/part [<ID místnosti>] [<důvod>]: opustit místnost, bez udání tu právě "
 "aktuální"
 
-#: ../libempathy-gtk/empathy-chat.c:1042
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ID kontaktu> [<zpráva>]: otevřít novou soukromou konverzaci"
 
-#: ../libempathy-gtk/empathy-chat.c:1045
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ID kontaktu> <zpráva>: otevřít novou soukromou konverzaci"
 
-#: ../libempathy-gtk/empathy-chat.c:1048
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <přezdívka>: změnit svoji přezdívku na aktuálním serveru"
 
-#: ../libempathy-gtk/empathy-chat.c:1051
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <zpráva>: zaslat zprávu AKCE do aktuální konverzace"
 
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1380,11 +1425,11 @@ msgstr ""
 "posílání zpráv za�ínajících s „/“. Například: „/say /join je použito pro "
 "připojení do místnosti“"
 
-#: ../libempathy-gtk/empathy-chat.c:1059
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ID kontaktu>: zobrazit informace o kontaktu"
 
-#: ../libempathy-gtk/empathy-chat.c:1062
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1392,113 +1437,113 @@ msgstr ""
 "/help [<příkaz>]: vypsat seznam podporovaných příkazů. Pokud je zadán "
 "<příkaz>, vypsat jeho použití."
 
-#: ../libempathy-gtk/empathy-chat.c:1072
+#: ../libempathy-gtk/empathy-chat.c:1114
 #, c-format
 msgid "Usage: %s"
 msgstr "Použití: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1111
+#: ../libempathy-gtk/empathy-chat.c:1159
 msgid "Unknown command"
 msgstr "Neznámý příkaz"
 
-#: ../libempathy-gtk/empathy-chat.c:1237
+#: ../libempathy-gtk/empathy-chat.c:1285
 msgid "Unknown command; see /help for the available commands"
 msgstr "Neznámý příkaz, pro výpis dostupných příkazů použijte /help"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1407
+#: ../libempathy-gtk/empathy-chat.c:1455
 msgid "insufficient balance to send message"
 msgstr "Nemáte dostate�ný kredit k poslání zprávy"
 
-#: ../libempathy-gtk/empathy-chat.c:1409
+#: ../libempathy-gtk/empathy-chat.c:1457
 msgid "not capable"
 msgstr "není k dispozici"
 
-#: ../libempathy-gtk/empathy-chat.c:1416
+#: ../libempathy-gtk/empathy-chat.c:1464
 msgid "offline"
 msgstr "odpojen"
 
-#: ../libempathy-gtk/empathy-chat.c:1419
+#: ../libempathy-gtk/empathy-chat.c:1467
 msgid "invalid contact"
 msgstr "neplatný kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1422
+#: ../libempathy-gtk/empathy-chat.c:1470
 msgid "permission denied"
 msgstr "oprávnění odepřeno"
 
-#: ../libempathy-gtk/empathy-chat.c:1425
+#: ../libempathy-gtk/empathy-chat.c:1473
 msgid "too long message"
 msgstr "příliš dlouhá zpráva"
 
-#: ../libempathy-gtk/empathy-chat.c:1428
+#: ../libempathy-gtk/empathy-chat.c:1476
 msgid "not implemented"
 msgstr "neimplementováno"
 
-#: ../libempathy-gtk/empathy-chat.c:1432
+#: ../libempathy-gtk/empathy-chat.c:1480
 msgid "unknown"
 msgstr "neznámý"
 
-#: ../libempathy-gtk/empathy-chat.c:1438
+#: ../libempathy-gtk/empathy-chat.c:1486
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Chyba při odesílání zprávy „%s“: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1442
+#: ../libempathy-gtk/empathy-chat.c:1490
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Chyba při odesílání zprávy: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1503 ../src/empathy-chat-window.c:760
+#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Téma:"
 
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1563
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Nastavit téma na: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1517
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "No topic defined"
 msgstr "Nestanoveno žádné téma"
 
-#: ../libempathy-gtk/empathy-chat.c:2024
+#: ../libempathy-gtk/empathy-chat.c:2074
 msgid "(No Suggestions)"
 msgstr "(Žádné návrhy)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2092
+#: ../libempathy-gtk/empathy-chat.c:2142
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Přidat „%s“ do slovníku"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2129
+#: ../libempathy-gtk/empathy-chat.c:2179
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Přidat „%s“ do slovníku %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2186
+#: ../libempathy-gtk/empathy-chat.c:2249
 msgid "Insert Smiley"
 msgstr "Vložit smajlíka"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2204
-#: ../libempathy-gtk/empathy-ui-utils.c:1756
+#: ../libempathy-gtk/empathy-chat.c:2267
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "_Odeslat"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2239
+#: ../libempathy-gtk/empathy-chat.c:2321
 msgid "_Spelling Suggestions"
 msgstr "Návrhy pravopi_sných oprav"
 
-#: ../libempathy-gtk/empathy-chat.c:2328
+#: ../libempathy-gtk/empathy-chat.c:2410
 msgid "Failed to retrieve recent logs"
 msgstr "Nepovedlo se získat záznam nedávné historie"
 
-#: ../libempathy-gtk/empathy-chat.c:2465
+#: ../libempathy-gtk/empathy-chat.c:2547
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s se odpojil"
@@ -1506,12 +1551,12 @@ msgstr "%s se odpojil"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2472
+#: ../libempathy-gtk/empathy-chat.c:2554
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s byl vyhozen uživatelem %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2475
+#: ../libempathy-gtk/empathy-chat.c:2557
 #, c-format
 msgid "%s was kicked"
 msgstr "%s byl vyhozen"
@@ -1519,17 +1564,17 @@ msgstr "%s byl vyhozen"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2483
+#: ../libempathy-gtk/empathy-chat.c:2565
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s byl zakázán uživatelem %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2486
+#: ../libempathy-gtk/empathy-chat.c:2568
 #, c-format
 msgid "%s was banned"
 msgstr "%s byl zakázán"
 
-#: ../libempathy-gtk/empathy-chat.c:2490
+#: ../libempathy-gtk/empathy-chat.c:2572
 #, c-format
 msgid "%s has left the room"
 msgstr "%s opustil místnost"
@@ -1539,69 +1584,72 @@ msgstr "%s opustil místnost"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2499
+#: ../libempathy-gtk/empathy-chat.c:2581
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2524
+#: ../libempathy-gtk/empathy-chat.c:2606
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s se připojil do místnosti"
 
-#: ../libempathy-gtk/empathy-chat.c:2549
+#: ../libempathy-gtk/empathy-chat.c:2631
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je te� znám jako %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2688
-#: ../src/empathy-streamed-media-window.c:1939
-#: ../src/empathy-event-manager.c:1241 ../src/empathy-call-window.c:1845
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2784
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
+#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
 msgid "Disconnected"
 msgstr "Odpojen"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3332
+#: ../libempathy-gtk/empathy-chat.c:3428
 msgid "Would you like to store this password?"
 msgstr "Přejete si uchovat toto heslo?"
 
-#: ../libempathy-gtk/empathy-chat.c:3338
+#: ../libempathy-gtk/empathy-chat.c:3434
 msgid "Remember"
 msgstr "Zapamatovat"
 
-#: ../libempathy-gtk/empathy-chat.c:3348
+#: ../libempathy-gtk/empathy-chat.c:3444
 msgid "Not now"
 msgstr "Nyní ne"
 
-#: ../libempathy-gtk/empathy-chat.c:3392
+#: ../libempathy-gtk/empathy-chat.c:3488
 msgid "Retry"
 msgstr "Opakovat"
 
-#: ../libempathy-gtk/empathy-chat.c:3396
+#: ../libempathy-gtk/empathy-chat.c:3492
 msgid "Wrong password; please try again:"
 msgstr "Špatné heslo, zkuste to prosím znovu:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3526
+#: ../libempathy-gtk/empathy-chat.c:3622
 msgid "This room is protected by a password:"
 msgstr "Tato místnost je chráněna heslem:"
 
-#: ../libempathy-gtk/empathy-chat.c:3553
+#: ../libempathy-gtk/empathy-chat.c:3649
 msgid "Join"
 msgstr "Připojit"
 
-#: ../libempathy-gtk/empathy-chat.c:3755 ../src/empathy-event-manager.c:1262
-#: ../src/empathy-call-window.c:2092
+#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "Připojen"
 
-#: ../libempathy-gtk/empathy-chat.c:3810
+#: ../libempathy-gtk/empathy-chat.c:3906
 msgid "Conversation"
 msgstr "Konverzace"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3815
+#: ../libempathy-gtk/empathy-chat.c:3911
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1626,15 +1674,15 @@ msgstr "Oprávnění odepřeno"
 msgid "Could not block contact"
 msgstr "Nelze blokovat kontakt"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:772
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
 msgid "Edit Blocked Contacts"
 msgstr "Upravit blokované kontakty"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:521
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1495
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
@@ -1645,15 +1693,22 @@ msgstr "Ú�et:"
 msgid "Blocked Contacts"
 msgstr "Blokované kontakty"
 
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Odstranit"
+
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:1417
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Kopírovat adresu odkazu"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:1424
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Otevřít odkaz"
 
@@ -1684,18 +1739,18 @@ msgid "Block %s?"
 msgstr "Blokovat %s?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Opravdu chcete blokovat „%s“, aby vás znovu nekontaktoval?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:274
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
 msgid "_Block"
 msgstr "_Blokovat"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:283
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "Na_hlásit tento kontakt jako obtěžující"
@@ -1722,38 +1777,38 @@ msgstr "Nezařazené do skupiny"
 msgid "Favorite People"
 msgstr "Oblíbení lidé"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1983
-#: ../libempathy-gtk/empathy-individual-view.c:2375
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Opravdu chcete odstranit skupinu „%s“?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1985
-#: ../libempathy-gtk/empathy-individual-view.c:2378
+#: ../libempathy-gtk/empathy-contact-list-view.c:1988
+#: ../libempathy-gtk/empathy-individual-view.c:2379
 msgid "Removing group"
 msgstr "Skupina  se odstraňuje"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2034
-#: ../libempathy-gtk/empathy-contact-list-view.c:2111
-#: ../libempathy-gtk/empathy-individual-view.c:2433
-#: ../libempathy-gtk/empathy-individual-view.c:2636
+#: ../libempathy-gtk/empathy-contact-list-view.c:2037
+#: ../libempathy-gtk/empathy-contact-list-view.c:2114
+#: ../libempathy-gtk/empathy-individual-view.c:2434
+#: ../libempathy-gtk/empathy-individual-view.c:2637
 msgid "_Remove"
 msgstr "_Odstranit"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2064
-#: ../libempathy-gtk/empathy-individual-view.c:2500
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
+#: ../libempathy-gtk/empathy-individual-view.c:2501
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Opravdu chcete odstranit kontakt „%s“?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2066
-#: ../libempathy-gtk/empathy-individual-view.c:2521
+#: ../libempathy-gtk/empathy-contact-list-view.c:2069
+#: ../libempathy-gtk/empathy-individual-view.c:2522
 msgid "Removing contact"
 msgstr "Kontakt se odstraňuje"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "_Přidat kontakt…"
 
@@ -1762,48 +1817,48 @@ msgid "_Block Contact"
 msgstr "_Blokovat kontakt"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:548
-#: ../src/empathy-main-window.ui.h:16
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "_Diskuze"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:639
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Audiohovor"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:684
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Videohovor"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:737
-#: ../src/empathy-main-window.ui.h:27
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "_Předchozí konverzace"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:778
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "Odeslat soubor"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:820
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
 msgstr "Sdílet moji plochu"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1890
-#: ../libempathy-gtk/empathy-individual-menu.c:855
-#: ../libempathy-gtk/empathy-individual-widget.c:1386
+#: ../libempathy-gtk/empathy-contact-widget.c:1886
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "Oblíbený"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:883
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "Infor_mace"
 
@@ -1813,33 +1868,41 @@ msgid "_Edit"
 msgstr "_Upravit"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1070
-#: ../src/empathy-chat-window.c:1010
+#: ../libempathy-gtk/empathy-individual-menu.c:1284
+#: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "Pozvání do místnosti"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1116
+#: ../libempathy-gtk/empathy-individual-menu.c:1330
 msgid "_Invite to Chat Room"
 msgstr "Pozvat do diskuzní místnost_i"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:514
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
 msgid "Search contacts"
 msgstr "Hledat kontakty"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:544
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
 msgid "Search: "
 msgstr "Hledat: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:602
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
 msgid "_Add Contact"
 msgstr "Přid_at kontakt"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:620
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
 msgid "No contacts found"
 msgstr "Nenalezen žádný kontakt"
 
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr "Vaše zpráva, kterou se představujete:"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
+msgstr "Dejte mi prosím vědět, až budete připojen. Děkuji!"
+
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "Vybrat kontakt"
@@ -1892,153 +1955,153 @@ msgstr "Zpráva v nepřítomnosti:"
 msgid "Channels:"
 msgstr "Kanály:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
 msgstr "Kód země ISO:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Country:"
 msgstr "ZemÄ›:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "State:"
 msgstr "Kraj:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "City:"
 msgstr "Město:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Area:"
 msgstr "Oblast:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
 msgstr "PSČ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Street:"
 msgstr "Ulice:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
 msgstr "Budova:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Floor:"
 msgstr "Podlaží:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Room:"
 msgstr "Místnost:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Text:"
 msgstr "Text:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:517
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Description:"
 msgstr "Popis:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:519
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:521
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
 msgstr "Úroveň přesnosti:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:523
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr "Chyba:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
 msgstr "Vertikální chyba (v metrech):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:527
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
 msgstr "Horizontální chyba (v metrech):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:529
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr "Rychlost:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:531
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Bearing:"
 msgstr "Azimut:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:533
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
 msgstr "Rychlost stoupání:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:535
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
 msgstr "Poslední aktualizace:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:537
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
 msgstr "Zeměpisná délka:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:945
-#: ../libempathy-gtk/empathy-individual-widget.c:539
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
 msgstr "Zeměpisná šířka:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:947
-#: ../libempathy-gtk/empathy-individual-widget.c:541
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
 msgstr "Nadmořská výška:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1000
-#: ../libempathy-gtk/empathy-contact-widget.c:1015
-#: ../libempathy-gtk/empathy-individual-widget.c:629
-#: ../libempathy-gtk/empathy-individual-widget.c:644
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "Poloha"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1017
-#: ../libempathy-gtk/empathy-individual-widget.c:646
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1069
-#: ../libempathy-gtk/empathy-individual-widget.c:695
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y v %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1151
-#: ../libempathy-gtk/empathy-individual-widget.c:931
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
 msgid "Save Avatar"
 msgstr "Uložit avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1207
-#: ../libempathy-gtk/empathy-individual-widget.c:989
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
 msgid "Unable to save avatar"
 msgstr "Nelze uložit avatar"
 
@@ -2048,7 +2111,7 @@ msgstr "<b>Poloha</b> (dne)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1321
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr "Alias:"
 
@@ -2068,7 +2131,7 @@ msgstr "Podrobnosti o kontaktu"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1525
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "Identifikátor:"
 
@@ -2107,18 +2170,18 @@ msgid "Select"
 msgstr "Vybrat"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1835
+#: ../src/empathy-main-window.c:1807
 msgid "Group"
 msgstr "Skupina"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:257
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Následující identita bude blokována:"
 msgstr[1] "Následující identity budou blokovány:"
 msgstr[2] "Následující identity budou blokovány:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:264
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Následující identitu nelze blokovat:"
@@ -2145,34 +2208,59 @@ msgstr "Kontakty vybrané v seznamu na levé straně budou pospojovány dohromad
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:138
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "Výběr ú�tu pro umístění volání"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "Hovor"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+msgid "Mobile"
+msgstr "Mobilní"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "Pracovní"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "Soukromý"
+
 #. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:594
-#: ../libempathy-gtk/empathy-new-message-dialog.c:248
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:931
+#: ../libempathy-gtk/empathy-individual-menu.c:1142
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Upravit"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:957
+#: ../libempathy-gtk/empathy-individual-menu.c:1168
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "Po_spojovat kontakty…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2340
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 msgid "Delete and _Block"
 msgstr "Smazat a _blokovat"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2509
+#: ../libempathy-gtk/empathy-individual-view.c:2510
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2181,7 +2269,7 @@ msgstr ""
 "Opravdu chcete odstranit pospojovaný kontakt „%s“? Uvědomte si, že tím se "
 "odstraní všechny kontakty, které tento pospojovaný kontakt tvoří."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1672
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2265,127 +2353,137 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "_Rozpojit"
 
-#: ../libempathy-gtk/empathy-log-window.c:458
+#: ../libempathy-gtk/empathy-log-window.c:634
 msgid "History"
 msgstr "Historie"
 
-#: ../libempathy-gtk/empathy-log-window.c:510
+#: ../libempathy-gtk/empathy-log-window.c:689
 msgid "Show"
 msgstr "Zobrazit"
 
-#: ../libempathy-gtk/empathy-log-window.c:532
+#: ../libempathy-gtk/empathy-log-window.c:711
 msgid "Search"
 msgstr "Hledat"
 
-#: ../libempathy-gtk/empathy-log-window.c:946
+#: ../libempathy-gtk/empathy-log-window.c:1159
 #, c-format
 msgid "Chat in %s"
 msgstr "Konverzace v místnosti %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:948
+#: ../libempathy-gtk/empathy-log-window.c:1161
 #, c-format
 msgid "Chat with %s"
 msgstr "Konverzace s kontaktem %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:998
-#: ../libempathy-gtk/empathy-log-window.c:1176
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e. %B %Y, %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1118
+#: ../libempathy-gtk/empathy-log-window.c:1300
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1124
+#: ../libempathy-gtk/empathy-log-window.c:1306
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1195
-#: ../libempathy-gtk/empathy-log-window.c:1197
-#: ../src/empathy-ft-manager.c:1026
-msgid "%"
-msgstr "%"
+#: ../libempathy-gtk/empathy-log-window.c:1382
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s sekunda"
+msgstr[1] "%s sekundy"
+msgstr[2] "%s sekund"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s minuta"
+msgstr[1] "%s minuty"
+msgstr[2] "%s minut"
 
-#: ../libempathy-gtk/empathy-log-window.c:1204
+#: ../libempathy-gtk/empathy-log-window.c:1397
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Hovor trval %s, skon�il %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1536
+#: ../libempathy-gtk/empathy-log-window.c:1729
 msgid "Today"
 msgstr "Dnes"
 
-#: ../libempathy-gtk/empathy-log-window.c:1540
+#: ../libempathy-gtk/empathy-log-window.c:1733
 msgid "Yesterday"
 msgstr "V�era"
 
-#: ../libempathy-gtk/empathy-log-window.c:1556
-msgctxt ""
-"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
 msgid "%e %B %Y"
 msgstr "%e. %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1637
-#: ../libempathy-gtk/empathy-log-window.c:3203
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3444
 msgid "Anytime"
 msgstr "Kdykoli"
 
-#: ../libempathy-gtk/empathy-log-window.c:1717
-#: ../libempathy-gtk/empathy-log-window.c:2154
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2372
 msgid "Anyone"
 msgstr "Kdokoli"
 
-#: ../libempathy-gtk/empathy-log-window.c:2451
+#: ../libempathy-gtk/empathy-log-window.c:2685
 msgid "Who"
 msgstr "Kdo"
 
-#: ../libempathy-gtk/empathy-log-window.c:2655
+#: ../libempathy-gtk/empathy-log-window.c:2889
 msgid "When"
 msgstr "Kdy"
 
-#: ../libempathy-gtk/empathy-log-window.c:2771
+#: ../libempathy-gtk/empathy-log-window.c:3005
 msgid "Anything"
 msgstr "Cokoli"
 
-#: ../libempathy-gtk/empathy-log-window.c:2773
+#: ../libempathy-gtk/empathy-log-window.c:3007
 msgid "Text chats"
 msgstr "Konverzace"
 
-#: ../libempathy-gtk/empathy-log-window.c:2775
+#: ../libempathy-gtk/empathy-log-window.c:3009
+#: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "Hovory"
 
-#: ../libempathy-gtk/empathy-log-window.c:2780
+#: ../libempathy-gtk/empathy-log-window.c:3014
 msgid "Incoming calls"
 msgstr "Příchozí hovory"
 
-#: ../libempathy-gtk/empathy-log-window.c:2781
+#: ../libempathy-gtk/empathy-log-window.c:3015
 msgid "Outgoing calls"
 msgstr "Odchozí hovory"
 
-#: ../libempathy-gtk/empathy-log-window.c:2782
+#: ../libempathy-gtk/empathy-log-window.c:3016
 msgid "Missed calls"
 msgstr "Zmeškané hovory"
 
-#: ../libempathy-gtk/empathy-log-window.c:2804
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "What"
 msgstr "Co"
 
-#: ../libempathy-gtk/empathy-log-window.c:3506
+#: ../libempathy-gtk/empathy-log-window.c:3747
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Opravdu chcete vymazat všechny předchozí konverzace?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3510
+#: ../libempathy-gtk/empathy-log-window.c:3751
 msgid "Clear All"
 msgstr "Vymazat vše"
 
-#: ../libempathy-gtk/empathy-log-window.c:3517
+#: ../libempathy-gtk/empathy-log-window.c:3758
 msgid "Delete from:"
 msgstr "Smazat z:"
 
@@ -2393,13 +2491,6 @@ msgstr "Smazat z:"
 msgid "<span size=\"x-large\">Loading...</span>"
 msgstr "<span size=\"x-large\">Na�ítá se…</span>"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1344
-msgid "Call"
-msgstr "Hovor"
-
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
 #: ../src/empathy-chat-window.ui.h:3
 msgid "Chat"
@@ -2414,13 +2505,14 @@ msgid "Profile"
 msgstr "Profil"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:22
 #: ../src/empathy-streamed-media-window.ui.h:20
 msgid "Video"
 msgstr "Video"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:20
 msgid "_Edit"
 msgstr "_Upravit"
 
@@ -2437,27 +2529,27 @@ msgid "Contact ID:"
 msgstr "ID kontaktu:"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:258
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
 msgid "C_hat"
 msgstr "_Diskuze"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:277
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
 msgstr "Nová konverzace"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:231
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
 msgid "Send _Video"
-msgstr "Odeslat _video"
+msgstr "Přenášet _video"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
 msgid "C_all"
 msgstr "Vol_at"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:252
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "New Call"
 msgstr "Nový hovor"
 
@@ -2517,24 +2609,24 @@ msgid "New %s account"
 msgstr "Nový ú�et %s"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "Najít následující"
+msgid "Find:"
+msgstr "Najít:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "Najít předchozí"
+msgid "Mat_ch case"
+msgstr "Rozlišovat v_elikost písmen"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Find:"
-msgstr "Najít:"
+msgid "Phrase not found"
+msgstr "Fráze nenalezena"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "Rozlišovat velikost znaků"
+msgid "_Next"
+msgstr "_Následující"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "Phrase not found"
-msgstr "Fráze nenalezena"
+msgid "_Previous"
+msgstr "_Předchozí"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2580,34 +2672,28 @@ msgstr "Hovor ukon�en"
 msgid "Edit Custom Messages"
 msgstr "Upravit vlastní zprávy"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
-#: ../src/empathy-chatrooms-window.ui.h:3
-msgid "Remove"
-msgstr "Odstranit"
-
-#: ../libempathy-gtk/empathy-theme-adium.c:1121
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
 #, c-format
 msgid "Message edited at %s"
 msgstr "Zpráva upravena %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1943
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
 msgid "Normal"
 msgstr "Normální"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:75
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "Klasický"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:76
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "Jednoduchý"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:77
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "Čistý"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:78
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "Modrý"
 
@@ -2682,19 +2768,19 @@ msgstr "Zapamatovat tuto volbu pro budoucí připojení"
 msgid "Certificate Details"
 msgstr "Podrobnosti certifikátu"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1653
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
 msgstr "Nelze otevřít URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1748
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
 msgstr "Vybrat soubor"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1820
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
 msgid "Insufficient free space to save file"
 msgstr "Nedostatek volného místa pro uložení souboru"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1828
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2703,7 +2789,7 @@ msgstr ""
 "Pro uložení tohoto souboru je zapotřebí %s volného místa, ale k dispozici je "
 "jen %s. Zvolte prosím jiné umístění."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Příchozí soubor od %s"
@@ -2891,23 +2977,23 @@ msgstr "Není dostupné chybové hlášení"
 msgid "Instant Message (Empathy)"
 msgstr "Rychlá zpráva (Empathy)"
 
-#: ../src/empathy.c:309
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "Nepřipojovat se po spuštění"
 
-#: ../src/empathy.c:313
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Nezobrazovat seznam kontaktů nebo žádné jiné dialogy po spuštění"
 
-#: ../src/empathy.c:321
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr "– komunikátor Empathy"
 
-#: ../src/empathy.c:500
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
 msgstr "Chyba při kontaktování správce ú�tu"
 
-#: ../src/empathy.c:502
+#: ../src/empathy.c:639
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3140,7 +3226,8 @@ msgid "Your new account has not been saved yet."
 msgstr "Váš nový ú�et ještě není uložen."
 
 #: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:801 ../src/empathy-call-window.c:875
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1216
 msgid "Connecting…"
 msgstr "Probíhá připojování…"
 
@@ -3248,121 +3335,116 @@ msgstr "Klient Empathy na ověření totožnosti"
 msgid "People nearby"
 msgstr "Lidé v okolí"
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:124
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr "– audio/videoklient Empathy"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:145
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "Audio/videoklient Empathy"
 
-#: ../src/empathy-streamed-media-window.c:478 ../src/empathy-call-window.c:453
+#: ../src/empathy-streamed-media-window.c:431
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: ../src/empathy-streamed-media-window.c:481 ../src/empathy-call-window.c:456
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Brightness"
 msgstr "Jas"
 
-#: ../src/empathy-streamed-media-window.c:484 ../src/empathy-call-window.c:459
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:589 ../src/empathy-call-window.c:564
+#: ../src/empathy-streamed-media-window.c:542
 msgid "Volume"
 msgstr "Hlasitost"
 
-#: ../src/empathy-streamed-media-window.c:1157
-#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.c:1110
 msgid "_Sidebar"
 msgstr "Po_straní lišta"
 
-#: ../src/empathy-streamed-media-window.c:1177
-#: ../src/empathy-call-window.c:1136
+#: ../src/empathy-streamed-media-window.c:1130
 msgid "Audio input"
 msgstr "Vstup zvuku"
 
-#: ../src/empathy-streamed-media-window.c:1181
-#: ../src/empathy-call-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1134
 msgid "Video input"
 msgstr "Vstup videa"
 
-#: ../src/empathy-streamed-media-window.c:1185
-#: ../src/empathy-call-window.c:1144
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Dialpad"
 msgstr "Tla�ítka vytá�ení"
 
-#: ../src/empathy-streamed-media-window.c:1196
-#: ../src/empathy-call-window.c:1154
+#: ../src/empathy-streamed-media-window.c:1151
 msgid "Details"
 msgstr "Podrobnosti"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1265
-#: ../src/empathy-call-window.c:1237
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1825
 #, c-format
 msgid "Call with %s"
 msgstr "Hovor s %s"
 
-#: ../src/empathy-streamed-media-window.c:1498
-#: ../src/empathy-call-window.c:1434
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:2069
 msgid "The IP address as seen by the machine"
 msgstr "Adresa IP, jak ji vidí po�íta�"
 
-#: ../src/empathy-streamed-media-window.c:1500
-#: ../src/empathy-call-window.c:1436
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:2071
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Adresa IP, jak ji vidí server v Internetu"
 
-#: ../src/empathy-streamed-media-window.c:1502
-#: ../src/empathy-call-window.c:1438
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:2073
 msgid "The IP address of the peer as seen by the other side"
 msgstr "Adresa IP vzájemného spojení, jak ji vidí druhá strana"
 
-#: ../src/empathy-streamed-media-window.c:1504
-#: ../src/empathy-call-window.c:1440
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:2075
 msgid "The IP address of a relay server"
 msgstr "Adresa IP přenosového serveru"
 
-#: ../src/empathy-streamed-media-window.c:1506
-#: ../src/empathy-call-window.c:1442
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:2077
 msgid "The IP address of the multicast group"
 msgstr "Adresa IP vysílací skupiny"
 
-#: ../src/empathy-streamed-media-window.c:1888
+#: ../src/empathy-streamed-media-window.c:1843
 msgctxt "encoding video codec"
 msgid "Unknown"
 msgstr "Neznámý"
 
-#: ../src/empathy-streamed-media-window.c:1891
+#: ../src/empathy-streamed-media-window.c:1846
 msgctxt "encoding audio codec"
 msgid "Unknown"
 msgstr "Neznámý"
 
-#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-streamed-media-window.c:1849
 msgctxt "decoding video codec"
 msgid "Unknown"
 msgstr "Neznámý"
 
-#: ../src/empathy-streamed-media-window.c:1897
+#: ../src/empathy-streamed-media-window.c:1852
 msgctxt "decoding audio codec"
 msgid "Unknown"
 msgstr "Neznámý"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2189
+#: ../src/empathy-streamed-media-window.c:2144
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Připojeno — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2250
-#: ../src/empathy-call-window.c:2154
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2846
 msgid "Technical Details"
 msgstr "Technické podrobnosti"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2192
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2884
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3371,8 +3453,8 @@ msgstr ""
 "Software používaný kontaktem „%s“ nerozumí žádnému z formátů zvuku, který je "
 "podporován na vašem po�íta�i"
 
-#: ../src/empathy-streamed-media-window.c:2293
-#: ../src/empathy-call-window.c:2197
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2889
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3381,8 +3463,8 @@ msgstr ""
 "Software používaný kontaktem „%s“ nerozumí žádnému z formátů videa, který je "
 "podporován na vašem po�íta�i"
 
-#: ../src/empathy-streamed-media-window.c:2299
-#: ../src/empathy-call-window.c:2203
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2895
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3391,29 +3473,29 @@ msgstr ""
 "Nelze navázat spojení s %s. Někdo z vás není nejspíš v síti, která podporuje "
 "přímá spojení."
 
-#: ../src/empathy-streamed-media-window.c:2305
-#: ../src/empathy-call-window.c:2209
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2901
 msgid "There was a failure on the network"
 msgstr "Někde na síti došlo k selhání"
 
-#: ../src/empathy-streamed-media-window.c:2309
-#: ../src/empathy-call-window.c:2213
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2905
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Nemáte nainstalovánu podporu žádného z formátů zvuku potřebného pro tento "
 "hovor"
 
-#: ../src/empathy-streamed-media-window.c:2312
-#: ../src/empathy-call-window.c:2216
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2908
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Nemáte nainstalovánu podporu žádného z formátů videa potřebného pro tento "
 "hovor"
 
-#: ../src/empathy-streamed-media-window.c:2322
-#: ../src/empathy-call-window.c:2228
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2920
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3424,36 +3506,31 @@ msgstr ""
 "prosím tuto chybu</a> a přiložte chybové zprávy získané z odla�ovacího okna "
 "v nabídce „Nápověda“."
 
-#: ../src/empathy-streamed-media-window.c:2330
-#: ../src/empathy-call-window.c:2237
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2929
 msgid "There was a failure in the call engine"
 msgstr "Selhala funkce pro volání"
 
-#: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:2240
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2932
 msgid "The end of the stream was reached"
 msgstr "Byl dosažen konec proudu"
 
-#: ../src/empathy-streamed-media-window.c:2373
-#: ../src/empathy-call-window.c:2280
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2972
 msgid "Can't establish audio stream"
 msgstr "Nelze navázat spojení pro přenos zvuku"
 
-#: ../src/empathy-streamed-media-window.c:2383
-#: ../src/empathy-call-window.c:2290
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2982
 msgid "Can't establish video stream"
 msgstr "Nelze navázat spojení pro přenos obrazu"
 
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
 #: ../src/empathy-streamed-media-window.ui.h:1
 msgid "Audio"
 msgstr "Zvuk"
 
-#: ../src/empathy-call-window.ui.h:2
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Znovu zavolat"
-
 #: ../src/empathy-call-window.ui.h:3
 #: ../src/empathy-streamed-media-window.ui.h:5
 msgid "Decoding Codec:"
@@ -3496,55 +3573,94 @@ msgid "Minimise me"
 msgstr "Minimalizovat"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Vyto�it znovu"
-
-#: ../src/empathy-call-window.ui.h:13
 #: ../src/empathy-streamed-media-window.ui.h:15
 msgid "Remote Candidate:"
 msgstr "Vzdálený ú�astník:"
 
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:13
 #: ../src/empathy-streamed-media-window.ui.h:16
 msgid "Send Audio"
 msgstr "Vysílat zvuk"
 
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:14
 msgid "Send Video"
 msgstr "Vysílat obraz"
 
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:15
 msgid "Show dialpad"
 msgstr "Zobrazit �íselník"
 
+#: ../src/empathy-call-window.ui.h:16
+msgid "Start a video call"
+msgstr "Za�ít videohovor"
+
 #: ../src/empathy-call-window.ui.h:17
+msgid "Start an audio call"
+msgstr "Za�ít hovor"
+
+#: ../src/empathy-call-window.ui.h:18
+msgid "Swap camera"
+msgstr "Prohodit kamery"
+
+#: ../src/empathy-call-window.ui.h:19
 #: ../src/empathy-streamed-media-window.ui.h:17
 msgid "Toggle audio transmission"
 msgstr "Přepnout přenos zvuku"
 
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:20
 msgid "Toggle video transmission"
 msgstr "Přepnout vysílání obrazu"
 
-#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:1800 ../src/empathy-call-window.c:1801
-#: ../src/empathy-call-window.c:1802 ../src/empathy-call-window.c:1803
+#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
+#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
 msgid "Unknown"
 msgstr "Neznámo"
 
-#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:23
+msgid "Video call"
+msgstr "Videohovor"
+
+#: ../src/empathy-call-window.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "_Hovor"
 
-#: ../src/empathy-call-window.ui.h:23 ../src/empathy-main-window.ui.h:30
+#: ../src/empathy-call-window.ui.h:25
+msgid "_Camera"
+msgstr "_Kamera"
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:18
+msgid "_Contents"
+msgstr "_Obsah"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
+msgid "_Debug"
+msgstr "La_dit"
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:22
+msgid "_Help"
+msgstr "_Nápověda"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Microphone"
+msgstr "_Mikrofon"
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "_Settings"
+msgstr "Na_stavení"
+
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_Zobrazit"
 
-#: ../src/empathy-chat-window.c:480 ../src/empathy-chat-window.c:500
+#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3552,7 +3668,7 @@ msgstr[0] "%s (%d nepře�tena)"
 msgstr[1] "%s (%d nepře�tené)"
 msgstr[2] "%s (%d nepře�tených)"
 
-#: ../src/empathy-chat-window.c:492
+#: ../src/empathy-chat-window.c:493
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3560,7 +3676,7 @@ msgstr[0] "%s (a %u další)"
 msgstr[1] "%s (a %u další)"
 msgstr[2] "%s (a %u dalších)"
 
-#: ../src/empathy-chat-window.c:508
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3568,7 +3684,7 @@ msgstr[0] "%s (%d nepře�tená od ostatních)"
 msgstr[1] "%s (%d nepře�tené od ostatních)"
 msgstr[2] "%s (%d nepře�tených od ostatních)"
 
-#: ../src/empathy-chat-window.c:517
+#: ../src/empathy-chat-window.c:518
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3576,11 +3692,11 @@ msgstr[0] "%s (%d nepře�tená ode všech)"
 msgstr[1] "%s (%d nepře�tené ode všech)"
 msgstr[2] "%s (%d nepře�tených ode všech)"
 
-#: ../src/empathy-chat-window.c:732
+#: ../src/empathy-chat-window.c:733
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:742
+#: ../src/empathy-chat-window.c:743
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3588,7 +3704,7 @@ msgstr[0] "Odesílá se zpráva"
 msgstr[1] "Odesílají se %d zprávy"
 msgstr[2] "Odesílá se %d zpráv"
 
-#: ../src/empathy-chat-window.c:764
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
 msgstr "Píše zprávu."
 
@@ -3620,10 +3736,6 @@ msgstr "Posunout kartu do_prava"
 msgid "Notify for All Messages"
 msgstr "Upozorňovat na všechny zprávy"
 
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:18
-msgid "_Contents"
-msgstr "_Obsah"
-
 #: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "_Konverzace"
@@ -3636,10 +3748,6 @@ msgstr "_Oddělit kartu"
 msgid "_Favorite Chat Room"
 msgstr "_Oblíbená diskuzní místnost"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:22
-msgid "_Help"
-msgstr "_Nápověda"
-
 #: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "_Následující karta"
@@ -3676,95 +3784,96 @@ msgstr "Automaticky připojit"
 msgid "Manage Favorite Rooms"
 msgstr "Spravovat oblíbené místnosti"
 
-#: ../src/empathy-event-manager.c:522
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming video call"
 msgstr "Příchozí videohovor"
 
-#: ../src/empathy-event-manager.c:522
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
 msgid "Incoming call"
 msgstr "Příchozí hovor"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:525
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "Volá vám %s, chcete to zvednout?"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "Volá vám %s, chcete to zvednout?"
 
-#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
-#: ../src/empathy-event-manager.c:764
+#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Příchozí hovor od %s"
 
-#: ../src/empathy-event-manager.c:555
+#: ../src/empathy-event-manager.c:554
 msgid "_Reject"
 msgstr "O_dmítnout"
 
-#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
 msgid "_Answer"
 msgstr "_Zvednout"
 
-#: ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:570
 msgid "_Answer with video"
 msgstr "_Videohovor"
 
-#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
+#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Příchozí videohovor od %s"
 
-#: ../src/empathy-event-manager.c:837
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
 msgstr "Pozvání do místnosti"
 
-#: ../src/empathy-event-manager.c:839
+#: ../src/empathy-event-manager.c:838
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Pozvánka na připojení %s"
 
-#: ../src/empathy-event-manager.c:846
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s vás zve do %s"
 
-#: ../src/empathy-event-manager.c:854
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
 msgstr "O_dmítnout"
 
-#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "Připo_jit"
 
-#: ../src/empathy-event-manager.c:886
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s vás pozval do %s"
 
-#: ../src/empathy-event-manager.c:892
+#: ../src/empathy-event-manager.c:891
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Byli jste pozváni do %s"
 
-#: ../src/empathy-event-manager.c:943
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Příchozí přenos souboru od %s"
 
-#: ../src/empathy-event-manager.c:1135 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
 msgid "Password required"
 msgstr "Požadováno heslo"
 
-#: ../src/empathy-event-manager.c:1191
+#: ../src/empathy-event-manager.c:1190
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s by chtěl oprávnění vidět, když jste dostupný"
 
-#: ../src/empathy-event-manager.c:1195
+#: ../src/empathy-event-manager.c:1194
 #, c-format
 msgid ""
 "\n"
@@ -3864,6 +3973,10 @@ msgstr "Ověřuje se neporušenost „%s“"
 msgid "Hashing \"%s\""
 msgstr "Vytváří se kontrolní sou�et „%s“"
 
+#: ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "%"
+
 #: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "Soubor"
@@ -3941,111 +4054,104 @@ msgid "Top up account credit"
 msgstr "Dobít kredit ú�tu"
 
 #. top up button
-#: ../src/empathy-main-window.c:1050
+#: ../src/empathy-main-window.c:1046
 msgid "Top Up..."
 msgstr "Dobít kredit…"
 
-#: ../src/empathy-main-window.c:1817
+#: ../src/empathy-main-window.c:1789
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../src/empathy-main-window.c:2169
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "Seznam kontaktů"
 
-#: ../src/empathy-main-window.c:2287
-msgid "Show and edit accounts"
-msgstr "Zobrazit a upravit ú�ty"
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "Kontakty na _mapÄ›"
 
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-main-window-menubar.ui.h:2
 msgid "Credit Balance"
 msgstr "Zůstatek kreditu"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "Najít v seznamu _kontaktů"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "Připojit se do _oblíbených"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "Spravovat oblíbené"
 
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "N_ormální velikost"
 
-#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "Nový _hovor…"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "Normální velikost, s _avatary"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "_Nastavení"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "Vypsat p_rotokoly"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "Řadit podle jmé_na"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "Řadit podle s_tavu"
 
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "Ú�_ty"
 
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "_Blokované kontakty"
 
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "_Kompaktní velikost"
 
-#: ../src/empathy-main-window.ui.h:19
-msgid "_Debug"
-msgstr "La_dit"
-
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "Přenosy _souborů"
 
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "Připo_jit…"
 
-#: ../src/empathy-main-window.ui.h:24 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "_Nová konverzace…"
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "_Odpojené kontakty"
 
-#: ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "_O mnÄ›"
 
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "_Místnost"
 
-#: ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-main-window-menubar.ui.h:29
 msgid "_Search for Contacts…"
 msgstr "_Hledat kontakty…"
 
@@ -4116,79 +4222,79 @@ msgstr "Seznam místností"
 msgid "_Room:"
 msgstr "_Místnost:"
 
-#: ../src/empathy-preferences.c:156
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr "Zpráva přijata"
 
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr "Zpráva odeslána"
 
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
 msgstr "Nová konverzace"
 
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
 msgstr "Kontakt se připojil"
 
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
 msgstr "Kontakt se odpojil"
 
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
 msgstr "Ú�et připojen"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
 msgstr "Ú�et odpojen"
 
-#: ../src/empathy-preferences.c:459
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr "Jazyk"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:709
+#: ../src/empathy-preferences.c:734
 msgid "Juliet"
 msgstr "Julie"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:716
+#: ../src/empathy-preferences.c:741
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:722
+#: ../src/empathy-preferences.c:747
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Ach Romeo, Romeo! Pro� jsi Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:750
 msgid "Deny thy father and refuse thy name;"
 msgstr "Své jméno zapři, odřekni se otce,"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:728
+#: ../src/empathy-preferences.c:753
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "anebo, nechceš-li, zasvěť se mně,"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:731
+#: ../src/empathy-preferences.c:756
 msgid "And I'll no longer be a Capulet."
 msgstr "a přestanu být Kapuletová."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:759
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Mám ještě poslouchat? Či odpovím?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:737
+#: ../src/empathy-preferences.c:762
 msgid "Juliet has disconnected"
 msgstr "Julie se odpojila"
 
-#: ../src/empathy-preferences.c:1135
+#: ../src/empathy-preferences.c:1166
 msgid "Preferences"
 msgstr "Nastavení"
 
@@ -4196,68 +4302,88 @@ msgstr "Nastavení"
 msgid "Appearance"
 msgstr "Vzhled"
 
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
 msgstr "Chování"
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
 msgid "Chat Th_eme:"
 msgstr "Vzhl_ed diskuze:"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
 msgid "Disable notifications when _away or busy"
 msgstr ""
 "Nezobrazovat upozornění v případě mé nepřítomnosti nebo z_aneprázdněnosti"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
 msgid "Disable sounds when _away or busy"
 msgstr "Vypnout zvuky v případě mé nepřítomnosti nebo z_aneprázdněnosti"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Zobrazovat příchozí události v oznamovací oblasti"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"Potla�ení ozvěny pomáhá, aby váš hlas zněl protější osobě �istěji, ale na "
+"některých po�íta�ích to může způsobovat problémy. Pokud vy nebo protější "
+"osoba slyšíte během hovoru podivné zvuky nebo závady, zkuste potla�ení "
+"ozvěny vypnout a hovor za�ít znovu."
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "Upozornit při připojení uživatele"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "Upozornit při odpojení uživatele"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Povolit upozornění, pokud disku_ze není vybrána"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "Povolit kontrolu pravopisu pro jazyky:"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "Všeobecné"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input level:"
+msgstr "Úroveň vstupu:"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "Hlasitost vstupu:"
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "Zdroje polohy:"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "Zaznamenávat konverzace"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "Upozornění"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Přehrávat zvuky při událostech"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "Soukromí"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -4266,71 +4392,71 @@ msgstr ""
 "Při omezené přesnosti polohy bude zobrazen pouze stát, kraj a město. "
 "Souřadnice GPS budou zaokrouhleny na 1 desetinné místo."
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "Zobrazovat _smajlíky jako obrázky"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "_Zobrazit seznam kontaktů v místnostech"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "Zvuky"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "Kontrola pravopisu"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 "Seznam jazyků obsahuje pouze jazyky, pro které máte nainstalovány slovníky."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "Motivy"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "Varianta:"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "Připojovat se _automaticky po spuštění "
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Mobil"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "P_ovolit bublinová upozornění"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "_Povolit zvuková upozornění"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Síť (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "_Otevírat nové diskuze v oddělených oknech"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "Zveřejnit _kontaktům polohu"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "O_mezit přesnost polohy"
 
@@ -4342,6 +4468,10 @@ msgstr "Stav"
 msgid "_Quit"
 msgstr "U_kon�it"
 
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "Znovu zavolat"
+
 #: ../src/empathy-streamed-media-window.ui.h:3
 msgid "Camera Off"
 msgstr "Kamera vypnuta"
@@ -4366,6 +4496,10 @@ msgstr "Zapnout kameru ale nepovolovat vysílání obrazu"
 msgid "Preview"
 msgstr "Náhled"
 
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "Vyto�it znovu"
+
 #: ../src/empathy-streamed-media-window.ui.h:19
 msgid "V_ideo"
 msgstr "V_ideo"
@@ -4386,78 +4520,78 @@ msgstr "Náhled videa"
 msgid "Contact Map View"
 msgstr "Zobrazení kontaktů na mapě"
 
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
 msgid "Save"
 msgstr "Uložit"
 
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
 msgstr "Ladící okno"
 
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
 msgstr "Pozastavit"
 
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
 msgstr "Úroveň "
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
 msgid "Debug"
-msgstr "Ladit"
+msgstr "Ladění"
 
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
 msgid "Info"
 msgstr "Informace"
 
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
 msgid "Message"
 msgstr "Zpráva"
 
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
 msgid "Warning"
 msgstr "Varování"
 
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
 msgid "Critical"
 msgstr "Kritické"
 
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
 msgid "Error"
 msgstr "Chyba"
 
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
 msgid "Time"
 msgstr "ÄŒas"
 
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
 msgid "Domain"
 msgstr "Doména"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
 msgstr "Kategorie"
 
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "Úroveň"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "Vybraný správce připojení nepodporuje rozšíření pro vzdálené ladění."
 
-#: ../src/empathy-invite-participant-dialog.c:429
-#: ../src/empathy-invite-participant-dialog.c:477
+#: ../src/empathy-invite-participant-dialog.c:179
+#: ../src/empathy-invite-participant-dialog.c:205
 msgid "Invite Participant"
 msgstr "Přizvat ú�astníka"
 
-#: ../src/empathy-invite-participant-dialog.c:430
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Zvolte kontakt, který chcete přizvat do konverzace: "
 
-#: ../src/empathy-invite-participant-dialog.c:473
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "Pozvat"
 
@@ -4484,13 +4618,21 @@ msgstr "<ID ú�tu>"
 
 #: ../src/empathy-accounts.c:198
 msgid "- Empathy Accounts"
-msgstr "- Ú�ty Empathy"
+msgstr "– Ú�ty Empathy"
 
 #: ../src/empathy-accounts.c:237
 msgid "Empathy Accounts"
 msgstr "Ú�ty Empathy"
 
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr "Zobrazit konkrétní službu"
+
+#: ../src/empathy-debugger.c:75
+msgid "- Empathy Debugger"
+msgstr "– Ladění Empathy"
+
+#: ../src/empathy-debugger.c:114
 msgid "Empathy Debugger"
 msgstr "Ladění Empathy"
 
@@ -4503,11 +4645,13 @@ msgid "Respond"
 msgstr "Odpovědět"
 
 #: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1459
 msgid "Reject"
 msgstr "Odmítnout"
 
 #: ../src/empathy-notifications-approver.c:222
 #: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1460
 msgid "Answer"
 msgstr "Zvednout"
 
@@ -4525,36 +4669,42 @@ msgstr "Odmítnout"
 msgid "Accept"
 msgstr "Přijmout"
 
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
 #: ../src/empathy-notifications-approver.c:260
 msgid "Provide"
 msgstr "Poskytnout"
 
-#: ../src/empathy-call-observer.c:135
+#: ../src/empathy-call-observer.c:134
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s vám právě zkouší volat, ale vy máte jiný hovor."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:782 ../src/empathy-call-window.c:796
+#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:1244
-#, c-format
-msgid "Call with %d participants"
-msgstr "Hovor s %d ú�astníky"
+#: ../src/empathy-call-window.c:2775
+msgid "On hold"
+msgstr "Čeká na lince"
+
+#: ../src/empathy-call-window.c:2778
+msgid "Mute"
+msgstr "Ztišit"
+
+#: ../src/empathy-call-window.c:2780
+msgid "Duration"
+msgstr "Doba"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2091
+#: ../src/empathy-call-window.c:2783
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:2092
-msgid "On hold"
-msgstr "Čeká na lince"
-
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "Rozlišovat velikost _znaků"
diff --git a/po/da.po b/po/da.po
index 139208275..8bbb23479 100644
--- a/po/da.po
+++ b/po/da.po
@@ -26,8 +26,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-03 17:44+0200\n"
-"PO-Revision-Date: 2011-04-03 00:28+0200\n"
+"POT-Creation-Date: 2011-09-16 13:32+0200\n"
+"PO-Revision-Date: 2011-09-16 13:41+0200\n"
 "Last-Translator: Kenneth Nielsen <k.nielsen81@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
@@ -58,6 +58,22 @@ msgid "Always open a separate chat window for new chats."
 msgstr "Ã…bn altid et separat chatvindue til nye chats."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr "Opkaldslydstyrke"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr "Opkaldslydstyrke, som en procentdel."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Camera device"
+msgstr "Kameraenhed"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "Kameraposition"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -65,46 +81,55 @@ msgstr ""
 "Tegn som skal tilføjes efter kaldenavn når du bliver navnefuldførelse (tab) "
 "i gruppechat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "Tema for chatvindue"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+msgid "Chat window theme variant"
+msgstr "Temavariant for chatvindue"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "Kommaadskilt liste af sprog, der skal bruges ved stavekontrol (f.eks. \"en, "
 "fr, nl\")."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "Kompakt kontaktliste"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "Forbindelseshåndteringer bør bruges"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "Sorteringskriterium for kontaktliste"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr ""
+"Standardkameraenheden som skal bruges ved videoopkald, f.eks. /dev/video0."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
 msgstr "Standardmappe at vælge profilbillede fra"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr "Deaktivér pop op-påmindelse ved fravær"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr "Deaktivér lyde ved fravær"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
 msgstr "Deaktiver indkommende begivenheder i statusområde"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -112,235 +137,253 @@ msgstr ""
 "Deaktiver indkommende begivenheder i statusområde. Præsenter dem til "
 "brugeren med det samme hvis den er sat til falsk."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+# Der er en streng et andet sted som afslører at det er lydekko der menes
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+msgid "Echo cancellation support"
+msgstr "Understøttelse for neutralisering af ekko"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr "Empathy må offentliggøre brugerens placering"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy må bruge GPS'en til at gætte placeringen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy må bruge mobilnetværket til at gætte placeringen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy må bruge netværket til at gætte placeringen"
 
 # Lidt klodset for at undgå at bruge download
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr "Standardmappe til hentede filer i Empathy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
 msgstr "Empathy har konverteret butterfly-logge"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy skal automatisk sættes til fraværende ved inaktivitet"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy skal autoforbinde ved start"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy skal reducere placeringens nøjagtighed"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy skal bruge kontaktens profilbillede som chattens vinduesikon"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr "Slå WebKit-udviklingsværktøjer til"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "Aktivér pop op-påmindelser for nye beskeder"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "Aktivér stavekontrol"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "Skjul hovedvindue"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "Skjul hovedvinduet."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "Navnefuldførelsestegn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "Ã…bn nye chats i separate vinduer"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "Sti til Adium-temaet, der skal bruges"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "Sti til adium-temaet, der skal bruges hvis Adium bruges som chat-tema."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Afspil en lyd ved indkommende beskeder"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "Afspil en lyd ved nye samtaler"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Afspil en lyd ved udgående beskeder"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "Afspil en lyd når en kontakt logger ind"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "Afspil en lyd når en kontakt logger ud"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "Afspil en lyd når vi logger ind"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "Afspil en lyd når vi logger ud"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Pop op-påmindelser hvis chatten ikke er i fokus"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "Pop op-påmindelser når en kontakt logger på"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "Pop op-påmindelser når en kontakt logger af"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr "Positionen for kameraforhåndsvisningen under et opkald."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+msgid "Show Balance in contact list"
+msgstr "Vis saldo i kontaktliste"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "Vis profilbilleder"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "Vis kontaktliste i rum"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr "Vis fif om lukning af hovedvinduet"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr "Vis offline kontakter"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
 msgstr "Vis protokoller"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "Stavekontrolleringssprog"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr "Den forvalgte mappe at gemme filoverførsler i."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Den seneste mappe som et profilbillede blev valgt fra."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
 msgstr "Positionen af chatvinduets sidepanel"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "Den gemte positionen (i billedpunkter) af chatvinduets sidepanel."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Det tema der bruges ved visning af samtalen i chatvinduer."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "Den temavariant der bruges ved visning af samtalen i chatvinduer."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Benyt grafiske tekstansigter"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "Benyt påmindelseslyde"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "Brug tema til chatrum"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr ""
 "Hvorvidt Empathy har lov til at offentliggøre brugerens placering overfor "
 "kontakterne."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Hvorvidt Empathy har lov til at bruge GPS til at gætte placeringen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
 "Hvorvidt Empathy har lov til at bruge mobilnetværket til at gætte "
 "placeringen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
 msgstr ""
 "Hvorvidt Empathy har lov til at bruge netværket til at gætte placeringen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "Om Empathy har konverteret butterfly-logge."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Om Empathy automatisk skal logge ind på dine konti ved opstart."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
 "Om der skal skiftes til \"fraværende\" automatisk, hvis brugeren ikke laver "
 "noget."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 "Hvorvidt Empathy skal reducere placeringens nøjagtighed af hensyn til "
 "privatlivet."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 "Om Empathy skal bruge kontaktens profilbillede som ikon for chatvinduet."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Hvorvidt WebKit-udviklingsværktøjer, som f.eks. Web Inspector, skal slås til."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
@@ -348,71 +391,75 @@ msgstr ""
 "Om der skal bruges forbindelseshåndteringer til, automatisk at afbryde/"
 "genforbinde."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr ""
 "Om der skal anvendes stavekontrol for de sprog, du har angivet, på de ord, "
 "du skriver."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "Om tekstansigter skal konverteres til grafiske billeder i samtaler."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Hvorvidt Pulseaudio's ekkoneutraliseringsfilter skal aktiveres."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr ""
 "Om der skal afspilles en lyd, for at gøre opmærksom på kontakter som logger "
 "på netværket."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
 "Om der skal afspilles en lyd, for at gøre opmærksom på kontakter som logger "
 "af netværket."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "Om der skal afspilles en lyd for at gøre opmærksom på begivenheder."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr ""
 "Om der skal afspilles en lyd for at gøre opmærksom på indkommende beskeder."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Om der skal afspilles en lyd for at gøre opmærksom på nye samtaler."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr ""
 "Om der skal afspilles en lyd for at gøre opmærksom på udgående beskeder."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "Om der skal afspilles en lyd, når der logges på et netværk."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Om der skal afspilles en lyd, når der logges af et netværk."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr ""
 "Om der skal afspilles lydpåmindelser, når brugeren er fraværende, eller har "
 "travlt."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "Om der skal vises pop op-påmindelser, når en kontakt logger af."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "Om der skal vises pop op-påmindelser, når en kontakt logger på."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -420,42 +467,46 @@ msgstr ""
 "Om der skal vises en pop op-påmindelse ved modtagelse af en ny besked, selv "
 "hvis chatten allerede er åben, men ikke er fokuseret."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "Om der skal vises en pop op-påmindelse ved modtagelse af en ny besked."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+msgid "Whether to show account balances in the contact list."
+msgstr "Hvorvidt der skal vises kontosaldi i kontaktlisten."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 "Om der skal vises profilbilleder for kontakter i kontaktlisten og "
 "chatvinduer."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "Om kontakter der ikke er tilsluttet, skal vises i kontaktlisten."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
 msgstr ""
 "Om der skal vises pop op-påmindelser, når brugeren er fraværende eller har "
 "travlt."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr ""
 "Om der skal vises profilbilleder for kontakter i kontaktlisten og "
 "chatvinduer."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Hvorvidt kontaktlisten skal vises i chatrum."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "Om kontaktlisten skal vises i kompakt form eller ej."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -463,11 +514,11 @@ msgstr ""
 "Om beskeddialogen om at lukke hovedvinduet med \"x\"-knappen i titelbjælken "
 "skal vises."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "Om temaet skal bruges til chatrum eller ej."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -483,7 +534,7 @@ msgstr "Håndtér konti for meddelelser og VoIP"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2269
+#: ../src/empathy-accounts-dialog.c:2324
 msgid "Messaging and VoIP Accounts"
 msgstr "Konti for meddelelser og VoIP"
 
@@ -491,18 +542,34 @@ msgstr "Konti for meddelelser og VoIP"
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Filoverførsel fuldført, men filen blev beskadiget"
 
-#: ../libempathy/empathy-ft-handler.c:1113
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
 msgstr "Filoverførsel understøttes ikke af fjernkontakten"
 
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is not a regular file"
 msgstr "Den valgte fil er ikke en regulær fil"
 
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1176
 msgid "The selected file is empty"
 msgstr "Den valgte fil er tom"
 
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#, c-format
+msgid "Missed call from %s"
+msgstr "Mistede opkald fra %s"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, c-format
+msgid "Called %s"
+msgstr "Ringede til %s"
+
+#: ../libempathy/empathy-message.c:422
+#, c-format
+msgid "Call from %s"
+msgstr "Opkald fra %s"
+
 #: ../libempathy/empathy-tp-file.c:268
 msgid "Socket type not supported"
 msgstr "Sokkeltype understøttet ikke"
@@ -531,152 +598,145 @@ msgstr "Fejl ved forsøg på overførsel af filen"
 msgid "The other participant is unable to transfer the file"
 msgstr "Den anden deltager er ikke i stand til at overføre filen"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:383
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
 msgid "Unknown reason"
 msgstr "Ukendt årsag"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:222
 msgid "Available"
 msgstr "Tilgængelig"
 
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:224
 msgid "Busy"
 msgstr "Optaget"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:227
 msgid "Away"
 msgstr "Ikke til stede"
 
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:229
 msgid "Invisible"
 msgstr "Usynlig"
 
-#: ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-utils.c:231
 msgid "Offline"
 msgstr "Offline"
 
 #. translators: presence type is unknown
-#. translators: encoding video codec is unknown
-#. translators: encoding audio codec is unknown
-#. translators: decoding video codec is unknown
-#. translators: decoding audio codec is unknown
-#: ../libempathy/empathy-utils.c:316
-#: ../src/empathy-streamed-media-window.c:1905
-#: ../src/empathy-streamed-media-window.c:1907
-#: ../src/empathy-streamed-media-window.c:1909
-#: ../src/empathy-streamed-media-window.c:1911
-#: ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:234
+msgctxt "presence"
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:274
 msgid "No reason specified"
 msgstr "Ingen årsag angivet"
 
-#: ../libempathy/empathy-utils.c:357 ../libempathy/empathy-utils.c:413
+#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
 msgid "Status is set to offline"
 msgstr "Status sat til offline"
 
-#: ../libempathy/empathy-utils.c:359 ../libempathy/empathy-utils.c:393
+#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "Netværksfejl"
 
-#: ../libempathy/empathy-utils.c:361 ../libempathy/empathy-utils.c:395
+#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
 msgid "Authentication failed"
 msgstr "Godkendelse mislykkedes"
 
-#: ../libempathy/empathy-utils.c:363 ../libempathy/empathy-utils.c:397
+#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
 msgid "Encryption error"
 msgstr "Krypteringsfejl"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:284
 msgid "Name in use"
 msgstr "Navn i brug"
 
-#: ../libempathy/empathy-utils.c:367 ../libempathy/empathy-utils.c:399
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
 msgid "Certificate not provided"
 msgstr "Certifikat ikke givet"
 
-#: ../libempathy/empathy-utils.c:369 ../libempathy/empathy-utils.c:401
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
 msgid "Certificate untrusted"
 msgstr "Certifikat utroværdigt"
 
-#: ../libempathy/empathy-utils.c:371 ../libempathy/empathy-utils.c:403
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
 msgid "Certificate expired"
 msgstr "Certifikat udløbet"
 
-#: ../libempathy/empathy-utils.c:373 ../libempathy/empathy-utils.c:405
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
 msgid "Certificate not activated"
 msgstr "Certifikat ikke aktiveret"
 
-#: ../libempathy/empathy-utils.c:375 ../libempathy/empathy-utils.c:407
+#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
 msgid "Certificate hostname mismatch"
 msgstr "Certifikat-værtsnavn passer ikke"
 
-#: ../libempathy/empathy-utils.c:377 ../libempathy/empathy-utils.c:409
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate fingerprint mismatch"
 msgstr "Certifikat-fingeraftryk passer ikke"
 
-#: ../libempathy/empathy-utils.c:379 ../libempathy/empathy-utils.c:411
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate self-signed"
 msgstr "Certifikat selv-underskrevet"
 
-#: ../libempathy/empathy-utils.c:381
+#: ../libempathy/empathy-utils.c:300
 msgid "Certificate error"
 msgstr "Certifikatfejl"
 
-#: ../libempathy/empathy-utils.c:415
+#: ../libempathy/empathy-utils.c:334
 msgid "Encryption is not available"
 msgstr "Kryptering er ikke tilgængelig"
 
-#: ../libempathy/empathy-utils.c:417
+#: ../libempathy/empathy-utils.c:336
 msgid "Certificate is invalid"
 msgstr "Certifikatet er ugyldigt"
 
-#: ../libempathy/empathy-utils.c:419
+#: ../libempathy/empathy-utils.c:338
 msgid "Connection has been refused"
 msgstr "Tilslutningen er blevet afvist"
 
-#: ../libempathy/empathy-utils.c:421
+#: ../libempathy/empathy-utils.c:340
 msgid "Connection can't be established"
 msgstr "Forbindelsen kunne ikke etableres"
 
-#: ../libempathy/empathy-utils.c:423
+#: ../libempathy/empathy-utils.c:342
 msgid "Connection has been lost"
 msgstr "Forbindelsen blev brudt"
 
-#: ../libempathy/empathy-utils.c:425
+#: ../libempathy/empathy-utils.c:344
 msgid "This resource is already connected to the server"
 msgstr "Denne ressource er allerede forbundet til serveren"
 
-#: ../libempathy/empathy-utils.c:427
+#: ../libempathy/empathy-utils.c:346
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Forbindelse er blevet erstattet af en ny forbindelse, der bruger samme "
 "ressource"
 
-#: ../libempathy/empathy-utils.c:430
+#: ../libempathy/empathy-utils.c:349
 msgid "The account already exists on the server"
 msgstr "Kontoen findes allerede på serveren"
 
-#: ../libempathy/empathy-utils.c:432
+#: ../libempathy/empathy-utils.c:351
 msgid "Server is currently too busy to handle the connection"
 msgstr ""
 "Serveren har på nuværende tidspunkt for travlt til at håndtere forbindelsen"
 
-#: ../libempathy/empathy-utils.c:434
+#: ../libempathy/empathy-utils.c:353
 msgid "Certificate has been revoked"
 msgstr "Certifikatet er blevet tilbagekaldt"
 
-#: ../libempathy/empathy-utils.c:436
+#: ../libempathy/empathy-utils.c:355
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Certifikatet bruger en usikker krypteringsalgoritme eller er kryptografisk "
 "svag"
 
-#: ../libempathy/empathy-utils.c:439
+#: ../libempathy/empathy-utils.c:358
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -684,152 +744,144 @@ msgstr ""
 "Længden af servercertifikatet, eller dybden af servercertifikatkæden, "
 "overskrider krypteringsbibliotekets grænser"
 
-#: ../libempathy/empathy-utils.c:602
+#: ../libempathy/empathy-utils.c:519
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "Folk i nærheden"
 
-#: ../libempathy/empathy-utils.c:607
+#: ../libempathy/empathy-utils.c:524
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:636
+#: ../libempathy/empathy-utils.c:553
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:637
+#: ../libempathy/empathy-utils.c:554
 msgid "Facebook Chat"
 msgstr "Facebook-chat"
 
-#: ../libempathy/empathy-time.c:137
+#: ../libempathy/empathy-time.c:88
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d sekund siden"
 msgstr[1] "%d sekunder siden"
 
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:93
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minut siden"
 msgstr[1] "%d minutter siden"
 
-#: ../libempathy/empathy-time.c:147
+#: ../libempathy/empathy-time.c:98
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d time siden"
 msgstr[1] "%d timer siden"
 
-#: ../libempathy/empathy-time.c:152
+#: ../libempathy/empathy-time.c:103
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d dag siden"
 msgstr[1] "%d dage siden"
 
-#: ../libempathy/empathy-time.c:157
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d uge siden"
 msgstr[1] "%d uger siden"
 
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:113
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d måned siden"
 msgstr[1] "%d måneder siden"
 
-#: ../libempathy/empathy-time.c:167
+#: ../libempathy/empathy-time.c:136
 msgid "in the future"
 msgstr "i fremtiden"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:491
-msgid "All"
-msgstr "Alle"
+#: ../libempathy-gtk/empathy-account-chooser.c:540
+msgid "All accounts"
+msgstr "Alle Konti"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../libempathy-gtk/empathy-log-window.c:643
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "Konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "Adgangskode"
 
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:685
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:757
-#: ../libempathy-gtk/empathy-account-widget.c:814
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1166
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "Mine Webkonti"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "Kontoen %s redigeres via Mine Webkonti."
+msgid "The account %s is edited via %s."
+msgstr "Kontoen %s redigeres via %s."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1172
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "Kontoen %s kan ikke redigeres i Empathy."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
 msgstr "Start Mine Webkonti"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1530
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "Redigér %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Brugernavn:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1897
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "An_vend"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1927
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
 msgstr "L_og ind"
 
-#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1993
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:520
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1481
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "Konto:"
-
-#. translators: this is the label of a checkbox used to enable/disable IM
-#. * accounts
-#: ../libempathy-gtk/empathy-account-widget.c:2006
-msgid "_Enabled"
-msgstr "_Aktiveret"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2071
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "Denne konto findes allerede på serveren"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2074
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "Opret en ny konto på serveren"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2266
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "_Annuller"
 
@@ -838,19 +890,19 @@ msgstr "_Annuller"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2563
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s på %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2589
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "%s-konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2593
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "Ny konto"
 
@@ -862,6 +914,7 @@ msgstr "<b>Eksempel:</b> MitNavn"
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -875,7 +928,7 @@ msgstr "Avanceret"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "Pass_word:"
 msgstr "_Adgangskode:"
@@ -885,7 +938,7 @@ msgstr "_Adgangskode:"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
 msgid "Remember Password"
 msgstr "Husk adgangskode"
 
@@ -895,7 +948,7 @@ msgstr "Husk adgangskode"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 #: ../libempathy-gtk/empathy-password-dialog.c:311
 msgid "Remember password"
@@ -972,78 +1025,86 @@ msgstr "Hvad er din UIN til ICQ?"
 msgid "What is your ICQ password?"
 msgstr "Hvad er din adgangskode til ICQ?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:183
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "Auto"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:221
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "Register"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:226
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "Options"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "Ingen"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Character set:"
 msgstr "Tegnsæt:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"De fleste IRC-servere kræver ikke en adgangskode, så hvis du ikke er sikker, "
+"så lad være med at skrive en."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Network"
 msgstr "Netværk"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Network:"
 msgstr "Netværk:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Kaldenavn:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "Afslutningsbesked:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "Rigtigt navn:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Servers"
 msgstr "Servere"
 
 # AIM er amerikansk, vi må hellere bruge begrebet screen name,
 # til IRC går jeg ud fra at vi bare kalder det skærmnavn
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "What is your IRC nickname?"
 msgstr "Hvad er dit kaldenavn til IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Hvilket IRC-netværk?"
 
@@ -1179,58 +1240,67 @@ msgid "Discover the STUN server automatically"
 msgstr "Find STUN-serveren automatisk"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "Ignore TLS Errors"
+msgstr "Ignorer TLS-fejl"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Interval (seconds)"
 msgstr "Interval (sekunder)"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
 msgid "Keep-Alive Options"
 msgstr "Indstillinger for opretholdelse af forbindelse"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
 msgid "Loose Routing"
 msgstr "Løs routing"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Mechanism:"
 msgstr "Mekanisme:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
 msgid "Miscellaneous Options"
 msgstr "Diverse indstillinger"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 msgid "NAT Traversal Options"
 msgstr "Indstillinger for NAT-gennemløb"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 msgid "Port:"
 msgstr "Port:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 msgid "Proxy Options"
 msgstr "Indstillinger for mellemvært"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "STUN Server:"
 msgstr "STUN-server:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.c:347
 msgid "Server:"
 msgstr "Server:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid "Transport:"
 msgstr "Transport:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Brug denne konto til at ringe til _fastnetslinjer og mobiltelefoner"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "Hvad er adgangskoden til din SIP-konto?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Hvad er din logind-id til SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "_Brugernavn:"
 
@@ -1254,28 +1324,36 @@ msgstr "Yahoo!-i_d:"
 msgid "_Room List locale:"
 msgstr "_Rumliste-placering:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:448
-#: ../libempathy-gtk/empathy-avatar-chooser.c:524
+#: ../libempathy-gtk/empathy-avatar-chooser.c:470
+#: ../libempathy-gtk/empathy-avatar-chooser.c:555
 msgid "Couldn't convert image"
 msgstr "Kunne ikke konvertere billede"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
 msgid "None of the accepted image formats are supported on your system"
 msgstr "Ingen af de accepterede billedformater understøttes på dit system"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:930
+#: ../libempathy-gtk/empathy-avatar-chooser.c:818
+msgid "Couldn't save picture to file"
+msgstr "Kunne ikke gemme billede til fil"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:934
 msgid "Select Your Avatar Image"
 msgstr "Vælg dit profilbillede"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+msgid "Take a picture..."
+msgstr "Tag et billede..."
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:941
 msgid "No Image"
 msgstr "Intet billede"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:995
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
 msgid "Images"
 msgstr "Billeder"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:999
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
 msgid "All Files"
 msgstr "Alle filer"
 
@@ -1283,35 +1361,61 @@ msgstr "Alle filer"
 msgid "Click to enlarge"
 msgstr "Klik for at forstørre"
 
-#: ../libempathy-gtk/empathy-chat.c:652
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
+msgid "There was an error starting the call"
+msgstr "Der opstod en fejl ved opstart af opkaldet"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact doesn't support calls"
+msgstr "Den angivne kontakt understøtter ikke opkald"
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is offline"
+msgstr "Den angivne kontakt er offline"
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "The specified contact is not valid"
+msgstr "Den angivne kontakt er ikke gyldig"
+
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "Emergency calls are not supported on this protocol"
+msgstr "Nødopkald er ikke understøttet med denne protokol"
+
+#: ../libempathy-gtk/empathy-chat.c:702
 msgid "Failed to open private chat"
 msgstr "Kunne ikke åbne privat chat"
 
-#: ../libempathy-gtk/empathy-chat.c:717
+#: ../libempathy-gtk/empathy-chat.c:763
 msgid "Topic not supported on this conversation"
 msgstr "Emne understøttes ikke af denne samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:723
+#: ../libempathy-gtk/empathy-chat.c:769
 msgid "You are not allowed to change the topic"
 msgstr "Du har ikke adgang til at ændre emnet"
 
-#: ../libempathy-gtk/empathy-chat.c:906
+#: ../libempathy-gtk/empathy-chat.c:973
+#, c-format
+msgid "“%s� is not a valid contact ID"
+msgstr "“%s� er ikke et gyldigt kontakt-id"
+
+#: ../libempathy-gtk/empathy-chat.c:1058
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: Ryd alle meddelelser fra den aktuelle samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:909
+#: ../libempathy-gtk/empathy-chat.c:1061
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <emne>: Angiv emnet for den aktuelle samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:912
+#: ../libempathy-gtk/empathy-chat.c:1064
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <id for chatrum>: GÃ¥ ind i et nyt chatrum"
 
-#: ../libempathy-gtk/empathy-chat.c:915
+#: ../libempathy-gtk/empathy-chat.c:1067
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <id for chatrum>: GÃ¥ ind i et nyt chatrum"
 
-#: ../libempathy-gtk/empathy-chat.c:920
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1319,23 +1423,23 @@ msgstr ""
 "/part [<id for chatrum>] [<grund>]: Forlad chatrummet, som standard det "
 "nuværende chatrum"
 
-#: ../libempathy-gtk/empathy-chat.c:925
+#: ../libempathy-gtk/empathy-chat.c:1075
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <kontact-id> [<meddelelse>]: Ã…bn en privat chat"
 
-#: ../libempathy-gtk/empathy-chat.c:928
+#: ../libempathy-gtk/empathy-chat.c:1078
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <kontakt-id> <meddelelse>: Ã…bn en privat chat"
 
-#: ../libempathy-gtk/empathy-chat.c:931
+#: ../libempathy-gtk/empathy-chat.c:1081
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <kaldenavn>: Ændr dit kaldenavn på den aktuelle server"
 
-#: ../libempathy-gtk/empathy-chat.c:934
+#: ../libempathy-gtk/empathy-chat.c:1084
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <meddelelse>: Send en handlingsmeddelelse til den aktuelle samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:937
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1345,7 +1449,11 @@ msgstr ""
 "til at sende en meddelelse, der begynder med \"/\". For eksempel: \"/say /"
 "join-kommandoen bruges til at gå ind i et nyt chatrum\""
 
-#: ../libempathy-gtk/empathy-chat.c:942
+#: ../libempathy-gtk/empathy-chat.c:1092
+msgid "/whois <contact ID>: display information about a contact"
+msgstr "/whois <kontakt-id>: viser information om en kontakt"
+
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1353,98 +1461,113 @@ msgstr ""
 "/help [<kommando>]: Vis alle understøttede kommandoer. Hvis <kommando> er "
 "angivet, så vis dens brugsdokumentation."
 
-#: ../libempathy-gtk/empathy-chat.c:952
+#: ../libempathy-gtk/empathy-chat.c:1112
 #, c-format
 msgid "Usage: %s"
 msgstr "Brug: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:991
+#: ../libempathy-gtk/empathy-chat.c:1157
 msgid "Unknown command"
 msgstr "Ukendt kommando"
 
-#: ../libempathy-gtk/empathy-chat.c:1117
+#: ../libempathy-gtk/empathy-chat.c:1283
 msgid "Unknown command; see /help for the available commands"
 msgstr "Ukendt kommando; brug /help for at se de tilgængelige kommandoer"
 
-#: ../libempathy-gtk/empathy-chat.c:1254
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1453
+msgid "insufficient balance to send message"
+msgstr "for lille saldo til at sende beskeden"
+
+#: ../libempathy-gtk/empathy-chat.c:1455
+msgid "not capable"
+msgstr "ude af stand til"
+
+#: ../libempathy-gtk/empathy-chat.c:1462
 msgid "offline"
 msgstr "offline"
 
-#: ../libempathy-gtk/empathy-chat.c:1257
+#: ../libempathy-gtk/empathy-chat.c:1465
 msgid "invalid contact"
 msgstr "ugyldig kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1260
+#: ../libempathy-gtk/empathy-chat.c:1468
 msgid "permission denied"
 msgstr "adgang nægtet"
 
-#: ../libempathy-gtk/empathy-chat.c:1263
+#: ../libempathy-gtk/empathy-chat.c:1471
 msgid "too long message"
 msgstr "for lang besked"
 
-#: ../libempathy-gtk/empathy-chat.c:1266
+#: ../libempathy-gtk/empathy-chat.c:1474
 msgid "not implemented"
 msgstr "ikke implementeret"
 
-#: ../libempathy-gtk/empathy-chat.c:1270
+#: ../libempathy-gtk/empathy-chat.c:1478
 msgid "unknown"
 msgstr "ukendt"
 
-#: ../libempathy-gtk/empathy-chat.c:1274
+#: ../libempathy-gtk/empathy-chat.c:1484
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Fejl under afsendelse af besked \"%s\": %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1335 ../src/empathy-chat-window.c:717
+#: ../libempathy-gtk/empathy-chat.c:1488
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Fejl under afsendelse af besked: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1549 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Emne:"
 
-#: ../libempathy-gtk/empathy-chat.c:1347
+#: ../libempathy-gtk/empathy-chat.c:1561
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Emne sat til: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1349
+#: ../libempathy-gtk/empathy-chat.c:1563
 msgid "No topic defined"
 msgstr "Intet emne defineret"
 
-#: ../libempathy-gtk/empathy-chat.c:1848
+#: ../libempathy-gtk/empathy-chat.c:2072
 msgid "(No Suggestions)"
 msgstr "(Ingen forslag)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1916
+#: ../libempathy-gtk/empathy-chat.c:2140
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Tilføj \"%s\" til ordbog"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1953
+#: ../libempathy-gtk/empathy-chat.c:2177
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Tilføj \"%s\" til ordbogen for %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2010
+#: ../libempathy-gtk/empathy-chat.c:2247
 msgid "Insert Smiley"
 msgstr "Indsæt tekstansigt"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2028
-#: ../libempathy-gtk/empathy-ui-utils.c:1808
+#: ../libempathy-gtk/empathy-chat.c:2265
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "_Send"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2063
+#: ../libempathy-gtk/empathy-chat.c:2319
 msgid "_Spelling Suggestions"
 msgstr "_Staveforslag"
 
-#: ../libempathy-gtk/empathy-chat.c:2152
+#: ../libempathy-gtk/empathy-chat.c:2408
 msgid "Failed to retrieve recent logs"
 msgstr "Kunne ikke hente seneste logge"
 
-#: ../libempathy-gtk/empathy-chat.c:2263
+#: ../libempathy-gtk/empathy-chat.c:2545
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s er koblet af"
@@ -1452,12 +1575,12 @@ msgstr "%s er koblet af"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2270
+#: ../libempathy-gtk/empathy-chat.c:2552
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s blev sparket ud af %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2273
+#: ../libempathy-gtk/empathy-chat.c:2555
 #, c-format
 msgid "%s was kicked"
 msgstr "%s blev sparket ud"
@@ -1465,17 +1588,17 @@ msgstr "%s blev sparket ud"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2281
+#: ../libempathy-gtk/empathy-chat.c:2563
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s blev bortvist af %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2284
+#: ../libempathy-gtk/empathy-chat.c:2566
 #, c-format
 msgid "%s was banned"
 msgstr "%s blev bortvist"
 
-#: ../libempathy-gtk/empathy-chat.c:2288
+#: ../libempathy-gtk/empathy-chat.c:2570
 #, c-format
 msgid "%s has left the room"
 msgstr "%s har forladt rummet"
@@ -1485,105 +1608,137 @@ msgstr "%s har forladt rummet"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2297
+#: ../libempathy-gtk/empathy-chat.c:2579
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2322
+#: ../libempathy-gtk/empathy-chat.c:2604
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s er kommet ind i rummet"
 
-#: ../libempathy-gtk/empathy-chat.c:2347
+#: ../libempathy-gtk/empathy-chat.c:2629
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s har nu navnet %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2486
-#: ../src/empathy-streamed-media-window.c:1953
-#: ../src/empathy-event-manager.c:1126
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2768
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1391
+#: ../src/empathy-call-window.c:1441 ../src/empathy-call-window.c:2479
 msgid "Disconnected"
 msgstr "Frakoblet"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3116
+#: ../libempathy-gtk/empathy-chat.c:3415
 msgid "Would you like to store this password?"
 msgstr "Ønsker du at gemme denne adgangskode?"
 
-#: ../libempathy-gtk/empathy-chat.c:3122
+#: ../libempathy-gtk/empathy-chat.c:3421
 msgid "Remember"
 msgstr "Husk"
 
-#: ../libempathy-gtk/empathy-chat.c:3132
+#: ../libempathy-gtk/empathy-chat.c:3431
 msgid "Not now"
 msgstr "Ikke nu"
 
-#: ../libempathy-gtk/empathy-chat.c:3176
+#: ../libempathy-gtk/empathy-chat.c:3475
 msgid "Retry"
 msgstr "Prøv igen"
 
-#: ../libempathy-gtk/empathy-chat.c:3180
+#: ../libempathy-gtk/empathy-chat.c:3479
 msgid "Wrong password; please try again:"
 msgstr "Forkert adgangskode; prøv venligst igen:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3297
+#: ../libempathy-gtk/empathy-chat.c:3609
 msgid "This room is protected by a password:"
 msgstr "Dette rum beskyttes af en adgangskode:"
 
-#: ../libempathy-gtk/empathy-chat.c:3324
+#: ../libempathy-gtk/empathy-chat.c:3636
 msgid "Join"
 msgstr "Deltag"
 
-#: ../libempathy-gtk/empathy-chat.c:3494 ../src/empathy-event-manager.c:1147
+#: ../libempathy-gtk/empathy-chat.c:3838 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "Tilsluttet"
 
-#: ../libempathy-gtk/empathy-chat.c:3547
-#: ../libempathy-gtk/empathy-log-window.c:650
+#: ../libempathy-gtk/empathy-chat.c:3893
 msgid "Conversation"
 msgstr "Samtale"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:422
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:3898
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (SMS)"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
 msgid "Unknown or invalid identifier"
 msgstr "Ukendt eller ugyldig identifikator"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
 msgid "Contact blocking temporarily unavailable"
 msgstr "Blokering af kontakter er midlertidigt ikke tilgængelig"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
 msgid "Contact blocking unavailable"
 msgstr "Blokering af kontakter er ikke tilgængelig"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
 msgid "Permission Denied"
 msgstr "Adgang nægtet"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
 msgid "Could not block contact"
 msgstr "Kunne ikke blokere kontakt"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:701
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
 msgid "Edit Blocked Contacts"
 msgstr "Redigér blokerede kontakter"
 
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Account:"
+msgstr "Konto:"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "Blokerede kontakter"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Fjern"
+
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:794
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Kopiér linkadresse"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:801
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Ã…bn link"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:420
+#: ../libempathy-gtk/empathy-chat-text-view.c:415
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
@@ -1602,13 +1757,13 @@ msgid "New Contact"
 msgstr "Ny kontakt"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:199
+#: ../libempathy-gtk/empathy-individual-dialogs.c:200
 #, c-format
 msgid "Block %s?"
 msgstr "Bloker %s?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:247
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr ""
@@ -1616,12 +1771,12 @@ msgstr ""
 "kontakte dig igen?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
 msgid "_Block"
 msgstr "_Blokér"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:278
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Indrapportér denne kontakt som værende grov"
@@ -1647,301 +1802,331 @@ msgstr "Ikke grupperet"
 msgid "Favorite People"
 msgstr "Favoritfolk"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2001
-#: ../libempathy-gtk/empathy-individual-view.c:2336
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Ønsker du at fjerne gruppen \"%s\"?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2003
-#: ../libempathy-gtk/empathy-individual-view.c:2339
+#: ../libempathy-gtk/empathy-contact-list-view.c:1988
+#: ../libempathy-gtk/empathy-individual-view.c:2379
 msgid "Removing group"
 msgstr "Fjerner gruppe"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2052
-#: ../libempathy-gtk/empathy-contact-list-view.c:2129
-#: ../libempathy-gtk/empathy-individual-view.c:2394
-#: ../libempathy-gtk/empathy-individual-view.c:2588
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../libempathy-gtk/empathy-contact-list-view.c:2037
+#: ../libempathy-gtk/empathy-contact-list-view.c:2114
+#: ../libempathy-gtk/empathy-individual-view.c:2434
+#: ../libempathy-gtk/empathy-individual-view.c:2637
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2082
-#: ../libempathy-gtk/empathy-individual-view.c:2458
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
+#: ../libempathy-gtk/empathy-individual-view.c:2501
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Ønsker du at fjerne kontakten \"%s\"?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2084
-#: ../libempathy-gtk/empathy-individual-view.c:2479
+#: ../libempathy-gtk/empathy-contact-list-view.c:2069
+#: ../libempathy-gtk/empathy-individual-view.c:2522
 msgid "Removing contact"
 msgstr "Fjerner kontakt"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:219
-#: ../src/empathy-main-window.ui.h:13
+#: ../libempathy-gtk/empathy-contact-menu.c:220
+#: ../src/empathy-main-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "_Tilføj kontakt…"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:299
+#: ../libempathy-gtk/empathy-contact-menu.c:300
 msgid "_Block Contact"
 msgstr "_Blokér kontakt"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:328
-#: ../libempathy-gtk/empathy-individual-menu.c:517
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:329
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "_Chat"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:359
-#: ../libempathy-gtk/empathy-individual-menu.c:560
+#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Lydopkald"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:390
-#: ../libempathy-gtk/empathy-individual-menu.c:602
+#: ../libempathy-gtk/empathy-contact-menu.c:394
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Videoopkald"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:436
-#: ../libempathy-gtk/empathy-individual-menu.c:645
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:440
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "_Tidligere samtaler"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:458
-#: ../libempathy-gtk/empathy-individual-menu.c:686
+#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "Send fil"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:481
-#: ../libempathy-gtk/empathy-individual-menu.c:728
+#: ../libempathy-gtk/empathy-contact-menu.c:485
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
 msgstr "Del mit skrivebord"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:521
-#: ../libempathy-gtk/empathy-contact-widget.c:1763
-#: ../libempathy-gtk/empathy-individual-menu.c:763
+#: ../libempathy-gtk/empathy-contact-menu.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:1886
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
 #: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "Favorit"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:550
-#: ../libempathy-gtk/empathy-individual-menu.c:791
+#: ../libempathy-gtk/empathy-contact-menu.c:554
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "Opl_ysninger"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:596
+#: ../libempathy-gtk/empathy-contact-menu.c:600
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "_Redigér"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:650
-#: ../libempathy-gtk/empathy-individual-menu.c:972
-#: ../src/empathy-chat-window.c:935
+#: ../libempathy-gtk/empathy-contact-menu.c:654
+#: ../libempathy-gtk/empathy-individual-menu.c:1283
+#: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "Inviterer dig til dette rum"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:681
-#: ../libempathy-gtk/empathy-individual-menu.c:1019
+#: ../libempathy-gtk/empathy-contact-menu.c:685
+#: ../libempathy-gtk/empathy-individual-menu.c:1329
 msgid "_Invite to Chat Room"
 msgstr "_Invitér til chatrum"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:513
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
 msgid "Search contacts"
 msgstr "Søg i kontakter"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:543
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
 msgid "Search: "
 msgstr "Søg: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:601
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
 msgid "_Add Contact"
 msgstr "_Tilføj kontakt"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:619
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
 msgid "No contacts found"
 msgstr "Ingen kontakter fundet"
 
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr "Besked til introduktion af dig selv:"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
+msgstr "Lad mig venligst se hvornår du er online. Tak!"
+
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "Vælg en kontakt"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:295
+#: ../libempathy-gtk/empathy-contact-widget.c:336
 #: ../libempathy-gtk/empathy-individual-widget.c:153
 msgid "Full name:"
 msgstr "Fulde navn:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:296
+#: ../libempathy-gtk/empathy-contact-widget.c:337
 #: ../libempathy-gtk/empathy-individual-widget.c:154
 msgid "Phone number:"
 msgstr "Telefonnummer:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:297
+#: ../libempathy-gtk/empathy-contact-widget.c:338
 #: ../libempathy-gtk/empathy-individual-widget.c:155
 msgid "E-mail address:"
 msgstr "E-mail-adresse:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:298
+#: ../libempathy-gtk/empathy-contact-widget.c:339
 #: ../libempathy-gtk/empathy-individual-widget.c:156
 msgid "Website:"
 msgstr "Webside:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:299
+#: ../libempathy-gtk/empathy-contact-widget.c:340
 #: ../libempathy-gtk/empathy-individual-widget.c:157
 msgid "Birthday:"
 msgstr "Fødselsdag:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:346
+msgid "Last seen:"
+msgstr "Sidst set:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:348
+msgid "Connected from:"
+msgstr "Tilsluttet fra:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:353
+msgid "Away message:"
+msgstr "Fraværsbesked:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+msgid "Channels:"
+msgstr "Kanaler:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
 msgstr "Lands ISO-kode:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Country:"
 msgstr "Land:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "State:"
 msgstr "Tilstand:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:768
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "City:"
 msgstr "By:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:770
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Area:"
 msgstr "Område:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:772
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
 msgstr "Postnummer:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:774
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Street:"
 msgstr "Gade:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:776
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
 msgstr "Bygning:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:778
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Floor:"
 msgstr "Etage:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:780
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Room:"
 msgstr "Rum:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:782
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Text:"
 msgstr "Tekst:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:784
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:786
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
 msgstr "Niveau for nøjagtighed:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:790
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr "Fejl:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:792
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
 msgstr "Lodret fejl (meter):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:794
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
 msgstr "Vandret fejl (meter):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr "Hastighed:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Bearing:"
 msgstr "Kurs:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:800
-#: ../libempathy-gtk/empathy-individual-widget.c:526
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
 msgstr "Stigningshastighed:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:802
-#: ../libempathy-gtk/empathy-individual-widget.c:528
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
 msgstr "Sidst opdateret den:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:804
-#: ../libempathy-gtk/empathy-individual-widget.c:530
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
 msgstr "Længdegrad:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:806
-#: ../libempathy-gtk/empathy-individual-widget.c:532
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
 msgstr "Breddegrad:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:808
-#: ../libempathy-gtk/empathy-individual-widget.c:534
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
 msgstr "Højde:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:871
-#: ../libempathy-gtk/empathy-contact-widget.c:888
-#: ../libempathy-gtk/empathy-individual-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:633
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "Placering"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:890
-#: ../libempathy-gtk/empathy-individual-widget.c:635
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:942
-#: ../libempathy-gtk/empathy-individual-widget.c:684
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e. %B, %Y klokken %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1024
-#: ../libempathy-gtk/empathy-individual-widget.c:919
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
 msgid "Save Avatar"
 msgstr "Gem profilbillede"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1080
-#: ../libempathy-gtk/empathy-individual-widget.c:977
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
 msgid "Unable to save avatar"
 msgstr "Kan ikke gemme profilbillede"
 
@@ -1951,7 +2136,7 @@ msgstr "<b>Placering</b> den (dato)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1307
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr "Alias:"
 
@@ -1971,7 +2156,7 @@ msgstr "Detaljer om kontakt"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "Identifikator:"
 
@@ -1988,11 +2173,11 @@ msgstr "Styresystem:"
 msgid "Version:"
 msgstr "Version:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:332
+#: ../libempathy-gtk/empathy-groups-widget.c:333
 msgid "Groups"
 msgstr "Grupper"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:344
+#: ../libempathy-gtk/empathy-groups-widget.c:345
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2000,74 +2185,105 @@ msgstr ""
 "Vælg de grupper, som du ønsker at denne skal fremgå i. Bemærk at du kan "
 "vælge mere end en gruppe eller slet ingen gruppe."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:363
+#: ../libempathy-gtk/empathy-groups-widget.c:364
 msgid "_Add Group"
 msgstr "Tilf_øj gruppe"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:398
+#: ../libempathy-gtk/empathy-groups-widget.c:399
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Vælg"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1436
+#: ../libempathy-gtk/empathy-groups-widget.c:409
+#: ../src/empathy-main-window.c:1807
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Følgende identitet vil blive blokeret:"
 msgstr[1] "Følgende identiteter vil blive blokeret:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:259
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Følgende identitet kan ikke blokeres:"
 msgstr[1] "Følgende identiteter kan ikke blokeres:"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
 msgstr "Sammenkædede kontakter"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:354
+#: ../libempathy-gtk/empathy-individual-linker.c:370
 msgid "Select contacts to link"
 msgstr "Vælg kontakter som skal sammenkædes"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:428
+#: ../libempathy-gtk/empathy-individual-linker.c:444
 msgid "New contact preview"
 msgstr "Forhåndsvisning af ny kontakt"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:472
+#: ../libempathy-gtk/empathy-individual-linker.c:488
 msgid "Contacts selected in the list on the left will be linked together."
 msgstr "De valgte kontakter i listen til venstre vil blive sammenkædet."
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:131
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:839
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "Vælg konto der skal bruges til at lave dette opkald"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "Opkald"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+msgid "Mobile"
+msgstr "Mobil"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "Arbejde"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "HJEM"
+
+#. add an SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+msgid "_SMS"
+msgstr "_SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1141
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Redigér"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:865
+#: ../libempathy-gtk/empathy-individual-menu.c:1167
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "_Sammenkæd kontakter…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2301
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 msgid "Delete and _Block"
 msgstr "Slet og _blokér"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2467
+#: ../libempathy-gtk/empathy-individual-view.c:2510
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2076,7 +2292,7 @@ msgstr ""
 "Ønsker du virklig at fjerne denne sammenkædede kontakt \"%s\"? Bemærk at "
 "dette vil fjerne alle de kontakter, som denne sammenkædede kontakt består af."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2162,65 +2378,202 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "_Adskil"
 
-#: ../libempathy-gtk/empathy-log-window.c:660
-msgid "Date"
-msgstr "Dato"
+#: ../libempathy-gtk/empathy-log-window.c:634
+msgid "History"
+msgstr "Historik"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
-msgstr "Samtaler"
+#: ../libempathy-gtk/empathy-log-window.c:689
+msgid "Show"
+msgstr "Vis"
+
+#: ../libempathy-gtk/empathy-log-window.c:711
+msgid "Search"
+msgstr "Søg"
+
+#: ../libempathy-gtk/empathy-log-window.c:1159
+#, c-format
+msgid "Chat in %s"
+msgstr "Chat i %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1161
+#, c-format
+msgid "Chat with %s"
+msgstr "Chat med %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%A, %e %B %Y %X"
+
+#. Translators: this is an emote: '* Danielle waves'
+#: ../libempathy-gtk/empathy-log-window.c:1300
+#, c-format
+msgid "<i>* %s %s</i>"
+msgstr "<i>* %s %s</i>"
+
+#. Translators: this is a message: 'Danielle: hello'
+#. * The string in bold is the sender's name
+#: ../libempathy-gtk/empathy-log-window.c:1306
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1382
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s sekund"
+msgstr[1] "%s sekunder"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s minut"
+msgstr[1] "%s minutter"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "Opkaldet tog %s, sluttede %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1729
+msgid "Today"
+msgstr "I dag"
+
+#: ../libempathy-gtk/empathy-log-window.c:1733
+msgid "Yesterday"
+msgstr "I går"
+
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
+msgid "%e %B %Y"
+msgstr "%e %B %Y"
+
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3425
+msgid "Anytime"
+msgstr "NÃ¥r som helst"
+
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2353
+msgid "Anyone"
+msgstr "Hvem som helst"
+
+#: ../libempathy-gtk/empathy-log-window.c:2666
+msgid "Who"
+msgstr "Hvem"
+
+#: ../libempathy-gtk/empathy-log-window.c:2870
+msgid "When"
+msgstr "Hvornår"
+
+#: ../libempathy-gtk/empathy-log-window.c:2986
+msgid "Anything"
+msgstr "Hvad som helst"
+
+#: ../libempathy-gtk/empathy-log-window.c:2988
+msgid "Text chats"
+msgstr "Tekstchat"
+
+#: ../libempathy-gtk/empathy-log-window.c:2990
+#: ../src/empathy-preferences.ui.h:4
+msgid "Calls"
+msgstr "Opkald"
+
+#: ../libempathy-gtk/empathy-log-window.c:2995
+msgid "Incoming calls"
+msgstr "Indkommende opkald"
+
+#: ../libempathy-gtk/empathy-log-window.c:2996
+msgid "Outgoing calls"
+msgstr "Udgående opkald"
+
+#: ../libempathy-gtk/empathy-log-window.c:2997
+msgid "Missed calls"
+msgstr "Mistede opkald"
+
+#: ../libempathy-gtk/empathy-log-window.c:3019
+msgid "What"
+msgstr "Hvad"
+
+#: ../libempathy-gtk/empathy-log-window.c:3728
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr ""
+"Er du sikker på at du ønsker at slette alle logge fra tidligere samtaler?"
+
+#: ../libempathy-gtk/empathy-log-window.c:3732
+msgid "Clear All"
+msgstr "Ryd alle"
+
+#: ../libempathy-gtk/empathy-log-window.c:3739
+msgid "Delete from:"
+msgstr "Slet fra:"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Indlæser...</span>"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "Find næste"
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Chat"
+msgstr "Chat"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "Find forrige"
+msgid "Delete All History..."
+msgstr "Slet al historik..."
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr "Tidligere samtaler"
+msgid "Profile"
+msgstr "Profil"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Video"
+msgstr "Video"
 
-#. Tab Label
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "Søg"
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:20
+msgid "_Edit"
+msgstr "_Redigér"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "_File"
+msgstr "_Fil"
 
-#. Searching *for* something
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "F_or:"
+msgid "page 2"
+msgstr "side 2"
 
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
 msgid "Contact ID:"
 msgstr "Kontakt-id:"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:171
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
 msgid "C_hat"
 msgstr "C_hat"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:181
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
 msgstr "Ny samtale"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:253
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
 msgid "Send _Video"
 msgstr "Send _video"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:261
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
 msgid "C_all"
 msgstr "_Opkald"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:271
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "New Call"
 msgstr "Nyt opkald"
 
@@ -2239,34 +2592,34 @@ msgstr ""
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Message…"
 msgstr "Tilpasset besked…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messages…"
 msgstr "Redigér tilpassede beskeder…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
 msgstr "Klik for at fjerne denne status som en favorit"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
 msgstr "Klik for at gøre denne status til en favorit"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
 msgstr "Sæt status"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:946
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
 msgid "Set your presence and current status"
 msgstr "Sæt din tilstedeværelse og status"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1134
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
 msgid "Custom messages…"
 msgstr "Tilpassede beskeder…"
 
@@ -2279,18 +2632,26 @@ msgstr "Tilpassede beskeder…"
 msgid "New %s account"
 msgstr "Ny %s-konto"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "Find:"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "Forskel på store/små bogstaver"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Mat_ch case"
+msgstr "Mat_ch store/små bogstaver"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
 msgid "Phrase not found"
 msgstr "Frasen ikke fundet"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "_Next"
+msgstr "_Næste"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+msgid "_Previous"
+msgstr "_Foregående"
+
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
 msgstr "Modtog en kvikbesked"
@@ -2331,35 +2692,32 @@ msgstr "Udgående stemmeopkald (voice call)"
 msgid "Voice call ended"
 msgstr "Stemmeopkald sluttede"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "Skriv tilpasset besked"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
 msgstr "Redigér tilpasset besked"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr "Gem _ny statusbesked"
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#, c-format
+msgid "Message edited at %s"
+msgstr "Besked redigeret %s"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Status Messages"
-msgstr "Gemte statusbeskeder"
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
+msgid "Normal"
+msgstr "Normal"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "Klassisk"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "Simpel"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "Ren"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "Blå"
 
@@ -2436,19 +2794,19 @@ msgstr "Husk dette valg til fremtidige forbindelser"
 msgid "Certificate Details"
 msgstr "Certifikatdetaljer"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1705
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
 msgstr "Kan ikke åbne URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1800
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
 msgstr "Vælg en fil"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
 msgid "Insufficient free space to save file"
 msgstr "Ikke nok fri plads til at gemme filen"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2457,7 +2815,7 @@ msgstr ""
 "%s fri plads er nødvendig for at gemme denne fil, men der er kun %s "
 "tilgængelig. Vælg venligst en anden placering."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1924
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Indkommende fil fra %s"
@@ -2645,23 +3003,23 @@ msgstr "Ingen fejlmeddelelse"
 msgid "Instant Message (Empathy)"
 msgstr "Chatbesked (Empathy)"
 
-#: ../src/empathy.c:308
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "Tilslut ikke ved start"
 
-#: ../src/empathy.c:312
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Vis ikke kontaktlisten eller nogen andre dialoger ved opstart"
 
-#: ../src/empathy.c:320
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr "- Empathy IM-klient"
 
-#: ../src/empathy.c:499
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
 msgstr "Fejl ved forsøg på at kontakte kontohåndteringen"
 
-#: ../src/empathy.c:501
+#: ../src/empathy.c:639
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2819,8 +3177,8 @@ msgid "Select the accounts you want to import:"
 msgstr "Vælg de konti, du vil importere:"
 
 #: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "Yes"
 msgstr "Ja"
 
@@ -2894,34 +3252,35 @@ msgstr "Der er ugemte ændringer til din %s-konto."
 msgid "Your new account has not been saved yet."
 msgstr "Din nye konto er ikke blevet gemt endnu."
 
-#: ../src/empathy-accounts-dialog.c:286
-#: ../src/empathy-streamed-media-window.c:809
+#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1175
 msgid "Connecting…"
 msgstr "Forbinder…"
 
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:386
 #, c-format
 msgid "Offline — %s"
 msgstr "Ikke tilsluttet — %s"
 
-#: ../src/empathy-accounts-dialog.c:339
+#: ../src/empathy-accounts-dialog.c:398
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Frakoblet — %s"
 
-#: ../src/empathy-accounts-dialog.c:350
+#: ../src/empathy-accounts-dialog.c:409
 msgid "Offline — No Network Connection"
 msgstr "Ikke tilsluttet — Ingen netværksforbindelse"
 
-#: ../src/empathy-accounts-dialog.c:357
+#: ../src/empathy-accounts-dialog.c:416
 msgid "Unknown Status"
 msgstr "Ukendt årsag"
 
-#: ../src/empathy-accounts-dialog.c:369
+#: ../src/empathy-accounts-dialog.c:428
 msgid "Offline — Account Disabled"
 msgstr "Ikke tilsluttet — Konto deaktiveret"
 
-#: ../src/empathy-accounts-dialog.c:772
+#: ../src/empathy-accounts-dialog.c:831
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2929,16 +3288,16 @@ msgstr ""
 "Du er ved at oprette en ny konto, hvilket vil kassere\n"
 "dine ændringer. Er du sikker på, at du vil fortsætte?"
 
-#: ../src/empathy-accounts-dialog.c:1133
+#: ../src/empathy-accounts-dialog.c:1192
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Ønsker du at fjerne %s fra din computer?"
 
-#: ../src/empathy-accounts-dialog.c:1137
+#: ../src/empathy-accounts-dialog.c:1196
 msgid "This will not remove your account on the server."
 msgstr "Dette vil ikke fjerne din konto på serveren."
 
-#: ../src/empathy-accounts-dialog.c:1375
+#: ../src/empathy-accounts-dialog.c:1432
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2947,15 +3306,15 @@ msgstr ""
 "ændringer. Er du sikker på, at du vil fortsætte?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1593
+#: ../src/empathy-accounts-dialog.c:1643
 msgid "_Enable"
 msgstr "_Aktivér"
 
-#: ../src/empathy-accounts-dialog.c:1594
+#: ../src/empathy-accounts-dialog.c:1644
 msgid "_Disable"
 msgstr "_Deaktivér"
 
-#: ../src/empathy-accounts-dialog.c:2113
+#: ../src/empathy-accounts-dialog.c:2154
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2964,18 +3323,22 @@ msgstr ""
 "ændringer. Er du sikker på, at du vil fortsætte?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Tilføj…"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
 msgid "Loading account information"
 msgstr "Indlæser kontaktoplysninger"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "No protocol installed"
 msgstr "Ingen protokol installeret"
 
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -2983,10 +3346,6 @@ msgstr ""
 "For at oprette en ny konto skal du først installere en motor til hver "
 "protokol, som du ønsker at bruge."
 
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add…"
-msgstr "_Tilføj…"
-
 # Fejlrapport, (v) eller (s)
 #
 # Kode omkring streng antyder at det er verbum bydeform
@@ -2997,15 +3356,15 @@ msgstr "_Tilføj…"
 #  _("Import"), cell,
 #  "active", COL_IMPORT,
 #  NULL); 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Import…"
 msgstr "_Importér…"
 
-#: ../src/empathy-auth-client.c:250
+#: ../src/empathy-auth-client.c:249
 msgid " - Empathy authentication client"
 msgstr " - Audio/video-klienten Empathy"
 
-#: ../src/empathy-auth-client.c:266
+#: ../src/empathy-auth-client.c:265
 msgid "Empathy authentication client"
 msgstr "Audio/video-klienten Empathy"
 
@@ -3013,94 +3372,116 @@ msgstr "Audio/video-klienten Empathy"
 msgid "People nearby"
 msgstr "Folk i nærheden"
 
-#: ../src/empathy-av.c:118
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr "- Audio/video-klienten Empathy"
 
-#: ../src/empathy-av.c:134
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "Audio/video-klienten Empathy"
 
-#: ../src/empathy-streamed-media-window.c:479
+#: ../src/empathy-streamed-media-window.c:431
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: ../src/empathy-streamed-media-window.c:482
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Brightness"
 msgstr "Lysstyrke"
 
-#: ../src/empathy-streamed-media-window.c:485
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:590
+#: ../src/empathy-streamed-media-window.c:542
 msgid "Volume"
 msgstr "Lydstyrke"
 
-#: ../src/empathy-streamed-media-window.c:1166
+#: ../src/empathy-streamed-media-window.c:1110
 msgid "_Sidebar"
 msgstr "_Sidepanel"
 
-#: ../src/empathy-streamed-media-window.c:1186
+#: ../src/empathy-streamed-media-window.c:1130
 msgid "Audio input"
 msgstr "Lydinput"
 
-#: ../src/empathy-streamed-media-window.c:1190
+#: ../src/empathy-streamed-media-window.c:1134
 msgid "Video input"
 msgstr "Videoinput"
 
-#: ../src/empathy-streamed-media-window.c:1194
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Dialpad"
 msgstr "Opkaldspanel"
 
-#: ../src/empathy-streamed-media-window.c:1205
+#: ../src/empathy-streamed-media-window.c:1151
 msgid "Details"
 msgstr "Detaljer"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1274
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1782
 #, c-format
 msgid "Call with %s"
 msgstr "Opkald til %s"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-streamed-media-window.c:1353
-msgid "Call"
-msgstr "Opkald"
-
-#: ../src/empathy-streamed-media-window.c:1507
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:2026
 msgid "The IP address as seen by the machine"
 msgstr "IP-adressen som den ses af maskinen"
 
-#: ../src/empathy-streamed-media-window.c:1509
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:2028
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP-adressen som den ses af en server på internettet"
 
-#: ../src/empathy-streamed-media-window.c:1511
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:2030
 msgid "The IP address of the peer as seen by the other side"
 msgstr "IP-adressen for modparten(peer), som den ses på den anden side"
 
-#: ../src/empathy-streamed-media-window.c:1513
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:2032
 msgid "The IP address of a relay server"
 msgstr "IP-adressen for en videresendelsesserver"
 
-#: ../src/empathy-streamed-media-window.c:1515
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:2034
 msgid "The IP address of the multicast group"
 msgstr "IP-adressen for multicastgruppen"
 
+#: ../src/empathy-streamed-media-window.c:1843
+msgctxt "encoding video codec"
+msgid "Unknown"
+msgstr "Ukendt"
+
+#: ../src/empathy-streamed-media-window.c:1846
+msgctxt "encoding audio codec"
+msgid "Unknown"
+msgstr "Ukendt"
+
+#: ../src/empathy-streamed-media-window.c:1849
+msgctxt "decoding video codec"
+msgid "Unknown"
+msgstr "Ukendt"
+
+#: ../src/empathy-streamed-media-window.c:1852
+msgctxt "decoding audio codec"
+msgid "Unknown"
+msgstr "Ukendt"
+
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2270
+#: ../src/empathy-streamed-media-window.c:2144
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Forbundet — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2331
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2798
 msgid "Technical Details"
 msgstr "Tekniske detaljer"
 
-#: ../src/empathy-streamed-media-window.c:2369
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2836
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3108,7 +3489,8 @@ msgid ""
 msgstr ""
 "%ss software forstår ingen af de lydformater, din computer understøtter"
 
-#: ../src/empathy-streamed-media-window.c:2374
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2841
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3116,7 +3498,8 @@ msgid ""
 msgstr ""
 "%ss software forstår ingen af de videoformater, din computer understøtter"
 
-#: ../src/empathy-streamed-media-window.c:2380
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2847
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3125,25 +3508,29 @@ msgstr ""
 "Kan ikke oprette forbindelse til %s. En af jer er måske på et netværk, der "
 "ikke tillader direkte forbindelser."
 
-#: ../src/empathy-streamed-media-window.c:2386
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2853
 msgid "There was a failure on the network"
 msgstr "Der opstod en fejl på netværket"
 
-#: ../src/empathy-streamed-media-window.c:2390
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2857
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Lydformaterne, der kræves til dette opkald, er ikke installeret på din "
 "computer"
 
-#: ../src/empathy-streamed-media-window.c:2393
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2860
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Videoformaterne, der kræves til dette opkald, er ikke installeret på din "
 "computer"
 
-#: ../src/empathy-streamed-media-window.c:2403
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2872
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3154,147 +3541,200 @@ msgstr ""
 "a> venligst denne fejl og vedhæft logfiler fra fejlfindingsvinduet i menuen "
 "Hjælp."
 
-#: ../src/empathy-streamed-media-window.c:2411
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2881
 msgid "There was a failure in the call engine"
 msgstr "Der opstod en fejl i opkaldsmotoren"
 
-#: ../src/empathy-streamed-media-window.c:2414
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2884
 msgid "The end of the stream was reached"
 msgstr "Afslutningen af strømmen blev nået"
 
-#: ../src/empathy-streamed-media-window.c:2454
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2924
 msgid "Can't establish audio stream"
 msgstr "Kan ikke oprette lydstrøm"
 
-#: ../src/empathy-streamed-media-window.c:2464
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2934
 msgid "Can't establish video stream"
 msgstr "Kan ikke oprette videostrøm"
 
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "Audio"
 msgstr "Lyd"
 
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Ring op til kontakten igen"
-
 #: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "Kamera slået fra"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "Afkodningscodec:"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "Kamera slået til"
+msgid "Disable camera"
+msgstr "Deaktivér kamera"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Afkodningscodec:"
+msgid "Display the dialpad"
+msgstr "Vis opkaldspanelet"
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Deaktivér kameraet og stop udsending af video"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "Indkodningscodec:"
 
 #: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Aktivér kameraet og send video"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Hang up"
+msgstr "Læg på"
 
 #: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Aktivér kamera, men send ikke video"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Hang up current call"
+msgstr "Afslut det nuværende opkald"
 
 #: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Indkodningscodec:"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "Lokal kandidat:"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "Læg på"
+msgid "Maximise me"
+msgstr "Maksimér mig"
 
 #: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Afslut det nuværende opkald"
+msgid "Minimise me"
+msgstr "Minimér mig"
 
 #: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Lokal kandidat:"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "Fjern kandidat:"
 
 #: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "Forhåndsvisning"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Send Audio"
+msgstr "Send lyd"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "Ring op igen"
+msgid "Send Video"
+msgstr "Send video"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Fjern kandidat:"
+msgid "Show dialpad"
+msgstr "Vis opkaldspanel"
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "Send lyd"
+msgid "Start a video call"
+msgstr "Start et videoopkald"
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Slå lydtransmission til/fra"
+msgid "Start an audio call"
+msgstr "Start et lydopkald"
+
+#: ../src/empathy-call-window.ui.h:18
+msgid "Swap camera"
+msgstr "Ombyt kamera"
 
 #: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ideo"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr "Slå lydtransmission til/fra"
 
 #: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "Video"
+msgid "Toggle video transmission"
+msgstr "Slå videotransmission til/fra"
 
 #: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "Video slået fra"
-
-#: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "Video slået til"
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:2431 ../src/empathy-call-window.c:2432
+#: ../src/empathy-call-window.c:2433 ../src/empathy-call-window.c:2434
+msgid "Unknown"
+msgstr "Ukendt"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "Forhåndsvisning for video"
+msgid "Video call"
+msgstr "Videoopkald"
 
 #: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "_Opkald"
 
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:25
+msgid "_Camera"
+msgstr "_Kamera"
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:18
+msgid "_Contents"
+msgstr "_Indhold"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
+msgid "_Debug"
+msgstr "_Fejlfind"
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:22
+msgid "_Help"
+msgstr "_Hjælp"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Microphone"
+msgstr "_Mikrofon"
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "_Settings"
+msgstr "_Indstillinger"
+
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_Vis"
 
-#: ../src/empathy-chat-window.c:474 ../src/empathy-chat-window.c:494
+#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d ulæst)"
 msgstr[1] "%s (%d ulæste)"
 
-#: ../src/empathy-chat-window.c:486
+#: ../src/empathy-chat-window.c:493
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (og %u anden)"
 msgstr[1] "%s (og %u andre)"
 
-#: ../src/empathy-chat-window.c:502
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d ulæst fra andre)"
 msgstr[1] "%s (%d ulæste fra andre)"
 
-#: ../src/empathy-chat-window.c:511
+#: ../src/empathy-chat-window.c:518
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d ulæst fra alle)"
 msgstr[1] "%s (%d ulæste fra alle)"
 
-#: ../src/empathy-chat-window.c:721
+#: ../src/empathy-chat-window.c:733
+msgid "SMS:"
+msgstr "SMS:"
+
+#: ../src/empathy-chat-window.c:743
+#, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "Sender %d besked"
+msgstr[1] "Sender %d beskeder"
+
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
 msgstr "Skriver en besked."
 
@@ -3306,10 +3746,6 @@ msgstr "_Ryd"
 msgid "C_ontact"
 msgstr "K_ontakt"
 
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Chat"
-
 #: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
 msgstr "Indsæt tekst_ansigt"
@@ -3330,10 +3766,6 @@ msgstr "Flyt til _højre"
 msgid "Notify for All Messages"
 msgstr "PÃ¥mind ved alle beskeder"
 
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
-msgid "_Contents"
-msgstr "_Indhold"
-
 #: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "_Samtale"
@@ -3342,18 +3774,10 @@ msgstr "_Samtale"
 msgid "_Detach Tab"
 msgstr "_Frigør faneblad"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
-msgid "_Edit"
-msgstr "_Redigér"
-
 #: ../src/empathy-chat-window.ui.h:13
 msgid "_Favorite Chat Room"
 msgstr "_Yndlingschatrum"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
-msgid "_Help"
-msgstr "_Hjælp"
-
 #: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "_Næste faneblad"
@@ -3374,15 +3798,15 @@ msgstr "_Faneblade"
 msgid "_Undo Close Tab"
 msgstr "_Fortryd lukning af faneblad"
 
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
 msgstr "Rum"
 
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "Auto-tilslut"
 
@@ -3390,90 +3814,96 @@ msgstr "Auto-tilslut"
 msgid "Manage Favorite Rooms"
 msgstr "Håndtér yndlingsrum"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming video call"
 msgstr "Indkommende videoopkald"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1408
 msgid "Incoming call"
 msgstr "Indkommende opkald"
 
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:525
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s foretager et videoopkald til dig! Ønsker du at besvare opkaldet?"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s ringer til dig! Ønsker du at besvare opkaldet?"
 
-#: ../src/empathy-event-manager.c:515 ../src/empathy-event-manager.c:667
+#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1414
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Indkommende opkald fra %s"
 
-#: ../src/empathy-event-manager.c:540
+#: ../src/empathy-event-manager.c:554
 msgid "_Reject"
 msgstr "Af_vis"
 
-#: ../src/empathy-event-manager.c:546
+#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
 msgid "_Answer"
 msgstr "_Besvar"
 
-#: ../src/empathy-event-manager.c:667
+#: ../src/empathy-event-manager.c:570
+msgid "_Answer with video"
+msgstr "_Besvar med video"
+
+#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1414
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Indkommende videoopkald fra %s"
 
-#: ../src/empathy-event-manager.c:744
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
 msgstr "Ruminvitation"
 
-#: ../src/empathy-event-manager.c:746
+#: ../src/empathy-event-manager.c:838
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Invitation til at deltage i %s"
 
-#: ../src/empathy-event-manager.c:753
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s inviterer dig til at slutte dig til %s"
 
-#: ../src/empathy-event-manager.c:761
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
 msgstr "_Afslå"
 
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Deltag"
 
-#: ../src/empathy-event-manager.c:793
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s inviterer dig til at deltage i %s"
 
-#: ../src/empathy-event-manager.c:799
+#: ../src/empathy-event-manager.c:891
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Du er blevet inviteret til at deltage i %s"
 
-#: ../src/empathy-event-manager.c:850
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Indkommende filoverførsel fra %s"
 
-#: ../src/empathy-event-manager.c:1020 ../src/empathy-main-window.c:370
+#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
 msgid "Password required"
 msgstr "Adgangskode påkrævet"
 
-#: ../src/empathy-event-manager.c:1076
+#: ../src/empathy-event-manager.c:1190
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s ønsker tilladelse til at se, når du er på nettet"
 
-#: ../src/empathy-event-manager.c:1080
+#: ../src/empathy-event-manager.c:1194
 #, c-format
 msgid ""
 "\n"
@@ -3483,105 +3913,105 @@ msgstr ""
 "Besked: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:100
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:102
+#: ../src/empathy-ft-manager.c:103
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:179
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s af %s med %s/s"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:275
 #, c-format
 msgid "%s of %s"
 msgstr "%s af %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:305
+#: ../src/empathy-ft-manager.c:306
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Modtager \"%s\" fra %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:309
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Sender \"%s\" til %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:338
+#: ../src/empathy-ft-manager.c:339
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Fejl ved modtagelse af \"%s\" fra %s"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:342
 msgid "Error receiving a file"
 msgstr "Fejl ved modtagelse af fil"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:347
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Fejl ved afsendelse af \"%s\" til %s"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:350
 msgid "Error sending a file"
 msgstr "Fejl ved afsendelse af en fil"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:489
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" modtaget fra %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:493
+#: ../src/empathy-ft-manager.c:494
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" sendt til %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:497
 msgid "File transfer completed"
 msgstr "Filoverførsel fuldført"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
 msgid "Waiting for the other participant's response"
 msgstr "Venter på den anden deltagers svar"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Kontrollerer integritet af \"%s\""
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Hasher \"%s\""
 
-#: ../src/empathy-ft-manager.c:1016
+#: ../src/empathy-ft-manager.c:1026
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1028
+#: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "Fil"
 
-#: ../src/empathy-ft-manager.c:1050
+#: ../src/empathy-ft-manager.c:1060
 msgid "Remaining"
 msgstr "Tilbage"
 
@@ -3629,127 +4059,141 @@ msgstr "Protokol"
 msgid "Source"
 msgstr "Kilde"
 
-#: ../src/empathy-main-window.c:387
+#: ../src/empathy-main-window.c:392
 msgid "Provide Password"
 msgstr "Giv adgangskode"
 
-#: ../src/empathy-main-window.c:393
+#: ../src/empathy-main-window.c:398
 msgid "Disconnect"
 msgstr "Frakobl"
 
-#: ../src/empathy-main-window.c:533
+#: ../src/empathy-main-window.c:622
 msgid "No match found"
 msgstr "Ingen træffere fundet"
 
-#: ../src/empathy-main-window.c:688
+#: ../src/empathy-main-window.c:777
 msgid "Reconnect"
 msgstr "Tilslut igen"
 
-#: ../src/empathy-main-window.c:694
+#: ../src/empathy-main-window.c:783
 msgid "Edit Account"
 msgstr "Redigér kontoen"
 
-#: ../src/empathy-main-window.c:700
+#: ../src/empathy-main-window.c:789
 msgid "Close"
 msgstr "Luk"
 
-#: ../src/empathy-main-window.c:1418
+# Dette er vist ikke helt efter den engelske definition som er noget med at fylde op til et bestemt niveau, men jeg synes heller ikke at udtrykket "at toppe op" har udbredelse nok til at man kan bruge det. Forslag modtages gerne.
+#. Translators: this string will be something like:
+#. *   Top up My Account ($1.23)..."
+#: ../src/empathy-main-window.c:928
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr "Fyld op %s (%s)..."
+
+#: ../src/empathy-main-window.c:975
+msgid "Top up account credit"
+msgstr "Fyld kontosaldo op"
+
+#. top up button
+#: ../src/empathy-main-window.c:1046
+msgid "Top Up..."
+msgstr "Fyld op..."
+
+#: ../src/empathy-main-window.c:1789
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../src/empathy-main-window.c:1765
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "Kontaktliste"
 
-#: ../src/empathy-main-window.c:1881
-msgid "Show and edit accounts"
-msgstr "Vis og redigér konti"
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "Kontakter på et _kort"
 
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-main-window-menubar.ui.h:2
+msgid "Credit Balance"
+msgstr "Kreditsaldo"
+
+#: ../src/empathy-main-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "Find i kontakt_liste"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "_Tilslut til favoritter"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "HÃ¥ndter favoritter"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "N_ormal størrelse"
 
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "Nyt _opkald…"
 
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "Normal størrelse med _profilbillede"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "_Indstillinger"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "Vis _protokoller"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "Sortér efter _navn"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "Sortér efter s_tatus"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Konti"
 
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "_Blokerede kontakter"
 
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "_Kompakt størrelse"
 
-#: ../src/empathy-main-window.ui.h:18
-msgid "_Debug"
-msgstr "_Fejlfind"
-
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "_Filoverførsler"
 
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "_Deltag…"
 
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "_Ny samtale…"
 
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "_Offline kontakter"
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "_Personlige oplysninger"
 
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "R_um"
 
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window-menubar.ui.h:29
 msgid "_Search for Contacts…"
 msgstr "_Søg efter kontakter…"
 
@@ -3763,7 +4207,7 @@ msgstr "Medlemmer"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:560
+#: ../src/empathy-new-chatroom-dialog.c:553
 #, c-format
 msgid ""
 "%s\n"
@@ -3776,16 +4220,16 @@ msgstr ""
 "Kræver adgangskode: %s\n"
 "Deltagere: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "No"
 msgstr "Nej"
 
-#: ../src/empathy-new-chatroom-dialog.c:591
+#: ../src/empathy-new-chatroom-dialog.c:584
 msgid "Could not start room listing"
 msgstr "Kunne ikke starte fremvisning af rumliste"
 
-#: ../src/empathy-new-chatroom-dialog.c:601
+#: ../src/empathy-new-chatroom-dialog.c:594
 msgid "Could not stop room listing"
 msgstr "Kunne ikke standse fremvisning af rumliste"
 
@@ -3820,39 +4264,84 @@ msgstr "Rumliste"
 msgid "_Room:"
 msgstr "R_um:"
 
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr "Besked modtaget"
 
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr "Besked sendt"
 
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
 msgstr "Ny samtale"
 
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
 msgstr "Kontakten logger på"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
 msgstr "Kontakten logger af"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
 msgstr "Konto tilsluttet"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
 msgstr "Konto frakoblet"
 
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr "Sprog"
 
-#: ../src/empathy-preferences.c:875
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:734
+msgid "Juliet"
+msgstr "Julie"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:741
+msgid "Romeo"
+msgstr "Romeo"
+
+# Forslag? Nogen der har en dansk version af Romeo og Julie?
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:747
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr "Ã…, Romeo, hvorfor er du Romeo?"
+
+# Forslag? Nogen der har en dansk version af Romeo og Julie?
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:750
+msgid "Deny thy father and refuse thy name;"
+msgstr "Fornægt din far, forkast det navn du bærer!"
+
+# Forslag? Nogen der har en dansk version af Romeo og Julie?
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:753
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr "Og vil du ikke, sværg så, du er min,"
+
+# Forslag? Nogen der har en dansk version af Romeo og Julie?
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:756
+msgid "And I'll no longer be a Capulet."
+msgstr "så er jeg ikke mer en Capulet!"
+
+# Forslag? Nogen der har en dansk version af Romeo og Julie?
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:759
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr "Skal jeg nu høre mere eller tale?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:762
+msgid "Juliet has disconnected"
+msgstr "Julie er koblet af"
+
+#: ../src/empathy-preferences.c:1166
 msgid "Preferences"
 msgstr "Indstillinger"
 
@@ -3860,67 +4349,87 @@ msgstr "Indstillinger"
 msgid "Appearance"
 msgstr "Udseende"
 
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
 msgstr "Opførsel"
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
 msgid "Chat Th_eme:"
 msgstr "Chat_tema:"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
 msgid "Disable notifications when _away or busy"
 msgstr "Deaktivér påmindelser når brugeren er _fraværende eller har travlt"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
 msgid "Disable sounds when _away or busy"
 msgstr "Deaktivér lyde når brugeren _ikke er til stede eller har travlt"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Vis indkommende begivenheder i statusfeltet"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"Ekkoneutralisering kan hjælpe med at gøre din stemme klarere overfor den "
+"anden person, men det kan også give problemer på visse computere. Hvis du "
+"eller den anden person hører mærkelig lyde eller huller i lyden under et "
+"opkald, så prøv at slå ekkoneutralisering fra og genstart opkaldet."
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "Vis påmindelser når en kontakt logger på"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "Vis påmindelser når en kontakt logger af"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Vis påmindelser når _chatten ikke har fokus"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "Aktivér stavekontrol for sprog:"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "Generelt"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input level:"
+msgstr "Inputniveau:"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "Inputlydstyrke:"
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "Stedkilder:"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "Log samtaler"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "PÃ¥mindelser"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Afspil lyde ved begivenheder"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "Privatliv"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -3930,67 +4439,71 @@ msgstr ""
 "end din by, stat eller land vil blive vist. GPS-koordinater vil blive "
 "begrænset til første decimal."
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "Vis _smileys som billeder"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "Vis kontakt_liste i rum"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "Lyde"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "Stavekontrol"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 "Denne liste indeholder kun sprog, som du har en ordbog installeret for."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "Temaer"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:30
+msgid "Variant:"
+msgstr "Variant:"
+
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "Tilslut _automatisk ved opstart"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Mobiltelefon"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "_Aktivér boblepåmindelser"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "_Aktivér lydpåmindelser"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Netværk (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "_Åbn nye chats i særskilte vinduer"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "_Offentliggør placering til mine kontakter"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "_Reducér placeringens nøjagtighed"
 
@@ -4002,67 +4515,115 @@ msgstr "Status"
 msgid "_Quit"
 msgstr "_Afslut"
 
-#: ../src/empathy-map-view.c:442
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "Ring op til kontakten igen"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "Kamera slået fra"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "Kamera slået til"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "Deaktivér kameraet og stop udsending af video"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "Aktivér kameraet og send video"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "Aktivér kamera, men send ikke video"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "Forhåndsvisning"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "Ring op igen"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "V_ideo"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "Video slået fra"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "Video slået til"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "Forhåndsvisning for video"
+
+#: ../src/empathy-map-view.c:448
 msgid "Contact Map View"
 msgstr "Kontaktkortvisning"
 
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
 msgid "Save"
 msgstr "Gem"
 
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
 msgstr "Fejlfindingsvindue"
 
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
 msgstr "Niveau "
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
 msgid "Debug"
 msgstr "Fejlfind"
 
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
 msgid "Info"
 msgstr "Info"
 
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
 msgid "Message"
 msgstr "Besked"
 
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
 msgid "Critical"
 msgstr "Kritisk"
 
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
 msgid "Error"
 msgstr "Fejl"
 
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
 msgid "Time"
 msgstr "Tidspunkt"
 
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
 msgid "Domain"
 msgstr "Domæne"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
 msgstr "Kategori"
 
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "Niveau"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4070,16 +4631,16 @@ msgstr ""
 "Den valgte forbindelseshåndtering understøtter ikke udvidelsen til "
 "fjernfejlfinding."
 
-#: ../src/empathy-invite-participant-dialog.c:34
-#: ../src/empathy-invite-participant-dialog.c:48
+#: ../src/empathy-invite-participant-dialog.c:179
+#: ../src/empathy-invite-participant-dialog.c:205
 msgid "Invite Participant"
 msgstr "Invitér deltager"
 
-#: ../src/empathy-invite-participant-dialog.c:35
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Vælg en kontakt, du vil invitere til samtalen:"
 
-#: ../src/empathy-invite-participant-dialog.c:45
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "Invitér"
 
@@ -4111,7 +4672,15 @@ msgstr "- Empathy-konti"
 msgid "Empathy Accounts"
 msgstr "Empathy-konti"
 
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr "Vis en bestemt tjeneste"
+
+#: ../src/empathy-debugger.c:75
+msgid "- Empathy Debugger"
+msgstr "- Empathy-fejlfinding"
+
+#: ../src/empathy-debugger.c:114
 msgid "Empathy Debugger"
 msgstr "Empathy-fejlfinding"
 
@@ -4119,39 +4688,116 @@ msgstr "Empathy-fejlfinding"
 msgid "- Empathy Chat Client"
 msgstr "- Empathy-samtaleklient"
 
-#: ../src/empathy-notifications-approver.c:184
+#: ../src/empathy-notifications-approver.c:203
 msgid "Respond"
 msgstr "Svar"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1418
 msgid "Reject"
 msgstr "Afvis"
 
-#: ../src/empathy-notifications-approver.c:194
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1419
 msgid "Answer"
 msgstr "Besvar"
 
-#: ../src/empathy-notifications-approver.c:201
-#: ../src/empathy-notifications-approver.c:211
+#: ../src/empathy-notifications-approver.c:227
+msgid "Answer with video"
+msgstr "Besvar med video"
+
+#: ../src/empathy-notifications-approver.c:235
+#: ../src/empathy-notifications-approver.c:245
 msgid "Decline"
 msgstr "Afslå"
 
-#: ../src/empathy-notifications-approver.c:205
-#: ../src/empathy-notifications-approver.c:216
+#: ../src/empathy-notifications-approver.c:239
+#: ../src/empathy-notifications-approver.c:250
 msgid "Accept"
 msgstr "Acceptér"
 
-#: ../src/empathy-call-observer.c:130
-#, c-format
-msgid "Missed call from %s"
-msgstr "Mistede opkald fra %s"
-
-#: ../src/empathy-call-observer.c:133
+# Af en eller anden grund kommer kodekommentaren ikke med:
+# translators: the 'Provide' button is displayed in a notification
+# bubble when Empathy is asking for an account password; clicking on it
+# brings the password popup.
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:260
+msgid "Provide"
+msgstr "Giv"
+
+#: ../src/empathy-call-observer.c:134
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr ""
 "%s har lige prøvet at ringe til dig, men du var i gang med en anden samtale."
 
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1047 ../src/empathy-call-window.c:1070
+msgid "i"
+msgstr "i"
+
+#: ../src/empathy-call-window.c:2727
+msgid "On hold"
+msgstr "I kø"
+
+#: ../src/empathy-call-window.c:2730
+msgid "Mute"
+msgstr "Stilhed"
+
+#: ../src/empathy-call-window.c:2732
+msgid "Duration"
+msgstr "Varighed"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2735
+#, c-format
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02dm"
+
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "_Match store/små bogstaver"
+
+#~ msgid "All"
+#~ msgstr "Alle"
+
+#~ msgid "_Enabled"
+#~ msgstr "_Aktiveret"
+
+#~ msgid "Date"
+#~ msgstr "Dato"
+
+#~ msgid "Conversations"
+#~ msgstr "Samtaler"
+
+#~ msgid "Find Next"
+#~ msgstr "Find næste"
+
+#~ msgid "Find Previous"
+#~ msgstr "Find forrige"
+
+#~ msgid "Previous Conversations"
+#~ msgstr "Tidligere samtaler"
+
+#~ msgid "_For:"
+#~ msgstr "F_or:"
+
+#~ msgid "Enter Custom Message"
+#~ msgstr "Skriv tilpasset besked"
+
+#~ msgid "Save _New Status Message"
+#~ msgstr "Gem _ny statusbesked"
+
+#~ msgid "Saved Status Messages"
+#~ msgstr "Gemte statusbeskeder"
+
+#~ msgid "Show and edit accounts"
+#~ msgstr "Vis og redigér konti"
+
 #~ msgid "Empathy has asked about importing accounts"
 #~ msgstr "Empathy har spurgt om at importere konti"
 
@@ -4253,9 +4899,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Brug løs routing-opførsel samt Route-headeren som anbefales i RFC 3261."
 
-#~ msgid "Salut account is created"
-#~ msgstr "Salutkonto oprettes"
-
 #~ msgid ""
 #~ "Whether or not the Salut account has been created on the first Empathy "
 #~ "run."
@@ -4343,9 +4986,6 @@ msgstr ""
 #~ "Hvis du skulle ønske at tilføje kontoen igen på et senere tidspunkt, vil "
 #~ "de stadig være tilgængelige."
 
-#~ msgid "Accounts"
-#~ msgstr "Konti"
-
 #~ msgid "Add new"
 #~ msgstr "Tilføj ny"
 
@@ -4422,10 +5062,6 @@ msgstr ""
 #~ msgid "Import Accounts..."
 #~ msgstr "Importér konti..."
 
-#~| msgid "<b>Settings</b>"
-#~ msgid "Settings"
-#~ msgstr "Indstillinger"
-
 #~ msgid "Type:"
 #~ msgstr "Type:"
 
@@ -4450,9 +5086,6 @@ msgstr ""
 #~ msgid "_Check Word Spelling..."
 #~ msgstr "_Kontrollér stavning af ord..."
 
-#~ msgid "<b>Topic:</b>"
-#~ msgstr "<b>Emne:</b>"
-
 #~ msgid "Group Chat"
 #~ msgstr "Gruppesamtale"
 
@@ -4471,9 +5104,6 @@ msgstr ""
 #~ msgid "<b>Groups</b>"
 #~ msgstr "<b>Grupper</b>"
 
-#~ msgid "Word"
-#~ msgstr "Ord"
-
 #~ msgid "Suggestions for the word"
 #~ msgstr "Forslag for ordet"
 
@@ -4575,9 +5205,6 @@ msgstr ""
 #~ msgid "Show _avatars"
 #~ msgstr "Vis _profilbilleder"
 
-#~ msgid "Show co_mpact contact list"
-#~ msgstr "_Vis kompakt kontaktliste"
-
 #~ msgid "Enable popup when contact is available"
 #~ msgstr "Aktivér popup når kontakt er tilgængelig"
 
@@ -4726,9 +5353,6 @@ msgstr ""
 #~ msgid "Gossip Instant Messenger"
 #~ msgstr "Gossip - samtaleklient"
 
-#~ msgid "Active"
-#~ msgstr "Aktiv"
-
 #~ msgid "Inactive"
 #~ msgstr "Inaktiv"
 
@@ -5577,9 +6201,6 @@ msgstr ""
 #~ msgid "_ICQ"
 #~ msgstr "_ICQ"
 
-#~ msgid "_MSN"
-#~ msgstr "_MSN"
-
 #~ msgid "_Yahoo!"
 #~ msgstr "_Yahoo!"
 
@@ -5595,9 +6216,6 @@ msgstr ""
 #~ msgid "About to leave..."
 #~ msgstr "Skal til at gå..."
 
-#~ msgid "Autoaway message"
-#~ msgstr "Automatisk fraværsbesked"
-
 #~ msgid "Busy messages"
 #~ msgstr "Optaget-beskeder"
 
@@ -5708,9 +6326,6 @@ msgstr ""
 #~ msgid "Others"
 #~ msgstr "Andre"
 
-#~ msgid "Free to chat"
-#~ msgstr "Ledig til snak"
-
 #~ msgid "Extended away"
 #~ msgstr "Udvidet fravær"
 
diff --git a/po/de.po b/po/de.po
index cad608a3f..9732b6205 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,14 +9,15 @@
 # Mario Blättermann <mariobl@freenet.de>, 2008-2011.
 # Mario Klug <mario@klug.me>, 2010.
 # Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009, 2010, 2011.
+# Wolfgang Stöggl <c72578@yahoo.de>, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-08-25 20:14+0000\n"
-"PO-Revision-Date: 2011-08-28 13:50+0100\n"
+"POT-Creation-Date: 2011-09-18 13:38+0000\n"
+"PO-Revision-Date: 2011-09-18 13:45+0100\n"
 "Last-Translator: Mario Blättermann <mariobl@freenet.de>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -59,6 +60,10 @@ msgid "Camera device"
 msgstr "Kameragerät"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "Kameraposition"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -66,55 +71,55 @@ msgstr ""
 "Nach einem Spitznamen hinzuzufügendes Zeichen, wenn Spitznamen-"
 "Vervollständigung (Tabulator) in einem Gruppen-Chat verwendet wird."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "Erscheinungsbild des Chat-Fensters"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Chat window theme variant"
 msgstr "Variante des Erscheinungsbilds des Chat-Fensters"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "Liste mit durch Kommata getrennter Sprachen, für die die Rechtschreibprüfung "
 "verwendet werden (z.B. »en, fr, nl«)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "Kompakte Kontaktliste"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "Verbindungsverwaltung verwenden"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "Sortierkriterium für die Kontaktliste"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr ""
 "Das für Videoanrufe als Vorgabe zu verwendende Kameragerät, z.B. /dev/video0."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
 msgstr "Vorgabeordner zum Auswählen eines Benutzerbildes"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr "Einblendende Benachrichtigungen bei Abwesenheit deaktivieren"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr "Klänge bei Abwesenheit deaktivieren"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
 msgstr "Eingehende Ereignisse in der Statuszeile anzeigen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -122,257 +127,263 @@ msgstr ""
 "Eingehende Ereignisse in der Statuszeile anzeigen. Falls »FALSCH«, so werden "
 "sie dem Benutzer direkt angezeigt."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Echo cancellation support"
 msgstr "Echounterdrückung"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr "Empathy darf die Position des Benutzers veröffentlichen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy darf das GPS verwenden, um die Position zu schätzen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy darf das Mobilfunknetz verwenden, um die Position zu schätzen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy darf das Netzwerk verwenden, um die Position zu ermitteln"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr "Empathy-Vorgabeordner für das Herunterladen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
 msgstr "Empathy hat die Mitschnitte von Butterfly migriert"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr "Automatisch in Abwesend-Status bei Untätigkeit"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "Automatisch beim Start verbinden"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy soll die Genauigkeit der Ortsangabe verringern"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
 "Legt fest, ob Empathy das Benutzerbild des Kontaktes als Symbol des Chat-"
 "Fensters verwenden soll"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr "WebKit-Entwicklerwerkzeuge aktivieren"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "Einblendende Benachrichtigungen für neue Nachrichten aktivieren"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "Rechtschreibprüfung aktivieren"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "Hauptfenster verstecken"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "Das Hauptfenster verstecken."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "Zeichen nach der Spitznamen-Vervollständigung"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "Neue Chats in eigenen Fenstern öffnen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "Pfad zum zu verwendenden Adium-Thema"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
 "Pfad zum zu verwendenden Adium-Thema, wenn das Thema für den Chat »Adium« ist."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Bei eingehender Nachricht Klang abspielen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "Bei neuen Unterhaltungen Klang abspielen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Bei ausgehender Nachricht Klang abspielen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "Bei Anmelden eines Kontaktes Klang abspielen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "Bei Abmelden eines Kontaktes Klang abspielen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "Bei eigenem Anmelden Klang abspielen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "Bei eigenem Abmelden Klang abspielen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Benachrichtigungen einblenden, wenn der Chat nicht fokussiert ist"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "Benachrichtigungen einblenden, wenn sich ein Kontakt anmeldet"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "Benachrichtigungen einblenden, wenn sich ein Kontakt abmeldet"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr "Position der Kameravorschau während eines Anrufs."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Show Balance in contact list"
 msgstr "Guthaben in der Kontaktliste anzeigen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "Benutzerbilder anzeigen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "Kontaktliste in Chaträumen anzeigen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr "Hinweis über das Schließen des Hauptfensters anzeigen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr "Abgemeldete Kontakte anzeigen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
 msgstr "Protokolle anzeigen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "Rechtschreibprüfungssprachen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr "Der vorgegebene Ordner zum Speichern der Dateiübertragungen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Der letzte Ordner, aus welchem ein Benutzerbild gewählt wurde."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
 msgstr "Position der Seitenleiste"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "Gespeicherte Position der Seitenleiste des Chat-Fensters (in Pixel)"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr ""
 "Das Erscheinungsbild, das für das Anzeigen von Chats in Chat-Fenstern "
 "verwendet wird."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr ""
 "Die Variante des Erscheinungsbilds, das für das Anzeigen von Chats in Chat-"
 "Fenstern verwendet wird."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Grafische Emoticons verwenden"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "Benachrichtigen mit Klängen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "Erscheinungsbild für Chaträume verwenden"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr ""
-"Legt fest, ob Empathy den Ort des Benutzers dessen Kontakten übermitteln darf."
+"Legt fest, ob Empathy den Ort des Benutzers dessen Kontakten übermitteln "
+"darf."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Legt fest, ob Empathy das GPS nutzen darf, um den Standort zu schätzen."
+msgstr ""
+"Legt fest, ob Empathy das GPS nutzen darf, um den Standort zu schätzen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
 "Legt fest, ob Empathy das Mobilfunknetz nutzen darf, um den Standort zu "
 "schätzen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
 msgstr ""
 "Legt fest, ob Empathy das Netzwerk nutzen darf, um den Standort zu schätzen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "Legt fest, ob Empathy Mitschnitte von Butterfly migriert hat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr ""
 "Legt fest, ob Empathy sich automatisch beim Start bei allen Konten anmelden "
 "soll."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"Legt fest, ob Empathy automatisch in den Abwesend-Modus versetzt werden soll, "
-"wenn der Benutzer untätig ist."
+"Legt fest, ob Empathy automatisch in den Abwesend-Modus versetzt werden "
+"soll, wenn der Benutzer untätig ist."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 "Legt fest, ob Empathy die Genauigkeit der Positionsangabe aus "
 "Datenschutzgründen reduzieren soll."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 "Legt fest, ob Empathy das Benutzerbild des Kontakts als Symbol des Chat-"
 "Fensters verwenden soll."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Legt fest, ob die WebKit-Entwicklerwerkzeuge, wie der Web Inspector, "
 "aktiviert werden sollen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
@@ -380,147 +391,147 @@ msgstr ""
 "Legt fest, ob Verbindungsverwaltungen für das automatische Verbinden und "
 "Trennen verwendet werden sollen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr ""
 "Legt fest, ob die Rechtschreibung eingegebener Wörter geprüft werden soll."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr ""
 "Legt fest, ob bei Unterhaltungen Emoticons als grafische Bilder dargestellt "
 "werden sollen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr ""
 "Legt fest, ob der Echo-Unterdrückungsfilter von Pulseaudio aktiviert werden "
 "soll."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr ""
 "Legt fest, ob auf das Anmelden von Kontakten am Netzwerk mit einem Klang "
 "hingewiesen werden soll."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
 "Legt fest, ob auf das Abmelden von Kontakten am Netzwerk mit einem Klang "
 "hingewiesen werden soll."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "Legt fest, ob bei Ereignissen Klänge abgespielt werden sollen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr ""
 "Legt fest, ob bei eingehenden Nachrichten ein Klang abgespielt werden soll."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Legt fest, ob bei neuen Gesprächen ein Klang abgespielt werden soll."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr ""
 "Legt fest, ob bei ausgehenden Nachrichten ein Klang abgespielt werden soll."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr ""
 "Legt fest, ob beim Anmelden ans Netzwerk ein Klang abgespielt werden soll."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr ""
 "Legt fest, ob beim Abmelden vom Netzwerk ein Klang abgespielt werden soll."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr ""
 "Legt fest, ob bei Abwesenheit oder Beschäftigung Klänge abgespielt werden "
 "sollen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr ""
-"Legt fest, ob beim Abmelden eines Kontakts eine Benachrichtigung eingeblendet "
-"werden soll."
+"Legt fest, ob beim Abmelden eines Kontakts eine Benachrichtigung "
+"eingeblendet werden soll."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr ""
-"Legt fest, ob beim Anmelden eines Kontakts eine Benachrichtigung eingeblendet "
-"werden soll."
+"Legt fest, ob beim Anmelden eines Kontakts eine Benachrichtigung "
+"eingeblendet werden soll."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
-"Whether to show a popup notification when receiving a new message even if the "
-"chat is already opened, but not focused."
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
 msgstr ""
 "Legt fest, ob eine eine Benachrichtigung beim Empfang einer neuen Nachricht "
 "auch dann eingeblendet werden soll, wenn der Chat bereits geöffnet, aber "
 "nicht fokussiert ist."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr ""
 "Legt fest, ob eine eine Benachrichtigung beim Empfang einer neuen Nachricht "
 "eingeblendet werden soll."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show account balances in the contact list."
 msgstr "Legt fest, ob Kontenguthaben in der Kontaktliste angezeigt werden."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 "Legt fest, ob Benutzerbilder für Kontakte in der Kontaktliste und den Chat-"
 "Fenstern angezeigt werden sollen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr ""
 "Legt fest, ob abgemeldete Kontakte in der Kontaktliste angezeigt werden."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
 msgstr ""
 "Legt fest, ob bei Abwesenheit oder Beschäftigung Benachrichtigungen "
 "eingeblendet werden sollen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr ""
 "Legt fest, ob Protokolle für Kontakte in der Kontaktliste angezeigt werden "
 "sollen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Legt fest, ob die Kontaktliste in Chaträumen angezeigt werden soll."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "Legt fest, ob die Kontaktliste im Kompaktmodus angezeigt werden soll."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
-"Whether to show the message dialog about closing the main window with the 'x' "
-"button in the title bar."
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
 msgstr ""
 "Legt fest, ob der Dialog zum Schließen des Hauptfensters mit dem »x«-Knopf in "
 "der Titelleiste angezeigt werden soll."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "Legt fest, ob das Thema für Chaträume verwendet werden soll."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -713,7 +724,8 @@ msgid "This resource is already connected to the server"
 msgstr "Diese Ressource ist bereits mit dem Server verbunden"
 
 #: ../libempathy/empathy-utils.c:346
-msgid "Connection has been replaced by a new connection using the same resource"
+msgid ""
+"Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Die Verbindung wurde durch eine neue Verbindung mit der gleichen Ressource "
 "ersetzt"
@@ -810,71 +822,81 @@ msgstr[1] "Vor %d Monaten"
 msgid "in the future"
 msgstr "in der Zukunft"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:539
+#: ../libempathy-gtk/empathy-account-chooser.c:540
 msgid "All accounts"
 msgstr "Alle Konten"
 
-#: ../libempathy-gtk/empathy-account-widget.c:693
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "Konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "Passwort"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:768
-#: ../libempathy-gtk/empathy-account-widget.c:825
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1166
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "My Web Accounts"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "Das Konto %s wird über »My Web Accounts« bearbeitet."
+msgid "The account %s is edited via %s."
+msgstr "Das Konto %s wird über »%s« bearbeitet."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1172
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "Das %s-Konto kann nicht in Empathy bearbeitet werden."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
 msgstr "»My Web Accounts« starten"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1532
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "%s bearbeiten"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Benutzername:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1850
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "An_wenden"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1880
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
 msgstr "_Anmelden"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1954
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "Dieses Konto ist bereits auf dem Server vorhanden"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1957
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "Ein neues Konto auf dem Server anlegen"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2149
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "A_bbrechen"
 
@@ -883,19 +905,19 @@ msgstr "A_bbrechen"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2427
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s auf %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2453
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "%s-Konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2457
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "Neues Konto"
 
@@ -1136,8 +1158,8 @@ msgid ""
 msgstr ""
 "Dies ist Ihr Benutzername, nicht Ihr gewöhnlicher Facebook-Anmeldename.\n"
 "Falls Sie facebook.com/<b>dachs</b> sind, geben Sie <b>dachs</b> ein.\n"
-"Wählen Sie auf <a href=\"http://www.facebook.com/username/\">dieser Seite</a> "
-"einen Facebook-Benutzernamen, falls Sie noch keinen besitzen."
+"Wählen Sie auf <a href=\"http://www.facebook.com/username/\">dieser Seite</"
+"a> einen Facebook-Benutzernamen, falls Sie noch keinen besitzen."
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "Use old SS_L"
@@ -1316,36 +1338,36 @@ msgstr "Yahoo! I_D:"
 msgid "_Room List locale:"
 msgstr "Standorteinstellungen für _Raumliste:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:470
-#: ../libempathy-gtk/empathy-avatar-chooser.c:555
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "Bild konnte nicht umgewandelt werden"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "Keines der akzeptierten Bildformate wird von Ihrem System unterstützt"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:818
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
 msgid "Couldn't save picture to file"
 msgstr "Bild konnte nicht als Datei gespeichert werden"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:934
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "Benutzerbild auswählen"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
 msgstr "Ein Foto aufnehmen …"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:941
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "Kein Bild"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "Bilder"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "Alle Dateien"
 
@@ -1391,176 +1413,176 @@ msgstr "Sie sind nicht berechtigt, das Thema zu ändern"
 msgid "“%s� is not a valid contact ID"
 msgstr "»%s« ist keine gültige Kontaktkennung"
 
-#: ../libempathy-gtk/empathy-chat.c:1030
+#: ../libempathy-gtk/empathy-chat.c:1058
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: Alle Nachrichten der aktuellen Unterhaltung löschen"
 
-#: ../libempathy-gtk/empathy-chat.c:1033
+#: ../libempathy-gtk/empathy-chat.c:1061
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <Thema>: Das Thema der aktuellen Unterhaltung festlegen"
 
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1064
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <Chatraum-Kennung>: Einem neuen Chatraum beitreten"
 
-#: ../libempathy-gtk/empathy-chat.c:1039
+#: ../libempathy-gtk/empathy-chat.c:1067
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <Chatraum-Kennung>: Einem neuen Chatraum beitreten"
 
-#: ../libempathy-gtk/empathy-chat.c:1043
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr ""
-"/part [<Chatraum-Kennung>] [<Grund>]: den Chatraum verlassen, Vorgabe ist der "
-"aktuelle Chatraum"
+"/part [<Chatraum-Kennung>] [<Grund>]: den Chatraum verlassen, Vorgabe ist "
+"der aktuelle Chatraum"
 
-#: ../libempathy-gtk/empathy-chat.c:1047
+#: ../libempathy-gtk/empathy-chat.c:1075
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <Kontaktkennung> [<Nachricht>]: Einen privaten Chat starten"
 
-#: ../libempathy-gtk/empathy-chat.c:1050
+#: ../libempathy-gtk/empathy-chat.c:1078
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <Kontaktkennung> <Nachricht>: Einen privaten Chat starten"
 
-#: ../libempathy-gtk/empathy-chat.c:1053
+#: ../libempathy-gtk/empathy-chat.c:1081
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <Spitzname>: Den Spitznamen auf dem aktuellen Server wechseln"
 
-#: ../libempathy-gtk/empathy-chat.c:1056
+#: ../libempathy-gtk/empathy-chat.c:1084
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr ""
 "/me <Nachricht>: Eine »ACTION«-Nachricht zur aktuellen Unterhaltung senden"
 
-#: ../libempathy-gtk/empathy-chat.c:1059
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
-"send a message starting with a '/'. For example: \"/say /join is used to join "
-"a new chat room\""
+"send a message starting with a '/'. For example: \"/say /join is used to "
+"join a new chat room\""
 msgstr ""
 "/say <Nachricht>: <Nachricht> zum aktuellen Chat senden. Es wird verwendet, "
 "um eine Nachricht zu senden, die mit »/« beginnt, wie z.B. »/say /join tritt "
 "einem Chatraum bei«"
 
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <Kontaktkennung>: Information über einen Kontakt anzeigen"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid ""
-"/help [<command>]: show all supported commands. If <command> is defined, show "
-"its usage."
+"/help [<command>]: show all supported commands. If <command> is defined, "
+"show its usage."
 msgstr ""
 "/help [<Befehl>]: Alle verfügbaren Befehle zeigen. Falls <Befehl> angegeben "
 "wird, so wird dessen Verwendung erklärt."
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1112
 #, c-format
 msgid "Usage: %s"
 msgstr "Aufruf: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1116
+#: ../libempathy-gtk/empathy-chat.c:1157
 msgid "Unknown command"
 msgstr "Unbekannter Befehl"
 
-#: ../libempathy-gtk/empathy-chat.c:1242
+#: ../libempathy-gtk/empathy-chat.c:1283
 msgid "Unknown command; see /help for the available commands"
 msgstr "Unbekannter Befehl; Bitte lesen Sie /help zu verfügbaren Befehlen"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1412
+#: ../libempathy-gtk/empathy-chat.c:1453
 msgid "insufficient balance to send message"
 msgstr "Nicht genügend Guthaben zum Senden der Nachricht"
 
-#: ../libempathy-gtk/empathy-chat.c:1414
+#: ../libempathy-gtk/empathy-chat.c:1455
 msgid "not capable"
 msgstr "Nicht verfügbar"
 
-#: ../libempathy-gtk/empathy-chat.c:1421
+#: ../libempathy-gtk/empathy-chat.c:1462
 msgid "offline"
 msgstr "Abgemeldet"
 
-#: ../libempathy-gtk/empathy-chat.c:1424
+#: ../libempathy-gtk/empathy-chat.c:1465
 msgid "invalid contact"
 msgstr "Ungültiger Kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1427
+#: ../libempathy-gtk/empathy-chat.c:1468
 msgid "permission denied"
 msgstr "Erlaubnis verweigert"
 
-#: ../libempathy-gtk/empathy-chat.c:1430
+#: ../libempathy-gtk/empathy-chat.c:1471
 msgid "too long message"
 msgstr "Zu lange Nachricht"
 
-#: ../libempathy-gtk/empathy-chat.c:1433
+#: ../libempathy-gtk/empathy-chat.c:1474
 msgid "not implemented"
 msgstr "Nicht implementiert"
 
-#: ../libempathy-gtk/empathy-chat.c:1437
+#: ../libempathy-gtk/empathy-chat.c:1478
 msgid "unknown"
 msgstr "Unbekannt"
 
-#: ../libempathy-gtk/empathy-chat.c:1443
+#: ../libempathy-gtk/empathy-chat.c:1484
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Fehler beim Senden der Nachricht »%s«: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1447
+#: ../libempathy-gtk/empathy-chat.c:1488
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Fehler beim Senden der Nachricht: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1508 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1549 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Thema:"
 
-#: ../libempathy-gtk/empathy-chat.c:1520
+#: ../libempathy-gtk/empathy-chat.c:1561
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Thema wurde gesetzt auf: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1563
 msgid "No topic defined"
 msgstr "Kein Thema gesetzt"
 
-#: ../libempathy-gtk/empathy-chat.c:2031
+#: ../libempathy-gtk/empathy-chat.c:2072
 msgid "(No Suggestions)"
 msgstr "(Keine Vorschläge)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2099
+#: ../libempathy-gtk/empathy-chat.c:2140
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "»%s« zum Wörterbuch hinzufügen"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2136
+#: ../libempathy-gtk/empathy-chat.c:2177
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "»%s« zum %s-Wörterbuch hinzufügen"
 
-#: ../libempathy-gtk/empathy-chat.c:2206
+#: ../libempathy-gtk/empathy-chat.c:2247
 msgid "Insert Smiley"
 msgstr "Emoticon einfügen"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2224
+#: ../libempathy-gtk/empathy-chat.c:2265
 #: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "_Senden"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2278
+#: ../libempathy-gtk/empathy-chat.c:2319
 msgid "_Spelling Suggestions"
 msgstr "Vor_schläge zur Rechtschreibung"
 
-#: ../libempathy-gtk/empathy-chat.c:2367
+#: ../libempathy-gtk/empathy-chat.c:2408
 msgid "Failed to retrieve recent logs"
 msgstr "Letzte Protokolle konnten nicht geholt werden"
 
-#: ../libempathy-gtk/empathy-chat.c:2504
+#: ../libempathy-gtk/empathy-chat.c:2545
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s hat sich abgemeldet"
@@ -1568,12 +1590,12 @@ msgstr "%s hat sich abgemeldet"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2511
+#: ../libempathy-gtk/empathy-chat.c:2552
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s wurde von %2$s rausgeworfen"
 
-#: ../libempathy-gtk/empathy-chat.c:2514
+#: ../libempathy-gtk/empathy-chat.c:2555
 #, c-format
 msgid "%s was kicked"
 msgstr "%s wurde rausgeworfen"
@@ -1581,17 +1603,17 @@ msgstr "%s wurde rausgeworfen"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2522
+#: ../libempathy-gtk/empathy-chat.c:2563
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s wurde von %2$s verbannt"
 
-#: ../libempathy-gtk/empathy-chat.c:2525
+#: ../libempathy-gtk/empathy-chat.c:2566
 #, c-format
 msgid "%s was banned"
 msgstr "%s wurde verbannt"
 
-#: ../libempathy-gtk/empathy-chat.c:2529
+#: ../libempathy-gtk/empathy-chat.c:2570
 #, c-format
 msgid "%s has left the room"
 msgstr "%s hat den Raum verlassen"
@@ -1601,68 +1623,72 @@ msgstr "%s hat den Raum verlassen"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2538
+#: ../libempathy-gtk/empathy-chat.c:2579
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2604
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s hat den Raum betreten"
 
-#: ../libempathy-gtk/empathy-chat.c:2588
+#: ../libempathy-gtk/empathy-chat.c:2629
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ist jetzt bekannt als %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2727
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2768
 #: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:2328
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1391
+#: ../src/empathy-call-window.c:1441 ../src/empathy-call-window.c:2479
 msgid "Disconnected"
 msgstr "Getrennt"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3374
+#: ../libempathy-gtk/empathy-chat.c:3415
 msgid "Would you like to store this password?"
 msgstr "Wollen Sie dieses Passwort speichern?"
 
-#: ../libempathy-gtk/empathy-chat.c:3380
+#: ../libempathy-gtk/empathy-chat.c:3421
 msgid "Remember"
 msgstr "Dauerhaft merken"
 
-#: ../libempathy-gtk/empathy-chat.c:3390
+#: ../libempathy-gtk/empathy-chat.c:3431
 msgid "Not now"
 msgstr "Jetzt nicht"
 
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3475
 msgid "Retry"
 msgstr "Wiederholen"
 
-#: ../libempathy-gtk/empathy-chat.c:3438
+#: ../libempathy-gtk/empathy-chat.c:3479
 msgid "Wrong password; please try again:"
 msgstr "Falsches Kennwort; Bitte versuchen Sie es erneut:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3568
+#: ../libempathy-gtk/empathy-chat.c:3609
 msgid "This room is protected by a password:"
 msgstr "Dieser Raum ist durch ein Kennwort geschützt:"
 
-#: ../libempathy-gtk/empathy-chat.c:3595
+#: ../libempathy-gtk/empathy-chat.c:3636
 msgid "Join"
 msgstr "Beitreten"
 
-#: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:3838 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "Verbunden"
 
-#: ../libempathy-gtk/empathy-chat.c:3852
+#: ../libempathy-gtk/empathy-chat.c:3893
 msgid "Conversation"
 msgstr "Unterhaltung"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3857
+#: ../libempathy-gtk/empathy-chat.c:3898
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1695,7 +1721,7 @@ msgstr "Blockierte Kontakte bearbeiten"
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:512
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1485
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
@@ -1708,7 +1734,8 @@ msgstr "Blockierte Kontakte"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5 ../src/empathy-chatrooms-window.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -1828,48 +1855,48 @@ msgid "_Block Contact"
 msgstr "Kontakt _blockieren"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:551
+#: ../libempathy-gtk/empathy-individual-menu.c:758
 #: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "_Chat"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:642
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Audioanruf"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:687
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Videoanruf"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:740
+#: ../libempathy-gtk/empathy-individual-menu.c:947
 #: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "_Vorherige Unterhaltungen"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:781
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "Datei senden"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:823
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
 msgstr "Meine Arbeitsumgebung freigeben"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:525
 #: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:858
-#: ../libempathy-gtk/empathy-individual-widget.c:1373
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "Favorit"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:886
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "Infor_mationen"
 
@@ -1879,13 +1906,13 @@ msgid "_Edit"
 msgstr "_Bearbeiten"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1076
+#: ../libempathy-gtk/empathy-individual-menu.c:1283
 #: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "Sie werden in diesen Chatraum eingeladen"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1122
+#: ../libempathy-gtk/empathy-individual-menu.c:1329
 msgid "_Invite to Chat Room"
 msgstr "In den Chatraum _einladen"
 
@@ -1964,7 +1991,7 @@ msgstr "Abwesenheitsnachricht:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:606
 msgid "Channels:"
-msgstr "Kanäle:"
+msgstr "Kanäle:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:897
 #: ../libempathy-gtk/empathy-individual-widget.c:469
@@ -2090,7 +2117,7 @@ msgstr "Höhe:"
 #: ../libempathy-gtk/empathy-contact-widget.c:1011
 #: ../libempathy-gtk/empathy-individual-widget.c:607
 #: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "Position"
 
@@ -2142,7 +2169,7 @@ msgstr "Kontaktinformationen"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1515
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "Bezeichner:"
 
@@ -2218,25 +2245,52 @@ msgstr ""
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:141
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "Konto für den Anruf wählen"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "Anrufen"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+msgid "Mobile"
+msgstr "Mobil"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "Arbeit"
+
+# Mobile, Work, Home laut Quelltext.
+# Im Original könnte auch »Home« statt »HOME« stehen.
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "Zu Hause"
+
 #. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:597
+#: ../libempathy-gtk/empathy-individual-menu.c:804
 #: ../libempathy-gtk/empathy-new-message-dialog.c:215
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:934
+#: ../libempathy-gtk/empathy-individual-menu.c:1141
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:960
+#: ../libempathy-gtk/empathy-individual-menu.c:1167
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "Kontakte verkn_üpfen …"
@@ -2254,7 +2308,7 @@ msgstr ""
 "Wollen Sie den Meta-Kontakt »%s« wirklich löschen? Dadurch werden alle "
 "Komponenten dieses Meta-Kontakts gelöscht."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1662
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2339,131 +2393,139 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "Verknüpfung _aufheben"
 
-#: ../libempathy-gtk/empathy-log-window.c:633
+#: ../libempathy-gtk/empathy-log-window.c:634
 msgid "History"
 msgstr "Chronik"
 
-#: ../libempathy-gtk/empathy-log-window.c:685
+#: ../libempathy-gtk/empathy-log-window.c:689
 msgid "Show"
 msgstr "Anzeigen"
 
-#: ../libempathy-gtk/empathy-log-window.c:707
+#: ../libempathy-gtk/empathy-log-window.c:711
 msgid "Search"
 msgstr "Suchen"
 
-#: ../libempathy-gtk/empathy-log-window.c:1155
+#: ../libempathy-gtk/empathy-log-window.c:1159
 #, c-format
 msgid "Chat in %s"
 msgstr "Chat in %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1157
+#: ../libempathy-gtk/empathy-log-window.c:1161
 #, c-format
 msgid "Chat with %s"
 msgstr "Chat mit %s"
 
 # http://php.net/manual/en/function.strftime.php
-#: ../libempathy-gtk/empathy-log-window.c:1207
-#: ../libempathy-gtk/empathy-log-window.c:1354
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %d.%B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1296
+#: ../libempathy-gtk/empathy-log-window.c:1300
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1302
+#: ../libempathy-gtk/empathy-log-window.c:1306
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
-#: ../libempathy-gtk/empathy-log-window.c:1375 ../src/empathy-ft-manager.c:1026
-msgid "%"
-msgstr "%"
-
 #: ../libempathy-gtk/empathy-log-window.c:1382
 #, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s Sekunde"
+msgstr[1] "%s Sekunden"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s Minute"
+msgstr[1] "%s Minuten"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
+#, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Anruf dauerte %s und endete um %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1714
+#: ../libempathy-gtk/empathy-log-window.c:1729
 msgid "Today"
 msgstr "Heute"
 
-#: ../libempathy-gtk/empathy-log-window.c:1718
+#: ../libempathy-gtk/empathy-log-window.c:1733
 msgid "Yesterday"
 msgstr "Gestern"
 
 # http://php.net/manual/en/function.strftime.php
-#: ../libempathy-gtk/empathy-log-window.c:1734
-msgctxt ""
-"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
 msgid "%e %B %Y"
 msgstr "%d.%B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1815
-#: ../libempathy-gtk/empathy-log-window.c:3396
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3425
 msgid "Anytime"
 msgstr "Jederzeit"
 
-#: ../libempathy-gtk/empathy-log-window.c:1895
-#: ../libempathy-gtk/empathy-log-window.c:2325
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2353
 msgid "Anyone"
 msgstr "Irgendjemand"
 
-#: ../libempathy-gtk/empathy-log-window.c:2637
+#: ../libempathy-gtk/empathy-log-window.c:2666
 msgid "Who"
 msgstr "Wer"
 
-#: ../libempathy-gtk/empathy-log-window.c:2841
+#: ../libempathy-gtk/empathy-log-window.c:2870
 msgid "When"
 msgstr "Wann"
 
-#: ../libempathy-gtk/empathy-log-window.c:2957
+#: ../libempathy-gtk/empathy-log-window.c:2986
 msgid "Anything"
 msgstr "Irgendetwas"
 
-#: ../libempathy-gtk/empathy-log-window.c:2959
+#: ../libempathy-gtk/empathy-log-window.c:2988
 msgid "Text chats"
 msgstr "Text-Chats"
 
-#: ../libempathy-gtk/empathy-log-window.c:2961
+#: ../libempathy-gtk/empathy-log-window.c:2990
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "Anrufe"
 
-#: ../libempathy-gtk/empathy-log-window.c:2966
+#: ../libempathy-gtk/empathy-log-window.c:2995
 msgid "Incoming calls"
 msgstr "Eingehende Anrufe"
 
-#: ../libempathy-gtk/empathy-log-window.c:2967
+#: ../libempathy-gtk/empathy-log-window.c:2996
 msgid "Outgoing calls"
 msgstr "Ausgehende Anrufe"
 
-#: ../libempathy-gtk/empathy-log-window.c:2968
+#: ../libempathy-gtk/empathy-log-window.c:2997
 msgid "Missed calls"
 msgstr "Anrufe in Abwesenheit"
 
-#: ../libempathy-gtk/empathy-log-window.c:2990
+#: ../libempathy-gtk/empathy-log-window.c:3019
 msgid "What"
 msgstr "Was"
 
-#: ../libempathy-gtk/empathy-log-window.c:3699
+#: ../libempathy-gtk/empathy-log-window.c:3728
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr ""
 "Sind Sie sicher, dass Sie alle Protokolle vergangener Unterhaltungen löschen "
 "möchten?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3703
+#: ../libempathy-gtk/empathy-log-window.c:3732
 msgid "Clear All"
 msgstr "Alle löschen"
 
-#: ../libempathy-gtk/empathy-log-window.c:3710
+#: ../libempathy-gtk/empathy-log-window.c:3739
 msgid "Delete from:"
 msgstr "Löschen ab:"
 
@@ -2471,14 +2533,6 @@ msgstr "Löschen ab:"
 msgid "<span size=\"x-large\">Loading...</span>"
 msgstr "<span size=\"x-large\">Wird geladen …</span>"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call"
-msgstr "Anrufen"
-
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
 #: ../src/empathy-chat-window.ui.h:3
 msgid "Chat"
@@ -2660,12 +2714,12 @@ msgstr "Gespräch beendet"
 msgid "Edit Custom Messages"
 msgstr "Benutzerdefinierte Nachrichten bearbeiten"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1030
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
 #, c-format
 msgid "Message edited at %s"
 msgstr "Nachricht bearbeitet um %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1720
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
 msgid "Normal"
 msgstr "Normal"
 
@@ -2717,7 +2771,8 @@ msgid "The certificate is self-signed."
 msgstr "Das Zertifikat ist selbst signiert."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:177
-msgid "The certificate has been revoked by the issuing Certification Authority."
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
 msgstr ""
 "Das Zertifikat wurde durch die herausgebende Zertifizierungsstelle "
 "zurückgezogen."
@@ -2970,23 +3025,23 @@ msgstr "Keine Fehlermeldung"
 msgid "Instant Message (Empathy)"
 msgstr "Sofortnachricht (Empathy)"
 
-#: ../src/empathy.c:354
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "Nicht automatisch beim Start verbinden"
 
-#: ../src/empathy.c:358
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Kontaktliste und andere Dialoge nicht automatisch beim Start anzeigen"
 
-#: ../src/empathy.c:373
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr "- Empathy Sofortnachrichtenprogramm"
 
-#: ../src/empathy.c:560
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
 msgstr "Fehler beim Aufruf der Kontenverwaltung"
 
-#: ../src/empathy.c:562
+#: ../src/empathy.c:639
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3008,14 +3063,15 @@ msgid ""
 msgstr ""
 "Empathy ist freie Software, Sie können sie weitergeben und/oder verändern "
 "solange Sie sich an die Regeln der GNU General Public License halten, so wie "
-"sie von der Free Software Foundation festgelegt wurden; entweder in Version 2 "
-"der Lizenz oder (nach Ihrem Ermessen) in jeder folgenden Lizenz."
+"sie von der Free Software Foundation festgelegt wurden; entweder in Version "
+"2 der Lizenz oder (nach Ihrem Ermessen) in jeder folgenden Lizenz."
 
 #: ../src/empathy-about-dialog.c:85
 msgid ""
 "Empathy 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."
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details."
 msgstr ""
 "Empathy wurde mit dem Ziel veröffentlicht, dass Sie es nützlich finden, "
 "jedoch OHNE JEDWEDE GARANTIE, sogar ohne eine implizite Garantie der "
@@ -3031,8 +3087,8 @@ msgid ""
 msgstr ""
 "Mit Empathy sollten Sie außerdem eine Kopie der GNU General Public License "
 "erhalten haben. Wenn dem nicht so ist, so schreiben Sie bitte an die Free "
-"Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
-"02110-1301, USA."
+"Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-"
+"1301, USA."
 
 #: ../src/empathy-about-dialog.c:107
 msgid "An Instant Messaging client for GNOME"
@@ -3221,7 +3277,8 @@ msgid "Your new account has not been saved yet."
 msgstr "Ihr neues Konto ist noch nicht gespeichert worden."
 
 #: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754 ../src/empathy-call-window.c:1152
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1175
 msgid "Connecting…"
 msgstr "Verbindung wird aufgebaut …"
 
@@ -3332,11 +3389,11 @@ msgstr "Empathy Legitimierungs-Client"
 msgid "People nearby"
 msgstr "Personen in der Nähe"
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:127
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathy Audio/Video-Client"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:152
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy Audio/Video-Client"
 
@@ -3379,34 +3436,34 @@ msgstr "Details"
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1660
+#: ../src/empathy-call-window.c:1782
 #, c-format
 msgid "Call with %s"
 msgstr "Mit %s anrufen"
 
 #: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:1904
+#: ../src/empathy-call-window.c:2026
 msgid "The IP address as seen by the machine"
 msgstr "Die von der Maschine gesehene IP-Adresse"
 
 #: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:1906
+#: ../src/empathy-call-window.c:2028
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Die von einem Server im Internet gesehene IP-Adresse"
 
 #: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:1908
+#: ../src/empathy-call-window.c:2030
 msgid "The IP address of the peer as seen by the other side"
 msgstr ""
 "Die IP-Adresse des Kommunikationspartners, wie von der anderen Seite gesehen"
 
 #: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:1910
+#: ../src/empathy-call-window.c:2032
 msgid "The IP address of a relay server"
 msgstr "Die IP-Adresse eines Relay-Servers"
 
 #: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:1912
+#: ../src/empathy-call-window.c:2034
 msgid "The IP address of the multicast group"
 msgstr "Die IP-Adresse der Multicast-Gruppe"
 
@@ -3437,12 +3494,12 @@ msgid "Connected — %d:%02dm"
 msgstr "Verbunden — %d:%02dm"
 
 #: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2647
+#: ../src/empathy-call-window.c:2798
 msgid "Technical Details"
 msgstr "Technische Details"
 
 #: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2685
+#: ../src/empathy-call-window.c:2836
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3452,7 +3509,7 @@ msgstr ""
 "Rechner unterstützt werden"
 
 #: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2690
+#: ../src/empathy-call-window.c:2841
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3462,7 +3519,7 @@ msgstr ""
 "Rechner unterstützt werden"
 
 #: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2696
+#: ../src/empathy-call-window.c:2847
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3472,28 +3529,28 @@ msgstr ""
 "Netzwerk des Gegenüber oder Ihres direkte Verbindungen."
 
 #: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2702
+#: ../src/empathy-call-window.c:2853
 msgid "There was a failure on the network"
 msgstr "Es gab im Netzwerk einen Fehler"
 
 #: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2706
+#: ../src/empathy-call-window.c:2857
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
-"Die für diesen Anruf erforderlichen Audioformate sind nicht auf Ihrem Rechner "
-"installiert"
+"Die für diesen Anruf erforderlichen Audioformate sind nicht auf Ihrem "
+"Rechner installiert"
 
 #: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2709
+#: ../src/empathy-call-window.c:2860
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
-"Die für diesen Anruf erforderlichen Videoformate sind nicht auf Ihrem Rechner "
-"installiert"
+"Die für diesen Anruf erforderlichen Videoformate sind nicht auf Ihrem "
+"Rechner installiert"
 
 #: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2721
+#: ../src/empathy-call-window.c:2872
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3505,22 +3562,22 @@ msgstr ""
 "dem Fenster »Fehlerdiagnose« im Menü »Hilfe« anbei."
 
 #: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2730
+#: ../src/empathy-call-window.c:2881
 msgid "There was a failure in the call engine"
 msgstr "Es gab einen Fehler im Anrufsystem"
 
 #: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2733
+#: ../src/empathy-call-window.c:2884
 msgid "The end of the stream was reached"
 msgstr "Das Ende des Datenstroms wurde erreicht"
 
 #: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2773
+#: ../src/empathy-call-window.c:2924
 msgid "Can't establish audio stream"
 msgstr "Es kann kein Audio-Strom aufgebaut werden"
 
 #: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2783
+#: ../src/empathy-call-window.c:2934
 msgid "Can't establish video stream"
 msgstr "Es kann kein Video-Strom aufgebaut werden"
 
@@ -3611,8 +3668,8 @@ msgstr "Videoübertragung ein-/ausschalten"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2280 ../src/empathy-call-window.c:2281
-#: ../src/empathy-call-window.c:2282 ../src/empathy-call-window.c:2283
+#: ../src/empathy-call-window.c:2431 ../src/empathy-call-window.c:2432
+#: ../src/empathy-call-window.c:2433 ../src/empathy-call-window.c:2434
 msgid "Unknown"
 msgstr "Unbekannt"
 
@@ -3781,7 +3838,7 @@ msgstr "Raumfavoriten verwalten"
 msgid "Incoming video call"
 msgstr "Eingehender Video-Anruf"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1408
 msgid "Incoming call"
 msgstr "Eingehender Anruf"
 
@@ -3796,7 +3853,7 @@ msgid "%s is calling you. Do you want to answer?"
 msgstr "%s ruft Sie an, möchten Sie annehmen?"
 
 #: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1414
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Eingehender Anruf von %s"
@@ -3814,6 +3871,7 @@ msgid "_Answer with video"
 msgstr "Mit _Video annehmen"
 
 #: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1414
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Eingehender Video-Anruf von %s"
@@ -3836,7 +3894,8 @@ msgstr "%s lädt Sie ein, %s beizutreten"
 msgid "_Decline"
 msgstr "A_blehnen"
 
-#: ../src/empathy-event-manager.c:858 ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:858
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Beitreten"
 
@@ -3964,6 +4023,10 @@ msgstr "Unversehrtheit von »%s« wird geprüft"
 msgid "Hashing \"%s\""
 msgstr "»%s« wird überprüft"
 
+#: ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "%"
+
 #: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "Datei"
@@ -3987,8 +4050,8 @@ msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr ""
-"Es wurden keine Benutzerkonten gefunden. Empathy unterstützt momentan nur den "
-"Import von Benutzerkonten aus Pidgin."
+"Es wurden keine Benutzerkonten gefunden. Empathy unterstützt momentan nur "
+"den Import von Benutzerkonten aus Pidgin."
 
 #: ../src/empathy-import-dialog.c:199
 msgid "Import Accounts"
@@ -4051,7 +4114,7 @@ msgstr "Aufladen …"
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../src/empathy-main-window.c:2119
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "Kontaktliste"
 
@@ -4123,7 +4186,8 @@ msgstr "_Dateiübertragungen"
 msgid "_Join…"
 msgstr "_Beitreten …"
 
-#: ../src/empathy-main-window-menubar.ui.h:24 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "_Neue Unterhaltung …"
 
@@ -4312,54 +4376,67 @@ msgid "Display incoming events in the notification area"
 msgstr "Eingehende Ereignisse im Benachrichtigungsfeld anzeigen"
 
 #: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"Die Echounterdrückung dient dazu, Ihre Stimme dem anderen Teilnehmer klarer "
+"darzustellen, könnte aber auf manchen Rechnern Probleme verursachen. Falls "
+"Sie oder der andere Teilnehmer Geräusche oder Unterbrechungen während eines "
+"Anrufs wahrnehmen, sollten Sie die Echounterdrückung deaktivieren und den "
+"Anruf neu starten."
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "Benachrichtigungen aktivieren, wenn sich ein Kontakt anmeldet"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "Benachrichtigungen aktivieren, wenn sich ein Kontakt abmeldet"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Benachrichtigungen aktivieren, wenn der _Chat nicht fokussiert ist"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "Rechtschreibprüfung für Sprachen aktivieren:"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "Allgemein"
 
-#: ../src/empathy-preferences.ui.h:14
-msgid "Input level"
-msgstr "Aufnahmepegel"
-
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input volume"
-msgstr "Aufnahmelautstärke"
+msgid "Input level:"
+msgstr "Aufnahmepegel:"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "Aufnahmelautstärke:"
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "Positionsquellen:"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "Unterhaltungen protokollieren"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "Benachrichtigen"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Klänge für Ereignisse abspielen"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "Privatsphäre"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -4369,23 +4446,23 @@ msgstr ""
 "Ihre Stadt, Ihr Bundesland und Ihr Land übermittelt werden. GPS-Koordinaten "
 "werden auf eine Dezimalstelle genau sein."
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "_Emoticons in grafische Bilder umwandeln"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "Kontaktliste in Räumen an_zeigen"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "Klänge"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "Rechtschreibprüfung"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
@@ -4393,48 +4470,48 @@ msgstr ""
 "Die Liste der Sprachen zeigt nur die Sprachen an, für die Wörterbücher "
 "installiert sind."
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "Erscheinungsbilder"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "Variante:"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "Automatisch beim Start _verbinden"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Mobiltelefon"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "_Benachrichtigungsfenster aktivieren"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "Klänge _aktivieren"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Netzwerk (IP, WLAN)"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "_Neue Chats in eigenen Fenstern öffnen"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "_Position an meine Kontakte übermitteln"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "Positionsgenauigkeit ve_rringern"
 
@@ -4562,16 +4639,16 @@ msgstr ""
 "Die ausgewählte Verbindungsverwaltung unterstützt die Erweiterung zur "
 "entfernten Fehlerdiagnose nicht."
 
+#: ../src/empathy-invite-participant-dialog.c:179
 #: ../src/empathy-invite-participant-dialog.c:205
-#: ../src/empathy-invite-participant-dialog.c:231
 msgid "Invite Participant"
 msgstr "Teilnehmer einladen"
 
-#: ../src/empathy-invite-participant-dialog.c:206
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Wählen Sie einen Kontakt für eine Einladung zur Unterhaltung:"
 
-#: ../src/empathy-invite-participant-dialog.c:227
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "Einladen"
 
@@ -4626,11 +4703,13 @@ msgid "Respond"
 msgstr "Beantworten"
 
 #: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1418
 msgid "Reject"
 msgstr "Abweisen"
 
 #: ../src/empathy-notifications-approver.c:222
 #: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1419
 msgid "Answer"
 msgstr "Antworten"
 
@@ -4648,6 +4727,9 @@ msgstr "Ablehnen"
 msgid "Accept"
 msgstr "Annehmen"
 
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
 #: ../src/empathy-notifications-approver.c:260
 msgid "Provide"
 msgstr "Bereitstellen"
@@ -4660,24 +4742,24 @@ msgstr ""
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1026 ../src/empathy-call-window.c:1049
+#: ../src/empathy-call-window.c:1047 ../src/empathy-call-window.c:1070
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2576
+#: ../src/empathy-call-window.c:2727
 msgid "On hold"
 msgstr "In Warteschleife"
 
-#: ../src/empathy-call-window.c:2579
+#: ../src/empathy-call-window.c:2730
 msgid "Mute"
 msgstr "Stumm"
 
-#: ../src/empathy-call-window.c:2581
+#: ../src/empathy-call-window.c:2732
 msgid "Duration"
 msgstr "Dauer"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2584
+#: ../src/empathy-call-window.c:2735
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
diff --git a/po/en_GB.po b/po/en_GB.po
index fab32d576..a414cae78 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-16 17:02+0000\n"
-"PO-Revision-Date: 2011-03-16 17:04+0100\n"
+"POT-Creation-Date: 2011-09-19 13:12+0100\n"
+"PO-Revision-Date: 2011-09-19 13:13+0100\n"
 "Last-Translator: Bruce Cowan <bruce@bcowan.me.uk>\n"
 "Language-Team: British English <en@li.org>\n"
 "Language: en_GB\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.6.1\n"
+"X-Generator: Virtaal 0.7.1-beta1\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
@@ -40,6 +40,22 @@ msgid "Always open a separate chat window for new chats."
 msgstr "Always open a separate chat window for new chats."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr "Call volume"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr "Call volume, as a percentage."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Camera device"
+msgstr "Camera device"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "Camera position"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -47,45 +63,53 @@ msgstr ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "Chat window theme"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+msgid "Chat window theme variant"
+msgstr "Chat window theme variant"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "Compact contact list"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "Connection managers should be used"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "Contact list sort criterion"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Default camera device to use in video calls, e.g. /dev/video0."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
 msgstr "Default directory to select an avatar image from"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr "Disable popup notifications when away"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr "Disable sounds when away"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
 msgstr "Display incoming events in the status area"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -93,229 +117,247 @@ msgstr ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+msgid "Echo cancellation support"
+msgstr "Echo cancellation support"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr "Empathy can publish the user's location"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy can use the GPS to guess the location"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy can use the mobile phone network to guess the location"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy can use the network to guess the location"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr "Empathy default download folder"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
 msgstr "Empathy has migrated butterfly logs"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy should auto-away when idle"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy should auto-connect on startup"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy should reduce the location's accuracy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy should use the avatar of the contact as the chat window icon"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr "Enable WebKit Developer Tools"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "Enable popup notifications for new messages"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "Enable spell checker"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "Hide main window"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "Hide the main window."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "Nick completed character"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "Open new chats in separate windows"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "Path of the Adium theme to use"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "Path of the Adium theme to use if the theme used for chat is Adium."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Play a sound for incoming messages"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "Play a sound for new conversations"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Play a sound for outgoing messages"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "Play a sound when a contact logs in"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "Play a sound when a contact logs out"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "Play a sound when we log in"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "Play a sound when we log out"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Pop up notifications if the chat isn't focused"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "Pop up notifications when a contact logs in"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "Pop up notifications when a contact logs out"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr "Position the camera preview should be during a call."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+msgid "Show Balance in contact list"
+msgstr "Show Balance in contact list"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "Show avatars"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "Show contact list in rooms"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr "Show hint about closing the main window"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr "Show offline contacts"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
 msgstr "Show protocols"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "Spell checking languages"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr "The default folder to save file transfers in."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
 msgstr "The last directory that an avatar image was chosen from."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
 msgstr "The position for the chat window side pane"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "The stored position (in pixels) of the chat window side pane."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "The theme that is used to display the conversation in chat windows."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr ""
+"The theme variant that is used to display the conversation in chat windows."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Use graphical smileys"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "Use notification sounds"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "Use theme for chat rooms"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Whether Empathy can publish the user's location to their contacts."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Whether Empathy can use the GPS to guess the location."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
 "Whether Empathy can use the mobile phone network to guess the location."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Whether Empathy can use the network to guess the location."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "Whether Empathy has migrated butterfly logs."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr ""
 "Whether Empathy should automatically log into your accounts on startup."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
@@ -323,64 +365,68 @@ msgstr ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr ""
 "Whether to check words typed against the languages you want to check with."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "Whether to convert smileys into graphical images in conversations."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Whether to enable Pulseaudio's echo cancellation filter."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr ""
 "Whether to play a sound to notify of contacts logging into the network."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
 "Whether to play a sound to notify of contacts logging out of the network."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "Whether to play a sound to notify of events."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Whether to play a sound to notify of incoming messages."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Whether to play a sound to notify of new conversations."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Whether to play a sound to notify of outgoing messages."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "Whether to play a sound when logging into a network."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Whether to play a sound when logging out of a network."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr "Whether to play sound notifications when away or busy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "Whether to show a popup notification when a contact goes offline."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "Whether to show a popup notification when a contact goes online."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -388,37 +434,41 @@ msgstr ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "Whether to show a popup notification when receiving a new message."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+msgid "Whether to show account balances in the contact list."
+msgstr "Whether to show account balances in the contact list."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "Whether to show contacts that are offline in the contact list."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
 msgstr "Whether to show popup notifications when away or busy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "Whether to show protocols for contacts in the contact list."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Whether to show the contact list in chat rooms."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "Whether to show the contact list in compact mode."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -426,11 +476,11 @@ msgstr ""
 "Whether to show the message dialogue about closing the main window with the "
 "'x' button in the title bar."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "Whether to use the theme for chat rooms."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -446,7 +496,7 @@ msgstr "Manage Messaging and VoIP accounts"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2242
+#: ../src/empathy-accounts-dialog.c:2324
 msgid "Messaging and VoIP Accounts"
 msgstr "Messaging and VoIP Accounts"
 
@@ -454,18 +504,34 @@ msgstr "Messaging and VoIP Accounts"
 msgid "File transfer completed, but the file was corrupted"
 msgstr "File transfer completed, but the file was corrupted"
 
-#: ../libempathy/empathy-ft-handler.c:1116
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
 msgstr "File transfer not supported by remote contact"
 
-#: ../libempathy/empathy-ft-handler.c:1172
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is not a regular file"
 msgstr "The selected file is not a regular file"
 
-#: ../libempathy/empathy-ft-handler.c:1181
+#: ../libempathy/empathy-ft-handler.c:1176
 msgid "The selected file is empty"
 msgstr "The selected file is empty"
 
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#, c-format
+msgid "Missed call from %s"
+msgstr "Missed call from %s"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, c-format
+msgid "Called %s"
+msgstr "Called %s"
+
+#: ../libempathy/empathy-message.c:422
+#, c-format
+msgid "Call from %s"
+msgstr "Call from %s"
+
 #: ../libempathy/empathy-tp-file.c:268
 msgid "Socket type not supported"
 msgstr "Socket type not supported"
@@ -494,144 +560,142 @@ msgstr "Error while trying to transfer the file"
 msgid "The other participant is unable to transfer the file"
 msgstr "The other participant is unable to transfer the file"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:383
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
 msgid "Unknown reason"
 msgstr "Unknown reason"
 
-#: ../libempathy/empathy-utils.c:305
+#: ../libempathy/empathy-utils.c:222
 msgid "Available"
 msgstr "Available"
 
-#: ../libempathy/empathy-utils.c:307
+#: ../libempathy/empathy-utils.c:224
 msgid "Busy"
 msgstr "Busy"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:227
 msgid "Away"
 msgstr "Away"
 
-#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:229
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:231
 msgid "Offline"
 msgstr "Offline"
 
-#: ../libempathy/empathy-utils.c:316
-#: ../src/empathy-streamed-media-window.c:1904
-#: ../src/empathy-streamed-media-window.c:1905
-#: ../src/empathy-streamed-media-window.c:1906
-#: ../src/empathy-streamed-media-window.c:1907
-#: ../src/empathy-call-window.ui.h:18
+#. translators: presence type is unknown
+#: ../libempathy/empathy-utils.c:234
+msgctxt "presence"
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:274
 msgid "No reason specified"
 msgstr "No reason specified"
 
-#: ../libempathy/empathy-utils.c:357 ../libempathy/empathy-utils.c:413
+#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
 msgid "Status is set to offline"
 msgstr "Status is set to offline"
 
-#: ../libempathy/empathy-utils.c:359 ../libempathy/empathy-utils.c:393
+#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "Network error"
 
-#: ../libempathy/empathy-utils.c:361 ../libempathy/empathy-utils.c:395
+#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
-#: ../libempathy/empathy-utils.c:363 ../libempathy/empathy-utils.c:397
+#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
 msgid "Encryption error"
 msgstr "Encryption error"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:284
 msgid "Name in use"
 msgstr "Name in use"
 
-#: ../libempathy/empathy-utils.c:367 ../libempathy/empathy-utils.c:399
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
 msgid "Certificate not provided"
 msgstr "Certificate not provided"
 
-#: ../libempathy/empathy-utils.c:369 ../libempathy/empathy-utils.c:401
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
 msgid "Certificate untrusted"
 msgstr "Certificate untrusted"
 
-#: ../libempathy/empathy-utils.c:371 ../libempathy/empathy-utils.c:403
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
 msgid "Certificate expired"
 msgstr "Certificate expired"
 
-#: ../libempathy/empathy-utils.c:373 ../libempathy/empathy-utils.c:405
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
 msgid "Certificate not activated"
 msgstr "Certificate not activated"
 
-#: ../libempathy/empathy-utils.c:375 ../libempathy/empathy-utils.c:407
+#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
 msgid "Certificate hostname mismatch"
 msgstr "Certificate hostname mismatch"
 
-#: ../libempathy/empathy-utils.c:377 ../libempathy/empathy-utils.c:409
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate fingerprint mismatch"
 msgstr "Certificate fingerprint mismatch"
 
-#: ../libempathy/empathy-utils.c:379 ../libempathy/empathy-utils.c:411
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate self-signed"
 msgstr "Certificate self-signed"
 
-#: ../libempathy/empathy-utils.c:381
+#: ../libempathy/empathy-utils.c:300
 msgid "Certificate error"
 msgstr "Certificate error"
 
-#: ../libempathy/empathy-utils.c:415
+#: ../libempathy/empathy-utils.c:334
 msgid "Encryption is not available"
 msgstr "Encryption is not available"
 
-#: ../libempathy/empathy-utils.c:417
+#: ../libempathy/empathy-utils.c:336
 msgid "Certificate is invalid"
 msgstr "Certificate is invalid"
 
-#: ../libempathy/empathy-utils.c:419
+#: ../libempathy/empathy-utils.c:338
 msgid "Connection has been refused"
 msgstr "Connection has been refused"
 
-#: ../libempathy/empathy-utils.c:421
+#: ../libempathy/empathy-utils.c:340
 msgid "Connection can't be established"
 msgstr "Connection can't be established"
 
-#: ../libempathy/empathy-utils.c:423
+#: ../libempathy/empathy-utils.c:342
 msgid "Connection has been lost"
 msgstr "Connection has been lost"
 
-#: ../libempathy/empathy-utils.c:425
+#: ../libempathy/empathy-utils.c:344
 msgid "This resource is already connected to the server"
 msgstr "This resource is already connected to the server"
 
-#: ../libempathy/empathy-utils.c:427
+#: ../libempathy/empathy-utils.c:346
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Connection has been replaced by a new connection using the same resource"
 
-#: ../libempathy/empathy-utils.c:430
+#: ../libempathy/empathy-utils.c:349
 msgid "The account already exists on the server"
 msgstr "The account already exists on the server"
 
-#: ../libempathy/empathy-utils.c:432
+#: ../libempathy/empathy-utils.c:351
 msgid "Server is currently too busy to handle the connection"
 msgstr "Server is currently too busy to handle the connection"
 
-#: ../libempathy/empathy-utils.c:434
+#: ../libempathy/empathy-utils.c:353
 msgid "Certificate has been revoked"
 msgstr "Certificate has been revoked"
 
-#: ../libempathy/empathy-utils.c:436
+#: ../libempathy/empathy-utils.c:355
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Certificate uses an insecure cypher algorithm or is cryptographically weak"
 
-#: ../libempathy/empathy-utils.c:439
+#: ../libempathy/empathy-utils.c:358
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -639,150 +703,144 @@ msgstr ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 
-#: ../libempathy/empathy-utils.c:602
+#: ../libempathy/empathy-utils.c:519
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "People Nearby"
 
-#: ../libempathy/empathy-utils.c:607
+#: ../libempathy/empathy-utils.c:524
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:636
+#: ../libempathy/empathy-utils.c:553
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:637
+#: ../libempathy/empathy-utils.c:554
 msgid "Facebook Chat"
 msgstr "Facebook Chat"
 
-#: ../libempathy/empathy-time.c:137
+#: ../libempathy/empathy-time.c:88
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d second ago"
 msgstr[1] "%d seconds ago"
 
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:93
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minute ago"
 msgstr[1] "%d minutes ago"
 
-#: ../libempathy/empathy-time.c:147
+#: ../libempathy/empathy-time.c:98
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d hour ago"
 msgstr[1] "%d hours ago"
 
-#: ../libempathy/empathy-time.c:152
+#: ../libempathy/empathy-time.c:103
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d day ago"
 msgstr[1] "%d days ago"
 
-#: ../libempathy/empathy-time.c:157
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d week ago"
 msgstr[1] "%d weeks ago"
 
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:113
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d month ago"
 msgstr[1] "%d months ago"
 
-#: ../libempathy/empathy-time.c:167
+#: ../libempathy/empathy-time.c:136
 msgid "in the future"
 msgstr "in the future"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:501
-msgid "All"
-msgstr "All"
+#: ../libempathy-gtk/empathy-account-chooser.c:540
+msgid "All accounts"
+msgstr "All accounts"
 
-#: ../libempathy-gtk/empathy-account-widget.c:679
-#: ../libempathy-gtk/empathy-log-window.c:647
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "Account"
 
-#: ../libempathy-gtk/empathy-account-widget.c:680
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "Password"
 
-#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:754
-#: ../libempathy-gtk/empathy-account-widget.c:811
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1163
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "My Web Accounts"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "The account %s is edited via My Web Accounts."
+msgid "The account %s is edited via %s."
+msgstr "The account %s is edited via %s."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1169
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "The account %s cannot be edited in Empathy."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1189
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
 msgstr "Launch My Web Accounts"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1527
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "Edit %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Username:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1894
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "A_pply"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1924
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
 msgstr "L_og in"
 
-#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1990
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:517
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1481
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "Account:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2001
-msgid "_Enabled"
-msgstr "_Enabled"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2066
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "This account already exists on the server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2069
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "Create a new account on the server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2261
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "Ca_ncel"
 
@@ -791,19 +849,19 @@ msgstr "Ca_ncel"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2558
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s on %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2584
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "%s Account"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2588
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "New account"
 
@@ -815,6 +873,7 @@ msgstr "<b>Example:</b> MyScreenName"
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -828,7 +887,7 @@ msgstr "Advanced"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "Pass_word:"
 msgstr "Pass_word:"
@@ -838,7 +897,7 @@ msgstr "Pass_word:"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
 msgid "Remember Password"
 msgstr "Remember Password"
 
@@ -848,7 +907,7 @@ msgstr "Remember Password"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 #: ../libempathy-gtk/empathy-password-dialog.c:311
 msgid "Remember password"
@@ -924,76 +983,84 @@ msgstr "What is your ICQ UIN?"
 msgid "What is your ICQ password?"
 msgstr "What is your ICQ password?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:183
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "Auto"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:221
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "Register"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:226
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "Options"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "None"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Character set:"
 msgstr "Character set:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Network"
 msgstr "Network"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Network:"
 msgstr "Network:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Nickname:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "Password:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "Quit message:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "Real name:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Servers"
 msgstr "Servers"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "What is your IRC nickname?"
 msgstr "What is your IRC nickname?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Which IRC network?"
 
@@ -1127,58 +1194,67 @@ msgid "Discover the STUN server automatically"
 msgstr "Discover the STUN server automatically"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "Ignore TLS Errors"
+msgstr "Ignore TLS Errors"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Interval (seconds)"
 msgstr "Interval (seconds)"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
 msgid "Keep-Alive Options"
 msgstr "Keep-Alive Options"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
 msgid "Loose Routing"
 msgstr "Loose Routeing"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Mechanism:"
 msgstr "Mechanism:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
 msgid "Miscellaneous Options"
 msgstr "Miscellaneous Options"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 msgid "NAT Traversal Options"
 msgstr "NAT Traversal Options"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 msgid "Port:"
 msgstr "Port:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 msgid "Proxy Options"
 msgstr "Proxy Options"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "STUN Server:"
 msgstr "STUN Server:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.c:347
 msgid "Server:"
 msgstr "Server:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid "Transport:"
 msgstr "Transport:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Use this account to call _landlines and mobile phones"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "What is your SIP account password?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "What is your SIP login ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "_Username:"
 
@@ -1202,28 +1278,36 @@ msgstr "Yahoo! I_D:"
 msgid "_Room List locale:"
 msgstr "_Room List locale:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:448
-#: ../libempathy-gtk/empathy-avatar-chooser.c:524
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "Couldn't convert image"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "None of the accepted image formats are supported on your system"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:936
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+msgid "Couldn't save picture to file"
+msgstr "Couldn't save picture to file"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "Select Your Avatar Image"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:939
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
+msgid "Take a picture..."
+msgstr "Take a picture…"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "No Image"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "Images"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "All Files"
 
@@ -1231,35 +1315,61 @@ msgstr "All Files"
 msgid "Click to enlarge"
 msgstr "Click to enlarge"
 
-#: ../libempathy-gtk/empathy-chat.c:655
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
+msgid "There was an error starting the call"
+msgstr "There was an error starting the call"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact doesn't support calls"
+msgstr "The specified contact doesn't support calls"
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is offline"
+msgstr "The specified contact is offline"
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "The specified contact is not valid"
+msgstr "The specified contact is not valid"
+
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "Emergency calls are not supported on this protocol"
+msgstr "Emergency calls are not supported on this protocol"
+
+#: ../libempathy-gtk/empathy-chat.c:702
 msgid "Failed to open private chat"
 msgstr "Failed to open private chat"
 
-#: ../libempathy-gtk/empathy-chat.c:720
+#: ../libempathy-gtk/empathy-chat.c:763
 msgid "Topic not supported on this conversation"
 msgstr "Topic not supported on this conversation"
 
-#: ../libempathy-gtk/empathy-chat.c:726
+#: ../libempathy-gtk/empathy-chat.c:769
 msgid "You are not allowed to change the topic"
 msgstr "You are not allowed to change the topic"
 
-#: ../libempathy-gtk/empathy-chat.c:909
+#: ../libempathy-gtk/empathy-chat.c:973
+#, c-format
+msgid "“%s� is not a valid contact ID"
+msgstr "“%s� is not a valid contact ID"
+
+#: ../libempathy-gtk/empathy-chat.c:1058
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: clear all messages from the current conversation"
 
-#: ../libempathy-gtk/empathy-chat.c:912
+#: ../libempathy-gtk/empathy-chat.c:1061
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topic>: set the topic of the current conversation"
 
-#: ../libempathy-gtk/empathy-chat.c:915
+#: ../libempathy-gtk/empathy-chat.c:1064
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <chat room ID>: join a new chat room"
 
-#: ../libempathy-gtk/empathy-chat.c:918
+#: ../libempathy-gtk/empathy-chat.c:1067
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <chat room ID>: join a new chat room"
 
-#: ../libempathy-gtk/empathy-chat.c:923
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1267,23 +1377,23 @@ msgstr ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 
-#: ../libempathy-gtk/empathy-chat.c:928
+#: ../libempathy-gtk/empathy-chat.c:1075
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <contact ID> [<message>]: open a private chat"
 
-#: ../libempathy-gtk/empathy-chat.c:931
+#: ../libempathy-gtk/empathy-chat.c:1078
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <contact ID> <message>: open a private chat"
 
-#: ../libempathy-gtk/empathy-chat.c:934
+#: ../libempathy-gtk/empathy-chat.c:1081
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nickname>: change your nickname on the current server"
 
-#: ../libempathy-gtk/empathy-chat.c:937
+#: ../libempathy-gtk/empathy-chat.c:1084
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <message>: send an ACTION message to the current conversation"
 
-#: ../libempathy-gtk/empathy-chat.c:940
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1293,7 +1403,11 @@ msgstr ""
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 
-#: ../libempathy-gtk/empathy-chat.c:945
+#: ../libempathy-gtk/empathy-chat.c:1092
+msgid "/whois <contact ID>: display information about a contact"
+msgstr "/whois <contact ID>: display information about a contact"
+
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1301,98 +1415,113 @@ msgstr ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 
-#: ../libempathy-gtk/empathy-chat.c:955
+#: ../libempathy-gtk/empathy-chat.c:1112
 #, c-format
 msgid "Usage: %s"
 msgstr "Usage: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:997
+#: ../libempathy-gtk/empathy-chat.c:1157
 msgid "Unknown command"
 msgstr "Unknown command"
 
-#: ../libempathy-gtk/empathy-chat.c:1123
+#: ../libempathy-gtk/empathy-chat.c:1283
 msgid "Unknown command; see /help for the available commands"
 msgstr "Unknown command; see /help for the available commands"
 
-#: ../libempathy-gtk/empathy-chat.c:1263
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1453
+msgid "insufficient balance to send message"
+msgstr "insufficient balance to send message"
+
+#: ../libempathy-gtk/empathy-chat.c:1455
+msgid "not capable"
+msgstr "not capable"
+
+#: ../libempathy-gtk/empathy-chat.c:1462
 msgid "offline"
 msgstr "offline"
 
-#: ../libempathy-gtk/empathy-chat.c:1266
+#: ../libempathy-gtk/empathy-chat.c:1465
 msgid "invalid contact"
 msgstr "invalid contact"
 
-#: ../libempathy-gtk/empathy-chat.c:1269
+#: ../libempathy-gtk/empathy-chat.c:1468
 msgid "permission denied"
 msgstr "permission denied"
 
-#: ../libempathy-gtk/empathy-chat.c:1272
+#: ../libempathy-gtk/empathy-chat.c:1471
 msgid "too long message"
 msgstr "too long message"
 
-#: ../libempathy-gtk/empathy-chat.c:1275
+#: ../libempathy-gtk/empathy-chat.c:1474
 msgid "not implemented"
 msgstr "not implemented"
 
-#: ../libempathy-gtk/empathy-chat.c:1279
+#: ../libempathy-gtk/empathy-chat.c:1478
 msgid "unknown"
 msgstr "unknown"
 
-#: ../libempathy-gtk/empathy-chat.c:1283
+#: ../libempathy-gtk/empathy-chat.c:1484
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Error sending message '%s': %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1344 ../src/empathy-chat-window.c:707
+#: ../libempathy-gtk/empathy-chat.c:1488
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Error sending message: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1549 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Topic:"
 
-#: ../libempathy-gtk/empathy-chat.c:1356
+#: ../libempathy-gtk/empathy-chat.c:1561
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Topic set to: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1358
+#: ../libempathy-gtk/empathy-chat.c:1563
 msgid "No topic defined"
 msgstr "No topic defined"
 
-#: ../libempathy-gtk/empathy-chat.c:1857
+#: ../libempathy-gtk/empathy-chat.c:2072
 msgid "(No Suggestions)"
 msgstr "(No Suggestions)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1925
+#: ../libempathy-gtk/empathy-chat.c:2140
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Add '%s' to Dictionary"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1962
+#: ../libempathy-gtk/empathy-chat.c:2177
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Add '%s' to %s Dictionary"
 
-#: ../libempathy-gtk/empathy-chat.c:2021
+#: ../libempathy-gtk/empathy-chat.c:2247
 msgid "Insert Smiley"
 msgstr "Insert Smiley"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2039
-#: ../libempathy-gtk/empathy-ui-utils.c:1810
+#: ../libempathy-gtk/empathy-chat.c:2265
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "_Send"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2319
 msgid "_Spelling Suggestions"
 msgstr "_Spelling Suggestions"
 
-#: ../libempathy-gtk/empathy-chat.c:2163
+#: ../libempathy-gtk/empathy-chat.c:2408
 msgid "Failed to retrieve recent logs"
 msgstr "Failed to retrieve recent logs"
 
-#: ../libempathy-gtk/empathy-chat.c:2274
+#: ../libempathy-gtk/empathy-chat.c:2545
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s has disconnected"
@@ -1400,12 +1529,12 @@ msgstr "%s has disconnected"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2281
+#: ../libempathy-gtk/empathy-chat.c:2552
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s was kicked by %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2284
+#: ../libempathy-gtk/empathy-chat.c:2555
 #, c-format
 msgid "%s was kicked"
 msgstr "%s was kicked"
@@ -1413,17 +1542,17 @@ msgstr "%s was kicked"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2292
+#: ../libempathy-gtk/empathy-chat.c:2563
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s was banned by %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2295
+#: ../libempathy-gtk/empathy-chat.c:2566
 #, c-format
 msgid "%s was banned"
 msgstr "%s was banned"
 
-#: ../libempathy-gtk/empathy-chat.c:2299
+#: ../libempathy-gtk/empathy-chat.c:2570
 #, c-format
 msgid "%s has left the room"
 msgstr "%s has left the room"
@@ -1433,105 +1562,137 @@ msgstr "%s has left the room"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2308
+#: ../libempathy-gtk/empathy-chat.c:2579
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2333
+#: ../libempathy-gtk/empathy-chat.c:2604
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s has joined the room"
 
-#: ../libempathy-gtk/empathy-chat.c:2358
+#: ../libempathy-gtk/empathy-chat.c:2629
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s is now known as %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2497
-#: ../src/empathy-streamed-media-window.c:1949
-#: ../src/empathy-event-manager.c:1122
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2768
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
+#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
 msgid "Disconnected"
 msgstr "Disconnected"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3127
+#: ../libempathy-gtk/empathy-chat.c:3415
 msgid "Would you like to store this password?"
 msgstr "Would you like to store this password?"
 
-#: ../libempathy-gtk/empathy-chat.c:3133
+#: ../libempathy-gtk/empathy-chat.c:3421
 msgid "Remember"
 msgstr "Remember"
 
-#: ../libempathy-gtk/empathy-chat.c:3143
+#: ../libempathy-gtk/empathy-chat.c:3431
 msgid "Not now"
 msgstr "Not now"
 
-#: ../libempathy-gtk/empathy-chat.c:3187
+#: ../libempathy-gtk/empathy-chat.c:3475
 msgid "Retry"
 msgstr "Retry"
 
-#: ../libempathy-gtk/empathy-chat.c:3191
+#: ../libempathy-gtk/empathy-chat.c:3479
 msgid "Wrong password; please try again:"
 msgstr "Wrong password; please try again:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3308
+#: ../libempathy-gtk/empathy-chat.c:3609
 msgid "This room is protected by a password:"
 msgstr "This room is protected by a password:"
 
-#: ../libempathy-gtk/empathy-chat.c:3335
+#: ../libempathy-gtk/empathy-chat.c:3636
 msgid "Join"
 msgstr "Join"
 
-#: ../libempathy-gtk/empathy-chat.c:3505 ../src/empathy-event-manager.c:1144
+#: ../libempathy-gtk/empathy-chat.c:3838 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "Connected"
 
-#: ../libempathy-gtk/empathy-chat.c:3558
-#: ../libempathy-gtk/empathy-log-window.c:654
+#: ../libempathy-gtk/empathy-chat.c:3893
 msgid "Conversation"
 msgstr "Conversation"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:422
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:3898
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (SMS)"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
 msgid "Unknown or invalid identifier"
 msgstr "Unknown or invalid identifier"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
 msgid "Contact blocking temporarily unavailable"
 msgstr "Contact blocking temporarily unavailable"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
 msgid "Contact blocking unavailable"
 msgstr "Contact blocking unavailable"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
 msgid "Permission Denied"
 msgstr "Permission Denied"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
 msgid "Could not block contact"
 msgstr "Could not block contact"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:701
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
 msgid "Edit Blocked Contacts"
 msgstr "Edit Blocked Contacts"
 
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Account:"
+msgstr "Account:"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "Blocked Contacts"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Remove"
+
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:794
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Copy Link Address"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:801
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Open Link"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:420
+#: ../libempathy-gtk/empathy-chat-text-view.c:415
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
@@ -1549,25 +1710,25 @@ msgstr "Personal Information"
 msgid "New Contact"
 msgstr "New Contact"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:532
-#: ../libempathy-gtk/empathy-individual-dialogs.c:198
+#: ../libempathy-gtk/empathy-contact-dialogs.c:533
+#: ../libempathy-gtk/empathy-individual-dialogs.c:200
 #, c-format
 msgid "Block %s?"
 msgstr "Block %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:537
-#: ../libempathy-gtk/empathy-individual-dialogs.c:239
+#: ../libempathy-gtk/empathy-contact-dialogs.c:538
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Are you sure you want to block '%s' from contacting you again?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:542
-#: ../libempathy-gtk/empathy-individual-dialogs.c:261
+#: ../libempathy-gtk/empathy-contact-dialogs.c:543
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
 msgid "_Block"
 msgstr "_Block"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:552
-#: ../libempathy-gtk/empathy-individual-dialogs.c:270
+#: ../libempathy-gtk/empathy-contact-dialogs.c:559
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Report this contact as abusive"
@@ -1593,301 +1754,331 @@ msgstr "Ungrouped"
 msgid "Favorite People"
 msgstr "Favourite People"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2012
-#: ../libempathy-gtk/empathy-individual-view.c:2337
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Do you really want to remove the group '%s'?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2014
-#: ../libempathy-gtk/empathy-individual-view.c:2340
+#: ../libempathy-gtk/empathy-contact-list-view.c:1988
+#: ../libempathy-gtk/empathy-individual-view.c:2379
 msgid "Removing group"
 msgstr "Removing group"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2063
-#: ../libempathy-gtk/empathy-contact-list-view.c:2140
-#: ../libempathy-gtk/empathy-individual-view.c:2395
-#: ../libempathy-gtk/empathy-individual-view.c:2563
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../libempathy-gtk/empathy-contact-list-view.c:2037
+#: ../libempathy-gtk/empathy-contact-list-view.c:2114
+#: ../libempathy-gtk/empathy-individual-view.c:2434
+#: ../libempathy-gtk/empathy-individual-view.c:2637
 msgid "_Remove"
 msgstr "_Remove"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2093
-#: ../libempathy-gtk/empathy-individual-view.c:2448
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
+#: ../libempathy-gtk/empathy-individual-view.c:2501
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Do you really want to remove the contact '%s'?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2095
-#: ../libempathy-gtk/empathy-individual-view.c:2469
+#: ../libempathy-gtk/empathy-contact-list-view.c:2069
+#: ../libempathy-gtk/empathy-individual-view.c:2522
 msgid "Removing contact"
 msgstr "Removing contact"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:219
-#: ../src/empathy-main-window.ui.h:13
+#: ../libempathy-gtk/empathy-contact-menu.c:220
+#: ../src/empathy-main-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "_Add Contact…"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:296
+#: ../libempathy-gtk/empathy-contact-menu.c:300
 msgid "_Block Contact"
 msgstr "_Block Contact"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:325
-#: ../libempathy-gtk/empathy-individual-menu.c:517
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:329
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "_Chat"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:356
-#: ../libempathy-gtk/empathy-individual-menu.c:560
+#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Audio Call"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:387
-#: ../libempathy-gtk/empathy-individual-menu.c:602
+#: ../libempathy-gtk/empathy-contact-menu.c:394
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Video Call"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:433
-#: ../libempathy-gtk/empathy-individual-menu.c:645
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:440
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "_Previous Conversations"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:455
-#: ../libempathy-gtk/empathy-individual-menu.c:686
+#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "Send File"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:478
-#: ../libempathy-gtk/empathy-individual-menu.c:728
+#: ../libempathy-gtk/empathy-contact-menu.c:485
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
 msgstr "Share My Desktop"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:518
-#: ../libempathy-gtk/empathy-contact-widget.c:1763
-#: ../libempathy-gtk/empathy-individual-menu.c:763
+#: ../libempathy-gtk/empathy-contact-menu.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:1886
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
 #: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "Favourite"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:547
-#: ../libempathy-gtk/empathy-individual-menu.c:791
+#: ../libempathy-gtk/empathy-contact-menu.c:554
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "Infor_mation"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:593
+#: ../libempathy-gtk/empathy-contact-menu.c:600
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "_Edit"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:647
-#: ../libempathy-gtk/empathy-individual-menu.c:972
-#: ../src/empathy-chat-window.c:919
+#: ../libempathy-gtk/empathy-contact-menu.c:654
+#: ../libempathy-gtk/empathy-individual-menu.c:1283
+#: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "Inviting you to this room"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:678
-#: ../libempathy-gtk/empathy-individual-menu.c:1019
+#: ../libempathy-gtk/empathy-contact-menu.c:685
+#: ../libempathy-gtk/empathy-individual-menu.c:1329
 msgid "_Invite to Chat Room"
 msgstr "_Invite to Chat Room"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:510
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
 msgid "Search contacts"
 msgstr "Search contacts"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:540
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
 msgid "Search: "
 msgstr "Search: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:598
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
 msgid "_Add Contact"
 msgstr "_Add Contact"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:616
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
 msgid "No contacts found"
 msgstr "No contacts found"
 
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr "Your message introducing yourself:"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
+msgstr "Please let me see when you're online. Thanks!"
+
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "Select a contact"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:295
+#: ../libempathy-gtk/empathy-contact-widget.c:336
 #: ../libempathy-gtk/empathy-individual-widget.c:153
 msgid "Full name:"
 msgstr "Full name:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:296
+#: ../libempathy-gtk/empathy-contact-widget.c:337
 #: ../libempathy-gtk/empathy-individual-widget.c:154
 msgid "Phone number:"
 msgstr "Phone number:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:297
+#: ../libempathy-gtk/empathy-contact-widget.c:338
 #: ../libempathy-gtk/empathy-individual-widget.c:155
 msgid "E-mail address:"
 msgstr "E-mail address:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:298
+#: ../libempathy-gtk/empathy-contact-widget.c:339
 #: ../libempathy-gtk/empathy-individual-widget.c:156
 msgid "Website:"
 msgstr "Website:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:299
+#: ../libempathy-gtk/empathy-contact-widget.c:340
 #: ../libempathy-gtk/empathy-individual-widget.c:157
 msgid "Birthday:"
 msgstr "Birthday:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:346
+msgid "Last seen:"
+msgstr "Last seen:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:348
+msgid "Connected from:"
+msgstr "Connected from:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:353
+msgid "Away message:"
+msgstr "Away message:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+msgid "Channels:"
+msgstr "Channels:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
 msgstr "Country ISO Code:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Country:"
 msgstr "Country:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "State:"
 msgstr "County:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:768
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "City:"
 msgstr "City:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:770
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Area:"
 msgstr "Area:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:772
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
 msgstr "Postal Code:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:774
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Street:"
 msgstr "Street:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:776
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
 msgstr "Building:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:778
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Floor:"
 msgstr "Floor:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:780
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Room:"
 msgstr "Room:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:782
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Text:"
 msgstr "Text:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:784
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Description:"
 msgstr "Description:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:786
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
 msgstr "Accuracy Level:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:790
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr "Error:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:792
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
 msgstr "Vertical Error (metres):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:794
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
 msgstr "Horizontal Error (metres):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr "Speed:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Bearing:"
 msgstr "Bearing:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:800
-#: ../libempathy-gtk/empathy-individual-widget.c:526
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
 msgstr "Climb Speed:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:802
-#: ../libempathy-gtk/empathy-individual-widget.c:528
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
 msgstr "Last Updated on:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:804
-#: ../libempathy-gtk/empathy-individual-widget.c:530
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
 msgstr "Longitude:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:806
-#: ../libempathy-gtk/empathy-individual-widget.c:532
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
 msgstr "Latitude:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:808
-#: ../libempathy-gtk/empathy-individual-widget.c:534
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
 msgstr "Altitude:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:871
-#: ../libempathy-gtk/empathy-contact-widget.c:888
-#: ../libempathy-gtk/empathy-individual-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:633
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "Location"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:890
-#: ../libempathy-gtk/empathy-individual-widget.c:635
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:942
-#: ../libempathy-gtk/empathy-individual-widget.c:684
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e %B, %Y at %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1024
-#: ../libempathy-gtk/empathy-individual-widget.c:919
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
 msgid "Save Avatar"
 msgstr "Save Avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1080
-#: ../libempathy-gtk/empathy-individual-widget.c:977
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
 msgid "Unable to save avatar"
 msgstr "Unable to save avatar"
 
@@ -1897,7 +2088,7 @@ msgstr "<b>Location</b> at (date)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1307
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr "Alias:"
 
@@ -1917,7 +2108,7 @@ msgstr "Contact Details"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "Identifier:"
 
@@ -1934,11 +2125,11 @@ msgstr "OS:"
 msgid "Version:"
 msgstr "Version:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:332
+#: ../libempathy-gtk/empathy-groups-widget.c:333
 msgid "Groups"
 msgstr "Groups"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:344
+#: ../libempathy-gtk/empathy-groups-widget.c:345
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -1946,74 +2137,105 @@ msgstr ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:363
+#: ../libempathy-gtk/empathy-groups-widget.c:364
 msgid "_Add Group"
 msgstr "_Add Group"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:398
+#: ../libempathy-gtk/empathy-groups-widget.c:399
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Select"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1436
+#: ../libempathy-gtk/empathy-groups-widget.c:409
+#: ../src/empathy-main-window.c:1807
 msgid "Group"
 msgstr "Group"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:244
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "The following identity will be blocked:"
 msgstr[1] "The following identities will be blocked:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:251
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "The following identity can not be blocked:"
 msgstr[1] "The following identities can not be blocked:"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
 msgstr "Linked Contacts"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:354
+#: ../libempathy-gtk/empathy-individual-linker.c:370
 msgid "Select contacts to link"
 msgstr "Select contacts to link"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:428
+#: ../libempathy-gtk/empathy-individual-linker.c:444
 msgid "New contact preview"
 msgstr "New contact preview"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:472
+#: ../libempathy-gtk/empathy-individual-linker.c:488
 msgid "Contacts selected in the list on the left will be linked together."
 msgstr "Contacts selected in the list on the left will be linked together."
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:131
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:839
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "Select account to use to place the call"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "Call"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+msgid "Mobile"
+msgstr "Mobile"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "Work"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "HOME"
+
+#. add an SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+msgid "_SMS"
+msgstr "_SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1141
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Edit"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:865
+#: ../libempathy-gtk/empathy-individual-menu.c:1167
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "_Link Contacts…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2302
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 msgid "Delete and _Block"
 msgstr "Delete and _Block"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2457
+#: ../libempathy-gtk/empathy-individual-view.c:2510
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2022,7 +2244,7 @@ msgstr ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
 "remove all the contacts which make up this linked contact."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2106,65 +2328,201 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "_Unlink"
 
-#: ../libempathy-gtk/empathy-log-window.c:664
-msgid "Date"
-msgstr "Date"
+#: ../libempathy-gtk/empathy-log-window.c:634
+msgid "History"
+msgstr "History"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
-msgstr "Conversations"
+#: ../libempathy-gtk/empathy-log-window.c:689
+msgid "Show"
+msgstr "Show"
+
+#: ../libempathy-gtk/empathy-log-window.c:711
+msgid "Search"
+msgstr "Search"
+
+#: ../libempathy-gtk/empathy-log-window.c:1159
+#, c-format
+msgid "Chat in %s"
+msgstr "Chat in %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1161
+#, c-format
+msgid "Chat with %s"
+msgstr "Chat with %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%A, %e %B %Y %X"
+
+#. Translators: this is an emote: '* Danielle waves'
+#: ../libempathy-gtk/empathy-log-window.c:1300
+#, c-format
+msgid "<i>* %s %s</i>"
+msgstr "<i>* %s %s</i>"
+
+#. Translators: this is a message: 'Danielle: hello'
+#. * The string in bold is the sender's name
+#: ../libempathy-gtk/empathy-log-window.c:1306
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1382
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s second"
+msgstr[1] "%s seconds"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s minute"
+msgstr[1] "%s minutes"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "Call took %s, ended at %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1729
+msgid "Today"
+msgstr "Today"
+
+#: ../libempathy-gtk/empathy-log-window.c:1733
+msgid "Yesterday"
+msgstr "Yesterday"
+
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
+msgid "%e %B %Y"
+msgstr "%e %B %Y"
+
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3425
+msgid "Anytime"
+msgstr "Anytime"
+
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2353
+msgid "Anyone"
+msgstr "Anyone"
+
+#: ../libempathy-gtk/empathy-log-window.c:2666
+msgid "Who"
+msgstr "Who"
+
+#: ../libempathy-gtk/empathy-log-window.c:2870
+msgid "When"
+msgstr "When"
+
+#: ../libempathy-gtk/empathy-log-window.c:2986
+msgid "Anything"
+msgstr "Anything"
+
+#: ../libempathy-gtk/empathy-log-window.c:2988
+msgid "Text chats"
+msgstr "Text chats"
+
+#: ../libempathy-gtk/empathy-log-window.c:2990
+#: ../src/empathy-preferences.ui.h:4
+msgid "Calls"
+msgstr "Calls"
+
+#: ../libempathy-gtk/empathy-log-window.c:2995
+msgid "Incoming calls"
+msgstr "Incoming calls"
+
+#: ../libempathy-gtk/empathy-log-window.c:2996
+msgid "Outgoing calls"
+msgstr "Outgoing calls"
+
+#: ../libempathy-gtk/empathy-log-window.c:2997
+msgid "Missed calls"
+msgstr "Missed calls"
+
+#: ../libempathy-gtk/empathy-log-window.c:3019
+msgid "What"
+msgstr "What"
+
+#: ../libempathy-gtk/empathy-log-window.c:3728
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr "Are you sure you want to delete all logs of previous conversations?"
+
+#: ../libempathy-gtk/empathy-log-window.c:3732
+msgid "Clear All"
+msgstr "Clear All"
+
+#: ../libempathy-gtk/empathy-log-window.c:3739
+msgid "Delete from:"
+msgstr "Delete from:"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Loading…</span>"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "Find Next"
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Chat"
+msgstr "Chat"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "Find Previous"
+msgid "Delete All History..."
+msgstr "Delete All History…"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr "Previous Conversations"
+msgid "Profile"
+msgstr "Profile"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Video"
+msgstr "Video"
 
-#. Tab Label
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "Search"
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:20
+msgid "_Edit"
+msgstr "_Edit"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "_File"
+msgstr "_File"
 
-#. Searching *for* something
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "_For:"
+msgid "page 2"
+msgstr "page 2"
 
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
 msgid "Contact ID:"
 msgstr "Contact ID:"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:171
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
 msgid "C_hat"
 msgstr "C_hat"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:181
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
 msgstr "New Conversation"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:252
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
 msgid "Send _Video"
 msgstr "Send _Video"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:260
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
 msgid "C_all"
 msgstr "C_all"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:270
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "New Call"
 msgstr "New Call"
 
@@ -2183,34 +2541,34 @@ msgstr ""
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Message…"
 msgstr "Custom Message…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messages…"
 msgstr "Edit Custom Messages…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
 msgstr "Click to remove this status as a favourite"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
 msgstr "Click to make this status a favourite"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
 msgstr "Set status"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:948
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
 msgid "Set your presence and current status"
 msgstr "Set your presence and current status"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1136
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
 msgid "Custom messages…"
 msgstr "Custom messages…"
 
@@ -2223,18 +2581,26 @@ msgstr "Custom messages…"
 msgid "New %s account"
 msgstr "New %s account"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "Find:"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "Match case"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Mat_ch case"
+msgstr "Mat_ch case"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
 msgid "Phrase not found"
 msgstr "Phrase not found"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "_Next"
+msgstr "_Next"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+msgid "_Previous"
+msgstr "_Previous"
+
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
 msgstr "Received an instant message"
@@ -2275,35 +2641,32 @@ msgstr "Outgoing voice call"
 msgid "Voice call ended"
 msgstr "Voice call ended"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "Enter Custom Message"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
 msgstr "Edit Custom Messages"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr "Save _New Status Message"
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#, c-format
+msgid "Message edited at %s"
+msgstr "Message edited at %s"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Status Messages"
-msgstr "Saved Status Messages"
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
+msgid "Normal"
+msgstr "Normal"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "Classic"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "Simple"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "Clean"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "Blue"
 
@@ -2380,19 +2743,19 @@ msgstr "Remember this choice for future connections"
 msgid "Certificate Details"
 msgstr "Certificate Details"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1707
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
 msgstr "Unable to open URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1802
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
 msgstr "Select a file"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1874
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
 msgid "Insufficient free space to save file"
 msgstr "Insufficient free space to save file"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1882
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2401,7 +2764,7 @@ msgstr ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1926
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Incoming file from %s"
@@ -2589,23 +2952,23 @@ msgstr "No error message"
 msgid "Instant Message (Empathy)"
 msgstr "Instant Message (Empathy)"
 
-#: ../src/empathy.c:308
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "Don't connect on startup"
 
-#: ../src/empathy.c:312
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Don't display the contact list or any other dialogues on startup"
 
-#: ../src/empathy.c:320
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr "- Empathy IM Client"
 
-#: ../src/empathy.c:499
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
 msgstr "Error contacting the Account Manager"
 
-#: ../src/empathy.c:501
+#: ../src/empathy.c:639
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2693,7 +3056,7 @@ msgstr ""
 "this assistant and add accounts later from the Edit menu."
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1268
+#: ../src/empathy-account-assistant.c:1271
 msgid "An error occurred"
 msgstr "An error occurred"
 
@@ -2757,17 +3120,17 @@ msgstr "No, I just want to see people online nearby for now"
 msgid "Select the accounts you want to import:"
 msgstr "Select the accounts you want to import:"
 
-#: ../src/empathy-account-assistant.c:810
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-account-assistant.c:813
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "Yes"
 msgstr "Yes"
 
-#: ../src/empathy-account-assistant.c:817
+#: ../src/empathy-account-assistant.c:820
 msgid "No, that's all for now"
 msgstr "No, that's all for now"
 
-#: ../src/empathy-account-assistant.c:1082
+#: ../src/empathy-account-assistant.c:1085
 msgid ""
 "Empathy can automatically discover and chat with the people connected on the "
 "same network as you. If you want to use this feature, please check that the "
@@ -2779,16 +3142,16 @@ msgstr ""
 "details below are correct. You can easily change these details later or "
 "disable this feature by using the 'Accounts' dialogue"
 
-#: ../src/empathy-account-assistant.c:1088
-#: ../src/empathy-account-assistant.c:1144
+#: ../src/empathy-account-assistant.c:1091
+#: ../src/empathy-account-assistant.c:1147
 msgid "Edit->Accounts"
 msgstr "Edit->Accounts"
 
-#: ../src/empathy-account-assistant.c:1104
+#: ../src/empathy-account-assistant.c:1107
 msgid "I do _not want to enable this feature for now"
 msgstr "I do _not want to enable this feature for now"
 
-#: ../src/empathy-account-assistant.c:1140
+#: ../src/empathy-account-assistant.c:1143
 msgid ""
 "You won't be able to chat with people connected to your local network, as "
 "telepathy-salut is not installed. If you want to enable this feature, please "
@@ -2800,23 +3163,23 @@ msgstr ""
 "install the telepathy-salut package and create a People Nearby account from "
 "the Accounts dialogue"
 
-#: ../src/empathy-account-assistant.c:1146
+#: ../src/empathy-account-assistant.c:1149
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut not installed"
 
-#: ../src/empathy-account-assistant.c:1192
+#: ../src/empathy-account-assistant.c:1195
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "Messaging and VoIP Accounts Assistant"
 
-#: ../src/empathy-account-assistant.c:1226
+#: ../src/empathy-account-assistant.c:1229
 msgid "Welcome to Empathy"
 msgstr "Welcome to Empathy"
 
-#: ../src/empathy-account-assistant.c:1235
+#: ../src/empathy-account-assistant.c:1238
 msgid "Import your existing accounts"
 msgstr "Import your existing accounts"
 
-#: ../src/empathy-account-assistant.c:1253
+#: ../src/empathy-account-assistant.c:1256
 msgid "Please enter personal details"
 msgstr "Please enter personal details"
 
@@ -2833,34 +3196,35 @@ msgstr "There are unsaved modifications to your %s account."
 msgid "Your new account has not been saved yet."
 msgstr "Your new account has not been saved yet."
 
-#: ../src/empathy-accounts-dialog.c:286
-#: ../src/empathy-streamed-media-window.c:809
+#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1216
 msgid "Connecting…"
 msgstr "Connecting…"
 
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:386
 #, c-format
 msgid "Offline — %s"
 msgstr "Offline — %s"
 
-#: ../src/empathy-accounts-dialog.c:339
+#: ../src/empathy-accounts-dialog.c:398
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Disconnected — %s"
 
-#: ../src/empathy-accounts-dialog.c:350
+#: ../src/empathy-accounts-dialog.c:409
 msgid "Offline — No Network Connection"
 msgstr "Offline — No Network Connection"
 
-#: ../src/empathy-accounts-dialog.c:357
+#: ../src/empathy-accounts-dialog.c:416
 msgid "Unknown Status"
 msgstr "Unknown Status"
 
-#: ../src/empathy-accounts-dialog.c:369
+#: ../src/empathy-accounts-dialog.c:428
 msgid "Offline — Account Disabled"
 msgstr "Offline — Account Disabled"
 
-#: ../src/empathy-accounts-dialog.c:772
+#: ../src/empathy-accounts-dialog.c:831
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2868,16 +3232,16 @@ msgstr ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 
-#: ../src/empathy-accounts-dialog.c:1133
+#: ../src/empathy-accounts-dialog.c:1192
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Do you want to remove %s from your computer?"
 
-#: ../src/empathy-accounts-dialog.c:1137
+#: ../src/empathy-accounts-dialog.c:1196
 msgid "This will not remove your account on the server."
 msgstr "This will not remove your account on the server."
 
-#: ../src/empathy-accounts-dialog.c:1375
+#: ../src/empathy-accounts-dialog.c:1432
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2886,15 +3250,15 @@ msgstr ""
 "your changes. Are you sure you want to proceed?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1571
+#: ../src/empathy-accounts-dialog.c:1643
 msgid "_Enable"
 msgstr "_Enable"
 
-#: ../src/empathy-accounts-dialog.c:1572
+#: ../src/empathy-accounts-dialog.c:1644
 msgid "_Disable"
 msgstr "_Disable"
 
-#: ../src/empathy-accounts-dialog.c:2086
+#: ../src/empathy-accounts-dialog.c:2154
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2903,18 +3267,22 @@ msgstr ""
 "your changes. Are you sure you want to proceed?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Add…"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
 msgid "Loading account information"
 msgstr "Loading account information"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "No protocol installed"
 msgstr "No protocol installed"
 
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -2922,19 +3290,15 @@ msgstr ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add…"
-msgstr "_Add…"
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Import…"
 msgstr "_Import…"
 
-#: ../src/empathy-auth-client.c:243
+#: ../src/empathy-auth-client.c:249
 msgid " - Empathy authentication client"
 msgstr " - Empathy authentication client"
 
-#: ../src/empathy-auth-client.c:259
+#: ../src/empathy-auth-client.c:265
 msgid "Empathy authentication client"
 msgstr "Empathy authentication client"
 
@@ -2942,94 +3306,116 @@ msgstr "Empathy authentication client"
 msgid "People nearby"
 msgstr "People nearby"
 
-#: ../src/empathy-av.c:118
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathy Audio/Video Client"
 
-#: ../src/empathy-av.c:134
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy Audio/Video Client"
 
-#: ../src/empathy-streamed-media-window.c:479
+#: ../src/empathy-streamed-media-window.c:431
 msgid "Contrast"
 msgstr "Contrast"
 
-#: ../src/empathy-streamed-media-window.c:482
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Brightness"
 msgstr "Brightness"
 
-#: ../src/empathy-streamed-media-window.c:485
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:590
+#: ../src/empathy-streamed-media-window.c:542
 msgid "Volume"
 msgstr "Volume"
 
-#: ../src/empathy-streamed-media-window.c:1166
+#: ../src/empathy-streamed-media-window.c:1110
 msgid "_Sidebar"
 msgstr "_Sidebar"
 
-#: ../src/empathy-streamed-media-window.c:1186
+#: ../src/empathy-streamed-media-window.c:1130
 msgid "Audio input"
 msgstr "Audio input"
 
-#: ../src/empathy-streamed-media-window.c:1190
+#: ../src/empathy-streamed-media-window.c:1134
 msgid "Video input"
 msgstr "Video input"
 
-#: ../src/empathy-streamed-media-window.c:1194
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Dialpad"
 msgstr "Dialpad"
 
-#: ../src/empathy-streamed-media-window.c:1205
+#: ../src/empathy-streamed-media-window.c:1151
 msgid "Details"
 msgstr "Details"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1274
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1825
 #, c-format
 msgid "Call with %s"
 msgstr "Call with %s"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-streamed-media-window.c:1353
-msgid "Call"
-msgstr "Call"
-
-#: ../src/empathy-streamed-media-window.c:1507
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:2069
 msgid "The IP address as seen by the machine"
 msgstr "The IP address as seen by the machine"
 
-#: ../src/empathy-streamed-media-window.c:1509
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:2071
 msgid "The IP address as seen by a server on the Internet"
 msgstr "The IP address as seen by a server on the Internet"
 
-#: ../src/empathy-streamed-media-window.c:1511
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:2073
 msgid "The IP address of the peer as seen by the other side"
 msgstr "The IP address of the peer as seen by the other side"
 
-#: ../src/empathy-streamed-media-window.c:1513
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:2075
 msgid "The IP address of a relay server"
 msgstr "The IP address of a relay server"
 
-#: ../src/empathy-streamed-media-window.c:1515
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:2077
 msgid "The IP address of the multicast group"
 msgstr "The IP address of the multicast group"
 
+#: ../src/empathy-streamed-media-window.c:1843
+msgctxt "encoding video codec"
+msgid "Unknown"
+msgstr "Unknown"
+
+#: ../src/empathy-streamed-media-window.c:1846
+msgctxt "encoding audio codec"
+msgid "Unknown"
+msgstr "Unknown"
+
+#: ../src/empathy-streamed-media-window.c:1849
+msgctxt "decoding video codec"
+msgid "Unknown"
+msgstr "Unknown"
+
+#: ../src/empathy-streamed-media-window.c:1852
+msgctxt "decoding audio codec"
+msgid "Unknown"
+msgstr "Unknown"
+
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2266
+#: ../src/empathy-streamed-media-window.c:2144
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Connected — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2327
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2846
 msgid "Technical Details"
 msgstr "Technical Details"
 
-#: ../src/empathy-streamed-media-window.c:2365
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2884
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3038,7 +3424,8 @@ msgstr ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 
-#: ../src/empathy-streamed-media-window.c:2370
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2889
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3047,7 +3434,8 @@ msgstr ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 
-#: ../src/empathy-streamed-media-window.c:2376
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2895
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3056,23 +3444,27 @@ msgstr ""
 "Can't establish a connection to %s. One of you might be on a network that "
 "does not allow direct connections."
 
-#: ../src/empathy-streamed-media-window.c:2382
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2901
 msgid "There was a failure on the network"
 msgstr "There was a failure on the network"
 
-#: ../src/empathy-streamed-media-window.c:2386
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2905
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "The audio formats necessary for this call are not installed on your computer"
 
-#: ../src/empathy-streamed-media-window.c:2389
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2908
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "The video formats necessary for this call are not installed on your computer"
 
-#: ../src/empathy-streamed-media-window.c:2399
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2920
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3083,147 +3475,200 @@ msgstr ""
 "\">report this bug</a> and attach logs gathered from the 'Debug' window in "
 "the Help menu."
 
-#: ../src/empathy-streamed-media-window.c:2407
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2929
 msgid "There was a failure in the call engine"
 msgstr "There was a failure in the call engine"
 
-#: ../src/empathy-streamed-media-window.c:2410
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2932
 msgid "The end of the stream was reached"
 msgstr "The end of the stream was reached"
 
-#: ../src/empathy-streamed-media-window.c:2450
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2972
 msgid "Can't establish audio stream"
 msgstr "Can't establish audio stream"
 
-#: ../src/empathy-streamed-media-window.c:2460
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2982
 msgid "Can't establish video stream"
 msgstr "Can't establish video stream"
 
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "Audio"
 msgstr "Audio"
 
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Call the contact again"
-
 #: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "Camera Off"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "Decoding Codec:"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "Camera On"
+msgid "Disable camera"
+msgstr "Disable camera"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Decoding Codec:"
+msgid "Display the dialpad"
+msgstr "Display the dialpad"
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Disable camera and stop sending video"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "Encoding Codec:"
 
 #: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Enable camera and send video"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Hang up"
+msgstr "Hang up"
 
 #: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Enable camera but don't send video"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Hang up current call"
+msgstr "Hang up current call"
 
 #: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Encoding Codec:"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "Local Candidate:"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "Hang up"
+msgid "Maximise me"
+msgstr "Maximise me"
 
 #: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Hang up current call"
+msgid "Minimise me"
+msgstr "Minimise me"
 
 #: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Local Candidate:"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "Remote Candidate:"
 
 #: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "Preview"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Send Audio"
+msgstr "Send Audio"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "Redial"
+msgid "Send Video"
+msgstr "Send Video"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Remote Candidate:"
+msgid "Show dialpad"
+msgstr "Show dialpad"
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "Send Audio"
+msgid "Start a video call"
+msgstr "Start a video call"
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Toggle audio transmission"
+msgid "Start an audio call"
+msgstr "Start an audio call"
+
+#: ../src/empathy-call-window.ui.h:18
+msgid "Swap camera"
+msgstr "Swap camera"
 
 #: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ideo"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr "Toggle audio transmission"
 
 #: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "Video"
+msgid "Toggle video transmission"
+msgstr "Toggle video transmission"
 
 #: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "Video Off"
-
-#: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "Video On"
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
+#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
+msgid "Unknown"
+msgstr "Unknown"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "Video Preview"
+msgid "Video call"
+msgstr "Video call"
 
 #: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "_Call"
 
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:25
+msgid "_Camera"
+msgstr "_Camera"
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:18
+msgid "_Contents"
+msgstr "_Contents"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
+msgid "_Debug"
+msgstr "_Debug"
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:22
+msgid "_Help"
+msgstr "_Help"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Microphone"
+msgstr "_Microphone"
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "_Settings"
+msgstr "_Settings"
+
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_View"
 
-#: ../src/empathy-chat-window.c:472 ../src/empathy-chat-window.c:492
+#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d unread)"
 msgstr[1] "%s (%d unread)"
 
-#: ../src/empathy-chat-window.c:484
+#: ../src/empathy-chat-window.c:493
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (and %u other)"
 msgstr[1] "%s (and %u others)"
 
-#: ../src/empathy-chat-window.c:500
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d unread from others)"
 msgstr[1] "%s (%d unread from others)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:518
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d unread from all)"
 msgstr[1] "%s (%d unread from all)"
 
-#: ../src/empathy-chat-window.c:711
+#: ../src/empathy-chat-window.c:733
+msgid "SMS:"
+msgstr "SMS:"
+
+#: ../src/empathy-chat-window.c:743
+#, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "Sending %d message"
+msgstr[1] "Sending %d messages"
+
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
 msgstr "Typing a message."
 
@@ -3235,10 +3680,6 @@ msgstr "C_lear"
 msgid "C_ontact"
 msgstr "C_ontact"
 
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Chat"
-
 #: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
 msgstr "Insert _Smiley"
@@ -3259,10 +3700,6 @@ msgstr "Move Tab _Right"
 msgid "Notify for All Messages"
 msgstr "Notify for All Messages"
 
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
-msgid "_Contents"
-msgstr "_Contents"
-
 #: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "_Conversation"
@@ -3271,18 +3708,10 @@ msgstr "_Conversation"
 msgid "_Detach Tab"
 msgstr "_Detach Tab"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
-msgid "_Edit"
-msgstr "_Edit"
-
 #: ../src/empathy-chat-window.ui.h:13
 msgid "_Favorite Chat Room"
 msgstr "_Favourite Chat Room"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
-msgid "_Help"
-msgstr "_Help"
-
 #: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "_Next Tab"
@@ -3303,15 +3732,15 @@ msgstr "_Tabs"
 msgid "_Undo Close Tab"
 msgstr "_Undo Close Tab"
 
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "Name"
 
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
 msgstr "Room"
 
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "Auto-Connect"
 
@@ -3319,90 +3748,96 @@ msgstr "Auto-Connect"
 msgid "Manage Favorite Rooms"
 msgstr "Manage Favourite Rooms"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming video call"
 msgstr "Incoming video call"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
 msgid "Incoming call"
 msgstr "Incoming call"
 
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:525
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s is video calling you. Do you want to answer?"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s is calling you. Do you want to answer?"
 
-#: ../src/empathy-event-manager.c:515 ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Incoming call from %s"
 
-#: ../src/empathy-event-manager.c:540
+#: ../src/empathy-event-manager.c:554
 msgid "_Reject"
 msgstr "_Reject"
 
-#: ../src/empathy-event-manager.c:546
+#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
 msgid "_Answer"
 msgstr "_Answer"
 
-#: ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:570
+msgid "_Answer with video"
+msgstr "_Answer with video"
+
+#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Incoming video call from %s"
 
-#: ../src/empathy-event-manager.c:737
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
 msgstr "Room invitation"
 
-#: ../src/empathy-event-manager.c:739
+#: ../src/empathy-event-manager.c:838
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Invitation to join %s"
 
-#: ../src/empathy-event-manager.c:746
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s is inviting you to join %s"
 
-#: ../src/empathy-event-manager.c:754
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
 msgstr "_Decline"
 
-#: ../src/empathy-event-manager.c:759
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Join"
 
-#: ../src/empathy-event-manager.c:786
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s invited you to join %s"
 
-#: ../src/empathy-event-manager.c:792
+#: ../src/empathy-event-manager.c:891
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "You have been invited to join %s"
 
-#: ../src/empathy-event-manager.c:843
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Incoming file transfer from %s"
 
-#: ../src/empathy-event-manager.c:1013 ../src/empathy-main-window.c:370
+#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
 msgid "Password required"
 msgstr "Password required"
 
-#: ../src/empathy-event-manager.c:1069
+#: ../src/empathy-event-manager.c:1190
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s would like permission to see when you are online"
 
-#: ../src/empathy-event-manager.c:1073
+#: ../src/empathy-event-manager.c:1194
 #, c-format
 msgid ""
 "\n"
@@ -3412,105 +3847,105 @@ msgstr ""
 "Message: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:100
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:102
+#: ../src/empathy-ft-manager.c:103
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:179
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s of %s at %s/s"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:275
 #, c-format
 msgid "%s of %s"
 msgstr "%s of %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:305
+#: ../src/empathy-ft-manager.c:306
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Receiving \"%s\" from %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:309
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Sending \"%s\" to %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:338
+#: ../src/empathy-ft-manager.c:339
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Error receiving \"%s\" from %s"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:342
 msgid "Error receiving a file"
 msgstr "Error receiving a file"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:347
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Error sending \"%s\" to %s"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:350
 msgid "Error sending a file"
 msgstr "Error sending a file"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:489
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" received from %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:493
+#: ../src/empathy-ft-manager.c:494
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" sent to %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:497
 msgid "File transfer completed"
 msgstr "File transfer completed"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
 msgid "Waiting for the other participant's response"
 msgstr "Waiting for the other participant's response"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Checking integrity of \"%s\""
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Hashing \"%s\""
 
-#: ../src/empathy-ft-manager.c:1016
+#: ../src/empathy-ft-manager.c:1026
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1028
+#: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "File"
 
-#: ../src/empathy-ft-manager.c:1050
+#: ../src/empathy-ft-manager.c:1060
 msgid "Remaining"
 msgstr "Remaining"
 
@@ -3547,127 +3982,140 @@ msgstr "Protocol"
 msgid "Source"
 msgstr "Source"
 
-#: ../src/empathy-main-window.c:387
+#: ../src/empathy-main-window.c:392
 msgid "Provide Password"
 msgstr "Provide Password"
 
-#: ../src/empathy-main-window.c:393
+#: ../src/empathy-main-window.c:398
 msgid "Disconnect"
 msgstr "Disconnect"
 
-#: ../src/empathy-main-window.c:533
+#: ../src/empathy-main-window.c:622
 msgid "No match found"
 msgstr "No match found"
 
-#: ../src/empathy-main-window.c:688
+#: ../src/empathy-main-window.c:777
 msgid "Reconnect"
 msgstr "Reconnect"
 
-#: ../src/empathy-main-window.c:694
+#: ../src/empathy-main-window.c:783
 msgid "Edit Account"
 msgstr "Edit Account"
 
-#: ../src/empathy-main-window.c:700
+#: ../src/empathy-main-window.c:789
 msgid "Close"
 msgstr "Close"
 
-#: ../src/empathy-main-window.c:1418
+#. Translators: this string will be something like:
+#. *   Top up My Account ($1.23)..."
+#: ../src/empathy-main-window.c:928
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr "Top up %s (%s)…"
+
+#: ../src/empathy-main-window.c:975
+msgid "Top up account credit"
+msgstr "Top up account credit"
+
+#. top up button
+#: ../src/empathy-main-window.c:1046
+msgid "Top Up..."
+msgstr "Top Up…"
+
+#: ../src/empathy-main-window.c:1789
 msgid "Contact"
 msgstr "Contact"
 
-#: ../src/empathy-main-window.c:1765
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "Contact List"
 
-#: ../src/empathy-main-window.c:1881
-msgid "Show and edit accounts"
-msgstr "Show and edit accounts"
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "Contacts on a _Map"
 
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-main-window-menubar.ui.h:2
+msgid "Credit Balance"
+msgstr "Credit Balance"
+
+#: ../src/empathy-main-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "Find in Contact _List"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "Join _Favourites"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "Manage Favourites"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "N_ormal Size"
 
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "New _Call…"
 
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "Normal Size With _Avatars"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "P_references"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "Show P_rotocols"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "Sort by _Name"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "Sort by _Status"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Accounts"
 
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "_Blocked Contacts"
 
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "_Compact Size"
 
-#: ../src/empathy-main-window.ui.h:18
-msgid "_Debug"
-msgstr "_Debug"
-
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "_File Transfers"
 
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "_Join…"
 
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "_New Conversation…"
 
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "_Offline Contacts"
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "_Personal Information"
 
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "_Room"
 
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window-menubar.ui.h:29
 msgid "_Search for Contacts…"
 msgstr "_Search for Contacts…"
 
@@ -3681,7 +4129,7 @@ msgstr "Members"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:560
+#: ../src/empathy-new-chatroom-dialog.c:553
 #, c-format
 msgid ""
 "%s\n"
@@ -3694,16 +4142,16 @@ msgstr ""
 "Password required: %s\n"
 "Members: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "No"
 msgstr "No"
 
-#: ../src/empathy-new-chatroom-dialog.c:591
+#: ../src/empathy-new-chatroom-dialog.c:584
 msgid "Could not start room listing"
 msgstr "Could not start room listing"
 
-#: ../src/empathy-new-chatroom-dialog.c:601
+#: ../src/empathy-new-chatroom-dialog.c:594
 msgid "Could not stop room listing"
 msgstr "Could not stop room listing"
 
@@ -3737,39 +4185,79 @@ msgstr "Room List"
 msgid "_Room:"
 msgstr "_Room:"
 
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr "Message received"
 
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr "Message sent"
 
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
 msgstr "New conversation"
 
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
 msgstr "Contact goes online"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
 msgstr "Contact goes offline"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
 msgstr "Account connected"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
 msgstr "Account disconnected"
 
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr "Language"
 
-#: ../src/empathy-preferences.c:875
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:734
+msgid "Juliet"
+msgstr "Juliet"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:741
+msgid "Romeo"
+msgstr "Romeo"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:747
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr "O Romeo, Romeo, wherefore art thou Romeo?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:750
+msgid "Deny thy father and refuse thy name;"
+msgstr "Deny thy father and refuse thy name;"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:753
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr "Or if thou wilt not, be but sworn my love"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:756
+msgid "And I'll no longer be a Capulet."
+msgstr "And I'll no longer be a Capulet."
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:759
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr "Shall I hear more, or shall I speak at this?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:762
+msgid "Juliet has disconnected"
+msgstr "Juliet has disconnected"
+
+#: ../src/empathy-preferences.c:1166
 msgid "Preferences"
 msgstr "Preferences"
 
@@ -3777,67 +4265,87 @@ msgstr "Preferences"
 msgid "Appearance"
 msgstr "Appearance"
 
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
 msgstr "Behaviour"
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
 msgid "Chat Th_eme:"
 msgstr "Chat Th_eme:"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
 msgid "Disable notifications when _away or busy"
 msgstr "Disable notifications when _away or busy"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
 msgid "Disable sounds when _away or busy"
 msgstr "Disable sounds when _away or busy"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Display incoming events in the notification area"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "Enable notifications when a contact comes online"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "Enable notifications when a contact goes offline"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Enable notifications when the _chat is not focused"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "Enable spell checking for languages:"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "General"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input level:"
+msgstr "Input level:"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "Input volume:"
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "Location sources:"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "Log conversations"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "Notifications"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Play sound for events"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "Privacy"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -3847,23 +4355,23 @@ msgstr ""
 "county and country will be published.  GPS coordinates will be accurate to 1 "
 "decimal place."
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "Show _smileys as images"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "Show contact _list in rooms"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "Sounds"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "Spell Checking"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
@@ -3871,44 +4379,48 @@ msgstr ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "Themes"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:30
+msgid "Variant:"
+msgstr "Variant:"
+
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "_Automatically connect on startup"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Mobile phone"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "_Enable bubble notifications"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "_Enable sound notifications"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Network (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "_Open new chats in separate windows"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "_Publish location to my contacts"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "_Reduce location accuracy"
 
@@ -3920,67 +4432,115 @@ msgstr "Status"
 msgid "_Quit"
 msgstr "_Quit"
 
-#: ../src/empathy-map-view.c:442
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "Call the contact again"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "Camera Off"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "Camera On"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "Disable camera and stop sending video"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "Enable camera and send video"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "Enable camera but don't send video"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "Preview"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "Redial"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "V_ideo"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "Video Off"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "Video On"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "Video Preview"
+
+#: ../src/empathy-map-view.c:448
 msgid "Contact Map View"
 msgstr "Contact Map View"
 
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
 msgid "Save"
 msgstr "Save"
 
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
 msgstr "Debug Window"
 
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
 msgstr "Level "
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
 msgid "Debug"
 msgstr "Debug"
 
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
 msgid "Info"
 msgstr "Info"
 
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
 msgid "Message"
 msgstr "Message"
 
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
 msgid "Warning"
 msgstr "Warning"
 
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
 msgid "Critical"
 msgstr "Critical"
 
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
 msgid "Error"
 msgstr "Error"
 
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
 msgid "Time"
 msgstr "Time"
 
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
 msgid "Domain"
 msgstr "Domain"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
 msgstr "Category"
 
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "Level"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -3988,16 +4548,16 @@ msgstr ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 
-#: ../src/empathy-invite-participant-dialog.c:34
-#: ../src/empathy-invite-participant-dialog.c:48
+#: ../src/empathy-invite-participant-dialog.c:179
+#: ../src/empathy-invite-participant-dialog.c:205
 msgid "Invite Participant"
 msgstr "Invite Participant"
 
-#: ../src/empathy-invite-participant-dialog.c:35
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Choose a contact to invite into the conversation:"
 
-#: ../src/empathy-invite-participant-dialog.c:45
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "Invite"
 
@@ -4028,7 +4588,15 @@ msgstr "- Empathy Accounts"
 msgid "Empathy Accounts"
 msgstr "Empathy Accounts"
 
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr "Show a particular service"
+
+#: ../src/empathy-debugger.c:75
+msgid "- Empathy Debugger"
+msgstr "- Empathy Debugger"
+
+#: ../src/empathy-debugger.c:114
 msgid "Empathy Debugger"
 msgstr "Empathy Debugger"
 
@@ -4036,38 +4604,111 @@ msgstr "Empathy Debugger"
 msgid "- Empathy Chat Client"
 msgstr "- Empathy Chat Client"
 
-#: ../src/empathy-notifications-approver.c:184
+#: ../src/empathy-notifications-approver.c:203
 msgid "Respond"
 msgstr "Respond"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1459
 msgid "Reject"
 msgstr "Reject"
 
-#: ../src/empathy-notifications-approver.c:194
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1460
 msgid "Answer"
 msgstr "Answer"
 
-#: ../src/empathy-notifications-approver.c:201
-#: ../src/empathy-notifications-approver.c:211
+#: ../src/empathy-notifications-approver.c:227
+msgid "Answer with video"
+msgstr "Answer with video"
+
+#: ../src/empathy-notifications-approver.c:235
+#: ../src/empathy-notifications-approver.c:245
 msgid "Decline"
 msgstr "Decline"
 
-#: ../src/empathy-notifications-approver.c:205
-#: ../src/empathy-notifications-approver.c:216
+#: ../src/empathy-notifications-approver.c:239
+#: ../src/empathy-notifications-approver.c:250
 msgid "Accept"
 msgstr "Accept"
 
-#: ../src/empathy-call-observer.c:130
-#, c-format
-msgid "Missed call from %s"
-msgstr "Missed call from %s"
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:260
+msgid "Provide"
+msgstr "Provide"
 
-#: ../src/empathy-call-observer.c:133
+#: ../src/empathy-call-observer.c:134
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s just tried to call you, but you were in another call."
 
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+msgid "i"
+msgstr "i"
+
+#: ../src/empathy-call-window.c:2775
+msgid "On hold"
+msgstr "On hold"
+
+#: ../src/empathy-call-window.c:2778
+msgid "Mute"
+msgstr "Mute"
+
+#: ../src/empathy-call-window.c:2780
+msgid "Duration"
+msgstr "Duration"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2783
+#, c-format
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02dm"
+
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "_Match case"
+
+#~ msgid "All"
+#~ msgstr "All"
+
+#~ msgid "_Enabled"
+#~ msgstr "_Enabled"
+
+#~ msgid "Date"
+#~ msgstr "Date"
+
+#~ msgid "Conversations"
+#~ msgstr "Conversations"
+
+#~ msgid "Find Next"
+#~ msgstr "Find Next"
+
+#~ msgid "Find Previous"
+#~ msgstr "Find Previous"
+
+#~ msgid "Previous Conversations"
+#~ msgstr "Previous Conversations"
+
+#~ msgid "_For:"
+#~ msgstr "_For:"
+
+#~ msgid "Enter Custom Message"
+#~ msgstr "Enter Custom Message"
+
+#~ msgid "Save _New Status Message"
+#~ msgstr "Save _New Status Message"
+
+#~ msgid "Saved Status Messages"
+#~ msgstr "Saved Status Messages"
+
+#~ msgid "Show and edit accounts"
+#~ msgstr "Show and edit accounts"
+
 #~ msgid "%s is now offline."
 #~ msgstr "%s is now offline."
 
@@ -4119,15 +4760,9 @@ msgstr "%s just tried to call you, but you were in another call."
 #~ msgid "<b>Location</b>, "
 #~ msgstr "<b>Location</b>, "
 
-#~ msgid "<b><span size='xx-large'>Loading account information</span></b>"
-#~ msgstr "<b><span size='xx-large'>Loading account information</span></b>"
-
 #~ msgid "page 1"
 #~ msgstr "page 1"
 
-#~ msgid "page 2"
-#~ msgstr "page 2"
-
 #~ msgid "page 3"
 #~ msgstr "page 3"
 
@@ -4186,9 +4821,6 @@ msgstr "%s just tried to call you, but you were in another call."
 #~ msgid "%s account"
 #~ msgstr "%s account"
 
-#~ msgid "Accounts"
-#~ msgstr "Accounts"
-
 #~ msgid "_Add&#x2026;"
 #~ msgstr "_Add&#x2026;"
 
@@ -4198,9 +4830,6 @@ msgstr "%s just tried to call you, but you were in another call."
 #~ msgid " Accounts"
 #~ msgstr " Accounts"
 
-#~ msgid "Salut account is created"
-#~ msgstr "Salut account is created"
-
 #~ msgid "Whether the Salut account has been created on the first Empathy run."
 #~ msgstr ""
 #~ "Whether the Salut account has been created on the first Empathy run."
@@ -4361,9 +4990,6 @@ msgstr "%s just tried to call you, but you were in another call."
 #~ msgid "Allow _network usage"
 #~ msgstr "Allow _network usage"
 
-#~ msgid "Geoclue Settings"
-#~ msgstr "Geoclue Settings"
-
 #~ msgid "Forget password and clear the entry."
 #~ msgstr "Forget password and clear the entry."
 
@@ -4382,9 +5008,6 @@ msgstr "%s just tried to call you, but you were in another call."
 #~ msgid "_Check Word Spelling..."
 #~ msgstr "_Check Word Spelling…"
 
-#~ msgid "<b>Topic:</b>"
-#~ msgstr "<b>Topic:</b>"
-
 #~ msgid "Group Chat"
 #~ msgstr "Group Chat"
 
@@ -4406,9 +5029,6 @@ msgstr "%s just tried to call you, but you were in another call."
 #~ msgid "<b>Groups</b>"
 #~ msgstr "<b>Groups</b>"
 
-#~ msgid "Save message"
-#~ msgstr "Save message"
-
 #~ msgid "Status:"
 #~ msgstr "Status:"
 
@@ -4495,9 +5115,6 @@ msgstr "%s just tried to call you, but you were in another call."
 #~ msgid "Show _Offline Contacts"
 #~ msgstr "Show _Offline Contacts"
 
-#~ msgid "Chat Rooms"
-#~ msgstr "Chat Rooms"
-
 #~ msgid "Browse:"
 #~ msgstr "Browse:"
 
@@ -4521,9 +5138,6 @@ msgstr "%s just tried to call you, but you were in another call."
 #~ msgid "Show _avatars"
 #~ msgstr "Show _avatars"
 
-#~ msgid "Show co_mpact contact list"
-#~ msgstr "Show co_mpact contact list"
-
 #~ msgid "Enable popup when contact is available"
 #~ msgstr "Enable popup when contact is available"
 
@@ -4681,18 +5295,12 @@ msgstr "%s just tried to call you, but you were in another call."
 #~ msgid "Channel banned"
 #~ msgstr "Channel banned"
 
-#~ msgid "Channel full"
-#~ msgstr "Channel full"
-
 #~ msgid "Channel invite only"
 #~ msgstr "Channel invite only"
 
 #~ msgid "Unknown error code"
 #~ msgstr "Unknown error code"
 
-#~ msgid "Start Call"
-#~ msgstr "Start Call"
-
 #~ msgid "gtk-close"
 #~ msgstr "gtk-close"
 
@@ -4732,9 +5340,6 @@ msgstr "%s just tried to call you, but you were in another call."
 #~ msgid "Input"
 #~ msgstr "Input"
 
-#~ msgid "Mute"
-#~ msgstr "Mute"
-
 #~ msgid "Output"
 #~ msgstr "Output"
 
@@ -4831,9 +5436,6 @@ msgstr "%s just tried to call you, but you were in another call."
 #~ msgid "Contact List - Gossip"
 #~ msgstr "Contact List - Gossip"
 
-#~ msgid "Edit Groups"
-#~ msgstr "Edit Groups"
-
 #~ msgid "ID:"
 #~ msgstr "ID:"
 
diff --git a/po/eo.po b/po/eo.po
index aad9dadff..30ac8814a 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -4,6 +4,7 @@
 #
 # Brient HESS <brient@brient.net>, 2004.
 # Aisano, Eliovir, ISHII Eiju, Javier Lancha, Kvantumo, Lucas LARSON, Michael MORONI, Petr Adam DOHN�LEK, Robert BOGENSCHNEIDER, Serge LEBLANC, Shane D, Yamiharu.
+# Neil ROBERTS < >, 2011.
 # Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>, 2010, 2011.
 #
 msgid ""
@@ -11,8 +12,8 @@ msgstr ""
 "Project-Id-Version: empathy master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-06-07 15:34+0000\n"
-"PO-Revision-Date: 2011-06-07 22:44+0200\n"
+"POT-Creation-Date: 2011-10-04 18:19+0000\n"
+"PO-Revision-Date: 2011-10-09 07:59+0200\n"
 "Last-Translator: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>\n"
 "Language-Team: Esperanto <ubuntu-l10n-eo@lists.launchpad.net>\n"
 "MIME-Version: 1.0\n"
@@ -20,8 +21,9 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"X-Launchpad-Export-Date: 2011-05-14 18:39+0000\n"
+"X-DamnedLies-Scope: partial\n"
 "X-Generator: Launchpad (build 13037)\n"
+"X-Launchpad-Export-Date: 2011-05-14 18:39+0000\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
@@ -44,58 +46,79 @@ msgid "Always open a separate chat window for new chats."
 msgstr "Ĉiam malfermi apartan babil-fenestron por novaj babiladoj."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+#| msgid "Call from %s"
+msgid "Call volume"
+msgstr "Voko-laÅ­teco"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#| msgid "Camera On"
+msgid "Camera device"
+msgstr "Filmila aparato"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#| msgid "Camera On"
+msgid "Camera position"
+msgstr "Filmila pazicio"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
-"Signo uzenda post kromnomo dum uzado de plenumig-klavo (Tab) en "
-"grupbabilejo."
+"Signo uzenda post kromnomo dum uzado de plenumig-klavo (Tab) en grupbabilejo."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "Babil-fenestra etoso"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Chat window theme variant"
-msgstr "Babil-fenestra etoso"
+msgstr "Variaĵo de babil-fenestra etoso"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "Listo disigita per komoj, kun uzendaj lingvoj por la kontrolilo (ekz. \"eo, "
 "fr, nl\")."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "Kompakta listo de kontaktuloj"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "Konekto-administrilo estu uzata"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "Kontaktlista ordigkriterio"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
 msgstr "DefaÅ­lta dosierujo por elekto de uzantobildo"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr "El�alti �prucfenestro-sciigojn dum foresto"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr "Malaktivigi sonon kiam fora"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
 msgstr "Montri envenantajn eventojn en la statusa areo"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -103,351 +126,395 @@ msgstr ""
 "Montri envenantajn eventojn en la statusa areo. Se negativa, prezenti ilin "
 "al la uzanto tuj."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+msgid "Echo cancellation support"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr "Empatio povas publikigi la lokon de la uzanto"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empatio rajtas uzi la GPS-on por diveni la lokon"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr ""
 "Empatio rajtas uzi la reton de la portebla telefono por diveni la lokon"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr "Empatio rajtas uzi la reton por diveni la lokon"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr "Defaŭlta el�utujo de Empatio"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
 msgstr "Empatio translokis papiliajn spurojn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr "Ka�i Empation aŭtomate kiam senokupe"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "AÅ­tomata konekto dum la startigo de Empatio"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
-msgstr "Empatio devas redukti la ekzakton pri la loko"
+msgstr "Empatio devas redukti la precizon pri la loko"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
 "Empatio devas uzi la uzantobildon de la kontaktulo kiel piktogramo de la "
 "babilo-fenestro"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr "En�alti evoluigantilojn de WebKit"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "En�alti �prucfenestro-sciigojn pri novaj mesa�oj"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "En�alti literumadan kontrolilon"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "Ka�i ĉeffenestron"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "Ka�i la ĉefan fenestron."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "Malfermi novajn babilejojn en apartaj fenestroj"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "Pado de la uzenda etoso por Adium"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
 "Vojo de la uzenda etoso por Adium se la etoso de la babilejo estas Adium."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Ludi sonon pro alvenintaj mesa�oj"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "Ludi sonon pro novaj babiloj"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Ludi sonon pro elirantaj mesa�oj"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "Ludi sonon kiam kontaktulo ensalutas"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "Ludi sonon kiam kontaktulo elsalutas"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "Ludi sonon kiam ni ensalutas"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "Ludi sonon kiam ni elsalutas"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Åœprucfenestri sciigojn se la babilejo ne estas fokusite"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "Åœprucfenestri sciigojn kiam kontaktulo ensalutas"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "Åœprucfenestri sciigojn kiam kontaktulo elsalutas"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Show Balance in contact list"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#, fuzzy
+#| msgid "Show offline contacts"
+msgid "Show Balance in contact list"
+msgstr "Montri malkonektitulojn"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "Montri avatarojn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "Montri kontakto-liston per ĉambroj"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr "Montri konsileton pri fermado de la ĉefa fenestro"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr "Montri malkonektitulojn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
 msgstr "Montri protokolojn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "Literum-kontrolataj lingvoj"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr "La defaÅ­lta dosierujo por konservi ricevitajn dosierojn."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
 msgstr "La lasta dosierujo el kie estis elektita avataron."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
 msgstr "La loko por la flanka babilfenestro"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "La memorigita loko (en bilderoj) de la flanka panelo de la babilejo."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr ""
 "La etoso, kiu estas uzata por montri la babilon en la babilejfenestroj."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr ""
-"La etoso, kiu estas uzata por montri la babilon en la babilejfenestroj."
+"La variaĵo de etoso, kiu estas uzata por montri la babilon en la "
+"babilejfenestroj."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Uzi grafikajn mienetojn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "Uzi atentig-sonojn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "Uzi etoson por la babilo-ĉambroj"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr ""
 "Ĉu Empatio rajtas publikigi la pozicion de la uzanto al ties kontaktuloj?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Ĉu Empatio rajtas uzi la GPS-on por diveni la pozicion?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
 "Ĉu Empatio rajtas uzi la reton de la portebla telefono por diveni la "
 "pozicion?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Ĉu Empatio rajtas uzi la reton por diveni la pozicion?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#, fuzzy
+#| msgid "Empathy has migrated butterfly logs"
 msgid "Whether Empathy has migrated butterfly logs."
-msgstr ""
+msgstr "Empatio translokis papiliajn spurojn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Ĉu Empatio aŭtomate konekti�u al via kontoj dum startigo?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#, fuzzy
+#| msgid ""
+#| "Whether Empathy should automatically log into your accounts on startup."
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
-msgstr ""
+msgstr "Ĉu Empatio aŭtomate konekti�u al via kontoj dum startigo?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "Ĉu Empatio reduktu la ekzakton de la loko pro privatec-kialoj?"
+msgstr "Ĉu Empatio reduktu la precizon de la loko pro privatec-kialoj?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#, fuzzy
+#| msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
+"Empatio devas uzi la uzantobildon de la kontaktulo kiel piktogramo de la "
+"babilo-fenestro"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "Ĉu konverti miensimbolojn al grafikaj bildoj en konversacioj?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#, fuzzy
+#| msgid "Play a sound for incoming messages"
 msgid "Whether to play a sound to notify of incoming messages."
-msgstr ""
+msgstr "Ludi sonon pro alvenintaj mesa�oj"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#, fuzzy
+#| msgid "Play a sound for new conversations"
 msgid "Whether to play a sound to notify of new conversations."
-msgstr ""
+msgstr "Ludi sonon pro novaj babiloj"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#, fuzzy
+#| msgid "Play a sound for outgoing messages"
 msgid "Whether to play a sound to notify of outgoing messages."
-msgstr ""
+msgstr "Ludi sonon pro elirantaj mesa�oj"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#, fuzzy
+#| msgid "Disable notifications when _away or busy"
 msgid "Whether to play sound notifications when away or busy."
-msgstr ""
+msgstr "Mal�alti sciigojn kiam oni foras aŭ okupi�as"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#, fuzzy
+#| msgid "Enable notifications when a contact goes offline"
 msgid "Whether to show a popup notification when a contact goes offline."
-msgstr ""
+msgstr "Åœalti sciigojn kian kontakto malkonektas"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#, fuzzy
+#| msgid "Enable notifications when a contact comes online"
 msgid "Whether to show a popup notification when a contact goes online."
-msgstr ""
+msgstr "Åœalti sciigojn kiam kontakto konektas"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#, fuzzy
+#| msgid "Enable popup notifications for new messages"
 msgid "Whether to show a popup notification when receiving a new message."
-msgstr ""
+msgstr "En�alti �prucfenestro-sciigojn pri novaj mesa�oj"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show account balances in the contact list."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#, fuzzy
+#| msgid "The theme that is used to display the conversation in chat windows."
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
+"La etoso, kiu estas uzata por montri la babilon en la babilejfenestroj."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#, fuzzy
+#| msgid "Disable notifications when _away or busy"
 msgid "Whether to show popup notifications when away or busy."
-msgstr ""
+msgstr "Mal�alti sciigojn kiam oni foras aŭ okupi�as"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#, fuzzy
+#| msgid "Whether to use the theme for chat rooms."
 msgid "Whether to show the contact list in chat rooms."
-msgstr ""
+msgstr "Ĉu uzi la etoson por babilejoj?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "Ĉu uzi la etoson por babilejoj?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -460,26 +527,42 @@ msgstr "Administri babilaj kaj VoIP-kontojn"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2320
+#: ../src/empathy-accounts-dialog.c:2324
 msgid "Messaging and VoIP Accounts"
 msgstr "Babilaj kaj VoIP-kontoj"
 
 #: ../libempathy/empathy-ft-handler.c:825
 msgid "File transfer completed, but the file was corrupted"
-msgstr ""
+msgstr "La �utado de la dosiero fini�is, sed la dosiero estis difektita"
 
-#: ../libempathy/empathy-ft-handler.c:1113
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
-msgstr ""
+msgstr "Åœutado de dosieroj ne estas subtenata de la fora kontakto"
 
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is not a regular file"
 msgstr "La elektita dosiero ne estas regula"
 
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1176
 msgid "The selected file is empty"
 msgstr "La elektita dosiero estas malplena"
 
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#, c-format
+msgid "Missed call from %s"
+msgstr "Maltrafita voko de %s"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, c-format
+msgid "Called %s"
+msgstr "Vokis %s"
+
+#: ../libempathy/empathy-message.c:422
+#, c-format
+msgid "Call from %s"
+msgstr "Voko de %s"
+
 #: ../libempathy/empathy-tp-file.c:268
 msgid "Socket type not supported"
 msgstr "Ingotipo estas nesubtenata"
@@ -508,158 +591,162 @@ msgstr "Eraro dum provi transigi la dosieron"
 msgid "The other participant is unable to transfer the file"
 msgstr "La alia partoprenanto ne povas transigi la dosieron"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:384
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
 msgid "Unknown reason"
 msgstr "Nekonata kialo"
 
-#: ../libempathy/empathy-utils.c:305
+#: ../libempathy/empathy-utils.c:232
 msgid "Available"
-msgstr "Disponeble"
+msgstr "Disponebla"
 
-#: ../libempathy/empathy-utils.c:307
+#: ../libempathy/empathy-utils.c:234
 msgid "Busy"
 msgstr "Okupite"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:237
 msgid "Away"
 msgstr "For"
 
-#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:239
 msgid "Invisible"
 msgstr "Nevideble"
 
-#: ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:241
 msgid "Offline"
 msgstr "Malkonektite"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:317
+#: ../libempathy/empathy-utils.c:244
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Nekonate"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:284
 msgid "No reason specified"
 msgstr "Neniu kialo indikita"
 
-#: ../libempathy/empathy-utils.c:358 ../libempathy/empathy-utils.c:414
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
 msgid "Status is set to offline"
 msgstr "Stato estas agortite al nekonektite"
 
-#: ../libempathy/empathy-utils.c:360 ../libempathy/empathy-utils.c:394
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "Reta eraro"
 
-#: ../libempathy/empathy-utils.c:362 ../libempathy/empathy-utils.c:396
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
 msgid "Authentication failed"
 msgstr "AÅ­tentokontrolo fiaskis"
 
-#: ../libempathy/empathy-utils.c:364 ../libempathy/empathy-utils.c:398
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
 msgid "Encryption error"
 msgstr "Ĉifrad-eraro"
 
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:294
 msgid "Name in use"
 msgstr "Jam uzata nomo"
 
-#: ../libempathy/empathy-utils.c:368 ../libempathy/empathy-utils.c:400
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate not provided"
 msgstr "Neniu prezentigita atestilo"
 
-#: ../libempathy/empathy-utils.c:370 ../libempathy/empathy-utils.c:402
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate untrusted"
 msgstr "Atestilo nekonfida"
 
-#: ../libempathy/empathy-utils.c:372 ../libempathy/empathy-utils.c:404
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
 msgid "Certificate expired"
 msgstr "Atestilo eksvalidi�is"
 
-#: ../libempathy/empathy-utils.c:374 ../libempathy/empathy-utils.c:406
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
 msgid "Certificate not activated"
 msgstr "Ne aktivigita atestilo"
 
-#: ../libempathy/empathy-utils.c:376 ../libempathy/empathy-utils.c:408
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
 msgid "Certificate hostname mismatch"
 msgstr "Atestogastnomo malkongruas"
 
-#: ../libempathy/empathy-utils.c:378 ../libempathy/empathy-utils.c:410
+#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
 msgid "Certificate fingerprint mismatch"
 msgstr "Atestilo-fingrospuro malkongruas"
 
-#: ../libempathy/empathy-utils.c:380 ../libempathy/empathy-utils.c:412
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
 msgid "Certificate self-signed"
 msgstr "Memkreita atestilo"
 
-#: ../libempathy/empathy-utils.c:382
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate error"
 msgstr "Atestil-eraro"
 
-#: ../libempathy/empathy-utils.c:416
+#: ../libempathy/empathy-utils.c:344
 msgid "Encryption is not available"
 msgstr "Ĉifrado ne estas diponebla"
 
-#: ../libempathy/empathy-utils.c:418
+#: ../libempathy/empathy-utils.c:346
 msgid "Certificate is invalid"
 msgstr "Atestilo estas nevalide"
 
-#: ../libempathy/empathy-utils.c:420
+#: ../libempathy/empathy-utils.c:348
 msgid "Connection has been refused"
 msgstr "Konekto estas rifuzite"
 
-#: ../libempathy/empathy-utils.c:422
+#: ../libempathy/empathy-utils.c:350
 msgid "Connection can't be established"
-msgstr ""
+msgstr "Ne eblas starigi la konekton"
 
-#: ../libempathy/empathy-utils.c:424
+#: ../libempathy/empathy-utils.c:352
 msgid "Connection has been lost"
 msgstr "Perdis konekton"
 
-#: ../libempathy/empathy-utils.c:426
+#: ../libempathy/empathy-utils.c:354
 msgid "This resource is already connected to the server"
-msgstr ""
+msgstr "Ĉi tiu rimedo jam konekti�is al la servilo"
 
-#: ../libempathy/empathy-utils.c:428
+#: ../libempathy/empathy-utils.c:356
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
-msgstr ""
+msgstr "La konekto anstataŭi�is per nova konekto uzanta la saman rimedon"
 
-#: ../libempathy/empathy-utils.c:431
+#: ../libempathy/empathy-utils.c:359
 msgid "The account already exists on the server"
 msgstr "La konto jam ekzistas sur la servilo"
 
-#: ../libempathy/empathy-utils.c:433
+#: ../libempathy/empathy-utils.c:361
 msgid "Server is currently too busy to handle the connection"
-msgstr ""
+msgstr "La servilo tro okupi�as por trakti la konekton"
 
-#: ../libempathy/empathy-utils.c:435
+#: ../libempathy/empathy-utils.c:363
 msgid "Certificate has been revoked"
-msgstr ""
+msgstr "La atestilo senvalidi�is"
 
-#: ../libempathy/empathy-utils.c:437
+#: ../libempathy/empathy-utils.c:365
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
+"La atestilo uzas nesekuran ĉifralgoritmon aŭ estas kriptografie malforta"
 
-#: ../libempathy/empathy-utils.c:440
+#: ../libempathy/empathy-utils.c:368
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr ""
+"La longeco de la atestilo de la servilo, aŭ la profundeco de la ĉeno de la "
+"atestilo, superas la limojn faratajn de la kriptografia biblioteko"
 
-#: ../libempathy/empathy-utils.c:603
+#: ../libempathy/empathy-utils.c:529
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "Proksimaj homoj"
 
-#: ../libempathy/empathy-utils.c:608
+#: ../libempathy/empathy-utils.c:534
 msgid "Yahoo! Japan"
 msgstr "Japana Yahoo!"
 
-#: ../libempathy/empathy-utils.c:637
+#: ../libempathy/empathy-utils.c:563
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:638
+#: ../libempathy/empathy-utils.c:564
 msgid "Facebook Chat"
 msgstr "Facebook-babilejo"
 
@@ -709,71 +796,81 @@ msgstr[1] "AntaÅ­ %d monatoj"
 msgid "in the future"
 msgstr "en la estonteco"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:491
-msgid "All"
-msgstr "Ĉiuj"
+#: ../libempathy-gtk/empathy-account-chooser.c:540
+msgid "All accounts"
+msgstr "Ĉiuj kontoj"
 
-#: ../libempathy-gtk/empathy-account-widget.c:681
-#: ../libempathy-gtk/empathy-log-window.c:643
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "Konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "Pasvorto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Servilo"
 
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Pordo"
 
-#: ../libempathy-gtk/empathy-account-widget.c:756
-#: ../libempathy-gtk/empathy-account-widget.c:813
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1154
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "Miaj surretaj _kontoj"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1209
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr ""
+msgid "The account %s is edited via %s."
+msgstr "La konto %s redakti�as per %s."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1160
+#: ../libempathy-gtk/empathy-account-widget.c:1215
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
-msgstr ""
+msgstr "Ne eblas redakti la konton %s per Empatio."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1180
+#: ../libempathy-gtk/empathy-account-widget.c:1234
 msgid "Launch My Web Accounts"
-msgstr ""
+msgstr "Lanĉi miajn surretajn kontojn"
+
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1242
+#, c-format
+msgid "Edit %s"
+msgstr "Redakti %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1518
+#: ../libempathy-gtk/empathy-account-widget.c:1592
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Uzantonomo:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1836
+#: ../libempathy-gtk/empathy-account-widget.c:1910
 msgid "A_pply"
 msgstr "A_pliki"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1866
+#: ../libempathy-gtk/empathy-account-widget.c:1940
 msgid "L_og in"
 msgstr "E_nsaluti"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:2014
 msgid "This account already exists on the server"
 msgstr "Tiu konto jam ekzistas sur la servilo"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1943
+#: ../libempathy-gtk/empathy-account-widget.c:2017
 msgid "Create a new account on the server"
 msgstr "Krei novan konton sur la servilo"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2135
+#: ../libempathy-gtk/empathy-account-widget.c:2209
 msgid "Ca_ncel"
 msgstr "_Nuligi"
 
@@ -782,19 +879,19 @@ msgstr "_Nuligi"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2413
+#: ../libempathy-gtk/empathy-account-widget.c:2487
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s ĉe %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2439
+#: ../libempathy-gtk/empathy-account-widget.c:2513
 #, c-format
 msgid "%s Account"
 msgstr "%s Konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2443
+#: ../libempathy-gtk/empathy-account-widget.c:2517
 msgid "New account"
 msgstr "Nova konto"
 
@@ -806,6 +903,7 @@ msgstr "<b>Ekzemplo:</b> MiaNomo"
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -888,11 +986,11 @@ msgstr "Ensalut-I_D:"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
 msgid "What is your GroupWise User ID?"
-msgstr ""
+msgstr "Kio estas via uzantidentigilo ĉe GroupWise?"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise password?"
-msgstr ""
+msgstr "Kio estas via pasvorto ĉe GroupWise?"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
 msgid "<b>Example:</b> 123456789"
@@ -905,86 +1003,94 @@ msgstr "Sign_a agordo:"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
 msgid "ICQ _UIN:"
-msgstr ""
+msgstr "_UIN ĉe ICQ:"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
 msgid "What is your ICQ UIN?"
-msgstr ""
+msgstr "Kio estas via UIN ĉe ICQ?"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ password?"
 msgstr "Kio estas via ICQ-pasvorto?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:184
-#: ../libempathy-gtk/empathy-account-widget-sip.c:217
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "AÅ­tomate"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:187
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:193
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:222
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
-msgstr ""
+msgstr "Registro"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:227
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "Agordoj"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "Neniu"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Character set:"
 msgstr "Signa agordo:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"Plej multaj el la serviloj de IRC ne bezonas pasvorton, do se vi ne certas, "
+"ne enmetu pasvorton."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Network"
 msgstr "Reto"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Network:"
 msgstr "Reto:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Kromnomo:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "Pasvorto:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "Ĉeso-mesa�o:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "Reala nomo:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Servers"
 msgstr "Serviloj"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "What is your IRC nickname?"
 msgstr "Kio estas via kromnomon ĉe IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Kiu IRC-reto?"
 
@@ -1002,11 +1108,11 @@ msgstr "Ĉ_ifrado nepras (TLS/SSL)"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
 msgid "I_gnore SSL certificate errors"
-msgstr ""
+msgstr "I_gnori erarojn de atestiloj de SSL"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Override server settings"
-msgstr ""
+msgstr "Superskribi agordojn de la servilo"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
 msgid "Priori_ty:"
@@ -1024,42 +1130,46 @@ msgid ""
 "Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
 "Facebook username if you don't have one."
 msgstr ""
+"Ĉi tio estas via uzantonomo, ne via kutima ensaluto ĉe Facebook.\n"
+"Se vi nomi�as facebook.com/<b>zizelo</b>, enmetu <b>zizelo</b>.\n"
+"Uzu <a href=\\\"http://www.facebook.com/username/\\\">ĉi tiu pa�o</a> por "
+"elekti uzantnomon ĉe Facebook se vi ne jam havas."
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "Use old SS_L"
-msgstr ""
+msgstr "Uzi malnovan SS_L"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
 msgid "What is your Facebook password?"
-msgstr ""
+msgstr "Kio estas via pasvorto ĉe Facebook?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
 msgid "What is your Facebook username?"
-msgstr ""
+msgstr "Kio estas via uzantnomo ĉe Facebook?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 msgid "What is your Google ID?"
-msgstr ""
+msgstr "Kio estas via identigilo ĉe Google?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 msgid "What is your Google password?"
-msgstr ""
+msgstr "Kio estas via pasvorto ĉe Google?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
 msgid "What is your Jabber ID?"
-msgstr ""
+msgstr "Kio estas via identigilo ĉe Jabber?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
 msgid "What is your Jabber password?"
-msgstr ""
+msgstr "Kio estas via pasvorto ĉe Jabber?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your desired Jabber ID?"
-msgstr ""
+msgstr "Kiun identigilon vi deziras ĉe Jabber?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber password?"
-msgstr ""
+msgstr "Kiun pasvorton vi deziras ĉe Jabber?"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
 msgid "<b>Example:</b> user@hotmail.com"
@@ -1067,11 +1177,11 @@ msgstr "<b>Ekzemplo:</b> uzanto@hotmail.com"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
 msgid "What is your Windows Live ID?"
-msgstr ""
+msgstr "Kio estas via identigilo ĉe Windows Live?"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live password?"
-msgstr ""
+msgstr "Kio estas via pasvorto ĉe Windows Live?"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
 msgid "E-_mail address:"
@@ -1095,7 +1205,7 @@ msgstr "_Familia nomo:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
 msgid "_Published Name:"
-msgstr ""
+msgstr "_Montrata nomo:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
 msgid "<b>Example:</b> user@my.sip.server"
@@ -1107,15 +1217,15 @@ msgstr "Aŭtentig-uzantonomo:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
 msgid "Discover Binding"
-msgstr ""
+msgstr "Eltrovi bindaĵon"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "Discover the STUN server automatically"
-msgstr ""
+msgstr "Eltrovi la servilon de STUN aÅ­tomate"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
 msgid "Ignore TLS Errors"
-msgstr ""
+msgstr "Ignori erarojn de TLS"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Interval (seconds)"
@@ -1123,11 +1233,11 @@ msgstr "Intervalo (sekundoj)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
 msgid "Keep-Alive Options"
-msgstr ""
+msgstr "Agordoj de vivodaÅ­rigo"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
 msgid "Loose Routing"
-msgstr ""
+msgstr "Malstrikta enkursigo"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Mechanism:"
@@ -1139,7 +1249,7 @@ msgstr "Diversaj agordoj"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 msgid "NAT Traversal Options"
-msgstr ""
+msgstr "Agordoj por transiro de NAT"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 msgid "Port:"
@@ -1163,28 +1273,32 @@ msgid "Transport:"
 msgstr "Transporto:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "What is your SIP account password?"
-msgstr ""
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Uzi ĉi tiun konton por voki _fiskajn kaj po�ajn telefonojn"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP login ID?"
-msgstr ""
+msgid "What is your SIP account password?"
+msgstr "Kio estas via pasvorto por via konto de SIP?"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP login ID?"
+msgstr "Kio estas via ensalut-identigilo de SIP?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "_Uzantonomo:"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
 msgid "I_gnore conference and chat room invitations"
-msgstr ""
+msgstr "I_gnori konferencajn kaj babilejajn invitojn"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "What is your Yahoo! ID?"
-msgstr ""
+msgstr "Kio estas via identigilo ĉe Yahoo! ?"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "What is your Yahoo! password?"
-msgstr ""
+msgstr "Kio estas via pasvorto ĉe Yahoo! ?"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
 msgid "Yahoo! I_D:"
@@ -1192,224 +1306,253 @@ msgstr "Yahoo!-I_D:"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "_Room List locale:"
-msgstr ""
+msgstr "_Lokaĵaro por la ĉambrolisto:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:474
-#: ../libempathy-gtk/empathy-avatar-chooser.c:559
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
-msgstr ""
+msgstr "Malsukcesis konverti bildon"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:475
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
-msgstr ""
+msgstr "Neniujn akceptatajn bildformojn subtenas via sistemo"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:822
-msgid "Couldn't save pixbuf to png"
-msgstr ""
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+msgid "Couldn't save picture to file"
+msgstr "Malsukcesis konservi la bildon en dosieron"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
-msgstr ""
+msgstr "Elekti bildon por via avataro"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:942
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
-msgstr ""
+msgstr "Foti..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:945
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "Sen bildo"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "Bildoj"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1009
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "Ĉiuj dosieroj"
 
 #: ../libempathy-gtk/empathy-avatar-image.c:322
 msgid "Click to enlarge"
-msgstr ""
+msgstr "Klaku por pligrandigi"
+
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
+msgid "There was an error starting the call"
+msgstr "Okazis eraro dum komenci la vokon"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact doesn't support calls"
+msgstr "La indikita kontakto ne subtenas vokojn"
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is offline"
+msgstr "La indikita kontakto estas malkonektita"
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "The specified contact is not valid"
+msgstr "La indikita atestilo nevalidas"
 
-#: ../libempathy-gtk/empathy-chat.c:695
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "Emergency calls are not supported on this protocol"
+msgstr "Krizajn vokojn ne subtenas ĉi tiu protokolo"
+
+#: ../libempathy-gtk/empathy-chat.c:704
 msgid "Failed to open private chat"
-msgstr ""
+msgstr "Malsukcesis malfermi privatan babilejon"
 
-#: ../libempathy-gtk/empathy-chat.c:756
+#: ../libempathy-gtk/empathy-chat.c:765
 msgid "Topic not supported on this conversation"
-msgstr ""
+msgstr "Ĉi tiu konversacio ne subtenas temojn"
 
-#: ../libempathy-gtk/empathy-chat.c:762
+#: ../libempathy-gtk/empathy-chat.c:771
 msgid "You are not allowed to change the topic"
-msgstr ""
+msgstr "Vi ne rajtas �an�i la temon"
 
-#: ../libempathy-gtk/empathy-chat.c:966
-#, fuzzy, c-format
+#: ../libempathy-gtk/empathy-chat.c:975
+#, c-format
 msgid "“%s� is not a valid contact ID"
-msgstr "nevalida kontakto"
+msgstr "“%s� ne estas valida identigo de kontakto"
 
-#: ../libempathy-gtk/empathy-chat.c:1023
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
-msgstr ""
+msgstr "/clear: Vakigi ĉiujn mesa�ojn el la aktuala konversacio"
 
-#: ../libempathy-gtk/empathy-chat.c:1026
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
-msgstr ""
+msgstr "/topic <temo>: Åœangi la temon de la aktuala konversacio"
 
-#: ../libempathy-gtk/empathy-chat.c:1029
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "/join <chat room ID>: join a new chat room"
-msgstr ""
+msgstr "/join <ID de babilo-ĉambro>: eniri novan babilo-ĉambron"
 
-#: ../libempathy-gtk/empathy-chat.c:1032
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid "/j <chat room ID>: join a new chat room"
-msgstr ""
+msgstr "/j <ID de babilo-ĉambro>: eniri novan babilo-ĉambron"
 
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr ""
+"/part [<ID de babil-ĉambro>] [<kialo>]: forlasi la babil-ĉambron, defaŭlte "
+"la aktualan"
 
-#: ../libempathy-gtk/empathy-chat.c:1040
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
-msgstr ""
+msgstr "/query <ID de kontakto> [<mesa�o>]: malfermi privatan babilon"
 
-#: ../libempathy-gtk/empathy-chat.c:1043
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
-msgstr ""
+msgstr "/msg <ID de kontakto> <mesa�o>: malfermi privatan babilon"
 
-#: ../libempathy-gtk/empathy-chat.c:1046
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/nick <nickname>: change your nickname on the current server"
-msgstr ""
+msgstr "/nick <kromnomo>: Ŝan�i vian kromnomon ĉe la aktuala servilo"
 
-#: ../libempathy-gtk/empathy-chat.c:1049
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr ""
+"/me <mesa�o>: sendi mesa�on de “ACTION� (ago) al la aktuala konversacio"
 
-#: ../libempathy-gtk/empathy-chat.c:1052
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 msgstr ""
+"/say <mesa�o>: sendi <mesa�o>n al la aktuala konversacio. Oni povas uzi ĉi "
+"tion por sendi mesa�on kiu komencas per ‘/’. Ekzemple: “/say /join uzi�as "
+"por eniri ĉambrojn�"
 
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/whois <contact ID>: display information about a contact"
-msgstr ""
+msgstr "/whois <ID de kontakto>: montri informon pri kontakto"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr ""
+"/help [<komando>]: montri ĉiujn subtenatajn komandojn. Se <komando> estas "
+"difinita, montri �ian uzon."
 
-#: ../libempathy-gtk/empathy-chat.c:1070
+#: ../libempathy-gtk/empathy-chat.c:1114
 #, c-format
 msgid "Usage: %s"
 msgstr "Uzo: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1109
+#: ../libempathy-gtk/empathy-chat.c:1159
 msgid "Unknown command"
 msgstr "Nekonata komando"
 
-#: ../libempathy-gtk/empathy-chat.c:1235
+#: ../libempathy-gtk/empathy-chat.c:1285
 msgid "Unknown command; see /help for the available commands"
-msgstr ""
+msgstr "Nekonata komando; vidu /help por la uzeblaj komandoj"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1393
+#: ../libempathy-gtk/empathy-chat.c:1455
 msgid "insufficient balance to send message"
-msgstr ""
+msgstr "kredito ne sufiĉas por sendi la mesa�on"
 
-#: ../libempathy-gtk/empathy-chat.c:1395
+#: ../libempathy-gtk/empathy-chat.c:1457
 msgid "not capable"
-msgstr ""
+msgstr "ne kapablas"
 
-#: ../libempathy-gtk/empathy-chat.c:1402
+#: ../libempathy-gtk/empathy-chat.c:1464
 msgid "offline"
 msgstr "nekonektite"
 
-#: ../libempathy-gtk/empathy-chat.c:1405
+#: ../libempathy-gtk/empathy-chat.c:1467
 msgid "invalid contact"
 msgstr "nevalida kontakto"
 
-#: ../libempathy-gtk/empathy-chat.c:1408
+#: ../libempathy-gtk/empathy-chat.c:1470
 msgid "permission denied"
 msgstr "aliro malpermesita"
 
-#: ../libempathy-gtk/empathy-chat.c:1411
+#: ../libempathy-gtk/empathy-chat.c:1473
 msgid "too long message"
 msgstr "tro longa mesa�o"
 
-#: ../libempathy-gtk/empathy-chat.c:1414
+#: ../libempathy-gtk/empathy-chat.c:1476
 msgid "not implemented"
 msgstr "ne realigite"
 
-#: ../libempathy-gtk/empathy-chat.c:1418
+#: ../libempathy-gtk/empathy-chat.c:1480
 msgid "unknown"
 msgstr "nekonate"
 
-#: ../libempathy-gtk/empathy-chat.c:1424
+#: ../libempathy-gtk/empathy-chat.c:1486
 #, c-format
 msgid "Error sending message '%s': %s"
-msgstr ""
+msgstr "Eraris sendi mesa�on ‘%s’: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1428
+#: ../libempathy-gtk/empathy-chat.c:1490
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Eraro dum sendo de mesa�o: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1489 ../src/empathy-chat-window.c:760
+#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Temo:"
 
-#: ../libempathy-gtk/empathy-chat.c:1501
+#: ../libempathy-gtk/empathy-chat.c:1563
 #, c-format
 msgid "Topic set to: %s"
-msgstr ""
+msgstr "La temo �an�i�is al: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1503
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "No topic defined"
-msgstr ""
+msgstr "Neniu temo estas definita"
 
-#: ../libempathy-gtk/empathy-chat.c:2010
+#: ../libempathy-gtk/empathy-chat.c:2074
 msgid "(No Suggestions)"
 msgstr "(Neniuj proponoj)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2078
+#: ../libempathy-gtk/empathy-chat.c:2142
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Aldoni '%s' al vortaro"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2115
+#: ../libempathy-gtk/empathy-chat.c:2179
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Aldoni '%s' al %s vortaro"
 
-#: ../libempathy-gtk/empathy-chat.c:2172
+#: ../libempathy-gtk/empathy-chat.c:2249
 msgid "Insert Smiley"
 msgstr "Enmeti miensimbolon"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2190
-#: ../libempathy-gtk/empathy-ui-utils.c:1756
+#: ../libempathy-gtk/empathy-chat.c:2267
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "_Sendi"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2225
+#: ../libempathy-gtk/empathy-chat.c:2321
 msgid "_Spelling Suggestions"
 msgstr "_Literumadaj proponoj"
 
-#: ../libempathy-gtk/empathy-chat.c:2314
+#: ../libempathy-gtk/empathy-chat.c:2410
 msgid "Failed to retrieve recent logs"
-msgstr ""
+msgstr "Malsukcesis akiri la ĵusajn protokolojn"
 
-#: ../libempathy-gtk/empathy-chat.c:2425
+#: ../libempathy-gtk/empathy-chat.c:2547
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s malkonekti�is"
@@ -1417,12 +1560,12 @@ msgstr "%s malkonekti�is"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2432
+#: ../libempathy-gtk/empathy-chat.c:2554
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s estas forpelita de %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2435
+#: ../libempathy-gtk/empathy-chat.c:2557
 #, c-format
 msgid "%s was kicked"
 msgstr "%s estas forpelita"
@@ -1430,17 +1573,17 @@ msgstr "%s estas forpelita"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2443
+#: ../libempathy-gtk/empathy-chat.c:2565
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s estas ekzilita de %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2446
+#: ../libempathy-gtk/empathy-chat.c:2568
 #, c-format
 msgid "%s was banned"
 msgstr "%s estas ekzilita"
 
-#: ../libempathy-gtk/empathy-chat.c:2450
+#: ../libempathy-gtk/empathy-chat.c:2572
 #, c-format
 msgid "%s has left the room"
 msgstr "%s forlasis la ĉambron"
@@ -1450,117 +1593,131 @@ msgstr "%s forlasis la ĉambron"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2459
+#: ../libempathy-gtk/empathy-chat.c:2581
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2484
+#: ../libempathy-gtk/empathy-chat.c:2606
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s ali�is la ĉambron"
 
-#: ../libempathy-gtk/empathy-chat.c:2509
+#: ../libempathy-gtk/empathy-chat.c:2631
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s nun estas konata kiel %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2648
-#: ../src/empathy-streamed-media-window.c:1957
-#: ../src/empathy-event-manager.c:1130
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2784
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
+#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
 msgid "Disconnected"
 msgstr "Malkonektite"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3316
+#: ../libempathy-gtk/empathy-chat.c:3428
 msgid "Would you like to store this password?"
-msgstr ""
+msgstr "Ĉu vi volas konservi ĉi tiun pasvorton?"
 
-#: ../libempathy-gtk/empathy-chat.c:3322
+#: ../libempathy-gtk/empathy-chat.c:3434
 msgid "Remember"
 msgstr "Memorigi"
 
-#: ../libempathy-gtk/empathy-chat.c:3332
+#: ../libempathy-gtk/empathy-chat.c:3444
 msgid "Not now"
 msgstr "Ne nun"
 
-#: ../libempathy-gtk/empathy-chat.c:3376
+#: ../libempathy-gtk/empathy-chat.c:3488
 msgid "Retry"
 msgstr "Reprovi"
 
-#: ../libempathy-gtk/empathy-chat.c:3380
+#: ../libempathy-gtk/empathy-chat.c:3492
 msgid "Wrong password; please try again:"
-msgstr ""
+msgstr "Mal�usta pasvorto; bonvolu reprovi:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3510
+#: ../libempathy-gtk/empathy-chat.c:3622
 msgid "This room is protected by a password:"
-msgstr ""
+msgstr "Pasvorto gardas ĉi tiun ĉambron:"
 
-#: ../libempathy-gtk/empathy-chat.c:3537
+#: ../libempathy-gtk/empathy-chat.c:3649
 msgid "Join"
 msgstr "Ali�i"
 
-#: ../libempathy-gtk/empathy-chat.c:3738 ../src/empathy-event-manager.c:1151
+#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "Konektite"
 
-#: ../libempathy-gtk/empathy-chat.c:3793
-#: ../libempathy-gtk/empathy-log-window.c:650
+#: ../libempathy-gtk/empathy-chat.c:3906
 msgid "Conversation"
 msgstr "Konversacio"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3798
+#: ../libempathy-gtk/empathy-chat.c:3911
 #, c-format
 msgid "%s (SMS)"
-msgstr ""
+msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:423
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
 msgid "Unknown or invalid identifier"
-msgstr ""
+msgstr "Nekonata aÅ­ nevalida identigilo"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:425
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
 msgid "Contact blocking temporarily unavailable"
-msgstr ""
+msgstr "Kontaktblokado portempe ne eblas"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:427
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
 msgid "Contact blocking unavailable"
-msgstr ""
+msgstr "Kontaktblokado ne eblas"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:429
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
 msgid "Permission Denied"
 msgstr "Aliro malpermesita"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:433
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
 msgid "Could not block contact"
-msgstr ""
+msgstr "Malsukcesis bloki kontakton"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:702
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
 msgid "Edit Blocked Contacts"
-msgstr ""
+msgstr "Redakti blokitajn kontaktojn"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:521
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1495
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid "Account:"
 msgstr "Konto:"
 
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "Blokitaj kontaktoj"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Forigi"
+
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:1264
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Kopii la ligiladreson"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:1271
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "Malfermi la ligil_on"
 
@@ -1591,22 +1748,22 @@ msgid "Block %s?"
 msgstr "Ĉu bloki na %s?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
-msgstr ""
+msgstr "Ĉu vi certas ke vi volas bloki ‘%s’ de kontakti vin plu?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:274
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
 msgid "_Block"
-msgstr ""
+msgstr "_Bloki"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:283
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "_Raporti ĉi tiun kontakton kiel mistraktema"
+msgstr[1] "_Raporti ĉi tiujn kontaktojn kiel mistraktemaj"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
@@ -1614,11 +1771,11 @@ msgstr "Decidi _poste"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
-msgstr ""
+msgstr "Abonpeto"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
 msgid "_Block User"
-msgstr ""
+msgstr "_Bloki uzanton"
 
 #: ../libempathy-gtk/empathy-contact-list-store.h:71
 msgid "Ungrouped"
@@ -1626,127 +1783,134 @@ msgstr "Negrupite"
 
 #: ../libempathy-gtk/empathy-contact-list-store.h:72
 msgid "Favorite People"
-msgstr ""
+msgstr "Legosignitaj homoj"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1983
-#: ../libempathy-gtk/empathy-individual-view.c:2367
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
-msgstr ""
+msgstr "Ĉu vi vere volas forigi la grupon ‘%s’?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1985
-#: ../libempathy-gtk/empathy-individual-view.c:2370
+#: ../libempathy-gtk/empathy-contact-list-view.c:1988
+#: ../libempathy-gtk/empathy-individual-view.c:2379
 msgid "Removing group"
 msgstr "Forigi grupon"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2034
-#: ../libempathy-gtk/empathy-contact-list-view.c:2111
-#: ../libempathy-gtk/empathy-individual-view.c:2425
-#: ../libempathy-gtk/empathy-individual-view.c:2628
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../libempathy-gtk/empathy-contact-list-view.c:2037
+#: ../libempathy-gtk/empathy-contact-list-view.c:2114
+#: ../libempathy-gtk/empathy-individual-view.c:2434
+#: ../libempathy-gtk/empathy-individual-view.c:2637
 msgid "_Remove"
 msgstr "Fo_rigi"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2064
-#: ../libempathy-gtk/empathy-individual-view.c:2492
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
+#: ../libempathy-gtk/empathy-individual-view.c:2501
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
-msgstr ""
+msgstr "Ĉu vi vere volas forigi la kontakton ‘%s’?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2066
-#: ../libempathy-gtk/empathy-individual-view.c:2513
+#: ../libempathy-gtk/empathy-contact-list-view.c:2069
+#: ../libempathy-gtk/empathy-individual-view.c:2522
 msgid "Removing contact"
-msgstr ""
+msgstr "Forigi kontakton"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:219
-#: ../src/empathy-main-window.ui.h:14
+#: ../libempathy-gtk/empathy-contact-menu.c:220
+#: ../src/empathy-main-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "_Aldoni kontakton…"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:299
+#: ../libempathy-gtk/empathy-contact-menu.c:300
 msgid "_Block Contact"
-msgstr ""
+msgstr "_Bloki kontakton"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:328
-#: ../libempathy-gtk/empathy-individual-menu.c:546
-#: ../src/empathy-main-window.ui.h:16
+#: ../libempathy-gtk/empathy-contact-menu.c:329
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "_Babilejo"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:358
-#: ../libempathy-gtk/empathy-individual-menu.c:635
+#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Sonalvoko"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:389
-#: ../libempathy-gtk/empathy-individual-menu.c:677
+#: ../libempathy-gtk/empathy-contact-menu.c:394
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Videoalvoko"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:435
-#: ../libempathy-gtk/empathy-individual-menu.c:720
-#: ../src/empathy-main-window.ui.h:27
+#: ../libempathy-gtk/empathy-contact-menu.c:440
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
-msgstr ""
+msgstr "_AntaÅ­aj konversacioj"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:457
-#: ../libempathy-gtk/empathy-individual-menu.c:761
+#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "Sendi dosieron"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:480
-#: ../libempathy-gtk/empathy-individual-menu.c:803
+#: ../libempathy-gtk/empathy-contact-menu.c:485
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
-msgstr ""
+msgstr "Komunigi mian labortabelon"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:520
-#: ../libempathy-gtk/empathy-contact-widget.c:1890
-#: ../libempathy-gtk/empathy-individual-menu.c:838
-#: ../libempathy-gtk/empathy-individual-widget.c:1386
+#: ../libempathy-gtk/empathy-contact-menu.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:1887
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
-msgstr ""
+msgstr "Librosigno"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:549
-#: ../libempathy-gtk/empathy-individual-menu.c:866
+#: ../libempathy-gtk/empathy-contact-menu.c:554
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "Infor_mo"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:595
+#: ../libempathy-gtk/empathy-contact-menu.c:600
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "R_edakti"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:649
-#: ../libempathy-gtk/empathy-individual-menu.c:1053
-#: ../src/empathy-chat-window.c:1010
+#: ../libempathy-gtk/empathy-contact-menu.c:654
+#: ../libempathy-gtk/empathy-individual-menu.c:1284
+#: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
-msgstr ""
+msgstr "Invitas vin al tiu ĉi ĉambro"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:680
-#: ../libempathy-gtk/empathy-individual-menu.c:1099
+#: ../libempathy-gtk/empathy-contact-menu.c:685
+#: ../libempathy-gtk/empathy-individual-menu.c:1330
 msgid "_Invite to Chat Room"
-msgstr ""
+msgstr "_Inviti al babil-ĉambro"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:514
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
 msgid "Search contacts"
 msgstr "Serĉi kontaktojn"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:544
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
 msgid "Search: "
 msgstr "Serĉi: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:602
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
 msgid "_Add Contact"
 msgstr "_Aldoni kontakton"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:620
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
 msgid "No contacts found"
 msgstr "Ne trovis kontaktojn"
 
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr "Via mesa�o por enkonduki vin:"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
+msgstr "Bonvolu permesi min vidi kiam vi konektas. Dankon!"
+
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "Elekti kontakton"
@@ -1782,7 +1946,7 @@ msgstr "Naski�tago:"
 #.
 #: ../libempathy-gtk/empathy-contact-widget.c:346
 msgid "Last seen:"
-msgstr ""
+msgstr "Lasta vido:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:348
 msgid "Connected from:"
@@ -1792,171 +1956,170 @@ msgstr "Konektite de:"
 #. * and should bin this.
 #.
 #: ../libempathy-gtk/empathy-contact-widget.c:353
-#, fuzzy
 msgid "Away message:"
-msgstr "Foresto-mesa�o"
+msgstr "Foresto-mesa�o:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:606
 msgid "Channels:"
 msgstr "Kanaloj:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
-msgstr ""
+msgstr "Landkodo de ISO:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Country:"
 msgstr "Lando:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "State:"
 msgstr "Åœtato:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "City:"
 msgstr "Urbo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Area:"
 msgstr "Areo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
 msgstr "Po�tkodo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Street:"
 msgstr "Strato:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
 msgstr "Konstruaĵo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Floor:"
 msgstr "Eta�o:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Room:"
 msgstr "Ĉambro:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Text:"
 msgstr "Teksto:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:517
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Description:"
 msgstr "Priskribo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:519
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:521
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
-msgstr ""
+msgstr "Nivelo de precizo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:523
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr "Eraro:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
-msgstr ""
+msgstr "Vertikala eraro (metroj):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:527
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
-msgstr ""
+msgstr "Horizontala eraro (metroj):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:529
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr "Rapido:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:531
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Bearing:"
-msgstr ""
+msgstr "Direkto:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:533
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
-msgstr ""
+msgstr "Rapideco de alti�o:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:535
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
-msgstr ""
+msgstr "Laste aktualigita je:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:537
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
 msgstr "Longitudo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:945
-#: ../libempathy-gtk/empathy-individual-widget.c:539
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
 msgstr "Latitudo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:947
-#: ../libempathy-gtk/empathy-individual-widget.c:541
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
 msgstr "Altitudo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1000
-#: ../libempathy-gtk/empathy-contact-widget.c:1015
-#: ../libempathy-gtk/empathy-individual-widget.c:629
-#: ../libempathy-gtk/empathy-individual-widget.c:644
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "Loko"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1017
-#: ../libempathy-gtk/empathy-individual-widget.c:646
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1069
-#: ../libempathy-gtk/empathy-individual-widget.c:695
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
-msgstr ""
+msgstr "%ea de %B, %Y je %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1151
-#: ../libempathy-gtk/empathy-individual-widget.c:931
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
 msgid "Save Avatar"
-msgstr ""
+msgstr "Konservi la avataron"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1207
-#: ../libempathy-gtk/empathy-individual-widget.c:989
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
 msgid "Unable to save avatar"
-msgstr ""
+msgstr "Malsukcesis konservi la avataron"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1
 msgid "<b>Location</b> at (date)\t"
-msgstr ""
+msgstr "<b>Pozicio</b> je (dato)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1321
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr "Kromnomo:"
 
@@ -1977,7 +2140,7 @@ msgstr "Kontaktdetaloj"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1525
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "Identigilo:"
 
@@ -2003,6 +2166,8 @@ msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr ""
+"Elektu la grupojn en kiuj vi volas ke ĉi tiu kontakto aperos. Rimarku ke oni "
+"povas elekti pli ol unu grupo aÅ­ neniom grupoj."
 
 #: ../libempathy-gtk/empathy-groups-widget.c:364
 msgid "_Add Group"
@@ -2014,90 +2179,117 @@ msgid "Select"
 msgstr "Elekti"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1751
+#: ../src/empathy-main-window.c:1807
 msgid "Group"
 msgstr "Grupo"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:257
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "La jena idento bloki�os:"
+msgstr[1] "La jenaj identoj bloki�os:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:264
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Ne eblas bloki la jena idento:"
+msgstr[1] "Ne eblas bloki la jenaj identoj:"
 
 #. Translators: the heading at the top of the Information dialogue
 #: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
-msgstr ""
+msgstr "Ligitaj kontaktoj"
 
 #: ../libempathy-gtk/empathy-individual-linker.c:370
 msgid "Select contacts to link"
-msgstr ""
+msgstr "Elekti kontaktojn por ligi"
 
 #: ../libempathy-gtk/empathy-individual-linker.c:444
 msgid "New contact preview"
-msgstr ""
+msgstr "AntaÅ­rigardo de nova kontakto"
 
 #: ../libempathy-gtk/empathy-individual-linker.c:488
 msgid "Contacts selected in the list on the left will be linked together."
-msgstr ""
+msgstr "Kontaktoj elektitaj en la maldekstra listo kunligi�os."
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:136
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "Elekti konton kiun uzi�os por voki"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "Voko"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+msgid "Mobile"
+msgstr "Po�telefono"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "Laboro"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "Hejmo"
+
 #. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:592
-#: ../libempathy-gtk/empathy-new-message-dialog.c:248
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
 msgid "_SMS"
-msgstr ""
+msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:914
+#: ../libempathy-gtk/empathy-individual-menu.c:1142
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "R_edakti"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:940
+#: ../libempathy-gtk/empathy-individual-menu.c:1168
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
-msgstr ""
+msgstr "_Ligi kontaktojn…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2332
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 msgid "Delete and _Block"
-msgstr ""
+msgstr "Forvi�i kaj _bloki"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2501
+#: ../libempathy-gtk/empathy-individual-view.c:2510
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
 "remove all the contacts which make up this linked contact."
 msgstr ""
+"Ĉu vere vi volas forigi la ligitan kontakton ‘%s’? Rimarku ke tio forigos "
+"ĉiujn kontaktojn kiuj ligi�as al ĉi tiu kontakto."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1672
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Ligita kontakto enhavanta %u kontakto"
+msgstr[1] "Ligitaj kontaktoj enhavantaj %u kontaktoj"
 
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:1
 msgid "<b>Location</b> at (date)"
-msgstr ""
+msgstr "<b>Pozicio</b> je (dato)"
 
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Online from a phone or mobile device"
-msgstr ""
+msgstr "Konektita per telefono aÅ­ portebla aparato"
 
 #: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
 msgid "New Network"
@@ -2105,11 +2297,11 @@ msgstr "Nova reto"
 
 #: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
 msgid "Choose an IRC network"
-msgstr ""
+msgstr "Elekti IRC-reton"
 
 #: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
 msgid "Reset _Networks List"
-msgstr ""
+msgstr "RedefaÅ­ltigi la liston"
 
 #: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
 msgctxt "verb displayed on a button to select an IRC network"
@@ -2129,7 +2321,7 @@ msgstr "SSL"
 #. * is a verb.
 #: ../libempathy-gtk/empathy-linking-dialog.c:115
 msgid "Link Contacts"
-msgstr ""
+msgstr "Ligi kontaktojn"
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:120
 msgctxt "Unlink individual (button)"
@@ -2139,7 +2331,7 @@ msgstr "_Malligi…"
 #: ../libempathy-gtk/empathy-linking-dialog.c:121
 msgid ""
 "Completely split the displayed linked contacts into the separate contacts."
-msgstr ""
+msgstr "Tute dividi la montratajn ligitajn kontaktojn al apartaj kontaktoj"
 
 #. Add button
 #. Translators: this is an action button in the linking dialogue. "Link" is
@@ -2152,78 +2344,217 @@ msgstr "_Ligi"
 #: ../libempathy-gtk/empathy-linking-dialog.c:183
 #, c-format
 msgid "Unlink linked contacts '%s'?"
-msgstr ""
+msgstr "Ĉu malligi la ligitajn kontaktojn ‘%s’?"
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:186
 msgid ""
 "Are you sure you want to unlink these linked contacts? This will completely "
 "split the linked contacts into separate contacts."
 msgstr ""
+"Ĉu vi certas ke vi volas malligi ĉi tiujn ligitajn kontaktojn? Tio tute "
+"dividos la ligitajn kontaktojn al apartaj kontaktoj."
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:190
 msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "_Malligi"
 
-#: ../libempathy-gtk/empathy-log-window.c:660
-msgid "Date"
-msgstr "Dato"
+#: ../libempathy-gtk/empathy-log-window.c:634
+msgid "History"
+msgstr "Historio"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
-msgstr "Konversacioj"
+#: ../libempathy-gtk/empathy-log-window.c:689
+msgid "Show"
+msgstr "Montri"
+
+#: ../libempathy-gtk/empathy-log-window.c:711
+msgid "Search"
+msgstr "Serĉi"
+
+#: ../libempathy-gtk/empathy-log-window.c:1159
+#, c-format
+msgid "Chat in %s"
+msgstr "Babili en %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1161
+#, c-format
+msgid "Chat with %s"
+msgstr "Babili kun %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%A, %e %B %Y %X"
+
+#. Translators: this is an emote: '* Danielle waves'
+#: ../libempathy-gtk/empathy-log-window.c:1300
+#, c-format
+msgid "<i>* %s %s</i>"
+msgstr "<i>* %s %s</i>"
+
+#. Translators: this is a message: 'Danielle: hello'
+#. * The string in bold is the sender's name
+#: ../libempathy-gtk/empathy-log-window.c:1306
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1382
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s sekundo"
+msgstr[1] "%s sekundoj"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s minuto"
+msgstr[1] "%s minutoj"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "Voko daŭris %s, fini�is je %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1729
+msgid "Today"
+msgstr "HodiaÅ­"
+
+#: ../libempathy-gtk/empathy-log-window.c:1733
+msgid "Yesterday"
+msgstr "HieraÅ­"
+
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
+msgid "%e %B %Y"
+msgstr "%e %B %Y"
+
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3444
+msgid "Anytime"
+msgstr "Iam ajn"
+
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2372
+msgid "Anyone"
+msgstr "Iu ajn"
+
+#: ../libempathy-gtk/empathy-log-window.c:2685
+msgid "Who"
+msgstr "Kiu"
+
+#: ../libempathy-gtk/empathy-log-window.c:2889
+msgid "When"
+msgstr "Kiam"
+
+#: ../libempathy-gtk/empathy-log-window.c:3005
+msgid "Anything"
+msgstr "Io ajn"
+
+#: ../libempathy-gtk/empathy-log-window.c:3007
+msgid "Text chats"
+msgstr "Tekstaj babiloj"
+
+#: ../libempathy-gtk/empathy-log-window.c:3009
+#: ../src/empathy-preferences.ui.h:4
+msgid "Calls"
+msgstr "Vokoj"
+
+#: ../libempathy-gtk/empathy-log-window.c:3014
+msgid "Incoming calls"
+msgstr "Venantaj vokoj"
+
+#: ../libempathy-gtk/empathy-log-window.c:3015
+msgid "Outgoing calls"
+msgstr "Elirantaj vokoj"
+
+#: ../libempathy-gtk/empathy-log-window.c:3016
+msgid "Missed calls"
+msgstr "Maltrafitaj vokoj"
+
+#: ../libempathy-gtk/empathy-log-window.c:3038
+msgid "What"
+msgstr "Kio"
+
+#: ../libempathy-gtk/empathy-log-window.c:3747
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr ""
+"Ĉu vi certas ke vi volas forvi�i ĉiujn protokolojn de antaŭaj konversacioj?"
+
+#: ../libempathy-gtk/empathy-log-window.c:3751
+msgid "Clear All"
+msgstr "Vakigi ĉion"
+
+#: ../libempathy-gtk/empathy-log-window.c:3758
+msgid "Delete from:"
+msgstr "Forigi de:"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Ŝargante…</span>"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "Trovi la sekvan"
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Chat"
+msgstr "Babilejo"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "Trovi la antaÅ­an"
+msgid "Delete All History..."
+msgstr "Forigi la tutan historion..."
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr ""
+msgid "Profile"
+msgstr "Profilo"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Video"
+msgstr "Video"
 
-#. Tab Label
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "Serĉi"
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:20
+msgid "_Edit"
+msgstr "R_edakti"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "_File"
+msgstr "_Dosiero"
 
-#. Searching *for* something
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "_Por:"
+msgid "page 2"
+msgstr "pa�o 2"
 
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
 msgid "Contact ID:"
 msgstr "Kontakt-ID:"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:258
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
 msgid "C_hat"
 msgstr "_Babilo"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:277
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
 msgstr "Nova konversacio"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:254
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
 msgid "Send _Video"
 msgstr "Sendi _videon"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:262
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
 msgid "C_all"
 msgstr "_Voki"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:272
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "New Call"
 msgstr "Nova voko"
 
@@ -2233,6 +2564,8 @@ msgid ""
 "Enter your password for account\n"
 "<b>%s</b>"
 msgstr ""
+"Enmetu vian pasvorton por la konto\n"
+"<b>%s</b>"
 
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
@@ -2240,36 +2573,36 @@ msgstr ""
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Message…"
-msgstr ""
+msgstr "Kutima mesa�o…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messages…"
 msgstr "Redakti kutimajn mesa�ojn…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
-msgstr ""
+msgstr "Klaku por forigi la librosignon de ĉi tiu stato"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
-msgstr ""
+msgstr "Klaku por librosigni ĉi tiun staton"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
 msgstr "Agordi staton"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:946
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
 msgid "Set your presence and current status"
-msgstr ""
+msgstr "Aktualigi vian ĉeestecon kaj staton"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1134
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
 msgid "Custom messages…"
-msgstr ""
+msgstr "Kutimaj mesa�oj…"
 
 #. Create account
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
@@ -2280,41 +2613,49 @@ msgstr ""
 msgid "New %s account"
 msgstr "Nova %s konto"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "Serĉi:"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "Uskleca kongruo"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Mat_ch case"
+msgstr "Uskleca _kongruo"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
 msgid "Phrase not found"
 msgstr "Frazo ne trovita"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "_Next"
+msgstr "_Sekva"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+msgid "_Previous"
+msgstr "_AntaÅ­a"
+
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
-msgstr ""
+msgstr "Ricevis tujmesa�on"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:53
 msgid "Sent an instant message"
-msgstr ""
+msgstr "Sendis tujmesa�on"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:55
 msgid "Incoming chat request"
-msgstr ""
+msgstr "Venanta babilpeto"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:57
 msgid "Contact connected"
-msgstr ""
+msgstr "Kontakto konektis"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:59
 msgid "Contact disconnected"
-msgstr ""
+msgstr "Kontakto malkonektis"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:61
 msgid "Connected to server"
-msgstr ""
+msgstr "Konektis al servilo"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:63
 msgid "Disconnected from server"
@@ -2322,60 +2663,52 @@ msgstr "Malkonektite de la servilo"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:65
 msgid "Incoming voice call"
-msgstr ""
+msgstr "Venanta voĉa voko"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:67
 msgid "Outgoing voice call"
-msgstr ""
+msgstr "Eliranta voĉa voko"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:69
 msgid "Voice call ended"
-msgstr ""
+msgstr "Voĉa voko fini�is"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
 msgstr "Redakti kutimajn mesa�ojn"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#, fuzzy
-msgid "Save _New Status Message"
-msgstr "Redakti kutimajn mesa�oj"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Status Messages"
-msgstr "Konservitaj stat-mesa�oj"
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#, c-format
+msgid "Message edited at %s"
+msgstr "Mesa�o redakti�is je %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1782
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
 msgid "Normal"
 msgstr "Normale"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:75
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "Klasike"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:76
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "Simple"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:77
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "Vake"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:78
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "Bluo"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:150
 msgid "The identity provided by the chat server cannot be verified."
-msgstr ""
+msgstr "Ne eblis certigi ke la idento provizita de la babilservilo validas."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:157
 msgid "The certificate is not signed by a Certification Authority."
-msgstr ""
+msgstr "La atestilo ne subskribi�is per Atestila Instanco."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:161
 msgid "The certificate has expired."
@@ -2387,11 +2720,12 @@ msgstr "La atestilo nun ne estas aktivigite."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:167
 msgid "The certificate does not have the expected fingerprint."
-msgstr ""
+msgstr "La atestilo ne havas la atenditan fingrospuron."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:170
 msgid "The hostname verified by the certificate doesn't match the server name."
 msgstr ""
+"La nomo validigita per la atestilo ne kongruas kun la nomo de la servilo."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:174
 msgid "The certificate is self-signed."
@@ -2400,31 +2734,29 @@ msgstr "La atestilo estas memkreite."
 #: ../libempathy-gtk/empathy-tls-dialog.c:177
 msgid ""
 "The certificate has been revoked by the issuing Certification Authority."
-msgstr ""
+msgstr "La atestilon senvalidigis �ia kreinta Atestila Instanco"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:181
-#, fuzzy
 msgid "The certificate is cryptographically weak."
-msgstr "La atestilo eksvalidi�is"
+msgstr "La atestilo kriptografie malfortas."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:184
 msgid "The certificate length exceeds verifiable limits."
-msgstr ""
+msgstr "La longo de la atestilo superas la kontroleblajn limojn."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:188
-#, fuzzy
 msgid "The certificate is malformed."
-msgstr "La atestilo eksvalidi�is"
+msgstr "La atestilo estas misformita."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
 msgid "Expected hostname: %s"
-msgstr ""
+msgstr "Atendita nomo: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:209
 #, c-format
 msgid "Certificate hostname: %s"
-msgstr ""
+msgstr "Nomo en la atestilo: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
 msgid "Continue"
@@ -2432,39 +2764,41 @@ msgstr "DaÅ­rigi"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
 msgid "This connection is untrusted. Would you like to continue anyway?"
-msgstr ""
+msgstr "Ĉi tiu konekto ne konfidas. Ĉu vi volus konekti malgraŭ tio?"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:297
 msgid "Remember this choice for future connections"
-msgstr ""
+msgstr "Memori ĉi tiun elekton por estontaj konektoj"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:303
 msgid "Certificate Details"
-msgstr ""
+msgstr "Detaloj de la atestilo"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1653
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
-msgstr ""
+msgstr "Malsukcesis malfermi la URIon"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1748
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
 msgstr "Elekti dosieron"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1820
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
 msgid "Insufficient free space to save file"
-msgstr ""
+msgstr "Mankas sufiĉa spaco por konservi la dosieron"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1828
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr ""
+"%s da libera spaco necesas por konservi ĉi tiun dosieron, sed nur %s "
+"disponeblas. Bonvolu elekti alian lokon."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid "Incoming file from %s"
-msgstr ""
+msgstr "Venanta dosiero de %s"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
@@ -2560,7 +2894,7 @@ msgstr "Hebrea"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:257
 msgid "Hebrew Visual"
-msgstr ""
+msgstr "Vidhebrea"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:260
 msgid "Hindi"
@@ -2635,11 +2969,11 @@ msgstr "Vjetnama"
 
 #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
 msgid "The selected contact cannot receive files."
-msgstr ""
+msgstr "La elektita kontakto ne povas ricevi dosierojn."
 
 #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
 msgid "The selected contact is offline."
-msgstr ""
+msgstr "La elektita kontakto estas senkonektita."
 
 #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
 msgid "No error message"
@@ -2649,23 +2983,23 @@ msgstr "Neniu erarmesa�o"
 msgid "Instant Message (Empathy)"
 msgstr "Tujmesa�o (Empatio)"
 
-#: ../src/empathy.c:307
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "Ne konekti dum lanĉo"
 
-#: ../src/empathy.c:311
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
-msgstr ""
+msgstr "Ne montri la kontaktliston aŭ iun alian dialogon dum lanĉo"
 
-#: ../src/empathy.c:319
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr "- Tujmesa�ilo 'Empatio'"
 
-#: ../src/empathy.c:498
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
-msgstr ""
+msgstr "Eraro dum kontakti la mastrumilon de kontoj"
 
-#: ../src/empathy.c:500
+#: ../src/empathy.c:639
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2673,6 +3007,10 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Eraro okazis dum peni konekti al la Telepatian mastrumilon de kontoj. La "
+"eraro estis:\n"
+"\n"
+"%s"
 
 #: ../src/empathy-about-dialog.c:81
 msgid ""
@@ -2727,21 +3065,22 @@ msgstr ""
 "  Petr Adam Dohnálek https://launchpad.net/~dohnp5a1\n"
 "  Robert BOGENSCHNEIDER https://launchpad.net/~robog\n"
 "  Serge Leblanc https://launchpad.net/~serge-leblanc\n"
-"  Serge Leblanc https://launchpad.net/~serge-leblanc-wanadoo\n"
 "  Shane D https://launchpad.net/~dimensional\n"
-"  Yamiharu https://launchpad.net/~yamiharu84"
+"  Yamiharu https://launchpad.net/~yamiharu84\n"
+"GNOME Contributions:\n"
+"  Neil ROBERTS"
 
 #: ../src/empathy-account-assistant.c:167
 msgid "There was an error while importing the accounts."
-msgstr ""
+msgstr "Eraro okazis dum importi la kontojn."
 
 #: ../src/empathy-account-assistant.c:170
 msgid "There was an error while parsing the account details."
-msgstr ""
+msgstr "Eraro okazis dum sintakse analizi la detalojn de la konto."
 
 #: ../src/empathy-account-assistant.c:173
 msgid "There was an error while creating the account."
-msgstr ""
+msgstr "Eraro okazis dum krei la konton."
 
 #: ../src/empathy-account-assistant.c:175
 msgid "There was an error."
@@ -2757,6 +3096,8 @@ msgid ""
 "You can either go back and try to enter your accounts' details again or quit "
 "this assistant and add accounts later from the Edit menu."
 msgstr ""
+"Vi povas aÅ­ iri reen kaj reprovi enmeti la detalojn de via konto aÅ­ eliri el "
+"ĉi tiu asistanto kaj aldoni kontojn poste per la menuo ‘Redakti’."
 
 #: ../src/empathy-account-assistant.c:220
 #: ../src/empathy-account-assistant.c:1271
@@ -2765,27 +3106,27 @@ msgstr "Eraro aperis"
 
 #: ../src/empathy-account-assistant.c:467
 msgid "What kind of chat account do you have?"
-msgstr ""
+msgstr "Kian babilkonton vi havas?"
 
 #: ../src/empathy-account-assistant.c:473
 msgid "Do you have any other chat accounts you want to set up?"
-msgstr ""
+msgstr "Ĉu vi havas aliajn babilkontojn kiujn vi volas agordi?"
 
 #: ../src/empathy-account-assistant.c:479
 msgid "Enter your account details"
-msgstr ""
+msgstr "Enmetu la detalojn de via konto"
 
 #: ../src/empathy-account-assistant.c:484
 msgid "What kind of chat account do you want to create?"
-msgstr ""
+msgstr "Kian babilkonton vi volas krei?"
 
 #: ../src/empathy-account-assistant.c:490
 msgid "Do you want to create other chat accounts?"
-msgstr ""
+msgstr "Ĉu vi volas krei aliajn babilkontojn?"
 
 #: ../src/empathy-account-assistant.c:497
 msgid "Enter the details for the new account"
-msgstr ""
+msgstr "Enmetu la detalojn de la nova konto"
 
 #: ../src/empathy-account-assistant.c:612
 msgid ""
@@ -2794,18 +3135,22 @@ msgid ""
 "programs. With a microphone or a webcam you can also have audio or video "
 "calls."
 msgstr ""
+"Per Empatio oni povas babili kun homoj konektitaj proksime kaj kun amikoj "
+"kaj kolegoj kiu uzas Google Talk, AIM, Windows Live kaj multajn aliajn "
+"babilaplikaĵojn. Per mikrofono aŭ retkamerao oni povas babili ankaŭ sone aŭ "
+"videe."
 
 #: ../src/empathy-account-assistant.c:629
 msgid "Do you have an account you've been using with another chat program?"
-msgstr ""
+msgstr "Ĉu vi havas konton kiun vi uzas en alia babilaplikaĵo?"
 
 #: ../src/empathy-account-assistant.c:652
 msgid "Yes, import my account details from "
-msgstr ""
+msgstr "Jes, enportu la detalojn de mia konto el "
 
 #: ../src/empathy-account-assistant.c:673
 msgid "Yes, I'll enter my account details now"
-msgstr ""
+msgstr "Jes, mi enmetos la detalojn de mia konto nun"
 
 #: ../src/empathy-account-assistant.c:695
 msgid "No, I want a new account"
@@ -2813,11 +3158,11 @@ msgstr "Ne, mi volas novan konton"
 
 #: ../src/empathy-account-assistant.c:705
 msgid "No, I just want to see people online nearby for now"
-msgstr ""
+msgstr "Ne, mi nur volas vidi homojn kiuj estas konektitaj proksime dumtempe"
 
 #: ../src/empathy-account-assistant.c:726
 msgid "Select the accounts you want to import:"
-msgstr ""
+msgstr "Elektu la kontojn kiujn vi volas importi:"
 
 #: ../src/empathy-account-assistant.c:813
 #: ../src/empathy-new-chatroom-dialog.c:555
@@ -2836,6 +3181,10 @@ msgid ""
 "details below are correct. You can easily change these details later or "
 "disable this feature by using the 'Accounts' dialog"
 msgstr ""
+"Empatio povas aÅ­tomate eltrovi la homojn kiu konektis al la sama reto kiel "
+"vi kaj babili kun ili. Se vi volas uzi ĉi tiun trajton, bonvolu kontroli ĉu "
+"la jenaj detaloj �ustas. Oni povas facile �an�i ĉi tiujn detalojn poste aŭ "
+"el�alti ĉi tiun trajton per uzi la dialogon de ‘Kontoj’."
 
 #: ../src/empathy-account-assistant.c:1091
 #: ../src/empathy-account-assistant.c:1147
@@ -2844,7 +3193,7 @@ msgstr "Redakti->Kontoj"
 
 #: ../src/empathy-account-assistant.c:1107
 msgid "I do _not want to enable this feature for now"
-msgstr ""
+msgstr "Mi _ne volas en�alti ĉi tiun trajton nun"
 
 #: ../src/empathy-account-assistant.c:1143
 msgid ""
@@ -2853,14 +3202,18 @@ msgid ""
 "install the telepathy-salut package and create a People Nearby account from "
 "the Accounts dialog"
 msgstr ""
+"Vi ne povos babili kun homoj konektitaj al via proksima reto, ĉar telepathy-"
+"salut ne instali�is. Se vi volas en�alti ĉi tiun trajton, bonvolu instali la "
+"pakaĵon ‘telepathy-salut’ kaj krei konton de proksimaj homoj per la dialogo "
+"de kontoj."
 
 #: ../src/empathy-account-assistant.c:1149
 msgid "telepathy-salut not installed"
-msgstr ""
+msgstr "telepathy-salut ne instali�is"
 
 #: ../src/empathy-account-assistant.c:1195
 msgid "Messaging and VoIP Accounts Assistant"
-msgstr ""
+msgstr "Asistanto por kontoj de mesa�ado kaj VoIP"
 
 #: ../src/empathy-account-assistant.c:1229
 msgid "Welcome to Empathy"
@@ -2868,27 +3221,28 @@ msgstr "Bonvenon al Empatio"
 
 #: ../src/empathy-account-assistant.c:1238
 msgid "Import your existing accounts"
-msgstr ""
+msgstr "Importi viajn ekzistajn kontojn"
 
 #: ../src/empathy-account-assistant.c:1256
 msgid "Please enter personal details"
-msgstr ""
+msgstr "Bonvolu enmeti viajn personajn detalojn"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
 #: ../src/empathy-accounts-dialog.c:64
 #, c-format
 msgid "There are unsaved modifications to your %s account."
-msgstr ""
+msgstr "Estas nekonservitaj �an�oj al via konto ‘%s’."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
 #: ../src/empathy-accounts-dialog.c:68
 msgid "Your new account has not been saved yet."
-msgstr ""
+msgstr "Via nova konto ankoraŭ ne konservi�is."
 
 #: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:809
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1216
 msgid "Connecting…"
 msgstr "Konektante…"
 
@@ -2919,6 +3273,8 @@ msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgstr ""
+"Vi estas kreonta novan konton kiu forvi�os\n"
+"vian �an�ojn. Ĉu vi certas ke vi volas daŭri?"
 
 #: ../src/empathy-accounts-dialog.c:1192
 #, c-format
@@ -2927,13 +3283,15 @@ msgstr "Ĉu vi volas forigi %s de la komputilo?"
 
 #: ../src/empathy-accounts-dialog.c:1196
 msgid "This will not remove your account on the server."
-msgstr ""
+msgstr "Ĉi tio ne forigos vian konton ĉe la servilo."
 
 #: ../src/empathy-accounts-dialog.c:1432
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgstr ""
+"Vi estas elektonta alian konton kiu forvi�os\n"
+"viajn �an�ojn. Ĉu vi certas ke vi volas daŭri?"
 
 #. Menu items: to enabled/disable the account
 #: ../src/empathy-accounts-dialog.c:1643
@@ -2949,351 +3307,408 @@ msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgstr ""
+"Vi estas fermonta la fenestron kiu forvi�os\n"
+"viajn �an�ojn. Ĉu vi certos ke vi volas daŭri?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Aldoni…"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
 msgid "Loading account information"
 msgstr "Åœargi kontoinformojn"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "No protocol installed"
 msgstr "Neniu protokolo estas instalita"
 
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Protocol:"
 msgstr "Protokolo:"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr ""
+"Por aldoni novan konton, oni unue devas instali modulon por ĉiu protokolo "
+"kiun oni volas uzi."
 
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add…"
-msgstr "_Aldoni…"
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Import…"
 msgstr "_Importi…"
 
 #: ../src/empathy-auth-client.c:249
 msgid " - Empathy authentication client"
-msgstr ""
+msgstr "- AÅ­tentkontrola kliento de Empathy"
 
 #: ../src/empathy-auth-client.c:265
 msgid "Empathy authentication client"
-msgstr ""
+msgstr "AÅ­tentkontrola kliento de Empatio"
 
 #: ../src/empathy-auto-salut-account-helper.c:83
 msgid "People nearby"
 msgstr "Proksimaj homoj"
 
-#: ../src/empathy-av.c:118
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
-msgstr ""
+msgstr "- Sona/videa kliento de Empatio"
 
-#: ../src/empathy-av.c:134
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
-msgstr ""
+msgstr "Sona/videa kliento de Empatio"
 
-#: ../src/empathy-streamed-media-window.c:479
+#: ../src/empathy-streamed-media-window.c:431
 msgid "Contrast"
 msgstr "Kontrasto"
 
-#: ../src/empathy-streamed-media-window.c:482
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Brightness"
 msgstr "Heleco"
 
-#: ../src/empathy-streamed-media-window.c:485
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Gamma"
 msgstr "Gamo"
 
-#: ../src/empathy-streamed-media-window.c:590
+#: ../src/empathy-streamed-media-window.c:542
 msgid "Volume"
 msgstr "LaÅ­teco"
 
-#: ../src/empathy-streamed-media-window.c:1166
+#: ../src/empathy-streamed-media-window.c:1110
 msgid "_Sidebar"
 msgstr "_Flanka breto"
 
-#: ../src/empathy-streamed-media-window.c:1186
+#: ../src/empathy-streamed-media-window.c:1130
 msgid "Audio input"
 msgstr "Sonenigo"
 
-#: ../src/empathy-streamed-media-window.c:1190
+#: ../src/empathy-streamed-media-window.c:1134
 msgid "Video input"
 msgstr "Videoenigo"
 
-#: ../src/empathy-streamed-media-window.c:1194
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Dialpad"
-msgstr ""
+msgstr "Ciferplato"
 
-#: ../src/empathy-streamed-media-window.c:1205
+#: ../src/empathy-streamed-media-window.c:1151
 msgid "Details"
 msgstr "Detaloj"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1274
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1825
 #, c-format
 msgid "Call with %s"
-msgstr ""
-
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-streamed-media-window.c:1353
-msgid "Call"
-msgstr "Voko"
+msgstr "Voko kun %s"
 
-#: ../src/empathy-streamed-media-window.c:1507
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:2069
 msgid "The IP address as seen by the machine"
-msgstr ""
+msgstr "La IP-adreso vidata de la ma�ino"
 
-#: ../src/empathy-streamed-media-window.c:1509
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:2071
 msgid "The IP address as seen by a server on the Internet"
-msgstr ""
+msgstr "La IP-adreso vidata de servilo ĉe la Interreto"
 
-#: ../src/empathy-streamed-media-window.c:1511
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:2073
 msgid "The IP address of the peer as seen by the other side"
-msgstr ""
+msgstr "La IP-adreso de la kliento vidata de la alia flanko"
 
-#: ../src/empathy-streamed-media-window.c:1513
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:2075
 msgid "The IP address of a relay server"
-msgstr ""
+msgstr "La IP-adreso de relajsa servilo"
 
-#: ../src/empathy-streamed-media-window.c:1515
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:2077
 msgid "The IP address of the multicast group"
-msgstr ""
+msgstr "La IP-adreso de la plurelsendgroupo"
 
-#: ../src/empathy-streamed-media-window.c:1906
+#: ../src/empathy-streamed-media-window.c:1843
 msgctxt "encoding video codec"
 msgid "Unknown"
 msgstr "Nekonate"
 
-#: ../src/empathy-streamed-media-window.c:1909
+#: ../src/empathy-streamed-media-window.c:1846
 msgctxt "encoding audio codec"
 msgid "Unknown"
 msgstr "Nekonate"
 
-#: ../src/empathy-streamed-media-window.c:1912
+#: ../src/empathy-streamed-media-window.c:1849
 msgctxt "decoding video codec"
 msgid "Unknown"
 msgstr "Nekonate"
 
-#: ../src/empathy-streamed-media-window.c:1915
+#: ../src/empathy-streamed-media-window.c:1852
 msgctxt "decoding audio codec"
 msgid "Unknown"
 msgstr "Nekonate"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2274
+#: ../src/empathy-streamed-media-window.c:2144
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Konektite — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2335
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2846
 msgid "Technical Details"
 msgstr "Teknikaj detaloj"
 
-#: ../src/empathy-streamed-media-window.c:2373
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2884
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr ""
+"La programaro de %s komprenas neniun sonformon subtenata per via komputilo"
 
-#: ../src/empathy-streamed-media-window.c:2378
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2889
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr ""
+"La programaro de %s komprenas neniun videformon subtenata per via komputilo"
 
-#: ../src/empathy-streamed-media-window.c:2384
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2895
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
 "does not allow direct connections."
 msgstr ""
+"Ne eblas sukcese konekti al %s. Eble unu el vi uzas reton kiu ne permesas "
+"rektajn konektojn."
 
-#: ../src/empathy-streamed-media-window.c:2390
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2901
 msgid "There was a failure on the network"
 msgstr "Okazis paneo je la reto"
 
-#: ../src/empathy-streamed-media-window.c:2394
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2905
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
-msgstr ""
+msgstr "La necesasj sonformoj por ĉi tiu voko ne instali�is ĉe via komputilo"
 
-#: ../src/empathy-streamed-media-window.c:2397
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2908
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
-msgstr ""
+msgstr "La necesaj videoformoj por ĉi tiu voko ne instali�is ĉe via komputilo"
 
-#: ../src/empathy-streamed-media-window.c:2407
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2920
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
 "\">report this bug</a> and attach logs gathered from the 'Debug' window in "
 "the Help menu."
 msgstr ""
+"Io neatendita okazis en modulo de Telepatio. Bonvolu <a href=\"%s\">raporti "
+"ĉi tiun cimon</a> kaj afi�i la protokolojn kiujn oni povas kolekti per la "
+"sencimig-fenestro en la helpmenuo."
 
-#: ../src/empathy-streamed-media-window.c:2415
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2929
 msgid "There was a failure in the call engine"
-msgstr ""
+msgstr "Eraro okazis en la vokmodulo"
 
-#: ../src/empathy-streamed-media-window.c:2418
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2932
 msgid "The end of the stream was reached"
-msgstr ""
+msgstr "La fino de la fluo atingi�is"
 
-#: ../src/empathy-streamed-media-window.c:2458
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2972
 msgid "Can't establish audio stream"
-msgstr ""
+msgstr "Ne eblas starigi la sonfluon"
 
-#: ../src/empathy-streamed-media-window.c:2468
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2982
 msgid "Can't establish video stream"
-msgstr ""
+msgstr "Ne eblas starigi la videfluon"
 
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "Audio"
 msgstr "Sono"
 
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr ""
-
 #: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr ""
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "Malkodanta kodeko:"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr ""
+msgid "Disable camera"
+msgstr "El�alti la kamaraon"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr ""
+msgid "Display the dialpad"
+msgstr "Montri la ciferplaton"
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr ""
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "Kodanta kodeko:"
 
 #: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr ""
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Hang up"
+msgstr "Fini vokon"
 
 #: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr ""
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Hang up current call"
+msgstr "Fini la aktualan vokon"
 
 #: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr ""
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "Loka kandidato:"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr ""
+msgid "Maximise me"
+msgstr "Maksimumigi min"
 
 #: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr ""
+msgid "Minimise me"
+msgstr "Minimumigi min"
 
 #: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
-msgstr ""
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "Fora kandidato:"
 
 #: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "AntaÅ­rigardo"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Send Audio"
+msgstr "Sendi sonon"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr ""
+msgid "Send Video"
+msgstr "Sendi videon"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr ""
+msgid "Show dialpad"
+msgstr "Montri la ciferplaton"
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "Sendi sonon"
+msgid "Start a video call"
+msgstr "Komenci videvokon"
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr ""
+msgid "Start an audio call"
+msgstr "Komenci sonvokon"
 
 #: ../src/empathy-call-window.ui.h:18
-msgid "Unknown"
-msgstr "Nekonate"
+msgid "Swap camera"
+msgstr "Inter�an�i filmilojn"
 
 #: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ideo"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr "Baskuligi la sonan transsendon"
 
 #: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "Video"
+msgid "Toggle video transmission"
+msgstr "Baskuligi la videan transsendon"
 
 #: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr ""
-
-#: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr ""
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
+#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
+msgid "Unknown"
+msgstr "Nekonate"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "Videa antaÅ­vido"
+msgid "Video call"
+msgstr "_Videoalvoko"
 
 #: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "_Voko"
 
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:30
+#: ../src/empathy-call-window.ui.h:25
+msgid "_Camera"
+msgstr "_Filmilo"
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:18
+msgid "_Contents"
+msgstr "_Enhavoj"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
+msgid "_Debug"
+msgstr "_Sencimigo"
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:22
+msgid "_Help"
+msgstr "_Helpo"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Microphone"
+msgstr "_Mikrofono"
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "_Settings"
+msgstr "_Agordoj"
+
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_Vido"
 
-#: ../src/empathy-chat-window.c:480 ../src/empathy-chat-window.c:500
+#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d nelegite)"
 msgstr[1] "%s (%d nelegite)"
 
-#: ../src/empathy-chat-window.c:492
+#: ../src/empathy-chat-window.c:493
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (kaj %u alia)"
 msgstr[1] "%s (kaj %u aliaj)"
 
-#: ../src/empathy-chat-window.c:508
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s (%d nelegita de aliaj)"
+msgstr[1] "%s (%d nelegitaj de aliaj)"
 
-#: ../src/empathy-chat-window.c:517
+#: ../src/empathy-chat-window.c:518
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s (%d nelegita de ĉiuj)"
+msgstr[1] "%s (%d nelegitaj de ĉiuj)"
 
-#: ../src/empathy-chat-window.c:732
+#: ../src/empathy-chat-window.c:733
 msgid "SMS:"
-msgstr ""
+msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:742
+#: ../src/empathy-chat-window.c:743
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "Sendante %d mesa�on"
 msgstr[1] "Sendante %d mesa�ojn"
 
-#: ../src/empathy-chat-window.c:764
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
 msgstr "Skribante mesa�on."
 
@@ -3305,17 +3720,13 @@ msgstr "_Vakigi"
 msgid "C_ontact"
 msgstr "K_ontakto"
 
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Babilejo"
-
 #: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
-msgstr ""
+msgstr "Aldoni _miensimbolon"
 
 #: ../src/empathy-chat-window.ui.h:5
 msgid "Invite _Participant…"
-msgstr ""
+msgstr "Inviti _partoprenanton…"
 
 #: ../src/empathy-chat-window.ui.h:6
 msgid "Move Tab _Left"
@@ -3329,10 +3740,6 @@ msgstr "Movi la langeton _dekstren"
 msgid "Notify for All Messages"
 msgstr "Atentigi pri ciuj mesa�oj"
 
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:18
-msgid "_Contents"
-msgstr "_Enhavoj"
-
 #: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "_Konversacio"
@@ -3341,17 +3748,9 @@ msgstr "_Konversacio"
 msgid "_Detach Tab"
 msgstr "_Malligi langeton"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:20
-msgid "_Edit"
-msgstr "R_edakti"
-
 #: ../src/empathy-chat-window.ui.h:13
 msgid "_Favorite Chat Room"
-msgstr ""
-
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:22
-msgid "_Help"
-msgstr "_Helpo"
+msgstr "_Librosignita babilĉambro"
 
 #: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
@@ -3373,106 +3772,112 @@ msgstr "_Langetoj"
 msgid "_Undo Close Tab"
 msgstr "_Malfari fermon de langeto"
 
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "Nomo"
 
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
 msgstr "Ĉambro"
 
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "AÅ­tomata konekto"
 
 #: ../src/empathy-chatrooms-window.ui.h:2
 msgid "Manage Favorite Rooms"
-msgstr ""
+msgstr "Administri librosignitajn ĉambrojn"
 
-#: ../src/empathy-event-manager.c:510
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming video call"
 msgstr "Venanta videotelefon-voko"
 
-#: ../src/empathy-event-manager.c:510
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
 msgid "Incoming call"
 msgstr "Venanta telefonvoko"
 
-#: ../src/empathy-event-manager.c:514
+#: ../src/empathy-event-manager.c:525
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
-msgstr ""
+msgstr "%s vokas vin videe. Ĉu vi volas respondi?"
 
-#: ../src/empathy-event-manager.c:515
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
-msgstr ""
+msgstr "%s vokas vin. Ĉu vi volas respondi?"
 
-#: ../src/empathy-event-manager.c:518 ../src/empathy-event-manager.c:667
+#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming call from %s"
-msgstr ""
+msgstr "Venanta voko de %s"
 
-#: ../src/empathy-event-manager.c:543
+#: ../src/empathy-event-manager.c:554
 msgid "_Reject"
 msgstr "_Rifuzi"
 
-#: ../src/empathy-event-manager.c:549
+#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
 msgid "_Answer"
 msgstr "_Respondo"
 
-#: ../src/empathy-event-manager.c:667
+#: ../src/empathy-event-manager.c:570
+msgid "_Answer with video"
+msgstr "_Respondi per video"
+
+#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming video call from %s"
-msgstr ""
+msgstr "Venenta videvoko de %s"
 
-#: ../src/empathy-event-manager.c:740
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
-msgstr ""
+msgstr "Ĉambrinviton"
 
-#: ../src/empathy-event-manager.c:742
+#: ../src/empathy-event-manager.c:838
 #, c-format
 msgid "Invitation to join %s"
-msgstr ""
+msgstr "Inviton por ali�i al %s"
 
-#: ../src/empathy-event-manager.c:749
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
-msgstr ""
+msgstr "%s invitas vin por ali�i al %s"
 
-#: ../src/empathy-event-manager.c:757
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
-msgstr ""
+msgstr "_Malakcepti"
 
-#: ../src/empathy-event-manager.c:762
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Ali�i"
 
-#: ../src/empathy-event-manager.c:789
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
-msgstr ""
+msgstr "%s invitis vin por ali�i al %s"
 
-#: ../src/empathy-event-manager.c:795
+#: ../src/empathy-event-manager.c:891
 #, c-format
 msgid "You have been invited to join %s"
-msgstr ""
+msgstr "Vi inviti�is por ali�i al %s"
 
-#: ../src/empathy-event-manager.c:846
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
-msgstr ""
+msgstr "Venanta dosiertransigo de %s"
 
-#: ../src/empathy-event-manager.c:1024 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
 msgid "Password required"
 msgstr "Pasvorto bezonatas"
 
-#: ../src/empathy-event-manager.c:1080
+#: ../src/empathy-event-manager.c:1190
 #, c-format
 msgid "%s would like permission to see when you are online"
-msgstr ""
+msgstr "%s volus permeson por scii kiam vi konektas"
 
-#: ../src/empathy-event-manager.c:1084
+#: ../src/empathy-event-manager.c:1194
 #, c-format
 msgid ""
 "\n"
@@ -3525,52 +3930,52 @@ msgstr "Sendante \"%s\" al %s"
 #: ../src/empathy-ft-manager.c:339
 #, c-format
 msgid "Error receiving \"%s\" from %s"
-msgstr ""
+msgstr "Eraro okazis dum ricevi “%s� de %s"
 
 #: ../src/empathy-ft-manager.c:342
 msgid "Error receiving a file"
-msgstr ""
+msgstr "Eraro okazis dum ricevi dosieron"
 
 #: ../src/empathy-ft-manager.c:347
 #, c-format
 msgid "Error sending \"%s\" to %s"
-msgstr ""
+msgstr "Eraro okazis dum sendi “%s� al %s"
 
 #: ../src/empathy-ft-manager.c:350
 msgid "Error sending a file"
-msgstr ""
+msgstr "Eraro okazis dum sendi dosieron"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
 #: ../src/empathy-ft-manager.c:489
 #, c-format
 msgid "\"%s\" received from %s"
-msgstr ""
+msgstr "“%s� ricevi�is de %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
 #: ../src/empathy-ft-manager.c:494
 #, c-format
 msgid "\"%s\" sent to %s"
-msgstr ""
+msgstr "“%s� sendi�is al %s"
 
 #: ../src/empathy-ft-manager.c:497
 msgid "File transfer completed"
-msgstr ""
+msgstr "Dosiertransigo fini�is"
 
 #: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
 msgid "Waiting for the other participant's response"
-msgstr ""
+msgstr "Atendante respondon de la alia partoprenanto"
 
 #: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
 #, c-format
 msgid "Checking integrity of \"%s\""
-msgstr ""
+msgstr "Kontrolante la integrecon de “%s�"
 
 #: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
 #, c-format
 msgid "Hashing \"%s\""
-msgstr ""
+msgstr "Haketante “%s�"
 
 #: ../src/empathy-ft-manager.c:1026
 msgid "%"
@@ -3590,13 +3995,15 @@ msgstr "Dosiertransigoj"
 
 #: ../src/empathy-ft-manager.ui.h:2
 msgid "Remove completed, canceled and failed file transfers from the list"
-msgstr ""
+msgstr "Forigi kompletajn, nuligitajn kaj fu�ajn dosiertransigojn el la listo"
 
 #: ../src/empathy-import-dialog.c:84
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr ""
+"Neniuj importeblaj kontoj trovi�is. Empatio aktuale subtenas importi kontojn "
+"de nur Pidgin."
 
 #: ../src/empathy-import-dialog.c:199
 msgid "Import Accounts"
@@ -3617,145 +4024,138 @@ msgstr "Fonto"
 
 #: ../src/empathy-main-window.c:392
 msgid "Provide Password"
-msgstr ""
+msgstr "Provizi pasvorton"
 
 #: ../src/empathy-main-window.c:398
 msgid "Disconnect"
 msgstr "Malkonekti"
 
-#: ../src/empathy-main-window.c:538
+#: ../src/empathy-main-window.c:622
 msgid "No match found"
 msgstr "Neniu kongruaĵo trovi�is"
 
-#: ../src/empathy-main-window.c:693
+#: ../src/empathy-main-window.c:777
 msgid "Reconnect"
 msgstr "Rekonekti"
 
-#: ../src/empathy-main-window.c:699
+#: ../src/empathy-main-window.c:783
 msgid "Edit Account"
 msgstr "Redakti konton"
 
-#: ../src/empathy-main-window.c:705
+#: ../src/empathy-main-window.c:789
 msgid "Close"
 msgstr "Fermi"
 
 #. Translators: this string will be something like:
 #. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:844
+#: ../src/empathy-main-window.c:928
 #, c-format
 msgid "Top up %s (%s)..."
-msgstr ""
+msgstr "Plenumi la konton %s (%s)…"
 
-#: ../src/empathy-main-window.c:891
+#: ../src/empathy-main-window.c:975
 msgid "Top up account credit"
-msgstr ""
+msgstr "Plenumi krediton en konto"
 
 #. top up button
-#: ../src/empathy-main-window.c:966
+#: ../src/empathy-main-window.c:1046
 msgid "Top Up..."
-msgstr ""
+msgstr "Plenumi konton…"
 
-#: ../src/empathy-main-window.c:1733
+#: ../src/empathy-main-window.c:1789
 msgid "Contact"
 msgstr "Kontakto"
 
-#: ../src/empathy-main-window.c:2085
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "Kontaktlisto"
 
-#: ../src/empathy-main-window.c:2203
-msgid "Show and edit accounts"
-msgstr "Montri kaj redakti kontojn"
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
-msgstr ""
+msgstr "Kontaktoj sur _mapo"
 
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-main-window-menubar.ui.h:2
 msgid "Credit Balance"
-msgstr ""
+msgstr "Bilanco de konto"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "Serĉi en kontakt_listo"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
-msgstr ""
+msgstr "Ali�i al librosignitajn ĉambrojn"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
-msgstr ""
+msgstr "Administri librosignitajn ĉambrojn"
 
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
-msgstr ""
+msgstr "N_ormala grandeco"
 
-#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "Nova _voko…"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
-msgstr ""
+msgstr "Normala grandeco kun _avataroj"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "Ago_rdoj"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "Montri p_rotokolojn"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "Ordigi laÅ­ _nomo"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "Ordigi laÅ­ _stato"
 
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Kontoj"
 
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
-msgstr ""
+msgstr "_Blokitaj kontoj"
 
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
-msgstr ""
+msgstr "_Kompakta grandeco"
 
-#: ../src/empathy-main-window.ui.h:19
-msgid "_Debug"
-msgstr "_Sencimigo"
-
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
-msgstr ""
+msgstr "_Dosiertransigoj"
 
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "_Ali�i…"
 
-#: ../src/empathy-main-window.ui.h:24 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "_Nova konversacio…"
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
-msgstr ""
+msgstr "_Nekonektaj kontaktoj"
 
-#: ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "_Personaj informoj"
 
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "Ĉamb_ro"
 
-#: ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-main-window-menubar.ui.h:29
 msgid "_Search for Contacts…"
 msgstr "_Serĉi kontaktojn…"
 
@@ -3777,6 +4177,10 @@ msgid ""
 "Password required: %s\n"
 "Members: %s"
 msgstr ""
+"%s\n"
+"Invito bezonata: %s\n"
+"Pasvorto bezonata: %s\n"
+"Membroj: %s"
 
 #: ../src/empathy-new-chatroom-dialog.c:555
 #: ../src/empathy-new-chatroom-dialog.c:556
@@ -3785,11 +4189,11 @@ msgstr "Ne"
 
 #: ../src/empathy-new-chatroom-dialog.c:584
 msgid "Could not start room listing"
-msgstr ""
+msgstr "Ne eblas komenci listi la ĉambrojn"
 
 #: ../src/empathy-new-chatroom-dialog.c:594
 msgid "Could not stop room listing"
-msgstr ""
+msgstr "Ne eblis ĉesi listi la ĉambrojn"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "Couldn't load room list"
@@ -3799,12 +4203,16 @@ msgstr "Ne eblis �argi ĉambroliston"
 msgid ""
 "Enter the room name to join here or click on one or more rooms in the list."
 msgstr ""
+"Enmetu la nomon de la ĉambro al kiu ali�i ĉi tie aŭ klaku al ĉambro aŭ "
+"ĉambroj en la liston."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
 msgstr ""
+"Enmetu la servilon kiu gastigas la ĉambron, aŭ lasu �in malplena se la "
+"ĉambro estas ĉe la servilo de la aktuala konto"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid "Join Room"
@@ -3818,79 +4226,81 @@ msgstr "Ĉambrolisto"
 msgid "_Room:"
 msgstr "Ĉamb_ro:"
 
-#: ../src/empathy-preferences.c:156
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr "Ricevis mesa�on"
 
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr "Sendis mesa�on"
 
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
 msgstr "Nova konversacio"
 
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
-msgstr ""
+msgstr "Kontakto malkonektas"
 
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
-msgstr ""
+msgstr "Kontakto konektas"
 
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
-msgstr ""
+msgstr "Konto konektis"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
-msgstr ""
+msgstr "Konto malkonektis"
 
-#: ../src/empathy-preferences.c:459
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr "Lingvo"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:709
+#: ../src/empathy-preferences.c:734
 msgid "Juliet"
-msgstr ""
+msgstr "Julieta"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:716
+#: ../src/empathy-preferences.c:741
 msgid "Romeo"
-msgstr ""
+msgstr "Romeo"
 
+# Traduko de Remeo kaj Julieta venas de:
+# http://donh.best.vwh.net/Esperanto/Literaturo/Revuoj/np/np5602/romeo_julieta.html
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:722
+#: ../src/empathy-preferences.c:747
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
-msgstr ""
+msgstr "Romeo! Kial estas vi Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:750
 msgid "Deny thy father and refuse thy name;"
-msgstr ""
+msgstr "La patron neu kaj la nomon ĵetu"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:728
+#: ../src/empathy-preferences.c:753
 msgid "Or if thou wilt not, be but sworn my love"
-msgstr ""
+msgstr "Aŭ, se ne tio, ĵuru vin nur mia,"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:731
+#: ../src/empathy-preferences.c:756
 msgid "And I'll no longer be a Capulet."
-msgstr ""
+msgstr "kaj mi ne estos Kapuleto plu!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:759
 msgid "Shall I hear more, or shall I speak at this?"
-msgstr ""
+msgstr "Ĉu plu aŭskulti, aŭ jam nun paroli?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:737
+#: ../src/empathy-preferences.c:762
 msgid "Juliet has disconnected"
-msgstr "Juliet nekonekti�is"
+msgstr "Juliet malkonektis"
 
-#: ../src/empathy-preferences.c:1131
+#: ../src/empathy-preferences.c:1166
 msgid "Preferences"
 msgstr "Agordoj"
 
@@ -3898,139 +4308,162 @@ msgstr "Agordoj"
 msgid "Appearance"
 msgstr "Aspekto"
 
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
 msgstr "Konduto"
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
 msgid "Chat Th_eme:"
 msgstr "Babileja _etoso:"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
 msgid "Disable notifications when _away or busy"
-msgstr ""
+msgstr "El�alti sciigojn kiam oni foras aŭ okupi�as"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
 msgid "Disable sounds when _away or busy"
-msgstr ""
+msgstr "El�alti sonojn kiam oni for_as aŭ okupi�as"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
+msgstr "Montri venantajn mesa�ojn en la sciiga areo"
+
+#: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
+"Eĥo-nuligado plibonigas la klarecon de via voĉo al la alia babilanto, sed �i "
+"povas kaŭzi problemojn ĉe kelkaj komputiloj. Se vi aŭ la alia babilanto "
+"aŭdas strangajn bruojn aŭ eraretojn dum vokoj, provu el�alti la eĥo-"
+"nuligadon kaj rekomencu la vokon. "
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
-msgstr ""
+msgstr "En�alti sciigojn kiam kontakto konektas"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
-msgstr ""
+msgstr "En�alti sciigojn kian kontakto malkonektas"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
-msgstr ""
+msgstr "En�alti sciigojn kiam la _babilo ne estas fokusita"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
-msgstr ""
+msgstr "En�alti literumkontrolon por la lingvoj:"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "Äœenerale"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input level:"
+msgstr "Nivelo de enigo:"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "LaÅ­teco de enigo:"
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
-msgstr ""
+msgstr "Lokfontoj:"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
-msgstr ""
+msgstr "Protokoli konversaciojn"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "Atentigoj"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
-msgstr ""
+msgstr "Ludi sonojn por eventoj"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "Privateco"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
 "decimal place."
 msgstr ""
+"Kiam la precizo de la loko redukti�as, nenio pli preciza ol la urbo, �tato "
+"kaj lando publiki�os. Koordinatoj de GPS precizos je nur 1 decimalo."
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
-msgstr ""
+msgstr "Montri _miensimbolojn kiel bildoj"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
-msgstr ""
+msgstr "Montri la kontakt_liston en ĉambroj"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "Sonoj"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "Literumkontrolo"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
+"La listo de lingvoj enhavas nur la lingvojn por kiuj vortaro instali�is."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "Etosoj"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "Variaĵo:"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
-msgstr ""
+msgstr "_Aŭtomate konekti je la lanĉo"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Po�telefono"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
-msgstr ""
+msgstr "Ŝ_alti vezikajn atentigojn"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "Aktivigi sonajn at_entigojn"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
-msgstr ""
+msgstr "_Reto (IP, Sendrata)"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "Malfermi n_ovajn babilojn en propraj fenestroj"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
-msgstr ""
+msgstr "_Publikigi mian lokon al miaj kontaktoj"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
-msgstr ""
+msgstr "_Redukti la precizon de la loko"
 
 #: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
@@ -4040,97 +4473,149 @@ msgstr "Stato"
 msgid "_Quit"
 msgstr "Ĉ_esi"
 
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "Voki la kontakton denove"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "Filmilo el�altita"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "Filmilo en�altita"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "El�alti la filmilon kaj ĉesi elsendi videon"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "En�alti la filmilon kaj elsendi videon"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "En�alti la filmilon sed ne elsendi videon"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "AntaÅ­rigardo"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "Revoki"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "V_ideo"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "Video el�altita"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "Video en�altita"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "Videa antaÅ­vido"
+
 #: ../src/empathy-map-view.c:448
 msgid "Contact Map View"
 msgstr "Vido de la mapo de kontakoj"
 
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
 msgid "Save"
 msgstr "Konservi"
 
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
 msgstr "Sencimig-fenestro"
 
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
 msgstr "PaÅ­zo"
 
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
 msgstr "Nivelo "
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
 msgid "Debug"
 msgstr "Sencimigo"
 
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
 msgid "Info"
 msgstr "Informo"
 
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
 msgid "Message"
 msgstr "Mesa�o"
 
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
 msgid "Warning"
 msgstr "Averto"
 
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
 msgid "Critical"
 msgstr "Kritike"
 
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
 msgid "Error"
 msgstr "Eraro"
 
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
 msgid "Time"
 msgstr "Tempo"
 
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
 msgid "Domain"
 msgstr "Retregiono"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
 msgstr "Kategorio"
 
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "Nivelo"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr ""
+"La elektita kontaktadministrilo ne subtenas la kromprogramon de fora "
+"sencimigo."
 
-#: ../src/empathy-invite-participant-dialog.c:429
-#: ../src/empathy-invite-participant-dialog.c:477
+#: ../src/empathy-invite-participant-dialog.c:179
+#: ../src/empathy-invite-participant-dialog.c:205
 msgid "Invite Participant"
-msgstr ""
+msgstr "Inviti partoprenonton"
 
-#: ../src/empathy-invite-participant-dialog.c:430
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
-msgstr ""
+msgstr "Elektu kontakton por inviti al la konversacio:"
 
-#: ../src/empathy-invite-participant-dialog.c:473
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "Inviti"
 
 #: ../src/empathy-accounts.c:183
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr ""
+msgstr "Montri neniun dialogojn; fari laboron (ekz. importado) kaj eliri"
 
 #: ../src/empathy-accounts.c:187
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
+"Ne montri iun ajn dialogojn krom se estas nur kontoj de “proksima homoj�"
 
 #: ../src/empathy-accounts.c:191
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
+"Unue elekti la indikitan konton (ekz. gabble/jabber/foo_40ekzemplo_2eorg0)"
 
 #: ../src/empathy-accounts.c:193
 msgid "<account-id>"
@@ -4144,7 +4629,15 @@ msgstr "- Empatio-kontoj"
 msgid "Empathy Accounts"
 msgstr "Empatio-kontoj"
 
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr "Montri specifan servon"
+
+#: ../src/empathy-debugger.c:75
+msgid "- Empathy Debugger"
+msgstr "- Empatio-sencimigilo"
+
+#: ../src/empathy-debugger.c:114
 msgid "Empathy Debugger"
 msgstr "Empatio-sencimigilo"
 
@@ -4152,46 +4645,102 @@ msgstr "Empatio-sencimigilo"
 msgid "- Empathy Chat Client"
 msgstr "- Babililo 'Empatio'"
 
-#: ../src/empathy-notifications-approver.c:184
+#: ../src/empathy-notifications-approver.c:203
 msgid "Respond"
 msgstr "Respondo"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1459
 msgid "Reject"
 msgstr "Rifuzi"
 
-#: ../src/empathy-notifications-approver.c:194
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1460
 msgid "Answer"
 msgstr "Respondo"
 
-#: ../src/empathy-notifications-approver.c:201
-#: ../src/empathy-notifications-approver.c:211
+#: ../src/empathy-notifications-approver.c:227
+msgid "Answer with video"
+msgstr "Respondi per video"
+
+#: ../src/empathy-notifications-approver.c:235
+#: ../src/empathy-notifications-approver.c:245
 msgid "Decline"
-msgstr ""
+msgstr "Malakcepti"
 
-#: ../src/empathy-notifications-approver.c:205
-#: ../src/empathy-notifications-approver.c:216
+#: ../src/empathy-notifications-approver.c:239
+#: ../src/empathy-notifications-approver.c:250
 msgid "Accept"
 msgstr "Akcepti"
 
-#: ../src/empathy-notifications-approver.c:226
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:260
 msgid "Provide"
 msgstr "Provizi"
 
-#: ../src/empathy-call-observer.c:130
+#: ../src/empathy-call-observer.c:134
 #, c-format
-msgid "Missed call from %s"
-msgstr ""
+msgid "%s just tried to call you, but you were in another call."
+msgstr "%s ĵus provis voki vin, sed vi jam estis en alia voko."
 
-#: ../src/empathy-call-observer.c:133
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+msgid "i"
+msgstr "i"
+
+#: ../src/empathy-call-window.c:2775
+msgid "On hold"
+msgstr "Atendanta"
+
+#: ../src/empathy-call-window.c:2778
+msgid "Mute"
+msgstr "Silentigi"
+
+#: ../src/empathy-call-window.c:2780
+msgid "Duration"
+msgstr "DaÅ­ro"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2783
 #, c-format
-msgid "%s just tried to call you, but you were in another call."
-msgstr ""
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02dm"
 
-#: ../libempathy-gtk/empathy-search-bar.c:282
+#: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "_Uskleca kongruo"
 
+#~ msgid "All"
+#~ msgstr "Ĉiuj"
+
+#~ msgid "Date"
+#~ msgstr "Dato"
+
+#~ msgid "Conversations"
+#~ msgstr "Konversacioj"
+
+#~ msgid "Find Next"
+#~ msgstr "Trovi la sekvan"
+
+#~ msgid "Find Previous"
+#~ msgstr "Trovi la antaÅ­an"
+
+#~ msgid "_For:"
+#~ msgstr "_Por:"
+
+#~ msgid "Save _New Status Message"
+#~ msgstr "Redakti kutimajn mesa�oj"
+
+#~ msgid "Saved Status Messages"
+#~ msgstr "Konservitaj stat-mesa�oj"
+
+#~ msgid "Show and edit accounts"
+#~ msgstr "Montri kaj redakti kontojn"
+
 #~ msgid "Empathy has asked about importing accounts"
 #~ msgstr "Empatio demandis pri importi kontojn"
 
@@ -4202,30 +4751,12 @@ msgstr "_Uskleca kongruo"
 #~ msgid "Your software is too old"
 #~ msgstr "Via programaro estas tro maljuna"
 
-#~ msgid "All accounts"
-#~ msgstr "Ĉiuj kontoj"
-
-#~ msgid "Clear All"
-#~ msgstr "Vakigi ĉion"
-
-#~ msgid "Delete from:"
-#~ msgstr "Forigi de:"
-
-#~ msgid "Delete All History..."
-#~ msgstr "Forigi la tutan historion..."
-
 #~ msgid "_Accept"
 #~ msgstr "_Akcepti"
 
-#~ msgid "_Answer with video"
-#~ msgstr "_Respondi per video"
-
 #~ msgid "Update software..."
 #~ msgstr "Äœisdatigi programaron..."
 
-#~ msgid "Answer with video"
-#~ msgstr "Respondi per video"
-
 #~ msgid "Context"
 #~ msgstr "Kunteksto"
 
diff --git a/po/es.po b/po/es.po
index 07e9120ba..ef737ab1f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,23 +1,23 @@
 # translation of empathy.master.po to Español
 # Copyright (C) 2003 Free Software Foundation
 # This file is distributed under the same license as the Gossip package.
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011.
 # Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010, 2011.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-08-30 09:49+0000\n"
-"PO-Revision-Date: 2011-08-30 18:56+0200\n"
-"Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
-"Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n"
+"POT-Creation-Date: 2011-09-26 10:35+0000\n"
+"PO-Revision-Date: 2011-10-07 10:06+0200\n"
+"Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
+"Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
@@ -52,7 +52,6 @@ msgid "Camera device"
 msgstr "Dispositivo de cámara"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-#| msgid "Camera On"
 msgid "Camera position"
 msgstr "Posición de la cámara"
 
@@ -92,28 +91,34 @@ msgid "Contact list sort criterion"
 msgstr "Criterio de ordenación de la lista de contactos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr ""
+"Ruta del objeto D-Bus de la última cuenta seleccionada para unirse a una "
+"sala."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr ""
 "El dispositivo de cámara predeterminado que usar en las llamadas de vídeo, "
 "ej. /dev/video0."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Default directory to select an avatar image from"
 msgstr "Carpeta predeterminada para seleccionar un avatar"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable popup notifications when away"
 msgstr "Desactivar las notificaciones emergentes al estar ausente"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Disable sounds when away"
 msgstr "Desactivar los sonidos al ausentarse"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Display incoming events in the status area"
 msgstr "Mostrar los eventos entrantes en el área de estado"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -121,34 +126,30 @@ msgstr ""
 "Mostrar los eventos entrantes en el área de estado. Si es falso presentarlos "
 "directamente al usuario."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Echo cancellation support"
 msgstr "Soporte de cancelación de eco"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can publish the user's location"
 msgstr "Empathy puede publicar la ubicación del usuario"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy puede usar el GPS para deducir la ubicación"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy puede usar la red telefónica móvil para deducir la ubicación"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy puede usar la red para deducir la ubicación"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy default download folder"
 msgstr "Carpeta de descargas predeterminada de Epiphany"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "Empathy ha migrado los registros de butterfly"
-
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy debería mostrar ausencia en inactividad"
@@ -187,159 +188,159 @@ msgid "Hide the main window."
 msgstr "Ocultar la ventana principal."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+msgid "Last account selected in Join Room dialog"
+msgstr "Última cuenta seleccionada en el diálogo Unirse a sala"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Nick completed character"
 msgstr "Carácter de completado de apodo"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Open new chats in separate windows"
 msgstr "Abrir chats nuevos en ventanas separadas"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use"
 msgstr "Ruta del tema Adium que usar"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "Ruta al tema Adium que usar si el tema usado para el chat es Adium."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for incoming messages"
 msgstr "Reproducir un sonido cuando lleguen mensajes"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for new conversations"
 msgstr "Reproducir un sonido para conversaciones nuevas"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound for outgoing messages"
 msgstr "Reproducir un sonido al enviar mensajes"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs in"
 msgstr "Reproducir un sonido cuando un contacto inicie sesión"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when a contact logs out"
 msgstr "Reproducir un sonido cuando un contacto finalice su sesión"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log in"
 msgstr "Reproducir un sonido cuando inicio sesión"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Play a sound when we log out"
 msgstr "Reproducir un sonido al finalizar una sesión"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications if the chat isn't focused"
 msgstr ""
 "Mostrar notificaciones emergentes si la ventana de chat no tiene el foco"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs in"
 msgstr "Mostrar notificaciones emergentes cuando un contacto se conecta"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "Pop up notifications when a contact logs out"
 msgstr "Mostrar notificaciones emergentes cuando un contacto se desconecta"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Position the camera preview should be during a call."
 msgstr "Posición donde estar la vista previa de la cámara durante una llamada."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show Balance in contact list"
 msgstr "Mostrar crédito en la lista de contactos"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show avatars"
 msgstr "Mostrar avatares"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show contact list in rooms"
 msgstr "Mostrar lista de contactos en salas"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show hint about closing the main window"
 msgstr "Mostrar consejo sobre cómo cerrar la ventana principal"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show offline contacts"
 msgstr "Mostrar contactos no conectados"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Show protocols"
 msgstr "Mostrar protocolos"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Spell checking languages"
 msgstr "Idiomas para revisión ortográfica"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The default folder to save file transfers in."
 msgstr "La carpeta predeterminada donde guardar los archivos transferidos."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Última carpeta de la que se eligió un avatar."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The position for the chat window side pane"
 msgstr "La posición para el panel lateral de la ventana de charla"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr ""
 "La posición almacenada (en píxeles) del panel lateral de la ventana de "
 "charla."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr ""
 "El tema que se usará para mostrar la conversación en las ventanas de chat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr ""
 "La variante del tema que se usará para mostrar la conversación en las "
 "ventanas de chat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use graphical smileys"
 msgstr "Usar emoticonos gráficos"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use notification sounds"
 msgstr "Usar sonidos de notificación"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Use theme for chat rooms"
 msgstr "Usar tema para salas de chat"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr ""
 "Indica si Empathy puede publicar la ubicación del usuario a sus contactos."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Indica si Empathy puede usar el GPS para deducir la ubicación."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
 "Indica si Empathy puede usar la red telefónica móvil para deducir la "
 "ubicación."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Indica si Empathy puede usar la red para deducir la ubicación."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Indica si Empathy ha migrado los registros de butterfly."
-
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr ""
@@ -601,144 +602,144 @@ msgstr "Error la intentar transferir el archivo"
 msgid "The other participant is unable to transfer the file"
 msgstr "El otro participante no puede transferir el archivo"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
 msgid "Unknown reason"
 msgstr "Razón desconocida"
 
-#: ../libempathy/empathy-utils.c:222
+#: ../libempathy/empathy-utils.c:232
 msgid "Available"
 msgstr "Disponible"
 
-#: ../libempathy/empathy-utils.c:224
+#: ../libempathy/empathy-utils.c:234
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libempathy/empathy-utils.c:227
+#: ../libempathy/empathy-utils.c:237
 msgid "Away"
 msgstr "Ausente"
 
-#: ../libempathy/empathy-utils.c:229
+#: ../libempathy/empathy-utils.c:239
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:241
 msgid "Offline"
 msgstr "Desconectado"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:244
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:284
 msgid "No reason specified"
 msgstr "No se especificó ninguna razón"
 
-#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
 msgid "Status is set to offline"
 msgstr "El estado se ha establecido a desconectado"
 
-#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
 #: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "Error de red"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
 msgid "Authentication failed"
 msgstr "Falló la autenticación"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
 msgid "Encryption error"
 msgstr "Error de cifrado"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:294
 msgid "Name in use"
 msgstr "Nombre en uso"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate not provided"
 msgstr "No se proporcionó el certificado"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate untrusted"
 msgstr "Certificado sin confianza"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
 msgid "Certificate expired"
 msgstr "El certificado ha expirado"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
 msgid "Certificate not activated"
 msgstr "El certificado no está activado"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
 msgid "Certificate hostname mismatch"
 msgstr "El nombre del equipo del certificado no coincide"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
 msgid "Certificate fingerprint mismatch"
 msgstr "La huella del certificado no coincide"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
 msgid "Certificate self-signed"
 msgstr "Certificado firmado consigo mismo"
 
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate error"
 msgstr "Error del certificado"
 
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:344
 msgid "Encryption is not available"
 msgstr "El cifrado no está disponible"
 
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:346
 msgid "Certificate is invalid"
 msgstr "El certificado no es válido"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:348
 msgid "Connection has been refused"
 msgstr "Se rechazó la conexión"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:350
 msgid "Connection can't be established"
 msgstr "No se pudo establecer la conexión"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:352
 msgid "Connection has been lost"
 msgstr "Se perdió la conexión"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:354
 msgid "This resource is already connected to the server"
 msgstr "El recurso ya está conectado al servidor"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:356
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Se ha reemplazado la conexión por una conexión nueva usando el mismo recurso"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:359
 msgid "The account already exists on the server"
 msgstr "La cuenta ya existe en el servidor"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:361
 msgid "Server is currently too busy to handle the connection"
 msgstr ""
 "Actualmente el servidor está demasiado ocupado para gestionar la conexión"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:363
 msgid "Certificate has been revoked"
 msgstr "Se revocó el certificado"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:365
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "El certificado usa un algoritmo de cifrado inseguro o es criptográficamente "
 "débil"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:368
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -747,20 +748,20 @@ msgstr ""
 "servidor de certificados exceden los límites impuestos por la biblioteca "
 "cripotográfica"
 
-#: ../libempathy/empathy-utils.c:519
+#: ../libempathy/empathy-utils.c:529
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "Gente cerca"
 
-#: ../libempathy/empathy-utils.c:524
+#: ../libempathy/empathy-utils.c:534
 msgid "Yahoo! Japan"
 msgstr "Yahoo Japón"
 
-#: ../libempathy/empathy-utils.c:553
+#: ../libempathy/empathy-utils.c:563
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:554
+#: ../libempathy/empathy-utils.c:564
 msgid "Facebook Chat"
 msgstr "Chat de Facebook"
 
@@ -810,71 +811,81 @@ msgstr[1] "hace %d meses"
 msgid "in the future"
 msgstr "en el futuro"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:539
+#: ../libempathy-gtk/empathy-account-chooser.c:540
 msgid "All accounts"
 msgstr "Todas las cuentas"
 
-#: ../libempathy-gtk/empathy-account-widget.c:693
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "Cuenta"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "Contraseña"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Puerto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:768
-#: ../libempathy-gtk/empathy-account-widget.c:825
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1166
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "Mis cuentas web"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "La vuenta %s se edita a través de My Web Accounts."
+msgid "The account %s is edited via %s."
+msgstr "La cuenta %s se edita a través de %s."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1172
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "No se puede editar la cuenta %s en Empathy."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
 msgstr "Lanzar My Web Accounts"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1532
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "Editar %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Nombre de usuario:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1850
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "_Aplicar"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1880
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
 msgstr "Iniciar _sesión"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1954
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "Esta cuenta ya existe en el servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1957
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "Crear una cuenta nueva en el servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2149
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "Ca_ncelar"
 
@@ -883,19 +894,19 @@ msgstr "Ca_ncelar"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2427
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s en %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2453
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "Cuenta %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2457
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "Cuenta nueva"
 
@@ -1312,36 +1323,36 @@ msgstr "I_D de Yahoo!:"
 msgid "_Room List locale:"
 msgstr "Configuración de la lista de _salas:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:470
-#: ../libempathy-gtk/empathy-avatar-chooser.c:555
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "No se pudo convertir la imagen"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "Su sistema no soporta ninguno de los formatos de imagen aceptados"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:818
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
 msgid "Couldn't save picture to file"
 msgstr "No se pudo guardar la imagen a un archivo"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:934
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "Seleccione su imagen de avatar"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
 msgstr "Tomar una imagen…"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:941
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "Sin imagen"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "Imágenes"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "Todos los archivos"
 
@@ -1370,40 +1381,40 @@ msgstr "El contacto especificado no es válido"
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Este protocolo no soporta llamadas de emergencia"
 
-#: ../libempathy-gtk/empathy-chat.c:702
+#: ../libempathy-gtk/empathy-chat.c:705
 msgid "Failed to open private chat"
 msgstr "Falló al abrir el chat privado"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:766
 msgid "Topic not supported on this conversation"
 msgstr "El tema no está soportado en esta conversación"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:772
 msgid "You are not allowed to change the topic"
 msgstr "No le está permitido cambiar el tema"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:976
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "%s no es un identificador de contacto válido"
 
-#: ../libempathy-gtk/empathy-chat.c:1030
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: limpiar todos los mensajes de la conversación actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1033
+#: ../libempathy-gtk/empathy-chat.c:1074
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <tema>: establecer el tema para la conversación actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <id de sala de chat>: unirse a una sala de chat nueva"
 
-#: ../libempathy-gtk/empathy-chat.c:1039
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <id de sala de chat>: unirse a una sala de chat nueva"
 
-#: ../libempathy-gtk/empathy-chat.c:1043
+#: ../libempathy-gtk/empathy-chat.c:1084
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1411,37 +1422,37 @@ msgstr ""
 "/part [<ID de la sala de chat>] [<razón>]: abandonar la sala de chat, la "
 "actual de manera predeterminada"
 
-#: ../libempathy-gtk/empathy-chat.c:1047
+#: ../libempathy-gtk/empathy-chat.c:1088
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <id del contacto> [<mensaje>]: abrir un chat privado"
 
-#: ../libempathy-gtk/empathy-chat.c:1050
+#: ../libempathy-gtk/empathy-chat.c:1091
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <id del contacto> <mensaje>: abrir un chat privado"
 
-#: ../libempathy-gtk/empathy-chat.c:1053
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <apodo>: cambiar su apodo en el servidor actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1056
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <mensaje>: enviar un mensaje de ACCIÓN a la conversación actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1059
+#: ../libempathy-gtk/empathy-chat.c:1100
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 msgstr ""
 "/say <mensaje>: enviar un <mensaje> a la conversación actual. Esto se usa "
-"para enviar un mensaje comenzando por una «/». Por ejemplo: «/say /join se "
-"usa para unirse a una sala de chat nueva»"
+"para enviar un mensaje comenzando por una «/». Por ejemplo: «/say /join se usa "
+"para unirse a una sala de chat nueva»"
 
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1105
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ID del contacto>: mostrar información sobre un contacto"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1108
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1449,113 +1460,113 @@ msgstr ""
 "/help [<comando>]: mostrar todos los comandos soportados. Si <comando> está "
 "definido, muestra su uso."
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1127
 #, c-format
 msgid "Usage: %s"
 msgstr "Uso: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1116
+#: ../libempathy-gtk/empathy-chat.c:1172
 msgid "Unknown command"
 msgstr "Comando desconocido"
 
-#: ../libempathy-gtk/empathy-chat.c:1242
+#: ../libempathy-gtk/empathy-chat.c:1298
 msgid "Unknown command; see /help for the available commands"
 msgstr "Comando desconocido; consulte /help para ver los comandos disponibles"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1412
+#: ../libempathy-gtk/empathy-chat.c:1468
 msgid "insufficient balance to send message"
 msgstr "no tiene balance suficiente para enviar el mensaje"
 
-#: ../libempathy-gtk/empathy-chat.c:1414
+#: ../libempathy-gtk/empathy-chat.c:1470
 msgid "not capable"
 msgstr "no es posible"
 
-#: ../libempathy-gtk/empathy-chat.c:1421
+#: ../libempathy-gtk/empathy-chat.c:1477
 msgid "offline"
 msgstr "desconectado"
 
-#: ../libempathy-gtk/empathy-chat.c:1424
+#: ../libempathy-gtk/empathy-chat.c:1480
 msgid "invalid contact"
 msgstr "contacto no válido"
 
-#: ../libempathy-gtk/empathy-chat.c:1427
+#: ../libempathy-gtk/empathy-chat.c:1483
 msgid "permission denied"
 msgstr "permiso denegado"
 
-#: ../libempathy-gtk/empathy-chat.c:1430
+#: ../libempathy-gtk/empathy-chat.c:1486
 msgid "too long message"
 msgstr "mensaje demasiado largo"
 
-#: ../libempathy-gtk/empathy-chat.c:1433
+#: ../libempathy-gtk/empathy-chat.c:1489
 msgid "not implemented"
 msgstr "no implementado"
 
-#: ../libempathy-gtk/empathy-chat.c:1437
+#: ../libempathy-gtk/empathy-chat.c:1493
 msgid "unknown"
 msgstr "desconocido"
 
-#: ../libempathy-gtk/empathy-chat.c:1443
+#: ../libempathy-gtk/empathy-chat.c:1499
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Error al enviar el mensaje «%s»: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1447
+#: ../libempathy-gtk/empathy-chat.c:1503
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Error al enviar el mensaje: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1508 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1564 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Tema:"
 
-#: ../libempathy-gtk/empathy-chat.c:1520
+#: ../libempathy-gtk/empathy-chat.c:1576
 #, c-format
 msgid "Topic set to: %s"
 msgstr "El tema se ha establecido a: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1578
 msgid "No topic defined"
 msgstr "No se ha definido el tema"
 
-#: ../libempathy-gtk/empathy-chat.c:2031
+#: ../libempathy-gtk/empathy-chat.c:2087
 msgid "(No Suggestions)"
 msgstr "(Sin sugerencias)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2099
+#: ../libempathy-gtk/empathy-chat.c:2155
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Añadir «%s» al diccionario"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2136
+#: ../libempathy-gtk/empathy-chat.c:2192
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Añadir «%s» al diccionario de «%s»"
 
-#: ../libempathy-gtk/empathy-chat.c:2206
+#: ../libempathy-gtk/empathy-chat.c:2262
 msgid "Insert Smiley"
 msgstr "Insertar emoticono"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2224
+#: ../libempathy-gtk/empathy-chat.c:2280
 #: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "E_nviar"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2278
+#: ../libempathy-gtk/empathy-chat.c:2334
 msgid "_Spelling Suggestions"
 msgstr "_Sugerencias ortográficas"
 
-#: ../libempathy-gtk/empathy-chat.c:2367
+#: ../libempathy-gtk/empathy-chat.c:2423
 msgid "Failed to retrieve recent logs"
 msgstr "Falló al recibir los registros recientes"
 
-#: ../libempathy-gtk/empathy-chat.c:2504
+#: ../libempathy-gtk/empathy-chat.c:2560
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s se ha desconectado"
@@ -1563,12 +1574,12 @@ msgstr "%s se ha desconectado"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2511
+#: ../libempathy-gtk/empathy-chat.c:2567
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s expulsó a %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2514
+#: ../libempathy-gtk/empathy-chat.c:2570
 #, c-format
 msgid "%s was kicked"
 msgstr "%s fue expulsado"
@@ -1576,17 +1587,17 @@ msgstr "%s fue expulsado"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2522
+#: ../libempathy-gtk/empathy-chat.c:2578
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s vetó a %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2525
+#: ../libempathy-gtk/empathy-chat.c:2581
 #, c-format
 msgid "%s was banned"
 msgstr "%s fue vetado"
 
-#: ../libempathy-gtk/empathy-chat.c:2529
+#: ../libempathy-gtk/empathy-chat.c:2585
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ha dejado la sala"
@@ -1596,68 +1607,72 @@ msgstr "%s ha dejado la sala"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2538
+#: ../libempathy-gtk/empathy-chat.c:2594
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2619
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s ha entrado en la sala"
 
-#: ../libempathy-gtk/empathy-chat.c:2588
+#: ../libempathy-gtk/empathy-chat.c:2644
 #, c-format
 msgid "%s is now known as %s"
 msgstr "Ahora %s se llama %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2727
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2797
 #: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:2335
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1546
+#: ../src/empathy-call-window.c:1596 ../src/empathy-call-window.c:2641
 msgid "Disconnected"
 msgstr "Desconectado"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3374
+#: ../libempathy-gtk/empathy-chat.c:3441
 msgid "Would you like to store this password?"
 msgstr "¿Quiere guardar esta contraseña?"
 
-#: ../libempathy-gtk/empathy-chat.c:3380
+#: ../libempathy-gtk/empathy-chat.c:3447
 msgid "Remember"
 msgstr "Recordar"
 
-#: ../libempathy-gtk/empathy-chat.c:3390
+#: ../libempathy-gtk/empathy-chat.c:3457
 msgid "Not now"
 msgstr "Ahora no"
 
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3501
 msgid "Retry"
 msgstr "Volver a intentarlo"
 
-#: ../libempathy-gtk/empathy-chat.c:3438
+#: ../libempathy-gtk/empathy-chat.c:3505
 msgid "Wrong password; please try again:"
 msgstr "Contraseña incorrecta; inténtelo de nuevo:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3568
+#: ../libempathy-gtk/empathy-chat.c:3635
 msgid "This room is protected by a password:"
 msgstr "Esta sala está protegida por contraseña:"
 
-#: ../libempathy-gtk/empathy-chat.c:3595
+#: ../libempathy-gtk/empathy-chat.c:3662
 msgid "Join"
 msgstr "Unirse"
 
-#: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:3864 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../libempathy-gtk/empathy-chat.c:3852
+#: ../libempathy-gtk/empathy-chat.c:3919
 msgid "Conversation"
 msgstr "Conversación"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3857
+#: ../libempathy-gtk/empathy-chat.c:3924
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1690,7 +1705,7 @@ msgstr "Editar contactos bloqueados"
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:512
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1485
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
@@ -1859,9 +1874,9 @@ msgid "Share My Desktop"
 msgstr "Compartir mi escritorio"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
+#: ../libempathy-gtk/empathy-contact-widget.c:1887
 #: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1373
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "Favorita"
 
@@ -1876,13 +1891,13 @@ msgid "_Edit"
 msgstr "_Editar"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1283
+#: ../libempathy-gtk/empathy-individual-menu.c:1284
 #: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "Invitándolo a esta sala"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1329
+#: ../libempathy-gtk/empathy-individual-menu.c:1330
 msgid "_Invite to Chat Room"
 msgstr "_Invitar a sala de chat"
 
@@ -2087,7 +2102,7 @@ msgstr "Altitud:"
 #: ../libempathy-gtk/empathy-contact-widget.c:1011
 #: ../libempathy-gtk/empathy-individual-widget.c:607
 #: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "Ubicación geográfica"
 
@@ -2139,7 +2154,7 @@ msgstr "Detalles del contacto"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1515
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "Identificador:"
 
@@ -2178,7 +2193,7 @@ msgid "Select"
 msgstr "Seleccionar"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../src/empathy-main-window.c:1833
 msgid "Group"
 msgstr "Grupo"
 
@@ -2252,14 +2267,14 @@ msgstr "Casa"
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1141
+#: ../libempathy-gtk/empathy-individual-menu.c:1142
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Editar"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1167
+#: ../libempathy-gtk/empathy-individual-menu.c:1168
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "_Enlazar contactos…"
@@ -2277,7 +2292,7 @@ msgstr ""
 "¿Realmente quiere quitar el contacto enlazado «%s»? Tenga en cuenta que esto "
 "quitará todos los contactos que componen este contacto enlazado."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1662
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2362,130 +2377,137 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "_Desenlazar"
 
-#: ../libempathy-gtk/empathy-log-window.c:633
+#: ../libempathy-gtk/empathy-log-window.c:634
 msgid "History"
 msgstr "Histórico"
 
-#: ../libempathy-gtk/empathy-log-window.c:685
+#: ../libempathy-gtk/empathy-log-window.c:689
 msgid "Show"
 msgstr "Mostrar"
 
-#: ../libempathy-gtk/empathy-log-window.c:707
+#: ../libempathy-gtk/empathy-log-window.c:711
 msgid "Search"
 msgstr "Buscar"
 
-#: ../libempathy-gtk/empathy-log-window.c:1155
+#: ../libempathy-gtk/empathy-log-window.c:1159
 #, c-format
 msgid "Chat in %s"
 msgstr "Chatee en %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1157
+#: ../libempathy-gtk/empathy-log-window.c:1161
 #, c-format
 msgid "Chat with %s"
 msgstr "Chat con %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1207
-#: ../libempathy-gtk/empathy-log-window.c:1354
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e de %B de %Y a las %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1296
+#: ../libempathy-gtk/empathy-log-window.c:1300
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1302
+#: ../libempathy-gtk/empathy-log-window.c:1306
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
-#: ../libempathy-gtk/empathy-log-window.c:1375
-#: ../src/empathy-ft-manager.c:1026
-msgid "%"
-msgstr "%"
-
 #: ../libempathy-gtk/empathy-log-window.c:1382
 #, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s segundo"
+msgstr[1] "%s segundos"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s minuto"
+msgstr[1] "%s minutos"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
+#, c-format
 msgid "Call took %s, ended at %s"
 msgstr "La llamada duró %s, finalizó a las %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1714
+#: ../libempathy-gtk/empathy-log-window.c:1729
 msgid "Today"
 msgstr "Hoy"
 
-#: ../libempathy-gtk/empathy-log-window.c:1718
+#: ../libempathy-gtk/empathy-log-window.c:1733
 msgid "Yesterday"
 msgstr "Ayer"
 
-#: ../libempathy-gtk/empathy-log-window.c:1734
-msgctxt ""
-"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
 msgid "%e %B %Y"
 msgstr "%e de %B de %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1815
-#: ../libempathy-gtk/empathy-log-window.c:3396
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3444
 msgid "Anytime"
 msgstr "Cualquier hora"
 
-#: ../libempathy-gtk/empathy-log-window.c:1895
-#: ../libempathy-gtk/empathy-log-window.c:2325
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2372
 msgid "Anyone"
 msgstr "Cualquiera"
 
-#: ../libempathy-gtk/empathy-log-window.c:2637
+#: ../libempathy-gtk/empathy-log-window.c:2685
 msgid "Who"
 msgstr "Quién"
 
-#: ../libempathy-gtk/empathy-log-window.c:2841
+#: ../libempathy-gtk/empathy-log-window.c:2889
 msgid "When"
 msgstr "Cuándo"
 
-#: ../libempathy-gtk/empathy-log-window.c:2957
+#: ../libempathy-gtk/empathy-log-window.c:3005
 msgid "Anything"
 msgstr "Cualquier cosa"
 
-#: ../libempathy-gtk/empathy-log-window.c:2959
+#: ../libempathy-gtk/empathy-log-window.c:3007
 msgid "Text chats"
 msgstr "Chats de texto"
 
-#: ../libempathy-gtk/empathy-log-window.c:2961
+#: ../libempathy-gtk/empathy-log-window.c:3009
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "Llamadas"
 
-#: ../libempathy-gtk/empathy-log-window.c:2966
+#: ../libempathy-gtk/empathy-log-window.c:3014
 msgid "Incoming calls"
 msgstr "Llamadas entrantes"
 
-#: ../libempathy-gtk/empathy-log-window.c:2967
+#: ../libempathy-gtk/empathy-log-window.c:3015
 msgid "Outgoing calls"
 msgstr "Llamadas salientes"
 
-#: ../libempathy-gtk/empathy-log-window.c:2968
+#: ../libempathy-gtk/empathy-log-window.c:3016
 msgid "Missed calls"
 msgstr "Llamadas perdidas"
 
-#: ../libempathy-gtk/empathy-log-window.c:2990
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "What"
 msgstr "Qué"
 
-#: ../libempathy-gtk/empathy-log-window.c:3699
+#: ../libempathy-gtk/empathy-log-window.c:3747
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr ""
 "¿Está seguro de que quiere eliminar todos los registros de conversaciones "
 "anteriores?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3703
+#: ../libempathy-gtk/empathy-log-window.c:3751
 msgid "Clear All"
 msgstr "Limpiar todo"
 
-#: ../libempathy-gtk/empathy-log-window.c:3710
+#: ../libempathy-gtk/empathy-log-window.c:3758
 msgid "Delete from:"
 msgstr "Eliminar de:"
 
@@ -2510,7 +2532,7 @@ msgstr "Perfil"
 #: ../src/empathy-call-window.ui.h:22
 #: ../src/empathy-streamed-media-window.ui.h:20
 msgid "Video"
-msgstr "Vi�deo"
+msgstr "Vídeo"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
 #: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
@@ -2674,12 +2696,12 @@ msgstr "Finalizó la llamada de voz"
 msgid "Edit Custom Messages"
 msgstr "Editar mensajes personalizados"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1030
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
 #, c-format
 msgid "Message edited at %s"
 msgstr "Mensaje editado a las %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1720
+#: ../libempathy-gtk/empathy-theme-adium.c:1740
 msgid "Normal"
 msgstr "Normal"
 
@@ -2982,23 +3004,23 @@ msgstr "Sin mensaje de eeror"
 msgid "Instant Message (Empathy)"
 msgstr "Mensaje instantáneo (Empathy)"
 
-#: ../src/empathy.c:400
+#: ../src/empathy.c:434
 msgid "Don't connect on startup"
 msgstr "No conectarse automáticamente al inicio"
 
-#: ../src/empathy.c:404
+#: ../src/empathy.c:438
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "No mostrar la lista de contactos o cualquier otro diálogo al inicio"
 
-#: ../src/empathy.c:419
+#: ../src/empathy.c:453
 msgid "- Empathy IM Client"
 msgstr "- Cliente de mensajería instantánea Empathy"
 
-#: ../src/empathy.c:606
+#: ../src/empathy.c:640
 msgid "Error contacting the Account Manager"
 msgstr "Error al contactar con el Gestor de cuentas"
 
-#: ../src/empathy.c:608
+#: ../src/empathy.c:642
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3150,8 +3172,8 @@ msgid "Select the accounts you want to import:"
 msgstr "Seleccione las cuentas que quiere importar:"
 
 #: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:625
+#: ../src/empathy-new-chatroom-dialog.c:626
 msgid "Yes"
 msgstr "Sí"
 
@@ -3228,7 +3250,7 @@ msgstr "Aún no se ha guardado su cuenta nueva."
 
 #: ../src/empathy-accounts-dialog.c:345
 #: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1159
+#: ../src/empathy-call-window.c:1330
 msgid "Connecting…"
 msgstr "Conectando…"
 
@@ -3336,13 +3358,13 @@ msgstr "Cliente de autenticación de Empathy"
 msgid "People nearby"
 msgstr "Gente cerca"
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:127
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr ": Cliente de sonido/vídeo Empathy"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:152
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
-msgstr "Cliente de sonido/vi�deo Empathy"
+msgstr "Cliente de sonido/vídeo Empathy"
 
 #: ../src/empathy-streamed-media-window.c:431
 msgid "Contrast"
@@ -3383,53 +3405,42 @@ msgstr "Detalles"
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1667
+#: ../src/empathy-call-window.c:1939
 #, c-format
 msgid "Call with %s"
 msgstr "Llamada con %s"
 
 #: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:1911
+#: ../src/empathy-call-window.c:2183
 msgid "The IP address as seen by the machine"
 msgstr "La dirección IP como la ve la máquina"
 
 #: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:1913
+#: ../src/empathy-call-window.c:2185
 msgid "The IP address as seen by a server on the Internet"
 msgstr "La dirección IP como la ve el servidor de Internet"
 
 #: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:1915
+#: ../src/empathy-call-window.c:2187
 msgid "The IP address of the peer as seen by the other side"
 msgstr "La dirección IP del par como la ve la otra parte"
 
 #: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:1917
+#: ../src/empathy-call-window.c:2189
 msgid "The IP address of a relay server"
 msgstr "La dirección IP de un servidor de desvío"
 
 #: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:1919
+#: ../src/empathy-call-window.c:2191
 msgid "The IP address of the multicast group"
 msgstr "La dirección IP del grupo multicast"
 
 #: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "Desconocido"
-
 #: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "Desconocido"
-
 #: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "Desconocido"
-
 #: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+#| msgid "Unknown"
+msgctxt "codec"
 msgid "Unknown"
 msgstr "Desconocido"
 
@@ -3440,12 +3451,12 @@ msgid "Connected — %d:%02dm"
 msgstr "Conectado — %d:%02dm"
 
 #: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2654
+#: ../src/empathy-call-window.c:2960
 msgid "Technical Details"
 msgstr "Detalles técnicos"
 
 #: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2692
+#: ../src/empathy-call-window.c:2998
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3455,7 +3466,7 @@ msgstr ""
 "por su equipo"
 
 #: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2697
+#: ../src/empathy-call-window.c:3003
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3465,7 +3476,7 @@ msgstr ""
 "por su equipo"
 
 #: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2703
+#: ../src/empathy-call-window.c:3009
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3475,12 +3486,12 @@ msgstr ""
 "una red que no acepta conexiones directas."
 
 #: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2709
+#: ../src/empathy-call-window.c:3015
 msgid "There was a failure on the network"
 msgstr "Hubo un fallo en la red"
 
 #: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2713
+#: ../src/empathy-call-window.c:3019
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
@@ -3488,7 +3499,7 @@ msgstr ""
 "llamada"
 
 #: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2716
+#: ../src/empathy-call-window.c:3022
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
@@ -3496,7 +3507,7 @@ msgstr ""
 "llamada"
 
 #: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2728
+#: ../src/empathy-call-window.c:3034
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3508,22 +3519,22 @@ msgstr ""
 "de «Depuración» en el menú de Ayuda."
 
 #: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2737
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure in the call engine"
 msgstr "Hubo un fallo en el motor de llamadas"
 
 #: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2740
+#: ../src/empathy-call-window.c:3046
 msgid "The end of the stream was reached"
 msgstr "Se llegó al final del flujo"
 
 #: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2780
+#: ../src/empathy-call-window.c:3086
 msgid "Can't establish audio stream"
 msgstr "No se puede establecer el flujo de voz"
 
 #: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2790
+#: ../src/empathy-call-window.c:3096
 msgid "Can't establish video stream"
 msgstr "No se puede establecer el flujo de vídeo"
 
@@ -3614,8 +3625,8 @@ msgstr "Conmutar la transmisión de vídeo"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2287 ../src/empathy-call-window.c:2288
-#: ../src/empathy-call-window.c:2289 ../src/empathy-call-window.c:2290
+#: ../src/empathy-call-window.c:2590 ../src/empathy-call-window.c:2591
+#: ../src/empathy-call-window.c:2592 ../src/empathy-call-window.c:2593
 msgid "Unknown"
 msgstr "Desconocido"
 
@@ -3784,7 +3795,7 @@ msgstr "Gestionar salas favoritas"
 msgid "Incoming video call"
 msgstr "Llamada de vídeo entrante"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1563
 msgid "Incoming call"
 msgstr "Llamada entrante"
 
@@ -3799,7 +3810,7 @@ msgid "%s is calling you. Do you want to answer?"
 msgstr "%s le está llamando. ¿Quiere responder?"
 
 #: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1569
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Llamada entrante de %s"
@@ -3814,9 +3825,10 @@ msgstr "Re_spuesta"
 
 #: ../src/empathy-event-manager.c:570
 msgid "_Answer with video"
-msgstr "_Responder con vi�deo"
+msgstr "_Responder con vídeo"
 
 #: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1569
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Llamada de vídeo entrante de %s"
@@ -3859,7 +3871,7 @@ msgstr "Le han invitado a unirse a %s"
 msgid "Incoming file transfer from %s"
 msgstr "Transferencia de archivo entrante de %s"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:378
 msgid "Password required"
 msgstr "Se requiere una contraseña"
 
@@ -3968,6 +3980,10 @@ msgstr "Comprobando la integridad de «%s»"
 msgid "Hashing \"%s\""
 msgstr "Obteniendo el «hash» de «%s»"
 
+#: ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "%"
+
 #: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "Archivo"
@@ -4011,51 +4027,51 @@ msgstr "Protocolo"
 msgid "Source"
 msgstr "Origen"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-main-window.c:395
 msgid "Provide Password"
 msgstr "Escriba su contraseña"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-main-window.c:401
 msgid "Disconnect"
 msgstr "Desconectar"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-main-window.c:642
 msgid "No match found"
 msgstr "No se encontró ninguna coincidencia"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-main-window.c:803
 msgid "Reconnect"
 msgstr "Reconectar"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-main-window.c:809
 msgid "Edit Account"
 msgstr "Editar cuenta"
 
-#: ../src/empathy-main-window.c:789
+#: ../src/empathy-main-window.c:815
 msgid "Close"
 msgstr "Cerrar"
 
 #. Translators: this string will be something like:
 #. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#: ../src/empathy-main-window.c:954
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Recargar %s (%s)…"
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-main-window.c:1001
 msgid "Top up account credit"
 msgstr "Recargar el saldo de la cuenta"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-main-window.c:1072
 msgid "Top Up..."
 msgstr "Recargar…"
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-main-window.c:1815
 msgid "Contact"
 msgstr "Contacto"
 
-#: ../src/empathy-main-window.c:2119
+#: ../src/empathy-main-window.c:2190
 msgid "Contact List"
 msgstr "Lista de contactos"
 
@@ -4148,17 +4164,17 @@ msgstr "_Sala"
 msgid "_Search for Contacts…"
 msgstr "_Buscar contactos…"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Sala de chat"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "Miembros"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:623
 #, c-format
 msgid ""
 "%s\n"
@@ -4171,16 +4187,16 @@ msgstr ""
 "Se necesita contraseña: %s\n"
 "Miembros: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:625
+#: ../src/empathy-new-chatroom-dialog.c:626
 msgid "No"
 msgstr "No"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:654
 msgid "Could not start room listing"
 msgstr "No se pudo iniciar la lista de la sala"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:664
 msgid "Could not stop room listing"
 msgstr "No se pudo parar la lista de la sala"
 
@@ -4316,54 +4332,66 @@ msgid "Display incoming events in the notification area"
 msgstr "Mostrar los eventos entrantes en el área de notificación"
 
 #: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"La cancelación de eco le ayuda a que la otra persona oiga su voz de forma "
+"más clara pero puede causar problemas en algunos equipos. Si usted o la otra "
+"persona oyen ruidos o tienen problemas durante las llamadas, intente "
+"desactivar la cancelación de eco y reiniciar la llamada."
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "Activar notificaciones cuando un contacto se conecta"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "Activar notificaciones cuando un contacto se desconecta"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Activar notificaciones cuando el _chat no tenga el foco"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "Activar la revisión ortográfica para idiomas:"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "General"
 
-#: ../src/empathy-preferences.ui.h:14
-msgid "Input level"
-msgstr "Nivel de entrada"
-
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input volume"
-msgstr "Volumen de entrada"
+msgid "Input level:"
+msgstr "Nivel de entrada:"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "Volumen de entrada:"
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "Orígenes de las ubicaciones:"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "Registrar conversaciones"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "Notificaciones"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Reproducir sonido para eventos"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "Privacidad"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -4373,23 +4401,23 @@ msgstr ""
 "preciso que su ciudad, estado y país. Las coordenadas GPS tendrán un valor "
 "aleatorio añadido 1 lugar decimal."
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "Mostrar los _emoticonos como imágenes"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "Mostrar _lista de contactos en salas"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "Sonidos"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "Revisión ortográfica"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
@@ -4397,48 +4425,48 @@ msgstr ""
 "La lista de idiomas refleja sólo los idiomas para los cuales tiene un "
 "diccionario instalado."
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "Temas"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "Variante:"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "C_onectarse automáticamente al inicio"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "Teléfono _móvil"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "_Activar notificaciones de burbuja"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "_Activar notificaciones de sonido"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Red (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "_Abrir charlas nuevas en ventanas separadas"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "_Publicar mi ubicación a mis contactos"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "_Reducir la precisión de la ubicación"
 
@@ -4566,44 +4594,49 @@ msgstr ""
 "El gestor de conexiones seleccionado no soporta la extensión de depuración "
 "remota."
 
+#: ../src/empathy-invite-participant-dialog.c:179
 #: ../src/empathy-invite-participant-dialog.c:205
-#: ../src/empathy-invite-participant-dialog.c:231
 msgid "Invite Participant"
 msgstr "Invitar participante"
 
-#: ../src/empathy-invite-participant-dialog.c:206
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Elegir un contacto para invitar a la conversación:"
 
-#: ../src/empathy-invite-participant-dialog.c:227
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "Invitar"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:184
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "No mostrar ningún diálogo; realizar cualquier trabajo (ej. importar) y salir"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:188
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "No mostrar ningún diálogo a no ser que sólo existan cuentas «Gente cerca»"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:192
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Cuenta proporcionada inicialmente seleccionada (ej. gabble/jabber/ejemplo)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:194
 msgid "<account-id>"
 msgstr "<id-de-cuenta>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:197
+#| msgid "Show the accounts dialog"
+msgid "Show account assistant"
+msgstr "Mostrar el asistente de cuentas"
+
+#: ../src/empathy-accounts.c:203
 msgid "- Empathy Accounts"
 msgstr ": Cuentas en Empathy"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:242
 msgid "Empathy Accounts"
 msgstr "Cuentas en Empathy"
 
@@ -4628,11 +4661,13 @@ msgid "Respond"
 msgstr "Respuesta"
 
 #: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1573
 msgid "Reject"
 msgstr "Rechazar"
 
 #: ../src/empathy-notifications-approver.c:222
 #: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1574
 msgid "Answer"
 msgstr "Responder"
 
@@ -4650,6 +4685,9 @@ msgstr "Rechazar"
 msgid "Accept"
 msgstr "Aceptar"
 
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
 #: ../src/empathy-notifications-approver.c:260
 msgid "Provide"
 msgstr "Proporcionar"
@@ -4661,24 +4699,24 @@ msgstr "%s intentó llamarle, pero estaba en otra llamada."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1031 ../src/empathy-call-window.c:1054
+#: ../src/empathy-call-window.c:1183 ../src/empathy-call-window.c:1206
 msgid "i"
 msgstr "Información"
 
-#: ../src/empathy-call-window.c:2583
+#: ../src/empathy-call-window.c:2889
 msgid "On hold"
 msgstr "En espera"
 
-#: ../src/empathy-call-window.c:2586
+#: ../src/empathy-call-window.c:2892
 msgid "Mute"
 msgstr "Silenciar"
 
-#: ../src/empathy-call-window.c:2588
+#: ../src/empathy-call-window.c:2894
 msgid "Duration"
 msgstr "Duracio�n"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2591
+#: ../src/empathy-call-window.c:2897
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s: %d:%02dm"
@@ -4687,6 +4725,28 @@ msgstr "%s: %d:%02dm"
 msgid "_Match case"
 msgstr "_Coincidir con capitalizacio�n"
 
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Empathy ha migrado los registros de butterfly"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Indica si Empathy ha migrado los registros de butterfly."
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Desconocido"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Desconocido"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Desconocido"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Desconocido"
+
 #~ msgid "Find Next"
 #~ msgstr "Buscar siguiente"
 
@@ -4866,9 +4926,6 @@ msgstr "_Coincidir con capitalizacio�n"
 #~ "Intentar importar cualquier cuenta reconocida y mostrar un mensaje si "
 #~ "falla"
 
-#~ msgid "Show the accounts dialog"
-#~ msgstr "Mostrar el diálogo de las cuentas"
-
 #~ msgid "The error message was: <span style=\"italic\">%s</span>"
 #~ msgstr "El mensaje de error fue: <span style=\"italic\">%s</span>"
 
diff --git a/po/eu.po b/po/eu.po
index 29863556d..21fc60df9 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,16 +8,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-03-29 08:16+0000\n"
-"PO-Revision-Date: 2011-04-05 19:36+0200\n"
-"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>\n"
-"Language-Team: Basque <itzulpena@euskalgnu.org>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-09-24 16:22+0200\n"
+"PO-Revision-Date: 2011-09-24 16:17+0200\n"
+"Last-Translator: \n"
+"Language-Team: American English <kde-i18n-doc@kde.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"\n"
 "\n"
 "\n"
 
@@ -44,6 +46,22 @@ msgid "Always open a separate chat window for new chats."
 msgstr "Ireki beti berriketa berriak beste leiho batean."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr "Deiaren bolumena"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr "Deiaren bolumena (ehunekotan)."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Camera device"
+msgstr "Kameraren gailua"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "Kameraren posizioa"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -51,45 +69,54 @@ msgstr ""
 "Karakterea goitizenaren atzean gehitzeko, taldeko berriketan goitizena "
 "osatzea (tabuladorea) erabiltzean."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "Berriketako leihoaren gaia"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+msgid "Chat window theme variant"
+msgstr "Berriketako leihoaren gai aldakorra"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "Komaz bereiztu erabiltzea nahi diren hizkuntzen zuzentzaile ortografikoen "
 "zerrenda (adib. \"de, ca, eu\")."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "Trinkotu kontaktu-zerrenda"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "Sare-kudeatzaileak erabili beharko lirateke"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "Kontaktu-zerrenda ordenatzeko irizpidea"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Kameraren gailu lehenetsia bideo-deiak egiteko. Adib. /dev/video0."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
 msgstr "Direktorio lehenetsia avatar baten irudia hautatzeko"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr "Desgaitu jakinarazpen-leihoa aldentzean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr "Desgaitu soinuak aldentzean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
 msgstr "Bistaratu sarrerako gertaerak egoeraren arean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -97,227 +124,254 @@ msgstr ""
 "Bistaratu sarrerako gertaerak egoeraren arean. False (faltsua) bada, "
 "erakutsi hauek erabiltzaileari berehala."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+msgid "Echo cancellation support"
+msgstr "Oihartzuna ezeztatzeko euskarria"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr "Empathy-k erabiltzailearen kokalekua argitara dezake"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy-k GPSa erabil dezake kokalekua asmatzeko"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy-k mugikorren sarea erabil dezake kokalekua asmatzeko"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy-k sarea erabil dezake kokalekua asmatzeko"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr "Empathy-ren deskargen karpeta lehenetsia"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
 msgstr "Empathy-k 'butterfly'-ren erregistroak migratu ditu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
-msgstr "Empathy-k automatikoki jarri behar duen 'kanpoan' moduan inaktibo dagoenean"
+msgstr ""
+"Empathy-k automatikoki jarri behar duen 'kanpoan' moduan inaktibo dagoenean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy-k automatikoki konektatu behar duen abiatzean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy-k kokalekuaren zehaztasuna gutxiagotu dezake"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Empathy-k berriketako leihoetan kontaktuen avatarrak ikono gisa  erabiltzea"
+msgstr ""
+"Empathy-k berriketako leihoetan kontaktuen avatarrak ikono gisa  erabiltzea"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr "Gaitu WebKit garatzaileen tresnak"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "Gaitu jakinarazpen-leihoak mezu berrientzako"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "Gaitu ortografia-egiaztapena"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "Ezkutatu leiho nagusia"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "Ezkutatu leiho nagusia."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "Goitizena osatzeko karakterea"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "Ireki berriketa berriak beste leihoetan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "Bide-izena Adium gaia erabiltzeko"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "Bide-izena Adium gaia erabiltzeko (berriketan erabiliko den gaia Adium bada)."
+msgstr ""
+"Bide-izena Adium gaia erabiltzeko (berriketan erabiliko den gaia Adium bada)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Jo soinua mezuak iristean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "Jo soinua solasaldi berrietan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Jo soinua mezuak bidaltzean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "Jo soinua kontaktu batek saioa hastean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "Jo soinua kontaktu batek saioa amaitzean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "Jo soinua zuk saioa hastean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "Jo soinua zuk saioa amaitzean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Jakinarazpen-leihoa berriketak ez badu fokua"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "Jakinarazpen-leihoa kontaktu bat konektatzen denean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "Jakinarazpen-leihoa kontaktu bat deskonektatzen denean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr "Kameraren aurrebista zein posiziotan egongo den deian zehar"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+msgid "Show Balance in contact list"
+msgstr "Erakutsi balantzea kontaktuen zerrendan"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "Erakutsi avatar-ak"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "Erakutsi kontaktu-zerrenda geletan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr "Erakutsi leiho nagusia nola ixten den buruzko argibidea"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr "Erakutsi konektatu gabeko kontaktuak"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
 msgstr "Erakutsi protokoloak"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "Hizkuntzen zuzentzailea"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr "Karpeta lehenetsia transferitutako fitxategiak gordetzeko."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Azken direktorioa, Avatar baten irudia aukeratu dena."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
 msgstr "Berriketako leihoaren alboko panelaren posizioa"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "Berriketako leihoaren alboko panelaren gordetako posizioa (pixeletan)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Gaia solasaldian bistaratzeko (berriketako leihoan)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "Gai aldakorra solasaldian bistaratzeko (berriketako leihoetan)."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Erabili aurpegierak"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "Erabili jakinarazpen-soinuak"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "Erabili gaia berriketa-gelan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Empathy-k erabiltzailearen kokalekua bere kontaktuei erakutsiko dien edo ez."
+msgstr ""
+"Empathy-k erabiltzailearen kokalekua bere kontaktuei erakutsiko dien edo ez."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Empathy-k kokalekua asmatzeko GPSa erabiliko duen edo ez."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Empathy-k kokalekua asmatzeko mugikorren sarea erabiliko duen edo ez."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Empathy-k kokalekua asmatzeko sarea erabiliko duen edo ez."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Empathy-k 'butterfly'-ren erregistroak migratu dituen ala ez adierazten du."
+msgstr ""
+"Empathy-k 'butterfly'-ren erregistroak migratu dituen ala ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Empathy abiatzean zure kontuetan saioa automatikoki hasi behar den ala ez."
+msgstr ""
+"Empathy abiatzean zure kontuetan saioa automatikoki hasi behar den ala ez."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid "Whether Empathy should go into away mode automatically if the user is idle."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
 "Empathy-k 'kanpoan' moduan automatikoki jarriko den erabiltzailea inaktibo "
 "dagoenean."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+msgid ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 "Arrazoi pribatuak direla eta Empathy-k kokalekuaren zehaztasuna gutxiagotuko "
 "duen edo ez."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 "Empathy-k berriketako leihoetan kontaktuen avatarrak ikono gisa erakutsi edo "
 "ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Webkit garatzeko tresnak, 'Web Inspector' bezalakoak, gaitu behar diren edo "
 "ez."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
@@ -325,71 +379,78 @@ msgstr ""
 "Automatikoki deskonektatzeko/birkonektatzeko sare-kudeatzailea erabili behar "
 "den edo ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether to check words typed against the languages you want to check with."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+msgid ""
+"Whether to check words typed against the languages you want to check with."
 msgstr ""
 "Idatzitako hitzen zuzenketa ortografikoa landu edo ez (nahi dituzun "
 "hizkuntzetan)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr ""
 "Solasaldietan aurpegierak irudi grafikoetara bihurtuko diren ala ez "
 "adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr ""
+"Pulseaudio-ren oihartzuna ezeztatzeko iragazkia gaitu edo ez adierazten du."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr ""
 "Kontaktuen sareko saio-hasierak jakinarazteko soinua joko duen ala ez "
 "adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether to play a sound to notify of contacts logging out of the network."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
 "Kontaktuen sareko saio-amaierak jakinarazteko soinua joko duen ala ez "
 "adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "Gertaerak jakinarazteko soinua joko duen ala ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Sarrerako mezuak jakinarazteko soinua joko duen ala ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Solasaldi berriak jakinarazteko soinua joko duen ala ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Irteerako mezuak jakinarazteko soinua joko duen ala ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "Sarean saioa hastean soinua joko duen ala ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Sareko saioa amaitzean soinua joko duen ala ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr "Kanpoan edo lanpetuta zaudenean soinua joko duen ala ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr ""
 "Kontaktu bat lineaz kanpo jartzean (deskonektatzean) jakinarazpen-leihoa "
 "erakutsiko duen edo ez."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr ""
 "Kontaktu bat linean jartzean (konektatzean) jakinarazpen-leihoa erakutsiko "
 "duen edo ez."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -398,45 +459,51 @@ msgstr ""
 "adierazten du (nahiz eta berriketa jadanik irekita, baina fokurik gabe, "
 "egon)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr ""
 "Mezu berri bat jasotzean jakinarazpen-leihoa erakutsiko den ala ez "
 "adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to show avatars for contacts in the contact list and chat windows."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+msgid "Whether to show account balances in the contact list."
+msgstr ""
+"Kontaktuen zerrendan kontuaren balantzea erakutsi edo ez adierazten du."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 "Kontaktu-zerrendan eta berriketako leihoetan kontaktuen avatarrak erakutsi "
 "ala ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr ""
 "Kontaktu-zerrendan deskonektatuak dauden kontaktuak erakutsiko dituen ala ez "
 "adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
 msgstr ""
 "Kanpoan edo lanpetuta zaudenean jakinarazpen-leihoa erakutsiko den ala ez "
 "adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr ""
 "Kontaktu-zerrendan eta berriketako leihoetan kontaktuen protokoloak erakutsi "
 "edo ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Kontaktu-zerrenda berriketa geletan erakutsi edo ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "Kontaktu-zerrenda trinkotuta erakutsi edo ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -444,11 +511,11 @@ msgstr ""
 "Leiho nagusia titulu-barrako 'x' botoiarekin ixteari buruzko elkarrizketa-"
 "koadroa erakutsi ala ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "Berriketa-geletan gaia erabili edo ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -464,7 +531,7 @@ msgstr "Kudeatu mezularitzako eta VoIP-ko kontuak"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2269
+#: ../src/empathy-accounts-dialog.c:2324
 msgid "Messaging and VoIP Accounts"
 msgstr "Mezularitzako eta VoIP-ko kontuak"
 
@@ -472,18 +539,34 @@ msgstr "Mezularitzako eta VoIP-ko kontuak"
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Fitxategi-transferentzia osatuta, baina fitxategia hondatuta dago"
 
-#: ../libempathy/empathy-ft-handler.c:1113
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
 msgstr "Urruneko kontaktuak ez du fitxategi-transferentziarik onartzen"
 
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is not a regular file"
 msgstr "Hautatutako fitxategia ez da fitxategi arrunta"
 
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1176
 msgid "The selected file is empty"
 msgstr "Hautatutako fitxategia hutsik dago"
 
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#, c-format
+msgid "Missed call from %s"
+msgstr "Galdutako deia %s(e)ndik"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, c-format
+msgid "Called %s"
+msgstr "%s(e)k deitu du"
+
+#: ../libempathy/empathy-message.c:422
+#, c-format
+msgid "Call from %s"
+msgstr "%s(e)tik deia"
+
 #: ../libempathy/empathy-tp-file.c:268
 msgid "Socket type not supported"
 msgstr "Socket mota ez dago onartuta"
@@ -512,142 +595,143 @@ msgstr "Errorea fitxategia transferitzen saiatzean"
 msgid "The other participant is unable to transfer the file"
 msgstr "Beste partaide batek ezin du fitxategia transferitu"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:382
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
 msgid "Unknown reason"
 msgstr "Arrazoi ezezaguna"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:232
 msgid "Available"
 msgstr "Astiarekin"
 
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:234
 msgid "Busy"
 msgstr "Lanpetuta"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:237
 msgid "Away"
 msgstr "Aldendua"
 
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:239
 msgid "Invisible"
 msgstr "Ikusezina"
 
-#: ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-utils.c:241
 msgid "Offline"
 msgstr "Deskonektatuta"
 
-#: ../libempathy/empathy-utils.c:315
-#: ../src/empathy-streamed-media-window.c:1904
-#: ../src/empathy-streamed-media-window.c:1905
-#: ../src/empathy-streamed-media-window.c:1906
-#: ../src/empathy-streamed-media-window.c:1907
-#: ../src/empathy-call-window.ui.h:18
+#. translators: presence type is unknown
+#: ../libempathy/empathy-utils.c:244
+msgctxt "presence"
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:284
 msgid "No reason specified"
 msgstr "Ez da arrazoirik zehaztu"
 
-#: ../libempathy/empathy-utils.c:356 ../libempathy/empathy-utils.c:412
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
 msgid "Status is set to offline"
 msgstr "Egoera lineaz kanpo gisa ezarri da"
 
-#: ../libempathy/empathy-utils.c:358 ../libempathy/empathy-utils.c:392
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "Sareko errorea"
 
-#: ../libempathy/empathy-utils.c:360 ../libempathy/empathy-utils.c:394
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
 msgid "Authentication failed"
 msgstr "Autentifikazioak huts egin du"
 
-#: ../libempathy/empathy-utils.c:362 ../libempathy/empathy-utils.c:396
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
 msgid "Encryption error"
 msgstr "Enkriptazioaren errorea"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:294
 msgid "Name in use"
 msgstr "Izena erabilita"
 
-#: ../libempathy/empathy-utils.c:366 ../libempathy/empathy-utils.c:398
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate not provided"
 msgstr "Ez da ziurtagiririk eman"
 
-#: ../libempathy/empathy-utils.c:368 ../libempathy/empathy-utils.c:400
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate untrusted"
 msgstr "Ziurtagiria ez da fidagarria"
 
-#: ../libempathy/empathy-utils.c:370 ../libempathy/empathy-utils.c:402
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
 msgid "Certificate expired"
 msgstr "Ziurtagiria iraungituta"
 
-#: ../libempathy/empathy-utils.c:372 ../libempathy/empathy-utils.c:404
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
 msgid "Certificate not activated"
 msgstr "Ziurtagiria aktibatu gabe"
 
-#: ../libempathy/empathy-utils.c:374 ../libempathy/empathy-utils.c:406
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
 msgid "Certificate hostname mismatch"
 msgstr "Ziurtagiriaren ostalari-izena ez dator bat"
 
-#: ../libempathy/empathy-utils.c:376 ../libempathy/empathy-utils.c:408
+#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
 msgid "Certificate fingerprint mismatch"
 msgstr "Ziurtagiriaren hatz-marka ez dator bat"
 
-#: ../libempathy/empathy-utils.c:378 ../libempathy/empathy-utils.c:410
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
 msgid "Certificate self-signed"
 msgstr "Ziurtagiria bere buruarekin sinatuta"
 
-#: ../libempathy/empathy-utils.c:380
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate error"
 msgstr "Ziurtagiriaren errorea"
 
-#: ../libempathy/empathy-utils.c:414
+#: ../libempathy/empathy-utils.c:344
 msgid "Encryption is not available"
 msgstr "Enkriptatzea ez dago erabilgarri"
 
-#: ../libempathy/empathy-utils.c:416
+#: ../libempathy/empathy-utils.c:346
 msgid "Certificate is invalid"
 msgstr "Ziurtagiria baliogabea da"
 
-#: ../libempathy/empathy-utils.c:418
+#: ../libempathy/empathy-utils.c:348
 msgid "Connection has been refused"
 msgstr "Konexioa ukatu egin da"
 
-#: ../libempathy/empathy-utils.c:420
+#: ../libempathy/empathy-utils.c:350
 msgid "Connection can't be established"
 msgstr "Konexioa ezin da ezarri"
 
-#: ../libempathy/empathy-utils.c:422
+#: ../libempathy/empathy-utils.c:352
 msgid "Connection has been lost"
 msgstr "Konexioa galdu egin da"
 
-#: ../libempathy/empathy-utils.c:424
+#: ../libempathy/empathy-utils.c:354
 msgid "This resource is already connected to the server"
 msgstr "Baliabidea jadanik zerbitzariarekin konektatuta dago"
 
-#: ../libempathy/empathy-utils.c:426
-msgid "Connection has been replaced by a new connection using the same resource"
-msgstr "Konexioa ordeztu egin da baliabide berdina darabilen konexio berri batekin"
+#: ../libempathy/empathy-utils.c:356
+msgid ""
+"Connection has been replaced by a new connection using the same resource"
+msgstr ""
+"Konexioa ordeztu egin da baliabide berdina darabilen konexio berri batekin"
 
-#: ../libempathy/empathy-utils.c:429
+#: ../libempathy/empathy-utils.c:359
 msgid "The account already exists on the server"
 msgstr "Kontu hau badago lehendik ere zerbitzarian"
 
-#: ../libempathy/empathy-utils.c:431
+#: ../libempathy/empathy-utils.c:361
 msgid "Server is currently too busy to handle the connection"
 msgstr "Zerbitzaria oso lanpetuegia dago konexioa kudeatzeko"
 
-#: ../libempathy/empathy-utils.c:433
+#: ../libempathy/empathy-utils.c:363
 msgid "Certificate has been revoked"
 msgstr "Ziurtagiria errebokatu egin da"
 
-#: ../libempathy/empathy-utils.c:435
-msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
+#: ../libempathy/empathy-utils.c:365
+msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Ziurtagiriak zifratzeko algoritmo ez-segurua darabil, edo kriptografikoki "
 "ahula da"
 
-#: ../libempathy/empathy-utils.c:438
+#: ../libempathy/empathy-utils.c:368
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -655,150 +739,144 @@ msgstr ""
 "Zerbitzariaren ziurtagiriaren luzerak, edo zerbitzariaren ziurtagiriaren "
 "katearen sakonerak, liburutegi kriptografikoak ezartzen duen muga gainditu du"
 
-#: ../libempathy/empathy-utils.c:601
+#: ../libempathy/empathy-utils.c:529
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "Inguruko jendea"
 
-#: ../libempathy/empathy-utils.c:606
+#: ../libempathy/empathy-utils.c:534
 msgid "Yahoo! Japan"
 msgstr "Japoniako Yahoo!"
 
-#: ../libempathy/empathy-utils.c:635
+#: ../libempathy/empathy-utils.c:563
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:636
+#: ../libempathy/empathy-utils.c:564
 msgid "Facebook Chat"
 msgstr "Facebook berriketa"
 
-#: ../libempathy/empathy-time.c:137
+#: ../libempathy/empathy-time.c:88
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "Duela segundo %d"
 msgstr[1] "Duela %d segundo"
 
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:93
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "Duela minutu %d"
 msgstr[1] "Duela %d minutu"
 
-#: ../libempathy/empathy-time.c:147
+#: ../libempathy/empathy-time.c:98
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "Duela ordu %d"
 msgstr[1] "Duela %d ordu"
 
-#: ../libempathy/empathy-time.c:152
+#: ../libempathy/empathy-time.c:103
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "Duela egun %d"
 msgstr[1] "Duela %d egun"
 
-#: ../libempathy/empathy-time.c:157
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "Duela aste %d"
 msgstr[1] "Duela %d aste"
 
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:113
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "Duela hilabete %d"
 msgstr[1] "Duela %d hilabete"
 
-#: ../libempathy/empathy-time.c:167
+#: ../libempathy/empathy-time.c:136
 msgid "in the future"
 msgstr "etorkizunean"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:491
-msgid "All"
-msgstr "Denak"
+#: ../libempathy-gtk/empathy-account-chooser.c:540
+msgid "All accounts"
+msgstr "Kontu guztiak"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../libempathy-gtk/empathy-log-window.c:643
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "Kontua"
 
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "Pasahitza"
 
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Zerbitzaria"
 
-#: ../libempathy-gtk/empathy-account-widget.c:685
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Ataka"
 
-#: ../libempathy-gtk/empathy-account-widget.c:757
-#: ../libempathy-gtk/empathy-account-widget.c:814
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1166
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "Nire Web Kontuak"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "%s kontua Nire Web Kontuaren bidez editatu da."
+msgid "The account %s is edited via %s."
+msgstr "%s kontua '%s' bidez editatu da."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1172
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "%s kontua ezin da Empathy-n editatu."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
 msgstr "Abiarazi 'Nire Web Kontuak'"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1530
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "Editatu %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Erabiltzaile-izena:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1897
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "_Aplikatu"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1927
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
 msgstr "_Saio-hasiera"
 
-#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1993
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:520
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1481
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "Kontua:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2004
-msgid "_Enabled"
-msgstr "_Gaituta"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2069
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "Kontu hau badago lehendik ere zerbitzarian"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2072
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "Sortu kontu berria zerbitzarian"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2264
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "_Utzi"
 
@@ -807,19 +885,19 @@ msgstr "_Utzi"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2561
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%s - %s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2587
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "%s kontua"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2591
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "Kontu berria"
 
@@ -831,6 +909,7 @@ msgstr "<b>Adibidea:</b> NirePantailaIzena"
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -844,7 +923,7 @@ msgstr "Aurreratua"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "Pass_word:"
 msgstr "_Pasahitza:"
@@ -854,7 +933,7 @@ msgstr "_Pasahitza:"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
 msgid "Remember Password"
 msgstr "Gogoratu pasahitza"
 
@@ -864,7 +943,7 @@ msgstr "Gogoratu pasahitza"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 #: ../libempathy-gtk/empathy-password-dialog.c:311
 msgid "Remember password"
@@ -940,76 +1019,84 @@ msgstr "Zein da zure ICQ UIN?"
 msgid "What is your ICQ password?"
 msgstr "Zein da zure ICQ pasahitza?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:183
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "Automatikoa"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:221
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "Erregistratu"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:226
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "Aukerak"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "Bat ere ez"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Character set:"
 msgstr "Karaktere-jokoa:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"IRC zerbitzari gehienek ez dute pasahitzik eskatzen. Ziur ez bazaude, ez "
+"sartu pasahitzik."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Network"
 msgstr "Sarea"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Network:"
 msgstr "Sarea:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Goitizena:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "Pasahitza:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "Irteerako mezua:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "Benetako izena:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Servers"
 msgstr "Zerbitzariak"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "What is your IRC nickname?"
 msgstr "Zein da zure IRCko goitizena?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Zer IRC sare?"
 
@@ -1144,58 +1231,67 @@ msgid "Discover the STUN server automatically"
 msgstr "Aurkitu STUN zerbitzaria automatikoki"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "Ignore TLS Errors"
+msgstr "Ez ikusi egin TLS erroreei"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Interval (seconds)"
 msgstr "Bitartea (seg.)"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
 msgid "Keep-Alive Options"
 msgstr "Konexio iraunkorren aukerak"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
 msgid "Loose Routing"
 msgstr "Bideraketa ez zehatza"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Mechanism:"
 msgstr "Mekanismoa:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
 msgid "Miscellaneous Options"
 msgstr "Hainbat aukera"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 msgid "NAT Traversal Options"
 msgstr "NAT zeiharbidearen aukerak"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 msgid "Port:"
 msgstr "Ataka:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 msgid "Proxy Options"
 msgstr "Proxy-aren aukerak"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "STUN Server:"
 msgstr "STUN zerbitzaria:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.c:347
 msgid "Server:"
 msgstr "Zerbitzaria:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid "Transport:"
 msgstr "Garraioa:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Erabili kontu hau telefono _finko eta mugikorretara deitzeko"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "Zein da zure SIP kontuaren pasahitza?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Zein da zure SIP saio-hasierako IDa?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "_Erabiltzaile-izena:"
 
@@ -1219,28 +1315,36 @@ msgstr "Yahoo! _IDa:"
 msgid "_Room List locale:"
 msgstr "_Gelen zerrenda lokala:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:448
-#: ../libempathy-gtk/empathy-avatar-chooser.c:524
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "Ezin izan da irudia bihurtu"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "Sistemak ez du onartzen onartutako irudi-formatuetariko bat bera ere"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:930
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+msgid "Couldn't save picture to file"
+msgstr "Ezin izan da irudia fitxategian gorde"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "Hautatu zure avatar irudia"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
+msgid "Take a picture..."
+msgstr "Egin argazkia..."
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "Irudirik ez"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:995
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "Irudiak"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:999
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "Fitxategi denak"
 
@@ -1248,35 +1352,61 @@ msgstr "Fitxategi denak"
 msgid "Click to enlarge"
 msgstr "Egin klik handitzeko"
 
-#: ../libempathy-gtk/empathy-chat.c:652
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
+msgid "There was an error starting the call"
+msgstr "Errore bat gertatu da deia hastean"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact doesn't support calls"
+msgstr "Zehaztutako kontaktuak ez dauka deien euskarririk"
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is offline"
+msgstr "Zehaztutako kontaktua lineaz kanpo dago."
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "The specified contact is not valid"
+msgstr "Zehaztutako kontaktua ez da baliozkoa"
+
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "Emergency calls are not supported on this protocol"
+msgstr "Protokolo honek ez du larrialdietarako deirik onartzen"
+
+#: ../libempathy-gtk/empathy-chat.c:704
 msgid "Failed to open private chat"
 msgstr "Huts egin du berriketa pribatua irekitzean"
 
-#: ../libempathy-gtk/empathy-chat.c:717
+#: ../libempathy-gtk/empathy-chat.c:765
 msgid "Topic not supported on this conversation"
 msgstr "Gaia ez dago onartuta solasaldi honetan"
 
-#: ../libempathy-gtk/empathy-chat.c:723
+#: ../libempathy-gtk/empathy-chat.c:771
 msgid "You are not allowed to change the topic"
 msgstr "Ez duzu baimenik gaia aldatzeko"
 
-#: ../libempathy-gtk/empathy-chat.c:906
+#: ../libempathy-gtk/empathy-chat.c:975
+#, c-format
+msgid "“%s� is not a valid contact ID"
+msgstr "'%s' ez da baliozko IDa"
+
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: mezu guztiak garbitzen ditu uneko solasaldian"
 
-#: ../libempathy-gtk/empathy-chat.c:909
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <gaia>: ezarri uneko solasaldiaren gaia"
 
-#: ../libempathy-gtk/empathy-chat.c:912
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <berriketa-gelaren IDa>: elkartu berriketa-gela berri batekin"
 
-#: ../libempathy-gtk/empathy-chat.c:915
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <berriketa-gelaren IDa>: elkartu berriketa-gela berri batekin"
 
-#: ../libempathy-gtk/empathy-chat.c:920
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1284,23 +1414,23 @@ msgstr ""
 "/part [<berriketa-gelaren IDa>] [<arrazoia>]: utzi berriketa-gela, lehenetsi "
 "gisa unekoa"
 
-#: ../libempathy-gtk/empathy-chat.c:925
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <kontaktuaren IDa> [<mezua>]: ireki berriketa pribatu bat"
 
-#: ../libempathy-gtk/empathy-chat.c:928
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <kontaktuaren IDa> <mezua>: ireki berriketa pribatu bat"
 
-#: ../libempathy-gtk/empathy-chat.c:931
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <goitizena>: aldatu zure goitizena uneko zerbitzarian"
 
-#: ../libempathy-gtk/empathy-chat.c:934
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <mezua>: bidali ekintzaren mezua uneko solasaldira"
 
-#: ../libempathy-gtk/empathy-chat.c:937
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1310,7 +1440,11 @@ msgstr ""
 "karakterearekin hasten diren mezuak bidaltzeko erabiltzen da. Adibidez, \"/"
 "say /join berriketa-gela berri batekin elkartzeko erabiltzen da\""
 
-#: ../libempathy-gtk/empathy-chat.c:942
+#: ../libempathy-gtk/empathy-chat.c:1094
+msgid "/whois <contact ID>: display information about a contact"
+msgstr "/whois <kontaktuaren IDa>: bistaratu kontaktuari buruzko informazioa"
+
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1318,98 +1452,113 @@ msgstr ""
 "/help [<komandoa>]: erakutsi onartutako komando guztiak. <komandoa> "
 "definitzen bada, nola erabiltzen den erakusten du."
 
-#: ../libempathy-gtk/empathy-chat.c:952
+#: ../libempathy-gtk/empathy-chat.c:1114
 #, c-format
 msgid "Usage: %s"
 msgstr "Erabilera: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:991
+#: ../libempathy-gtk/empathy-chat.c:1159
 msgid "Unknown command"
 msgstr "Komando ezezaguna"
 
-#: ../libempathy-gtk/empathy-chat.c:1117
+#: ../libempathy-gtk/empathy-chat.c:1285
 msgid "Unknown command; see /help for the available commands"
 msgstr "Komando ezezaguna; ikus /help komando erabilgarrientzako"
 
-#: ../libempathy-gtk/empathy-chat.c:1254
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1455
+msgid "insufficient balance to send message"
+msgstr "ez dago nahikoa balantzerik mezua bidaltzeko"
+
+#: ../libempathy-gtk/empathy-chat.c:1457
+msgid "not capable"
+msgstr "ez da gai"
+
+#: ../libempathy-gtk/empathy-chat.c:1464
 msgid "offline"
 msgstr "lineaz kanpo"
 
-#: ../libempathy-gtk/empathy-chat.c:1257
+#: ../libempathy-gtk/empathy-chat.c:1467
 msgid "invalid contact"
 msgstr "kontaktu baliogabea"
 
-#: ../libempathy-gtk/empathy-chat.c:1260
+#: ../libempathy-gtk/empathy-chat.c:1470
 msgid "permission denied"
 msgstr "baimena ukatuta"
 
-#: ../libempathy-gtk/empathy-chat.c:1263
+#: ../libempathy-gtk/empathy-chat.c:1473
 msgid "too long message"
 msgstr "mezua luzeegia"
 
-#: ../libempathy-gtk/empathy-chat.c:1266
+#: ../libempathy-gtk/empathy-chat.c:1476
 msgid "not implemented"
 msgstr "inplementatu gabe"
 
-#: ../libempathy-gtk/empathy-chat.c:1270
+#: ../libempathy-gtk/empathy-chat.c:1480
 msgid "unknown"
 msgstr "ezezaguna"
 
-#: ../libempathy-gtk/empathy-chat.c:1274
+#: ../libempathy-gtk/empathy-chat.c:1486
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Errorea '%s' mezua bidaltzean: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1335 ../src/empathy-chat-window.c:717
+#: ../libempathy-gtk/empathy-chat.c:1490
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Errorea mezua bidaltzean: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Gaia:"
 
-#: ../libempathy-gtk/empathy-chat.c:1347
+#: ../libempathy-gtk/empathy-chat.c:1563
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Gaia honela ezarria: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1349
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "No topic defined"
 msgstr "Ez da gairik definitu"
 
-#: ../libempathy-gtk/empathy-chat.c:1848
+#: ../libempathy-gtk/empathy-chat.c:2074
 msgid "(No Suggestions)"
 msgstr "(Iradokizunik ez)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1916
+#: ../libempathy-gtk/empathy-chat.c:2142
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Gehitu '%s' hiztegiari"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1953
+#: ../libempathy-gtk/empathy-chat.c:2179
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Gehitu '%s' '%s' hiztegiari"
 
-#: ../libempathy-gtk/empathy-chat.c:2010
+#: ../libempathy-gtk/empathy-chat.c:2249
 msgid "Insert Smiley"
 msgstr "Txertatu aurpegiera"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2028
-#: ../libempathy-gtk/empathy-ui-utils.c:1808
+#: ../libempathy-gtk/empathy-chat.c:2267
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "_Bidali"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2063
+#: ../libempathy-gtk/empathy-chat.c:2321
 msgid "_Spelling Suggestions"
 msgstr "Iradokizun _ortografikoak"
 
-#: ../libempathy-gtk/empathy-chat.c:2152
+#: ../libempathy-gtk/empathy-chat.c:2410
 msgid "Failed to retrieve recent logs"
 msgstr "Huts egin du azken erregistroak eskuratzean"
 
-#: ../libempathy-gtk/empathy-chat.c:2263
+#: ../libempathy-gtk/empathy-chat.c:2547
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s deskonektatu egin da"
@@ -1417,12 +1566,12 @@ msgstr "%s deskonektatu egin da"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2270
+#: ../libempathy-gtk/empathy-chat.c:2554
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s(e)k %1$s kanporatu du"
 
-#: ../libempathy-gtk/empathy-chat.c:2273
+#: ../libempathy-gtk/empathy-chat.c:2557
 #, c-format
 msgid "%s was kicked"
 msgstr "%s kanporatua izan da"
@@ -1430,17 +1579,17 @@ msgstr "%s kanporatua izan da"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2281
+#: ../libempathy-gtk/empathy-chat.c:2565
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s(e)k %1$s debekatu du"
 
-#: ../libempathy-gtk/empathy-chat.c:2284
+#: ../libempathy-gtk/empathy-chat.c:2568
 #, c-format
 msgid "%s was banned"
 msgstr "%s debekatua izan da"
 
-#: ../libempathy-gtk/empathy-chat.c:2288
+#: ../libempathy-gtk/empathy-chat.c:2572
 #, c-format
 msgid "%s has left the room"
 msgstr "%s(e)k gela utzi du"
@@ -1450,105 +1599,137 @@ msgstr "%s(e)k gela utzi du"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2297
+#: ../libempathy-gtk/empathy-chat.c:2581
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2322
+#: ../libempathy-gtk/empathy-chat.c:2606
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s(e)k gelara elkartzea nahi du"
 
-#: ../libempathy-gtk/empathy-chat.c:2347
+#: ../libempathy-gtk/empathy-chat.c:2631
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s orain honela ezagutzen da: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2486
-#: ../src/empathy-streamed-media-window.c:1949
-#: ../src/empathy-event-manager.c:1129
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2784
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
+#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
 msgid "Disconnected"
 msgstr "Deskonektatuta"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3116
+#: ../libempathy-gtk/empathy-chat.c:3428
 msgid "Would you like to store this password?"
 msgstr "Pasahitz hau gordetzea nahi duzu?"
 
-#: ../libempathy-gtk/empathy-chat.c:3122
+#: ../libempathy-gtk/empathy-chat.c:3434
 msgid "Remember"
 msgstr "Gogoratu"
 
-#: ../libempathy-gtk/empathy-chat.c:3132
+#: ../libempathy-gtk/empathy-chat.c:3444
 msgid "Not now"
 msgstr "Orain ez"
 
-#: ../libempathy-gtk/empathy-chat.c:3176
+#: ../libempathy-gtk/empathy-chat.c:3488
 msgid "Retry"
 msgstr "Saiatu berriro"
 
-#: ../libempathy-gtk/empathy-chat.c:3180
+#: ../libempathy-gtk/empathy-chat.c:3492
 msgid "Wrong password; please try again:"
 msgstr "Okerreko pasahitza, saiatu berriro:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3297
+#: ../libempathy-gtk/empathy-chat.c:3622
 msgid "This room is protected by a password:"
 msgstr "Gela hau pasahitz batekin babestuta dago:"
 
-#: ../libempathy-gtk/empathy-chat.c:3324
+#: ../libempathy-gtk/empathy-chat.c:3649
 msgid "Join"
 msgstr "Elkartu"
 
-#: ../libempathy-gtk/empathy-chat.c:3494 ../src/empathy-event-manager.c:1151
+#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "Konektatuta"
 
-#: ../libempathy-gtk/empathy-chat.c:3547
-#: ../libempathy-gtk/empathy-log-window.c:650
+#: ../libempathy-gtk/empathy-chat.c:3906
 msgid "Conversation"
 msgstr "Solasaldia"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:422
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:3911
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (SMS)"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
 msgid "Unknown or invalid identifier"
 msgstr "Identifikatzaile ezezaguna edo baliogabea"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
 msgid "Contact blocking temporarily unavailable"
 msgstr "Kontaktuen blokeoa ez dago erabilgarri aldi baterako"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
 msgid "Contact blocking unavailable"
 msgstr "Kontaktuen blokeoa ez dago erabilgarri"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
 msgid "Permission Denied"
 msgstr "Baimena ukatuta"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
 msgid "Could not block contact"
 msgstr "Ezin izan da kontaktua blokeatu"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:701
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
 msgid "Edit Blocked Contacts"
 msgstr "Editatu blokeatutako kontaktuak"
 
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Account:"
+msgstr "Kontua:"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "Blokeatutako kontaktuak"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Kendu"
+
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:794
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Kopiatu estekaren helbidea"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:801
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Ireki esteka"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:420
+#: ../libempathy-gtk/empathy-chat-text-view.c:415
 msgid "%A %B %d %Y"
 msgstr "%A, %Y %B %d"
 
@@ -1567,13 +1748,13 @@ msgid "New Contact"
 msgstr "Kontaktu berria"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:199
+#: ../libempathy-gtk/empathy-individual-dialogs.c:200
 #, c-format
 msgid "Block %s?"
 msgstr "Blokeatu %s?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:247
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr ""
@@ -1581,12 +1762,12 @@ msgstr ""
 "jartzeko?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
 msgid "_Block"
 msgstr "_Blokeatu"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:278
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Salatu kontaktu hau iraingarri gisa"
@@ -1612,301 +1793,331 @@ msgstr "Banatuta"
 msgid "Favorite People"
 msgstr "Gogoko jendea"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2001
-#: ../libempathy-gtk/empathy-individual-view.c:2336
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Ziur zaude '%s' taldea kentzea nahi duzula?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2003
-#: ../libempathy-gtk/empathy-individual-view.c:2339
+#: ../libempathy-gtk/empathy-contact-list-view.c:1988
+#: ../libempathy-gtk/empathy-individual-view.c:2379
 msgid "Removing group"
 msgstr "Taldea kentzen"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2052
-#: ../libempathy-gtk/empathy-contact-list-view.c:2129
-#: ../libempathy-gtk/empathy-individual-view.c:2394
-#: ../libempathy-gtk/empathy-individual-view.c:2588
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../libempathy-gtk/empathy-contact-list-view.c:2037
+#: ../libempathy-gtk/empathy-contact-list-view.c:2114
+#: ../libempathy-gtk/empathy-individual-view.c:2434
+#: ../libempathy-gtk/empathy-individual-view.c:2637
 msgid "_Remove"
 msgstr "_Kendu"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2082
-#: ../libempathy-gtk/empathy-individual-view.c:2458
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
+#: ../libempathy-gtk/empathy-individual-view.c:2501
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Ziur zaude '%s' kontaktua kendu nahi duzula?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2084
-#: ../libempathy-gtk/empathy-individual-view.c:2479
+#: ../libempathy-gtk/empathy-contact-list-view.c:2069
+#: ../libempathy-gtk/empathy-individual-view.c:2522
 msgid "Removing contact"
 msgstr "Kontaktua kentzen"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:219
-#: ../src/empathy-main-window.ui.h:13
+#: ../libempathy-gtk/empathy-contact-menu.c:220
+#: ../src/empathy-main-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "Gehitu _kontaktua..."
 
-#: ../libempathy-gtk/empathy-contact-menu.c:299
+#: ../libempathy-gtk/empathy-contact-menu.c:300
 msgid "_Block Contact"
 msgstr "_Blokeatu kontaktua"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:328
-#: ../libempathy-gtk/empathy-individual-menu.c:517
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:329
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "_Berriketa"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:359
-#: ../libempathy-gtk/empathy-individual-menu.c:560
+#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Audio-deia"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:390
-#: ../libempathy-gtk/empathy-individual-menu.c:602
+#: ../libempathy-gtk/empathy-contact-menu.c:394
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Bideo-deia"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:436
-#: ../libempathy-gtk/empathy-individual-menu.c:645
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:440
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "_Aurreko solasaldiak"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:458
-#: ../libempathy-gtk/empathy-individual-menu.c:686
+#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "Bidali fitxategia"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:481
-#: ../libempathy-gtk/empathy-individual-menu.c:728
+#: ../libempathy-gtk/empathy-contact-menu.c:485
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
 msgstr "Partekatu nire mahaigaina"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:521
-#: ../libempathy-gtk/empathy-contact-widget.c:1763
-#: ../libempathy-gtk/empathy-individual-menu.c:763
+#: ../libempathy-gtk/empathy-contact-menu.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:1886
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
 #: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "Gogokoa"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:550
-#: ../libempathy-gtk/empathy-individual-menu.c:791
+#: ../libempathy-gtk/empathy-contact-menu.c:554
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "_Informazioa"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:596
+#: ../libempathy-gtk/empathy-contact-menu.c:600
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "_Editatu"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:650
-#: ../libempathy-gtk/empathy-individual-menu.c:972
-#: ../src/empathy-chat-window.c:935
+#: ../libempathy-gtk/empathy-contact-menu.c:654
+#: ../libempathy-gtk/empathy-individual-menu.c:1284
+#: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "Gela honetara gonbidatzen zaituzte"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:681
-#: ../libempathy-gtk/empathy-individual-menu.c:1019
+#: ../libempathy-gtk/empathy-contact-menu.c:685
+#: ../libempathy-gtk/empathy-individual-menu.c:1330
 msgid "_Invite to Chat Room"
 msgstr "_Gonbidatu berriketa-gelara"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:513
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
 msgid "Search contacts"
 msgstr "Bilatu kontaktuak"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:543
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
 msgid "Search: "
 msgstr "Bilatu: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:601
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
 msgid "_Add Contact"
 msgstr "_Gehitu kontaktua"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:619
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
 msgid "No contacts found"
 msgstr "Ez da kontakturik aurkitu"
 
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr "Zure mezua zeure burua aurkeztuz:"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
+msgstr "Utzidazu ikusten linean zaudenean. Mila esker."
+
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "Hautatu kontaktua"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:295
+#: ../libempathy-gtk/empathy-contact-widget.c:336
 #: ../libempathy-gtk/empathy-individual-widget.c:153
 msgid "Full name:"
 msgstr "Izen osoa:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:296
+#: ../libempathy-gtk/empathy-contact-widget.c:337
 #: ../libempathy-gtk/empathy-individual-widget.c:154
 msgid "Phone number:"
 msgstr "Telefono zenbakia:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:297
+#: ../libempathy-gtk/empathy-contact-widget.c:338
 #: ../libempathy-gtk/empathy-individual-widget.c:155
 msgid "E-mail address:"
 msgstr "Helbide elektronikoa:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:298
+#: ../libempathy-gtk/empathy-contact-widget.c:339
 #: ../libempathy-gtk/empathy-individual-widget.c:156
 msgid "Website:"
 msgstr "Webgunea:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:299
+#: ../libempathy-gtk/empathy-contact-widget.c:340
 #: ../libempathy-gtk/empathy-individual-widget.c:157
 msgid "Birthday:"
 msgstr "Urtebetetzea:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:346
+msgid "Last seen:"
+msgstr "Ikusi zen azken aldia:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:348
+msgid "Connected from:"
+msgstr "Hemendik konektatuta:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:353
+msgid "Away message:"
+msgstr "Kanpoan nagoeneko mezua:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+msgid "Channels:"
+msgstr "Kanalak:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
 msgstr "Herrialdearen ISO kodea:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Country:"
 msgstr "Herrialdea:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "State:"
 msgstr "Estatua:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:768
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "City:"
 msgstr "Herria:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:770
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Area:"
 msgstr "Area:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:772
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
 msgstr "Posta-kodea:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:774
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Street:"
 msgstr "Kalea:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:776
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
 msgstr "Eraikuntza:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:778
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Floor:"
 msgstr "Solairua:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:780
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Room:"
 msgstr "Gela:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:782
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Text:"
 msgstr "Testua:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:784
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Description:"
 msgstr "Azalpena:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:786
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
 msgstr "URIa:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
 msgstr "Zehaztasun maila:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:790
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr "Errorea:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:792
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
 msgstr "Errore bertikala (metroak):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:794
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
 msgstr "Errore horizontala (metroak):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr "Abiadura:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Bearing:"
 msgstr "Atzerapena:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:800
-#: ../libempathy-gtk/empathy-individual-widget.c:526
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
 msgstr "Igoerako abiadura:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:802
-#: ../libempathy-gtk/empathy-individual-widget.c:528
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
 msgstr "Azken eguneraketa:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:804
-#: ../libempathy-gtk/empathy-individual-widget.c:530
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
 msgstr "Longitudea:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:806
-#: ../libempathy-gtk/empathy-individual-widget.c:532
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
 msgstr "Latitudea:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:808
-#: ../libempathy-gtk/empathy-individual-widget.c:534
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
 msgstr "Altitudea:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:871
-#: ../libempathy-gtk/empathy-contact-widget.c:888
-#: ../libempathy-gtk/empathy-individual-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:633
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "Kokalekua"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:890
-#: ../libempathy-gtk/empathy-individual-widget.c:635
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:942
-#: ../libempathy-gtk/empathy-individual-widget.c:684
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
 msgstr "%Y/%B/%e, %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1024
-#: ../libempathy-gtk/empathy-individual-widget.c:919
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
 msgid "Save Avatar"
 msgstr "Gorde avatar-a"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1080
-#: ../libempathy-gtk/empathy-individual-widget.c:977
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
 msgid "Unable to save avatar"
 msgstr "Ezin da avatar-a gorde"
 
@@ -1916,7 +2127,7 @@ msgstr "<b>Kokalekua</b> (data)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1307
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr "Aliasa:"
 
@@ -1936,7 +2147,7 @@ msgstr "Kontaktuaren xehetasunak"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "Identifikatzailea:"
 
@@ -1953,11 +2164,11 @@ msgstr "SE:"
 msgid "Version:"
 msgstr "Bertsioa:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:332
+#: ../libempathy-gtk/empathy-groups-widget.c:333
 msgid "Groups"
 msgstr "Taldeak"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:344
+#: ../libempathy-gtk/empathy-groups-widget.c:345
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -1965,75 +2176,105 @@ msgstr ""
 "Hautatu taldeak kontaktu hau talde horietan azaltzeko, talde bat baino "
 "gehiago hauta ditzakezu, edo talderik ez."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:363
+#: ../libempathy-gtk/empathy-groups-widget.c:364
 msgid "_Add Group"
 msgstr "_Gehitu taldea"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:398
+#: ../libempathy-gtk/empathy-groups-widget.c:399
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Hautatu"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1436
+#: ../libempathy-gtk/empathy-groups-widget.c:409
+#: ../src/empathy-main-window.c:1807
 msgid "Group"
 msgstr "Taldea"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Honako identitatea blokeatu egingo da:"
 msgstr[1] "Honako identitateak blokeatu egingo dira:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:259
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Honako identitatea ezingo da blokeatu:"
 msgstr[1] "Honako identitateak ezingo dira blokeatu:"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
 msgstr "Estekatutako kontaktuak"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:354
+#: ../libempathy-gtk/empathy-individual-linker.c:370
 msgid "Select contacts to link"
 msgstr "Hautatu kontaktuak estekatzeko"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:428
+#: ../libempathy-gtk/empathy-individual-linker.c:444
 msgid "New contact preview"
 msgstr "Kontaktu berriaren aurrebista"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:472
+#: ../libempathy-gtk/empathy-individual-linker.c:488
 msgid "Contacts selected in the list on the left will be linked together."
 msgstr "Ezkerreko zerrendan hautatutako kontaktuak elkarrekin estekatuko dira."
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:131
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:839
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "Hautatu kontua deia egitean erabiltzeko"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "Deitu"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+msgid "Mobile"
+msgstr "Mugikorra"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "Lana"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "Etxea"
+
+#. add an SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+msgid "_SMS"
+msgstr "_SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1142
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Editatu"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:865
-#| msgid "Link Contacts"
+#: ../libempathy-gtk/empathy-individual-menu.c:1168
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "_Konektatu kontaktuak..."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2301
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 msgid "Delete and _Block"
 msgstr "Ezabatu eta _blokeatu"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2467
+#: ../libempathy-gtk/empathy-individual-view.c:2510
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2043,7 +2284,7 @@ msgstr ""
 "estekatutako kontaktu hau osatzen dituzten kontaktu guztiak ezabatuko "
 "dituela."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2096,7 +2337,8 @@ msgid "_Unlink…"
 msgstr "_Deskonektatu..."
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid "Completely split the displayed linked contacts into the separate contacts."
+msgid ""
+"Completely split the displayed linked contacts into the separate contacts."
 msgstr ""
 "Bistaratuta dauden estekatutako kontaktuak erabat zatitu bereiztutako "
 "kontaktuetan."
@@ -2127,65 +2369,202 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "_Deskonektatu"
 
-#: ../libempathy-gtk/empathy-log-window.c:660
-msgid "Date"
-msgstr "Data"
+#: ../libempathy-gtk/empathy-log-window.c:634
+msgid "History"
+msgstr "Historia"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
-msgstr "Solasaldiak"
+#: ../libempathy-gtk/empathy-log-window.c:689
+msgid "Show"
+msgstr "Erakutsi"
+
+#: ../libempathy-gtk/empathy-log-window.c:711
+msgid "Search"
+msgstr "Bilatu"
+
+#: ../libempathy-gtk/empathy-log-window.c:1159
+#, c-format
+msgid "Chat in %s"
+msgstr "%s(e)n berriketan"
+
+#: ../libempathy-gtk/empathy-log-window.c:1161
+#, c-format
+msgid "Chat with %s"
+msgstr "%s(r)ekin berriketan"
+
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%A, %Y/%B/%e %X"
+
+#. Translators: this is an emote: '* Danielle waves'
+#: ../libempathy-gtk/empathy-log-window.c:1300
+#, c-format
+msgid "<i>* %s %s</i>"
+msgstr "<i>* %s %s</i>"
+
+#. Translators: this is a message: 'Danielle: hello'
+#. * The string in bold is the sender's name
+#: ../libempathy-gtk/empathy-log-window.c:1306
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1382
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "segundo %s"
+msgstr[1] "%s segundo"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "minutu %s"
+msgstr[1] "%s minutu"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "Deiaren iraupena: %s; amaiera: %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1729
+msgid "Today"
+msgstr "Gaur"
+
+#: ../libempathy-gtk/empathy-log-window.c:1733
+msgid "Yesterday"
+msgstr "Atzo"
+
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
+msgid "%e %B %Y"
+msgstr "%Y %B %e"
+
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3444
+msgid "Anytime"
+msgstr "Edozer ordu"
+
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2372
+msgid "Anyone"
+msgstr "Edozein"
+
+#: ../libempathy-gtk/empathy-log-window.c:2685
+msgid "Who"
+msgstr "Nor"
+
+#: ../libempathy-gtk/empathy-log-window.c:2889
+msgid "When"
+msgstr "Noiz"
+
+#: ../libempathy-gtk/empathy-log-window.c:3005
+msgid "Anything"
+msgstr "Edozer"
+
+#: ../libempathy-gtk/empathy-log-window.c:3007
+msgid "Text chats"
+msgstr "Testuzko berriketak"
+
+#: ../libempathy-gtk/empathy-log-window.c:3009
+#: ../src/empathy-preferences.ui.h:4
+msgid "Calls"
+msgstr "Deiak"
+
+#: ../libempathy-gtk/empathy-log-window.c:3014
+msgid "Incoming calls"
+msgstr "Sarrerako deiak"
+
+#: ../libempathy-gtk/empathy-log-window.c:3015
+msgid "Outgoing calls"
+msgstr "Irteerako deiak"
+
+#: ../libempathy-gtk/empathy-log-window.c:3016
+msgid "Missed calls"
+msgstr "Galdutako deiak"
+
+#: ../libempathy-gtk/empathy-log-window.c:3038
+msgid "What"
+msgstr "Zer"
+
+#: ../libempathy-gtk/empathy-log-window.c:3747
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr ""
+"Ziur zaude aurreko berriketetako egunkari guztiak ezabatzea nahi dituzula?"
+
+#: ../libempathy-gtk/empathy-log-window.c:3751
+msgid "Clear All"
+msgstr "Garbitu denak"
+
+#: ../libempathy-gtk/empathy-log-window.c:3758
+msgid "Delete from:"
+msgstr "Ezabatu hemendik:"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Kargatzen...</span>"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "Bilatu hurrengoa"
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Chat"
+msgstr "Berriketa"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "Bilatu aurrekoa"
+msgid "Delete All History..."
+msgstr "Ezabatu historia guztia..."
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr "Aurreko solasaldiak"
+msgid "Profile"
+msgstr "Profila"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Video"
+msgstr "Bideoa"
 
-#. Tab Label
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "Bilatu"
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:20
+msgid "_Edit"
+msgstr "_Editatu"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "_File"
+msgstr "_Fitxategia"
 
-#. Searching *for* something
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "_Honentzako:"
+msgid "page 2"
+msgstr "2. orrialdea"
 
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
 msgid "Contact ID:"
 msgstr "Kontaktuaren IDa:"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:171
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
 msgid "C_hat"
 msgstr "_Berriketa"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:181
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
 msgstr "Solasaldi berria"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:253
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
 msgid "Send _Video"
 msgstr "Bidali _bideoa"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:261
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
 msgid "C_all"
 msgstr "_Deitu"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:271
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "New Call"
 msgstr "Dei berria"
 
@@ -2204,34 +2583,34 @@ msgstr ""
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Message…"
 msgstr "Mezu pertsonalizatua..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messages…"
 msgstr "Editatu mezu pertsonalizatuak..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
 msgstr "Egin klik egoera hau gogokoa izatetik kentzeko"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
 msgstr "Egin klik egoera hau gogoko bihurtzeko"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
 msgstr "Ezarri egoera"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:946
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
 msgid "Set your presence and current status"
 msgstr "Ezarri zure presentzia eta uneko egoera"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1134
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
 msgid "Custom messages…"
 msgstr "Mezu pertsonalizatuak..."
 
@@ -2244,18 +2623,26 @@ msgstr "Mezu pertsonalizatuak..."
 msgid "New %s account"
 msgstr "%s kontu berria"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "Bilatu:"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "Maiuskula/minuskula"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Mat_ch case"
+msgstr "_Maiuskula/minuskula"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
 msgid "Phrase not found"
 msgstr "Ez da esaldia aurkitu"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "_Next"
+msgstr "_Hurrengoa"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+msgid "_Previous"
+msgstr "_Aurrekoa"
+
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
 msgstr "Jaso berehalako mezua"
@@ -2296,35 +2683,32 @@ msgstr "Irteerako ahots-deia"
 msgid "Voice call ended"
 msgstr "Ahots-deia amaituta"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "Sartu mezu pertsonalizatua"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
 msgstr "Editatu mezu pertsonalizatuak"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr "Gorde _Egoera berriaren mezua"
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#, c-format
+msgid "Message edited at %s"
+msgstr "Mezua noiz editatuta: %s"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Status Messages"
-msgstr "Gordetako egoeren mezuak"
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
+msgid "Normal"
+msgstr "Arrunta"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "Klasikoa"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "Soila"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "Garbia"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "Urdina"
 
@@ -2359,8 +2743,10 @@ msgid "The certificate is self-signed."
 msgstr "Ziurtagiria bere buruarekin sinatuta."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:177
-msgid "The certificate has been revoked by the issuing Certification Authority."
-msgstr "Ziurtagiria errebokatua izan da ziurtagiri-emailearen jaulkipenarengatik."
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
+msgstr ""
+"Ziurtagiria errebokatua izan da ziurtagiri-emailearen jaulkipenarengatik."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:181
 msgid "The certificate is cryptographically weak."
@@ -2400,19 +2786,19 @@ msgstr "Gogoratu aukera hau etorkizuneko konexioetan"
 msgid "Certificate Details"
 msgstr "Ziurtagiriaren xehetasunak"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1705
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
 msgstr "Ezin da URIa ireki"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1800
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
 msgstr "Hautatu fitxategia"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
 msgid "Insufficient free space to save file"
 msgstr "Ez dago nahikoa lekurik fitxategia gordetzeko"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2421,7 +2807,7 @@ msgstr ""
 "%s-tako leku librea behar da fitxategi hau gordetzeko, soilik %s dago ordea "
 "erabilgarri. Aukeratu beste kokaleku bat."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1924
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Sarrerako fitxategia %s(e)ndik"
@@ -2609,23 +2995,24 @@ msgstr "Ez dago errorearen mezurik"
 msgid "Instant Message (Empathy)"
 msgstr "Berehalako mezularitza (Empathy)"
 
-#: ../src/empathy.c:308
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "Ez konektatu abiatzean"
 
-#: ../src/empathy.c:312
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
-msgstr "Ez bistaratu kontaktu-zerrenda edo bestelako elkarrizketa-koadrorik abiatzean"
+msgstr ""
+"Ez bistaratu kontaktu-zerrenda edo bestelako elkarrizketa-koadrorik abiatzean"
 
-#: ../src/empathy.c:320
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr "- Empathy BM bezeroa"
 
-#: ../src/empathy.c:499
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
 msgstr "Errorea kontu-kudeatzailearekin kontaktatzean"
 
-#: ../src/empathy.c:501
+#: ../src/empathy.c:639
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2776,8 +3163,8 @@ msgid "Select the accounts you want to import:"
 msgstr "Hautatu inportatzea nahi dituzun kontuak:"
 
 #: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "Yes"
 msgstr "Bai"
 
@@ -2852,34 +3239,35 @@ msgstr "Gorde gabeko eraldaketak daude zure %s kontuan."
 msgid "Your new account has not been saved yet."
 msgstr "Zure kontu berria oraindik gorde gabe dago."
 
-#: ../src/empathy-accounts-dialog.c:286
-#: ../src/empathy-streamed-media-window.c:809
+#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1216
 msgid "Connecting…"
 msgstr "Konektatzen..."
 
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:386
 #, c-format
 msgid "Offline — %s"
 msgstr "Lineaz kanpo — %s"
 
-#: ../src/empathy-accounts-dialog.c:339
+#: ../src/empathy-accounts-dialog.c:398
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Deskonektatuta — %s"
 
-#: ../src/empathy-accounts-dialog.c:350
+#: ../src/empathy-accounts-dialog.c:409
 msgid "Offline — No Network Connection"
 msgstr "Lineaz kanpo — Ez dago sareko konexiorik"
 
-#: ../src/empathy-accounts-dialog.c:357
+#: ../src/empathy-accounts-dialog.c:416
 msgid "Unknown Status"
 msgstr "Egoera ezezaguna"
 
-#: ../src/empathy-accounts-dialog.c:369
+#: ../src/empathy-accounts-dialog.c:428
 msgid "Offline — Account Disabled"
 msgstr "Lineaz kanpo — Kontua desgaituta"
 
-#: ../src/empathy-accounts-dialog.c:772
+#: ../src/empathy-accounts-dialog.c:831
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2887,16 +3275,16 @@ msgstr ""
 "Kontu berri bat sortzera zoaz, eta ondorioz zuk egindako\n"
 "aldaketak baztertu egingo dira. Ziur zaude jarraitzea nahi duzula?"
 
-#: ../src/empathy-accounts-dialog.c:1133
+#: ../src/empathy-accounts-dialog.c:1192
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Ziur zaude '%s' kentzea nahi duzula ordenagailutik?"
 
-#: ../src/empathy-accounts-dialog.c:1137
+#: ../src/empathy-accounts-dialog.c:1196
 msgid "This will not remove your account on the server."
 msgstr "Honek ez du zure kontua zerbitzaritik kenduko."
 
-#: ../src/empathy-accounts-dialog.c:1375
+#: ../src/empathy-accounts-dialog.c:1432
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2905,15 +3293,15 @@ msgstr ""
 "aldaketak baztertu egingo dira Ziur zaude jarraitzea nahi duzula?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1593
+#: ../src/empathy-accounts-dialog.c:1643
 msgid "_Enable"
 msgstr "_Gaituta"
 
-#: ../src/empathy-accounts-dialog.c:1594
+#: ../src/empathy-accounts-dialog.c:1644
 msgid "_Disable"
 msgstr "_Desgaituta"
 
-#: ../src/empathy-accounts-dialog.c:2113
+#: ../src/empathy-accounts-dialog.c:2154
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2922,18 +3310,22 @@ msgstr ""
 "aldaketak baztertu egingo dira. Ziur zaude jarraitzea nahi duzula?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Gehitu..."
+
+#: ../src/empathy-accounts-dialog.ui.h:2
 msgid "Loading account information"
 msgstr "Kontaktuaren informazioa kargatzen"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "No protocol installed"
 msgstr "Ez da protokolorik instalatu"
 
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Protocol:"
 msgstr "Protokoloa:"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -2941,19 +3333,15 @@ msgstr ""
 "Kontu berri bat gehitzeko, aurrenik erabiltzea nahi duzun protokolo "
 "bakoitzaren motorra instalatu behar duzu."
 
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add…"
-msgstr "_Gehitu..."
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Import…"
 msgstr "_Inportatu..."
 
-#: ../src/empathy-auth-client.c:250
+#: ../src/empathy-auth-client.c:249
 msgid " - Empathy authentication client"
 msgstr " - Empathy-ren autentifikazio-bezeroa"
 
-#: ../src/empathy-auth-client.c:266
+#: ../src/empathy-auth-client.c:265
 msgid "Empathy authentication client"
 msgstr "Empathy-ren autentifikazio-bezeroa"
 
@@ -2961,94 +3349,116 @@ msgstr "Empathy-ren autentifikazio-bezeroa"
 msgid "People nearby"
 msgstr "Inguruko jendea"
 
-#: ../src/empathy-av.c:118
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr " - Empathy-ren audio/bideo bezeroa"
 
-#: ../src/empathy-av.c:134
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy-ren audio/bideo bezeroa"
 
-#: ../src/empathy-streamed-media-window.c:479
+#: ../src/empathy-streamed-media-window.c:431
 msgid "Contrast"
 msgstr "Kontrastea"
 
-#: ../src/empathy-streamed-media-window.c:482
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Brightness"
 msgstr "Distira"
 
-#: ../src/empathy-streamed-media-window.c:485
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:590
+#: ../src/empathy-streamed-media-window.c:542
 msgid "Volume"
 msgstr "Bolumena"
 
-#: ../src/empathy-streamed-media-window.c:1166
+#: ../src/empathy-streamed-media-window.c:1110
 msgid "_Sidebar"
 msgstr "_Albo-barra"
 
-#: ../src/empathy-streamed-media-window.c:1186
+#: ../src/empathy-streamed-media-window.c:1130
 msgid "Audio input"
 msgstr "Audio-sarrera"
 
-#: ../src/empathy-streamed-media-window.c:1190
+#: ../src/empathy-streamed-media-window.c:1134
 msgid "Video input"
 msgstr "Bideo-sarrera"
 
-#: ../src/empathy-streamed-media-window.c:1194
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Dialpad"
 msgstr "Dei-teklatua"
 
-#: ../src/empathy-streamed-media-window.c:1205
+#: ../src/empathy-streamed-media-window.c:1151
 msgid "Details"
 msgstr "Xehetasunak"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1274
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1825
 #, c-format
 msgid "Call with %s"
 msgstr "Deitu honekin: %s"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-streamed-media-window.c:1353
-msgid "Call"
-msgstr "Deitu"
-
-#: ../src/empathy-streamed-media-window.c:1507
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:2069
 msgid "The IP address as seen by the machine"
 msgstr "Makinak IP helbidea ikusi du"
 
-#: ../src/empathy-streamed-media-window.c:1509
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:2071
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP helbidea interneteko zerbitzari batek ikusi du"
 
-#: ../src/empathy-streamed-media-window.c:1511
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:2073
 msgid "The IP address of the peer as seen by the other side"
 msgstr "Parekoaren IP helbidea bestaldean ikusi da"
 
-#: ../src/empathy-streamed-media-window.c:1513
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:2075
 msgid "The IP address of a relay server"
 msgstr "Transmisioko ('relay') zerbitzariaren IP helbidea"
 
-#: ../src/empathy-streamed-media-window.c:1515
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:2077
 msgid "The IP address of the multicast group"
 msgstr "Multidifusioko taldearen IP helbidea"
 
+#: ../src/empathy-streamed-media-window.c:1843
+msgctxt "encoding video codec"
+msgid "Unknown"
+msgstr "Ezezaguna"
+
+#: ../src/empathy-streamed-media-window.c:1846
+msgctxt "encoding audio codec"
+msgid "Unknown"
+msgstr "Ezezaguna"
+
+#: ../src/empathy-streamed-media-window.c:1849
+msgctxt "decoding video codec"
+msgid "Unknown"
+msgstr "Ezezaguna"
+
+#: ../src/empathy-streamed-media-window.c:1852
+msgctxt "decoding audio codec"
+msgid "Unknown"
+msgstr "Ezezaguna"
+
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2266
+#: ../src/empathy-streamed-media-window.c:2144
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Konektatuta — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2327
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2846
 msgid "Technical Details"
 msgstr "Xehetasun teknikoak"
 
-#: ../src/empathy-streamed-media-window.c:2365
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2884
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3057,7 +3467,8 @@ msgstr ""
 "%s(r)en softwareak ez du ulertzen zure ordenagailuak onartzen dituen audio-"
 "formatuak"
 
-#: ../src/empathy-streamed-media-window.c:2370
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2889
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3066,7 +3477,8 @@ msgstr ""
 "%s(r)en softwareak ez du ulertzen zure ordenagailuak onartzen dituen bideo-"
 "formatuak"
 
-#: ../src/empathy-streamed-media-window.c:2376
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2895
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3075,23 +3487,29 @@ msgstr ""
 "Ezin da konexiorik ezarri %s(r)ekin. Zuetako bat zuzeneko konexioak "
 "baimentzen ez dituen sare batean dago."
 
-#: ../src/empathy-streamed-media-window.c:2382
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2901
 msgid "There was a failure on the network"
 msgstr "Hutsegite bat egon da sarean"
 
-#: ../src/empathy-streamed-media-window.c:2386
-msgid "The audio formats necessary for this call are not installed on your computer"
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2905
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Dei hau egiteko beharrezkoak diren audio-formatuak instalatu gabe daude "
 "ordenagailuan"
 
-#: ../src/empathy-streamed-media-window.c:2389
-msgid "The video formats necessary for this call are not installed on your computer"
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2908
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Dei hau egiteko beharrezkoak diren bideo-formatuak instalatu gabe daude "
 "ordenagailuan"
 
-#: ../src/empathy-streamed-media-window.c:2399
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2920
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3102,147 +3520,200 @@ msgstr ""
 "genizuke <a href=\"%s\">akats honen berri emango bazenu</a> eta Laguntza "
 "menuko 'Araztu' leihotik eskuratutako erregistroak erantsiko bazenio."
 
-#: ../src/empathy-streamed-media-window.c:2407
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2929
 msgid "There was a failure in the call engine"
 msgstr "Hutsegite bat gertatu da deiaren motorrean"
 
-#: ../src/empathy-streamed-media-window.c:2410
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2932
 msgid "The end of the stream was reached"
 msgstr "Korrontearen amaierara iritsi da"
 
-#: ../src/empathy-streamed-media-window.c:2450
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2972
 msgid "Can't establish audio stream"
 msgstr "Ezin da audioaren korrontea ezarri"
 
-#: ../src/empathy-streamed-media-window.c:2460
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2982
 msgid "Can't establish video stream"
 msgstr "Ezin da bideoaren korrontea ezarri"
 
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "Audio"
 msgstr "Audioa"
 
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Deitu kontaktuari berriro"
-
 #: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "Itzali kamera"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "Deskodeketaren kodeka:"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "Piztu kamera"
+msgid "Disable camera"
+msgstr "Desgaitu kamera"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Deskodeketaren kodeka:"
+msgid "Display the dialpad"
+msgstr "Bistaratu dei-teklatua"
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Desgaitu kamera eta gelditu bideoa bidaltzea"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "Kodeketaren kodeka:"
 
 #: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Gaitu kamera eta bidali bideoa"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Hang up"
+msgstr "Eseki"
 
 #: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Gaitu kamera baina ez bidali bideoa"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Hang up current call"
+msgstr "Eseki uneko deia"
 
 #: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Kodeketaren kodeka:"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "Lokaleko hautagaia:"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "Eseki"
+msgid "Maximise me"
+msgstr "Maximizatu"
 
 #: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Eseki uneko deia"
+msgid "Minimise me"
+msgstr "Minimizatu"
 
 #: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Lokaleko hautagaia:"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "Urruneko hautagaia:"
 
 #: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "Aurrebista"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Send Audio"
+msgstr "Bidali audioa"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "Berriro deitu"
+msgid "Send Video"
+msgstr "Bidali bideoa"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Urruneko hautagaia:"
+msgid "Show dialpad"
+msgstr "Erakutsi dei-teklatua"
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "Bidali audioa"
+msgid "Start a video call"
+msgstr "Hasi bideo-deia"
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Txandakatu audioaren igorpena"
+msgid "Start an audio call"
+msgstr "Hasi audio-deia"
+
+#: ../src/empathy-call-window.ui.h:18
+msgid "Swap camera"
+msgstr "Trukatu kamera"
 
 #: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "_Bideoa"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr "Txandakatu audioaren igorpena"
 
 #: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "Bideoa"
+msgid "Toggle video transmission"
+msgstr "Txandakatu bideoaren igorpena"
 
 #: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "Itzali bideoa"
-
-#: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "Piztu bideoa"
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
+#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
+msgid "Unknown"
+msgstr "Ezezaguna"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "Bideoaren aurrebista"
+msgid "Video call"
+msgstr "Bideo-deia"
 
 #: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "_Deitu"
 
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:25
+msgid "_Camera"
+msgstr "_Kamera"
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:18
+msgid "_Contents"
+msgstr "_Edukia"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
+msgid "_Debug"
+msgstr "_Araztu"
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:22
+msgid "_Help"
+msgstr "_Laguntza"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Microphone"
+msgstr "_Mikrofonoa"
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "_Settings"
+msgstr "_Ezarpenak"
+
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_Ikusi"
 
-#: ../src/empathy-chat-window.c:474 ../src/empathy-chat-window.c:494
+#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d irakurri gabe)"
 msgstr[1] "%s (%d irakurri gabe)"
 
-#: ../src/empathy-chat-window.c:486
+#: ../src/empathy-chat-window.c:493
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (eta beste %u)"
 msgstr[1] "%s (eta beste %u)"
 
-#: ../src/empathy-chat-window.c:502
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d irakurri gabe besteengandik)"
 msgstr[1] "%s (%d irakurri gabe besteengandik)"
 
-#: ../src/empathy-chat-window.c:511
+#: ../src/empathy-chat-window.c:518
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d irakurri gabe guztietatik)"
 msgstr[1] "%s (%d irakurri gabe guztietatik)"
 
-#: ../src/empathy-chat-window.c:721
+#: ../src/empathy-chat-window.c:733
+msgid "SMS:"
+msgstr "SMS:"
+
+#: ../src/empathy-chat-window.c:743
+#, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "Mezu %d bidaltzen"
+msgstr[1] "%d mezu bidaltzen"
+
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
 msgstr "Mezua idazten."
 
@@ -3254,10 +3725,6 @@ msgstr "_Garbitu"
 msgid "C_ontact"
 msgstr "_Kontaktua"
 
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Berriketa"
-
 #: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
 msgstr "Txertatu _aurpegiera"
@@ -3278,10 +3745,6 @@ msgstr "Eraman fitxa e_skuinera"
 msgid "Notify for All Messages"
 msgstr "Jakinarazi mezu guztientzat"
 
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
-msgid "_Contents"
-msgstr "_Edukia"
-
 #: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "_Solasaldia"
@@ -3290,18 +3753,10 @@ msgstr "_Solasaldia"
 msgid "_Detach Tab"
 msgstr "E_zabatu fitxa"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
-msgid "_Edit"
-msgstr "_Editatu"
-
 #: ../src/empathy-chat-window.ui.h:13
 msgid "_Favorite Chat Room"
 msgstr "_Gogoko berriketa-gela"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
-msgid "_Help"
-msgstr "_Laguntza"
-
 #: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "_Hurrengo fitxa"
@@ -3322,15 +3777,15 @@ msgstr "_Fitxak"
 msgid "_Undo Close Tab"
 msgstr "_Desegin fitxa ixtea"
 
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "Izena"
 
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
 msgstr "Gela"
 
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "Konektatu automatikoki"
 
@@ -3338,90 +3793,96 @@ msgstr "Konektatu automatikoki"
 msgid "Manage Favorite Rooms"
 msgstr "Kudeatu gogoko gelak"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming video call"
 msgstr "Sarrerako bideo-deia"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
 msgid "Incoming call"
 msgstr "Sarrerako deia"
 
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:525
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s bideoz deitzen ari zaizu. Nahi duzu erantzutea?"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s deitzen ari zaizu. Nahi duzu erantzutea?"
 
-#: ../src/empathy-event-manager.c:515 ../src/empathy-event-manager.c:667
+#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Sarrerako deia %s-(e)ndik"
 
-#: ../src/empathy-event-manager.c:540
+#: ../src/empathy-event-manager.c:554
 msgid "_Reject"
 msgstr "Ez ona_rtu"
 
-#: ../src/empathy-event-manager.c:546
+#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
 msgid "_Answer"
 msgstr "_Erantzun"
 
-#: ../src/empathy-event-manager.c:667
+#: ../src/empathy-event-manager.c:570
+msgid "_Answer with video"
+msgstr "_Erantzun bideoarekin"
+
+#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Sarrerako bideoko deia %s-(e)ndik"
 
-#: ../src/empathy-event-manager.c:744
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
 msgstr "Gelarako gonbitea"
 
-#: ../src/empathy-event-manager.c:746
+#: ../src/empathy-event-manager.c:838
 #, c-format
 msgid "Invitation to join %s"
 msgstr "'%s'(e)ra elkartzeko gonbitea"
 
-#: ../src/empathy-event-manager.c:753
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s(e)k gonbidatzen zaitu '%s'(e)ra elkartzeko"
 
-#: ../src/empathy-event-manager.c:761
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
 msgstr "_Ukatu"
 
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Elkartu"
 
-#: ../src/empathy-event-manager.c:793
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s(e)k gonbidatu zaitu '%s'(e)ra elkartzeko"
 
-#: ../src/empathy-event-manager.c:799
+#: ../src/empathy-event-manager.c:891
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "'%s'(e)ra elkartzeko gonbidatua izan zara"
 
-#: ../src/empathy-event-manager.c:850
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Sarrerako fitxategi-transferentzia %s-(e)ndik"
 
-#: ../src/empathy-event-manager.c:1020 ../src/empathy-main-window.c:370
+#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
 msgid "Password required"
 msgstr "Pasahitza behar da"
 
-#: ../src/empathy-event-manager.c:1076
+#: ../src/empathy-event-manager.c:1190
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s(e)k baimena eskatzen du zu linean noiz zauden ikusteko"
 
-#: ../src/empathy-event-manager.c:1080
+#: ../src/empathy-event-manager.c:1194
 #, c-format
 msgid ""
 "\n"
@@ -3431,105 +3892,105 @@ msgstr ""
 "Mezua: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:100
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:102
+#: ../src/empathy-ft-manager.c:103
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:179
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s / %s (%s/s)"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:275
 #, c-format
 msgid "%s of %s"
 msgstr "%s / %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:305
+#: ../src/empathy-ft-manager.c:306
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "\"%s\" hemendik jasotzen: %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:309
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "\"%s\" honi bidaltzen: %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:338
+#: ../src/empathy-ft-manager.c:339
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Errorea \"%s\" hemendik jasotzean: %s"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:342
 msgid "Error receiving a file"
 msgstr "Errorea fitxategi bat jasotzean"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:347
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Errorea \"%s\" honi bidaltzean: %s"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:350
 msgid "Error sending a file"
 msgstr "Errorea fitxategi bat bidaltzean"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:489
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" hemendik jasota: %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:493
+#: ../src/empathy-ft-manager.c:494
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" honi bidalita: %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:497
 msgid "File transfer completed"
 msgstr "Fitxategi-transferentzia osatuta"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
 msgid "Waiting for the other participant's response"
 msgstr "Beste partaideen erantzunaren zai"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "\"%s\"(r)en osotasuna egiaztatzen"
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "\"%s\"(r)en hash-a egiten"
 
-#: ../src/empathy-ft-manager.c:1016
+#: ../src/empathy-ft-manager.c:1026
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1028
+#: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "Fitxategia"
 
-#: ../src/empathy-ft-manager.c:1050
+#: ../src/empathy-ft-manager.c:1060
 msgid "Remaining"
 msgstr "Falta:"
 
@@ -3568,127 +4029,140 @@ msgstr "Protokoloa"
 msgid "Source"
 msgstr "Iturburua"
 
-#: ../src/empathy-main-window.c:387
+#: ../src/empathy-main-window.c:392
 msgid "Provide Password"
 msgstr "Eman pasahitza"
 
-#: ../src/empathy-main-window.c:393
+#: ../src/empathy-main-window.c:398
 msgid "Disconnect"
 msgstr "Deskonektatu"
 
-#: ../src/empathy-main-window.c:533
+#: ../src/empathy-main-window.c:622
 msgid "No match found"
 msgstr "Ez da bat datorrenik aurkitu"
 
-#: ../src/empathy-main-window.c:688
+#: ../src/empathy-main-window.c:777
 msgid "Reconnect"
 msgstr "Berriz konektatu"
 
-#: ../src/empathy-main-window.c:694
+#: ../src/empathy-main-window.c:783
 msgid "Edit Account"
 msgstr "Editatu kontua"
 
-#: ../src/empathy-main-window.c:700
+#: ../src/empathy-main-window.c:789
 msgid "Close"
 msgstr "Itxi"
 
-#: ../src/empathy-main-window.c:1418
+#. Translators: this string will be something like:
+#. *   Top up My Account ($1.23)..."
+#: ../src/empathy-main-window.c:928
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr "Berriro kargatu %s (%s)..."
+
+#: ../src/empathy-main-window.c:975
+msgid "Top up account credit"
+msgstr "Berriro kargatu kontuaren kreditua"
+
+#. top up button
+#: ../src/empathy-main-window.c:1046
+msgid "Top Up..."
+msgstr "Berriro kargatu..."
+
+#: ../src/empathy-main-window.c:1789
 msgid "Contact"
 msgstr "Kontaktua"
 
-#: ../src/empathy-main-window.c:1765
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "Kontaktuen zerrenda"
 
-#: ../src/empathy-main-window.c:1881
-msgid "Show and edit accounts"
-msgstr "Erakutsi eta editatu kontuak"
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "Kontaktuak _mapa batean"
 
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-main-window-menubar.ui.h:2
+msgid "Credit Balance"
+msgstr "Kredituaren balantzea"
+
+#: ../src/empathy-main-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "Bilatu kontaktuen _zerrendan"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "Elkartu _gogokoetan"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "Kudeatu gogokoak"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "Tamaina _normala"
 
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "Dei _berria..."
 
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "Tamaina normala _avatarrekin"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "_Hobespenak"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "Erakutsi p_rotokoloak"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "Ordenatu _izenarekiko"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "Ordenatu _egoerarekiko"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Kontuak"
 
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "_Blokeatutako kontaktuak"
 
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "Tamaina _trinkoa"
 
-#: ../src/empathy-main-window.ui.h:18
-msgid "_Debug"
-msgstr "_Araztu"
-
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "_Fitxategi-transferentziak"
 
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "_Elkartu..."
 
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "_Solasaldi berria..."
 
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "_Konektatu gabeko kontaktuak"
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "_Informazio pertsonala"
 
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "_Gela"
 
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window-menubar.ui.h:29
 msgid "_Search for Contacts…"
 msgstr "_Bilatu kontaktuak..."
 
@@ -3702,7 +4176,7 @@ msgstr "Kideak"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:560
+#: ../src/empathy-new-chatroom-dialog.c:553
 #, c-format
 msgid ""
 "%s\n"
@@ -3715,16 +4189,16 @@ msgstr ""
 "Pasahitza behar da: %s\n"
 "Kideak: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "No"
 msgstr "Ez"
 
-#: ../src/empathy-new-chatroom-dialog.c:591
+#: ../src/empathy-new-chatroom-dialog.c:584
 msgid "Could not start room listing"
 msgstr "Ezin izan da gelen zerrenda abiarazi"
 
-#: ../src/empathy-new-chatroom-dialog.c:601
+#: ../src/empathy-new-chatroom-dialog.c:594
 msgid "Could not stop room listing"
 msgstr "Ezin izan da gelen zerrenda gelditu"
 
@@ -3733,7 +4207,8 @@ msgid "Couldn't load room list"
 msgstr "Ezin izan da gelen zerrenda kargatu"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
-msgid "Enter the room name to join here or click on one or more rooms in the list."
+msgid ""
+"Enter the room name to join here or click on one or more rooms in the list."
 msgstr ""
 "Idatzi gelaren izena bertara elkartzeko edo egin klik gela batean edo "
 "gehiagotan zerrendan."
@@ -3758,39 +4233,79 @@ msgstr "Gelen zerrenda"
 msgid "_Room:"
 msgstr "_Gela:"
 
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr "Mezua jasota"
 
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr "Mezua bidalita"
 
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
 msgstr "Solasaldi berria"
 
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
 msgstr "Kontaktua linean dago"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
 msgstr "Kontaktua lineaz kanpo dago"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
 msgstr "Kontua konektatuta"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
 msgstr "Kontua deskonektatuta"
 
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr "Hizkuntza"
 
-#: ../src/empathy-preferences.c:875
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:734
+msgid "Juliet"
+msgstr "Julieta"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:741
+msgid "Romeo"
+msgstr "Romeo"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:747
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr "O Romeo, Romeo, non zaude ez zaitudala ikusten Romeo?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:750
+msgid "Deny thy father and refuse thy name;"
+msgstr "Ukatu aita, ukatu izena ere;"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:753
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr "Edo, ez baduzu nahi, zin egin maite nauzula"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:756
+msgid "And I'll no longer be a Capulet."
+msgstr "Eta ez naiz gehiago Capuletar bat izango."
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:759
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr "Gehiago entzun behar dut, edo erantzun dezaket?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:762
+msgid "Juliet has disconnected"
+msgstr "Julieta deskonektatu egin da"
+
+#: ../src/empathy-preferences.c:1166
 msgid "Preferences"
 msgstr "Hobespenak"
 
@@ -3798,67 +4313,87 @@ msgstr "Hobespenak"
 msgid "Appearance"
 msgstr "Itxura"
 
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
 msgstr "Portaera"
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
 msgid "Chat Th_eme:"
 msgstr "Berriketa-_gaia:"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
 msgid "Disable notifications when _away or busy"
 msgstr "Desgaitu jakinarazpenak _aldentzean edo lanpetuta egotean"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
 msgid "Disable sounds when _away or busy"
 msgstr "Desgaitu soinuak _aldentzean edo lanpetuta egotean"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Bistaratu sarrerako gertaerak jakinarazpen-arean"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"Oihartzunaren ezeztapenak zure ahotsa garbiagoa izatea laguntzen dio beste "
+"pertsonari, baina arazoak sor ditzake ordenagailu batzuetan. Zuk (edo beste "
+"pertsonak)zarata edo karraska bitxiak entzuten badituzu, saiatu "
+"oihartzunaren ezeztapena desgaitzen eta deia berriro egiten."
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "Gaitu jakinarazpenak kontaktu bat konektatzen denean"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "Gaitu jakinarazpenak kontaktu bat deskonektatzen denean"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Gaitu jakinarazpenak _berriketak fokua ez duenean"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "Gaitu hizkuntzen zuzentzailea:"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "Orokorra"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input level:"
+msgstr "Sarrerako maila:"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "Sarrerako bolumena:"
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "Kokalekuaren iturburuak:"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "Erregistratu solasaldiak"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "Jakinarazpenak"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Jo soinua gertaeretan"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "Pribatutasuna"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -3868,66 +4403,70 @@ msgstr ""
 "soilik argitaratuko dela adierazten du. GPS koordenatuak dezimal 1eko "
 "zehaztasuna edukiko du."
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "Erakutsi _aurpegierak irudi gisa"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "Erakutsi kontaktu-_zerrenda geletan"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "Soinuak"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "Zuzentzailea"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "Hizkuntzen zerrendak instalatutako hiztegiei soilik dagokie."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "Gaiak"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:30
+msgid "Variant:"
+msgstr "Aldaera:"
+
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "Automatikoki _konektatu abiatzean"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Telefono mugikorra"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "_Gaitu jakinarazpen-burbuilak"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "_Gaitu soinu-jakinarazpenak"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Sarea (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "_Ireki berriketa berriak beste leihoetan"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "_Erakutsi kokalekua nire kontaktuei"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "_Murriztu kokalekuaren zehaztasuna"
 
@@ -3939,82 +4478,131 @@ msgstr "Egoera"
 msgid "_Quit"
 msgstr "I_rten"
 
-#: ../src/empathy-map-view.c:442
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "Deitu kontaktuari berriro"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "Itzali kamera"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "Piztu kamera"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "Desgaitu kamera eta gelditu bideoa bidaltzea"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "Gaitu kamera eta bidali bideoa"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "Gaitu kamera baina ez bidali bideoa"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "Aurrebista"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "Berriro deitu"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "_Bideoa"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "Itzali bideoa"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "Piztu bideoa"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "Bideoaren aurrebista"
+
+#: ../src/empathy-map-view.c:448
 msgid "Contact Map View"
 msgstr "Kontaktuen maparen ikuspegia"
 
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
 msgid "Save"
 msgstr "Gorde"
 
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
 msgstr "Arazketa-leihoa"
 
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
 msgstr "Pausatu"
 
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
 msgstr "Maila: "
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
 msgid "Debug"
 msgstr "Arazketa"
 
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
 msgid "Info"
 msgstr "Informazioa"
 
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
 msgid "Message"
 msgstr "Mezua"
 
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
 msgid "Warning"
 msgstr "Abisua"
 
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
 msgid "Critical"
 msgstr "Kritikoa"
 
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
 msgid "Error"
 msgstr "Errorea"
 
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
 msgid "Time"
 msgstr "Ordua"
 
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
 msgid "Domain"
 msgstr "Domeinua"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
 msgstr "Kategoria"
 
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "Maila"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
-msgstr "Hautatutako konexio-kudeatzaileak ez du urruneko arazketa-hedapenik onartzen."
+msgstr ""
+"Hautatutako konexio-kudeatzaileak ez du urruneko arazketa-hedapenik onartzen."
 
-#: ../src/empathy-invite-participant-dialog.c:34
-#: ../src/empathy-invite-participant-dialog.c:48
+#: ../src/empathy-invite-participant-dialog.c:179
+#: ../src/empathy-invite-participant-dialog.c:205
 msgid "Invite Participant"
 msgstr "Gonbidatu partaidea"
 
-#: ../src/empathy-invite-participant-dialog.c:35
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Aukeratu kontaktua solasaldira gonbidatzeko:"
 
-#: ../src/empathy-invite-participant-dialog.c:45
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "Gonbidatu"
 
@@ -4025,14 +4613,16 @@ msgstr ""
 "inportatzea) eta irten"
 
 #: ../src/empathy-accounts.c:187
-msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "Ez bistaratu inolako elkarrizketa-koadrorik \"Inguruko jendea\" kontuak "
 "soilik egon arte"
 
 #: ../src/empathy-accounts.c:191
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr "Hasieran hautatu emandako kontua (adib. gabble/jabber/foo_40adibidea_2eorg0)"
+msgstr ""
+"Hasieran hautatu emandako kontua (adib. gabble/jabber/foo_40adibidea_2eorg0)"
 
 #: ../src/empathy-accounts.c:193
 msgid "<account-id>"
@@ -4046,7 +4636,15 @@ msgstr "- Empathy kontuak"
 msgid "Empathy Accounts"
 msgstr "Empathy kontuak"
 
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr "Erakutsi zerbitzu berezi bat"
+
+#: ../src/empathy-debugger.c:75
+msgid "- Empathy Debugger"
+msgstr "- Empathy araztailea"
+
+#: ../src/empathy-debugger.c:114
 msgid "Empathy Debugger"
 msgstr "Empathy araztailea"
 
@@ -4054,35 +4652,107 @@ msgstr "Empathy araztailea"
 msgid "- Empathy Chat Client"
 msgstr "- Empathy berriketarako bezeroa"
 
-#: ../src/empathy-notifications-approver.c:184
+#: ../src/empathy-notifications-approver.c:203
 msgid "Respond"
 msgstr "Erantzun"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1459
 msgid "Reject"
 msgstr "Baztertu"
 
-#: ../src/empathy-notifications-approver.c:194
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1460
 msgid "Answer"
 msgstr "Erantzun"
 
-#: ../src/empathy-notifications-approver.c:201
-#: ../src/empathy-notifications-approver.c:211
+#: ../src/empathy-notifications-approver.c:227
+msgid "Answer with video"
+msgstr "Erantzun bideoarekin"
+
+#: ../src/empathy-notifications-approver.c:235
+#: ../src/empathy-notifications-approver.c:245
 msgid "Decline"
 msgstr "Ukatu"
 
-#: ../src/empathy-notifications-approver.c:205
-#: ../src/empathy-notifications-approver.c:216
+#: ../src/empathy-notifications-approver.c:239
+#: ../src/empathy-notifications-approver.c:250
 msgid "Accept"
 msgstr "Onartu"
 
-#: ../src/empathy-call-observer.c:130
-#, c-format
-msgid "Missed call from %s"
-msgstr "Galdutako deia %s(e)ndik"
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:260
+msgid "Provide"
+msgstr "Eman"
 
-#: ../src/empathy-call-observer.c:133
+#: ../src/empathy-call-observer.c:134
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s(e)k zuri deitzen saiatu da, baina beste dei batean zeunden."
 
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+msgid "i"
+msgstr "i"
+
+#: ../src/empathy-call-window.c:2775
+msgid "On hold"
+msgstr "Itxaron"
+
+#: ../src/empathy-call-window.c:2778
+msgid "Mute"
+msgstr "Mututu"
+
+#: ../src/empathy-call-window.c:2780
+msgid "Duration"
+msgstr "Iraupena"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2783
+#, c-format
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02dm"
+
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "_Maiuskula/minuskula"
+
+#~ msgid "All"
+#~ msgstr "Denak"
+
+#~ msgid "_Enabled"
+#~ msgstr "_Gaituta"
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ msgid "Conversations"
+#~ msgstr "Solasaldiak"
+
+#~ msgid "Find Next"
+#~ msgstr "Bilatu hurrengoa"
+
+#~ msgid "Find Previous"
+#~ msgstr "Bilatu aurrekoa"
+
+#~ msgid "Previous Conversations"
+#~ msgstr "Aurreko solasaldiak"
+
+#~ msgid "_For:"
+#~ msgstr "_Honentzako:"
+
+#~ msgid "Enter Custom Message"
+#~ msgstr "Sartu mezu pertsonalizatua"
+
+#~ msgid "Save _New Status Message"
+#~ msgstr "Gorde _Egoera berriaren mezua"
+
+#~ msgid "Saved Status Messages"
+#~ msgstr "Gordetako egoeren mezuak"
+
+#~ msgid "Show and edit accounts"
+#~ msgstr "Erakutsi eta editatu kontuak"
diff --git a/po/fa.po b/po/fa.po
index 8625a0542..6ea81094c 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy 2.28.1.1\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-08-10 11:03+0000\n"
-"PO-Revision-Date: 2011-08-13 02:35+0330\n"
+"POT-Creation-Date: 2011-09-06 05:37+0000\n"
+"PO-Revision-Date: 2011-09-06 12:17+0330\n"
 "Last-Translator: Arash Mousavi <mousavi.arash@gmail.com>\n"
 "Language-Team: Persian <translate@ifsug.org>\n"
 "MIME-Version: 1.0\n"
@@ -50,378 +50,400 @@ msgid "Call volume, as a percentage."
 msgstr "بلندی صدای تماس، بر اساس درصد"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#| msgid "Camera On"
+msgid "Camera device"
+msgstr "دوربین"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#| msgid "Camera On"
+msgid "Camera position"
+msgstr "محل دوربین"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid "Character to add after nickname when using nick completion (tab) in group chat."
 msgstr "نویسه‌ای که هنگام کامل کردن اسم (با کلید جهش) در گپ گروهی، بعد از نام مستعار اضا�ه می‌شود."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "تم پنجره‌ی گپ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-#| msgid "Chat window theme"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Chat window theme variant"
 msgstr "گزینه‌های تم پنجره‌ی گپ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr "�هرست زبان‌ها جهت غلط‌یابی املایی، جدا شده با ویرگول (مثال: «en, fr, nl»)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "�هرست �شرده‌ی آشناها"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "از مدیرهای اتصال باید است�اده شود"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "معیارهای مرتب‌سازی �هرست آشناها"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "دستگاه دوربین پیش‌�رض جهت است�اده در تماس‌های ویدئویی، مثال dev/video0/."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
 msgstr "شاخه‌ی پیش‌�رض برای انتخاب تصویر آواتار از آن"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr "در حالت «غایب»، اطلاعیه‌های واشو از کار بیا�تند"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr "در حالت «غایب»، صداها از کار بیا�تند"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
 msgstr "رویدادهای ورودی در منطقه‌ی وضعیت نمایش داده شوند"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Display incoming events in the status area. If false, present them to the user immediately."
 msgstr "رویدادهای ورودی در منطقه‌ی وضعیت نمایش داده شوند. اگر نادرست باشد، مستقیما به کاربر نمایش داده شوند."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+msgid "Echo cancellation support"
+msgstr "پشتیبانی از لغو پژواک صدا"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr "امپاتی می‌تواند مکان کاربر را منتشر کند"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "امپاتی می‌تواند از مکان‌یاب جغرا�یایی (جی‌پی‌اس) است�اده کند تا مکان کاربر را حدس بزند"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "امپاتی می‌تواند از شبکه‌ی سلولی برای حدس مکان است�اده کند"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr "امپاتی می‌تواند از شبکه برای حدس مکان است�اده کند"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr "پوشه‌ی پیش‌�رض بارگیری امپاتی"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
 msgstr "امپاتی ثبت وقایع پروانه‌ای (butterfly) را منتقل کرده است"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr "امپاتی در صورت بی‌کار بودن کاربر، خودکار به حالت «غایب» برود"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "امپاتی در زمان راه‌اندازی به طور خودکار متصل شود"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "امپاتی دقت مکان را کاهش دهد"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "امپاتی از آواتار برای شمایل پنجره‌ی گپ است�اده کند"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr "�عال‌سازی ابزارهای توسعه‌ی WebKit"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "�عال‌سازی اطلاعیه‌های واشو برای پیام‌های جدید"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "به کار انداختن غلط‌یابی املایی"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "مخ�ی کردن پنجره‌ی اصلی"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "مخ�ی کردن پنجره‌ی اصلی."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "نویسه‌ی کامل شده لقب"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "گپ‌های جدید در پنجره‌ی مجزا باز شود"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "مسیر تم Adium برای است�اده"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "مسیر تم Adium برای است�اده چناچه تم مورد است�اده برای گپ Adium باشد."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "هنگام دریا�ت پیام، صدایی پخش شود"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "برای مکالمه‌های جدید صدایی پخش شود"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "برای پیام‌های خروجی صدایی پخش شود"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "وقتی آشنایی وارد می‌شود صدایی پخش شود"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "وقتی کاربری خارج می‌شود صدایی پخش شود"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "وقتی وارد می‌شویم صدایی پخش شود"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "وقتی خارج می‌شویم صدایی پخش شود"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "در صورتیکه پنجره‌ی گپ در مرکز توجه نیست، اطلاعیه‌های واشو انجام شود"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "وقتی آشنایی وارد می‌شود، اطلاعیه‌های واشو انجام شود"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "وقتی آشنایی خارج می‌شود، اطلاعیه‌های واشو انجام شود"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-#| msgid "Show offline contacts"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr "موقعیتی که پیش‌نمایش دوربین باید در حین تماس آنجا باشد."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Show Balance in contact list"
 msgstr "نمایش اعتبار در �هرست آشناها"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "نشان دادن آواتارها"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "نمایش �هرست ا�راد در اتاق‌ها"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr "هنگام بستن پنجره، راهنمایی نشان داده شود"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr "نمایش آشنا‌های برون‌خط"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
 msgstr "نشان دادن پروتکل‌ها"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "زبان‌ها برای غلط‌یابی املایی"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr "پوشه‌ی پیش‌�رض برای ذخیره‌ی پرونده‌های انتقالی."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
 msgstr "آخرین شاخه‌ای که یک آواتار از آن انتخاب شده بود."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
 msgstr "مکان قاب کناری پنجره‌ی گپ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "مکان ذخیره شده‌ی (به نقطه) قاب کناری پنجره‌ی گپ."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "تمی که برای نشان دادن گ�تگو در پنجره‌ی چت است�اده می‌شود."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-#| msgid "The theme that is used to display the conversation in chat windows."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "The theme variant that is used to display the conversation in chat windows."
 msgstr "گزینه تمی که برای نمایش گ�تگو پنجره گپ است�اده می‌شود."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "است�اده از صورتک‌های گرا�یکی"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "به کار انداختن صداهای اخطارها"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "است�اده از تم برای اتاق‌های گپ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "این‌که امپاتی اجازه داشته باشد، مکان کاربر را برای آشنایان منتشر کنند یا خیر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "این‌که امپاتی اجازه داشته باشد، از مکان‌یاب جغرا�یایی (جی‌پی‌اس) برای حدس مکان است�اده کند یا خیر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "این‌که امپاتی اجازه داشته باشد، از شبکه‌ی سلولی برای حدس مکان است�اده کند یا خیر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "این‌که امپاتی اجازه داشته باشد، از شبکه برای حدس مکان است�اده کند یا خیر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "این‌که امپاتی وقایع پروانه‌ای را منتقل کرده است یا خیر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "این‌که امپاتی در هنگام راه‌اندازی، خودکار به حساب شما وارد شود یا خیر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr "این‌که امپاتی در صورت بی‌کار بودن کاربر، خودکار به حالت «غایب» برود یا خیر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "این‌که امپاتی دقت مکان را به دلیل حریم خصوصی کاهش دهد یا خیر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "این‌که امپاتی از آواتار آشنا برای شمایل پنجره‌ی گپ است�اده کند یا خیر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "این‌که ابزارهای توسعه‌ی WebKit، مانند Web Inspector، باید به کار بیا�تد یا خیر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
 msgstr "این‌که مدیر‌های اتصال برای قطع کردن�/اتصال مجدد� خودکار است�اده شود یا خیر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid "Whether to check words typed against the languages you want to check with."
 msgstr "این‌که کلماتی که تایپ می‌کنید براساس زبان‌هایی که می‌خواهید بررسی شود، یا خیر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "این‌که در گ�تگوها، صورتک‌ها تبدیل به تصویر گرا�یکی شوند یا خیر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "اینکه آیا �یلتر لغو پژواک صدای Pulseaudio �عال شود یا خیر."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "این‌که برای اطلاع دادن از ورود آشناها به شبکه، صدایی پخش شود یا خیر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "این‌که برای اطلاع دادن از خروج آشناها از شبکه، صدای پخش شود یا خیر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "این که برای اطلاع رویدادها صدایی پخش بشود یا خیر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "این‌که برای اطلاع از پیام‌های ورودی صدایی پخش شود یا خیر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "این‌که برای اطلاع از گ�تگوهای جدید صدایی پخش شود یا خیر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "این‌که برای اطلاع از پیام‌های خروجی صدایی پخش شود یا خیر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "این‌که هنگام ورود به شبکه صدایی پخش شود یا خیر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "این‌که هنگام خروج از شبکه صدایی پخش شود یا خیر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr "این‌که هنگام تغییر حالت به «مشغول» یا «غایب» صدایی پخش شود یا خیر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "این‌که وقتی آشنایی برون‌خط می‌شود، یک اطلاعیه‌ی واشو نمایش داده شود یا خیر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "این‌که وقتی آشنایی برخط می‌شود، یک اطلاعیه‌ی واشو نمایش داده شود یا خیر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
 msgstr "این‌که هنگام دریا�ت پیام جدید، یک اطلاعیه‌ی واشو نمایش داده شود، حتی اگر پنجره‌ی گپ پیشاپیش باز شده باشد، ولی در مرکز توجه نباشد، یا خیر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "این‌که هنگام دریا�ت یک پیام جدید، یک اطلاعیه‌ی واشو نمایش داده شود یا خیر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-#| msgid "Whether to show protocols for contacts in the contact list."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show account balances in the contact list."
 msgstr "این‌که در �هرست آشناها، اعتبار حساب‌ها نمایش داده شود یا خیر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "این‌که آواتار برای آشناها در �هرست آشنایان و پنجره‌ی گپ نشان داده شوند یا خیر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "این‌که آشناهایی که برون‌خط هستند در �هرست آشناها دیده شوند یا خیر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
 msgstr "این‌که در حالت «غایب» یا «مشغول»، اطلاعیه‌های واشو نمایش داده شوند یا خیر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "این‌که در �هرست آشناها، پروتکل‌های مورد است�اده برای آشناها هم دیده شوند یا خیر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr "این‌که �هرست آشناها در اتاق‌های گپ دیده شود یا خیر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "این‌که �هرست آشنا‌ها در حالت �شرده نمایش داده شود یا خیر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
 msgstr "این‌که در صورت بستن برنامه توسط دکمه‌ی «x»، محاوره‌ی پیام در این مورد نشان داده شود یا خیر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "این که از تم برای اتاق‌های گپ است�اده شود یا خیر."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid "Which criterion to use when sorting the contact list. Default is to sort by the contact's name with the value \"name\". A value of \"state\" will sort the contact list by state."
 msgstr "کدام معیار برای مرتب کردن �هرست آشناها است�اده شود. پیش �رض بر روی مرتب کردن بر اساس نام آشنا با مقدار «name». یک مقدار «state» بر اساس حالت مرتب می‌کند."
 
@@ -439,34 +461,32 @@ msgstr "حساب‌های پیام‌رسانی و VoIP"
 msgid "File transfer completed, but the file was corrupted"
 msgstr "انتقال پرونده کامل شد، اما پرونده خراب بود"
 
-#: ../libempathy/empathy-ft-handler.c:1113
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
 msgstr "انتقال پرونده توسط آشنای دوردست پشتیبانی نمی‌شود"
 
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is not a regular file"
 msgstr "پرونده‌ی انتخاب شده، پرونده‌ی عادی‌ای نیست"
 
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1176
 msgid "The selected file is empty"
 msgstr "پرونده‌ی انتخاب شده خالی است"
 
-#: ../libempathy/empathy-message.c:413
-#: ../src/empathy-call-observer.c:132
+#: ../libempathy/empathy-message.c:415
+#: ../src/empathy-call-observer.c:131
 #, c-format
 msgid "Missed call from %s"
 msgstr "تماس از دست ر�ته از %s"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:417
+#: ../libempathy/empathy-message.c:419
 #, c-format
-#| msgid "Call with %s"
 msgid "Called %s"
 msgstr "تماس به %s"
 
-#: ../libempathy/empathy-message.c:420
+#: ../libempathy/empathy-message.c:422
 #, c-format
-#| msgid "Missed call from %s"
 msgid "Call from %s"
 msgstr "تماس از %s"
 
@@ -499,166 +519,166 @@ msgid "The other participant is unable to transfer the file"
 msgstr "مشترک طر� دیگر نمی‌تواند پرونده را منتقل کند"
 
 #: ../libempathy/empathy-tp-file.c:405
-#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:302
 msgid "Unknown reason"
 msgstr "دلیل ناشناخته"
 
-#: ../libempathy/empathy-utils.c:212
+#: ../libempathy/empathy-utils.c:222
 msgid "Available"
 msgstr "در دسترس"
 
-#: ../libempathy/empathy-utils.c:214
+#: ../libempathy/empathy-utils.c:224
 msgid "Busy"
 msgstr "مشغول"
 
-#: ../libempathy/empathy-utils.c:217
+#: ../libempathy/empathy-utils.c:227
 msgid "Away"
 msgstr "غایب"
 
-#: ../libempathy/empathy-utils.c:219
+#: ../libempathy/empathy-utils.c:229
 msgid "Invisible"
 msgstr "مخ�ی"
 
-#: ../libempathy/empathy-utils.c:221
+#: ../libempathy/empathy-utils.c:231
 msgid "Offline"
 msgstr "برون‌خط"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:224
+#: ../libempathy/empathy-utils.c:234
 msgctxt "presence"
 msgid "Unknown"
 msgstr "ناشناخته"
 
-#: ../libempathy/empathy-utils.c:264
+#: ../libempathy/empathy-utils.c:274
 msgid "No reason specified"
 msgstr "هیچ دلیلی مشخص نشده است"
 
-#: ../libempathy/empathy-utils.c:266
-#: ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:276
+#: ../libempathy/empathy-utils.c:332
 msgid "Status is set to offline"
 msgstr "وضعیت روی برون‌خط تنظیم شده است"
 
-#: ../libempathy/empathy-utils.c:268
-#: ../libempathy/empathy-utils.c:302
-#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy/empathy-utils.c:278
+#: ../libempathy/empathy-utils.c:312
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "خطای شبکه"
 
-#: ../libempathy/empathy-utils.c:270
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:280
+#: ../libempathy/empathy-utils.c:314
 msgid "Authentication failed"
 msgstr "تأیید هویت شکست خورد"
 
-#: ../libempathy/empathy-utils.c:272
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:282
+#: ../libempathy/empathy-utils.c:316
 msgid "Encryption error"
 msgstr "خطای رمزنگاری"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:284
 msgid "Name in use"
 msgstr "نام است�اده شده"
 
-#: ../libempathy/empathy-utils.c:276
-#: ../libempathy/empathy-utils.c:308
+#: ../libempathy/empathy-utils.c:286
+#: ../libempathy/empathy-utils.c:318
 msgid "Certificate not provided"
 msgstr "گواهی �راهم نشده است"
 
-#: ../libempathy/empathy-utils.c:278
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:320
 msgid "Certificate untrusted"
 msgstr "گواهی غیر قابل اعتماد"
 
-#: ../libempathy/empathy-utils.c:280
-#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:290
+#: ../libempathy/empathy-utils.c:322
 msgid "Certificate expired"
 msgstr "گواهی منقضی شده است"
 
-#: ../libempathy/empathy-utils.c:282
-#: ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:324
 msgid "Certificate not activated"
 msgstr "گواهی �عال نشده است"
 
-#: ../libempathy/empathy-utils.c:284
-#: ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:326
 msgid "Certificate hostname mismatch"
 msgstr "عدم تطابق گواهی در نام میزبان"
 
-#: ../libempathy/empathy-utils.c:286
-#: ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:296
+#: ../libempathy/empathy-utils.c:328
 msgid "Certificate fingerprint mismatch"
 msgstr "عدم تطابق گواهی در اثر انگشت"
 
-#: ../libempathy/empathy-utils.c:288
-#: ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:298
+#: ../libempathy/empathy-utils.c:330
 msgid "Certificate self-signed"
 msgstr "گواهی خود امضا شده"
 
-#: ../libempathy/empathy-utils.c:290
+#: ../libempathy/empathy-utils.c:300
 msgid "Certificate error"
 msgstr "خطای گواهی"
 
-#: ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:334
 msgid "Encryption is not available"
 msgstr "رمزنگاری در دسترس نیست"
 
-#: ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:336
 msgid "Certificate is invalid"
 msgstr "گواهی نامعتبر است"
 
-#: ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:338
 msgid "Connection has been refused"
 msgstr "اتصال رد شده است"
 
-#: ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:340
 msgid "Connection can't be established"
 msgstr "اتصال برقرار نمی‌شود"
 
-#: ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:342
 msgid "Connection has been lost"
 msgstr "اتصال از دست ر�ت"
 
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:344
 msgid "This resource is already connected to the server"
 msgstr "این منبع پیشاپیش به کارگزار متصل شده است"
 
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:346
 msgid "Connection has been replaced by a new connection using the same resource"
 msgstr "اتصال با یک اتصال جدید با است�اده از همان منبع، جایگزین شده است"
 
-#: ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:349
 msgid "The account already exists on the server"
 msgstr "حساب پیشاپیش بر روی کارگزار وجود دارد"
 
-#: ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:351
 msgid "Server is currently too busy to handle the connection"
 msgstr "کارگزار �علا خیلی مشغول است و نمی‌تواند اتصال را برقرار کند"
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:353
 msgid "Certificate has been revoked"
 msgstr "گواهی لغو شده است"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:355
 msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "گواهی از یک الگوریتم رمز نا‌امن است�اده می‌کند یا از نظر رمزنگاری ضعی� است"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:358
 msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
 msgstr "طول گواهی کارگزار، یا عمق زنجیر گواهی کارگزار از حد محدود شده توسط کتابخانه cryptography رد می‌شود"
 
-#: ../libempathy/empathy-utils.c:509
+#: ../libempathy/empathy-utils.c:519
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "ا�راد دور و بر"
 
-#: ../libempathy/empathy-utils.c:514
+#: ../libempathy/empathy-utils.c:524
 msgid "Yahoo! Japan"
 msgstr " یاهو! ژاپن"
 
-#: ../libempathy/empathy-utils.c:543
+#: ../libempathy/empathy-utils.c:553
 msgid "Google Talk"
 msgstr "گوگل تاک"
 
-#: ../libempathy/empathy-utils.c:544
+#: ../libempathy/empathy-utils.c:554
 msgid "Facebook Chat"
 msgstr "گپ �یس‌بوک"
 
@@ -709,71 +729,83 @@ msgid "in the future"
 msgstr "در آینده"
 
 #: ../libempathy-gtk/empathy-account-chooser.c:539
-#| msgid "_Accounts"
 msgid "All accounts"
 msgstr "تمام حساب‌ها"
 
-#: ../libempathy-gtk/empathy-account-widget.c:693
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "حساب"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "گذرواژه"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "کارگزار"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "درگاه"
 
-#: ../libempathy-gtk/empathy-account-widget.c:768
-#: ../libempathy-gtk/empathy-account-widget.c:825
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1166
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+#| msgid "Launch My Web Accounts"
+msgid "My Web Accounts"
+msgstr "حساب‌های وب من"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "حساب %s از طریق� «حسابهای وب من» ویرایش شده است."
+#| msgid "The account %s is edited via My Web Accounts."
+msgid "The account %s is edited via %s."
+msgstr "حساب %s از طریق� %s ویرایش شد."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1172
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "حساب %s از طریق امپاتی قابل ویرایش نیست."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
 msgstr "اجرای حساب‌های وب من"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1532
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+#| msgid "_Edit"
+msgid "Edit %s"
+msgstr "ویرایش %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "نام کاربری:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1850
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "_اعمال"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1880
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
 msgstr "_ورود به سیستم"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1954
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "این حساب از قبل بر روی کارگزار وجود دارد"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1957
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "ایجاد یک حساب جدید بر روی کارگزار"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2149
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "_لغو"
 
@@ -782,19 +814,19 @@ msgstr "_لغو"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2427
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s در %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2453
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "حساب %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2457
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "حساب جدید"
 
@@ -916,36 +948,36 @@ msgstr "نام کاربری (UIN) شما در ICQ چیست؟"
 msgid "What is your ICQ password?"
 msgstr "گذرواژه‌ی ICQ شما چیست؟"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:184
-#: ../libempathy-gtk/empathy-account-widget-sip.c:217
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "خودکار"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:187
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:193
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:222
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "Register"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:227
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "Options"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "هیچ‌کدام"
 
@@ -1170,14 +1202,18 @@ msgid "Transport:"
 msgstr "انتقال:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "از این حساب برای تماس‌های _خطوط زمینی و تل�ن‌های همراه است�اده کن"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "گذرواژه‌ی حساب SIP شما چیست؟"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "شناسه‌ی ورود SIP شما چیست؟"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "نام _کاربری:"
 
@@ -1201,36 +1237,37 @@ msgstr "_شناسه‌ی یاهو!:"
 msgid "_Room List locale:"
 msgstr "کدبومی _�هرست اتاق:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:474
-#: ../libempathy-gtk/empathy-avatar-chooser.c:559
+#: ../libempathy-gtk/empathy-avatar-chooser.c:470
+#: ../libempathy-gtk/empathy-avatar-chooser.c:555
 msgid "Couldn't convert image"
 msgstr "تصویر تبدیل نشد"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:475
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
 msgid "None of the accepted image formats are supported on your system"
 msgstr "هیچ‌کدام از قالب‌های تصویر پذیر�ته در سیستم شما پشتیبانی نمی‌شوند"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:822
-msgid "Couldn't save pixbuf to png"
-msgstr "نمی‌توان pixbuf را به png ذخیره کرد"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:818
+#| msgid "Couldn't save pixbuf to png"
+msgid "Couldn't save picture to file"
+msgstr "نمی‌توان تصویر را در پرونده ذخیره کرد"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:934
 msgid "Select Your Avatar Image"
 msgstr "آواتار خود را انتخاب کنید"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:942
+#: ../libempathy-gtk/empathy-avatar-chooser.c:938
 msgid "Take a picture..."
 msgstr "یک عکس بگیرید..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:945
+#: ../libempathy-gtk/empathy-avatar-chooser.c:941
 msgid "No Image"
 msgstr "بدون تصویر"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
 msgid "Images"
 msgstr "تصویرها"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1009
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
 msgid "All Files"
 msgstr "همه‌ی پرونده‌ها"
 
@@ -1238,28 +1275,24 @@ msgstr "همه‌ی پرونده‌ها"
 msgid "Click to enlarge"
 msgstr "برای بزرگ کردن کلیک کنید"
 
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:58
-#| msgid "There was an error while creating the account."
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "خطایی در هنگام شروع تماس بود"
 
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact doesn't support calls"
 msgstr "آشنای مشخص شده از تماس پشتیبانی نمی‌کند"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
-#| msgid "The selected contact is offline."
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is offline"
 msgstr "آشنای انتخاب شده برون‌خط است"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
-#| msgid "The selected contact is offline."
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "The specified contact is not valid"
 msgstr "آشنای انتخاب شده صحیح نیست"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
-#| msgid "Topic not supported on this conversation"
+#: ../libempathy-gtk/empathy-call-utils.c:57
 msgid "Emergency calls are not supported on this protocol"
 msgstr "تماس‌های اضطراری بر روی این پروتکل پشتیبانی نمی‌شوند"
 
@@ -1277,7 +1310,6 @@ msgstr "شما اجازه‌ی تغییرسر�صل را ندارید"
 
 #: ../libempathy-gtk/empathy-chat.c:973
 #, c-format
-#| msgid "invalid contact"
 msgid "“%s� is not a valid contact ID"
 msgstr "شناسه آشنای «%s» صحیح نیست"
 
@@ -1345,7 +1377,6 @@ msgstr "دستور ناشناخته؛ help/ را برای دیدن دستورهØ
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
 #: ../libempathy-gtk/empathy-chat.c:1412
-#| msgid "Insufficient free space to save file"
 msgid "insufficient balance to send message"
 msgstr "مانده اعتبار برای ارسای پیام کا�ی نیست"
 
@@ -1388,7 +1419,7 @@ msgid "Error sending message: %s"
 msgstr "خطا در �رستان پیام: %s"
 
 #: ../libempathy-gtk/empathy-chat.c:1508
-#: ../src/empathy-chat-window.c:760
+#: ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "سر�صل:"
 
@@ -1424,7 +1455,7 @@ msgstr "درج صورتک"
 
 #. send button
 #: ../libempathy-gtk/empathy-chat.c:2224
-#: ../libempathy-gtk/empathy-ui-utils.c:1757
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "_ارسال"
 
@@ -1495,8 +1526,8 @@ msgstr "�رد %s اکنون با %s شناخته می‌شود"
 
 #: ../libempathy-gtk/empathy-chat.c:2727
 #: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1241
-#: ../src/empathy-call-window.c:1704
+#: ../src/empathy-event-manager.c:1240
+#: ../src/empathy-call-window.c:2355
 msgid "Disconnected"
 msgstr "قطع شد"
 
@@ -1531,7 +1562,7 @@ msgid "Join"
 msgstr "پیوستن"
 
 #: ../libempathy-gtk/empathy-chat.c:3797
-#: ../src/empathy-event-manager.c:1262
+#: ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "متصل شد"
 
@@ -1543,7 +1574,6 @@ msgstr "گ�تگو"
 #. * "Escher Cat (SMS)"
 #: ../libempathy-gtk/empathy-chat.c:3857
 #, c-format
-#| msgid "%s (%s)"
 msgid "%s (SMS)"
 msgstr "%s (اس‌ام‌اس)"
 
@@ -1567,15 +1597,15 @@ msgstr "مجوز رد شد"
 msgid "Could not block contact"
 msgstr "نمی‌توان آشنا را مسدود کرد"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:772
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
 msgid "Edit Blocked Contacts"
 msgstr "ویرایش آشناهای مسدود شده"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:521
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1495
+#: ../libempathy-gtk/empathy-individual-widget.c:1485
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
@@ -1583,19 +1613,25 @@ msgid "Account:"
 msgstr "حساب:"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
-#| msgid "_Blocked Contacts"
 msgid "Blocked Contacts"
 msgstr "آشناهای مسدود شده"
 
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "حذ�"
+
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:1417
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_رونوشت از نشانی پیوند"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:1424
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_باز کردن پیوند"
 
@@ -1626,18 +1662,18 @@ msgid "Block %s?"
 msgstr "مسدود کردن %s؟"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "آیا مطمئنید که می‌خواهید «%s» را از برقراری دوباره ارتباط با خود مسدود کنید؟"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:274
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
 msgid "_Block"
 msgstr "_مسدود کردن"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:283
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_گزارش این آشنا به عنوان سوء است�اده‌گر"
@@ -1663,38 +1699,38 @@ msgstr "گروه‌بندی لغو شد"
 msgid "Favorite People"
 msgstr "ا�راد موردپسند"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1983
-#: ../libempathy-gtk/empathy-individual-view.c:2375
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "جدا می‌خواهید گروه «%s» را حذ� کنید؟"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1985
-#: ../libempathy-gtk/empathy-individual-view.c:2378
+#: ../libempathy-gtk/empathy-contact-list-view.c:1988
+#: ../libempathy-gtk/empathy-individual-view.c:2379
 msgid "Removing group"
 msgstr "در حال حذ� گروه"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2034
-#: ../libempathy-gtk/empathy-contact-list-view.c:2111
-#: ../libempathy-gtk/empathy-individual-view.c:2433
-#: ../libempathy-gtk/empathy-individual-view.c:2636
+#: ../libempathy-gtk/empathy-contact-list-view.c:2037
+#: ../libempathy-gtk/empathy-contact-list-view.c:2114
+#: ../libempathy-gtk/empathy-individual-view.c:2434
+#: ../libempathy-gtk/empathy-individual-view.c:2637
 msgid "_Remove"
 msgstr "_حذ�"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2064
-#: ../libempathy-gtk/empathy-individual-view.c:2500
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
+#: ../libempathy-gtk/empathy-individual-view.c:2501
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "جدا می‌خواهید آشنای «%s» را حذ� کنید؟"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2066
-#: ../libempathy-gtk/empathy-individual-view.c:2521
+#: ../libempathy-gtk/empathy-contact-list-view.c:2069
+#: ../libempathy-gtk/empathy-individual-view.c:2522
 msgid "Removing contact"
 msgstr "در حال حذ� آشنا"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "ا_�زودن آشنا..."
 
@@ -1703,48 +1739,48 @@ msgid "_Block Contact"
 msgstr "_مسدود کردن آشنا"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:548
-#: ../src/empathy-main-window.ui.h:16
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "_Ú¯Ù¾"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:639
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "تماس _صوتی"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:684
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "تماس _تصویری"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:737
-#: ../src/empathy-main-window.ui.h:27
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "گ�تگوی _پیشین"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:778
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "ارسال پرونده"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:820
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
 msgstr "میزکارم به اشتراک گذاشته شود"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1890
-#: ../libempathy-gtk/empathy-individual-menu.c:855
-#: ../libempathy-gtk/empathy-individual-widget.c:1386
+#: ../libempathy-gtk/empathy-contact-widget.c:1886
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:1373
 msgid "Favorite"
 msgstr "علاقه‌مندی‌ها"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:883
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "_اطلاعات"
 
@@ -1754,33 +1790,41 @@ msgid "_Edit"
 msgstr "_ویرایش"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1070
-#: ../src/empathy-chat-window.c:1010
+#: ../libempathy-gtk/empathy-individual-menu.c:1283
+#: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "در حال دعوت شما به این اتاق"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1116
+#: ../libempathy-gtk/empathy-individual-menu.c:1329
 msgid "_Invite to Chat Room"
 msgstr "_دعوت به اتاق گپ"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:514
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
 msgid "Search contacts"
 msgstr "جستجو آشناها"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:544
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
 msgid "Search: "
 msgstr "جستجو: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:602
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
 msgid "_Add Contact"
 msgstr "ا_�زودن آشنا"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:620
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
 msgid "No contacts found"
 msgstr "هیچ آشنایی پیدا نشد"
 
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr "پیام شما برای معر�ی خودتان:"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
+msgstr "لط�ا اجازه بدهید بدانم چه زمانی برخط هستید. تشکر!"
+
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "آشنایی انتخاب کنید"
@@ -1815,12 +1859,10 @@ msgstr "روز تولد:"
 #. * with their IM client.
 #.
 #: ../libempathy-gtk/empathy-contact-widget.c:346
-#| msgid "_Last Name:"
 msgid "Last seen:"
 msgstr "آخرین حضور:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:348
-#| msgid "Connected"
 msgid "Connected from:"
 msgstr "متصل شد از:"
 
@@ -1828,162 +1870,160 @@ msgstr "متصل شد از:"
 #. * and should bin this.
 #.
 #: ../libempathy-gtk/empathy-contact-widget.c:353
-#| msgid "Quit message:"
 msgid "Away message:"
 msgstr "پیغام ترک:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:606
-#| msgid "Ca_ncel"
 msgid "Channels:"
 msgstr "کانال‌ها:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
 msgstr "کد ISO کشور:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Country:"
 msgstr "کشور:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "State:"
 msgstr "ایالت:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "City:"
 msgstr "شهر:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Area:"
 msgstr "منطقه:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
 msgstr "کد پستی:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Street:"
 msgstr "خیابان:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
 msgstr "ساختمان:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Floor:"
 msgstr "طبقه:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Room:"
 msgstr "اتاق:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Text:"
 msgstr "متن:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:517
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Description:"
 msgstr "توضیحات:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:519
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
 msgstr "نشانی اینترنتی:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:521
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
 msgstr "سطح دقت:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:523
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr "خطا:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
 msgstr "خطای عمودی (متر):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:527
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
 msgstr "خطای ا�قی (متر):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:529
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr "سرعت:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:531
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Bearing:"
 msgstr "جهت:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:533
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
 msgstr "سرعت بالا ر�تن:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:535
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
 msgstr "آخرین به‌روزرسانی در:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:537
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
 msgstr "طول جغرا�یایی:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:945
-#: ../libempathy-gtk/empathy-individual-widget.c:539
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
 msgstr "عرض جغرا�یایی:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:947
-#: ../libempathy-gtk/empathy-individual-widget.c:541
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
 msgstr "بلندی:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1000
-#: ../libempathy-gtk/empathy-contact-widget.c:1015
-#: ../libempathy-gtk/empathy-individual-widget.c:629
-#: ../libempathy-gtk/empathy-individual-widget.c:644
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
 #: ../src/empathy-preferences.ui.h:16
 msgid "Location"
 msgstr "مکان"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1017
-#: ../libempathy-gtk/empathy-individual-widget.c:646
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
 #, c-format
 msgid "%s, %s"
 msgstr "%s، %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1069
-#: ../libempathy-gtk/empathy-individual-widget.c:695
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
 msgstr "%Od %B، سال %Oy در %OH:%OM UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1151
-#: ../libempathy-gtk/empathy-individual-widget.c:931
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
 msgid "Save Avatar"
 msgstr "ذخیره‌ی آواتار"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1207
-#: ../libempathy-gtk/empathy-individual-widget.c:989
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
 msgid "Unable to save avatar"
 msgstr "ذخیره‌ی آواتار ممکن نیست"
 
@@ -1993,7 +2033,7 @@ msgstr "<b>مکان</b> در (تاریخ)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1321
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr "نام مستعار:"
 
@@ -2013,7 +2053,7 @@ msgstr "جزئیات آشنا"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1525
+#: ../libempathy-gtk/empathy-individual-widget.c:1515
 msgid "Identifier:"
 msgstr "شناسه:"
 
@@ -2048,17 +2088,17 @@ msgid "Select"
 msgstr "انتخاب"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1835
+#: ../src/empathy-main-window.c:1807
 msgid "Group"
 msgstr "گروه"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:257
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "هویت مقابل مسدود خواهد شد:"
 msgstr[1] "هویت‌های مقابل مسدود خواهند شد:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:264
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "هویت مقابل را نمی‌توان مسدود کرد:"
@@ -2084,39 +2124,65 @@ msgstr "آشناهای انتخاب شده در �هرست سمت چپ با یک
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:138
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "یک حساب جهت است�اده برای برقراری ارتباط انتخاب کنید"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "تماس"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+#| msgid "Profile"
+msgid "Mobile"
+msgstr "تل�ن همراه"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "شغل"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "خانه"
+
 #. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:594
-#: ../libempathy-gtk/empathy-new-message-dialog.c:248
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
 msgid "_SMS"
 msgstr "_اس‌ام‌اس"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:931
+#: ../libempathy-gtk/empathy-individual-menu.c:1141
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_ویرایش"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:957
+#: ../libempathy-gtk/empathy-individual-menu.c:1167
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "_پیوند آشناها..."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2340
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 msgid "Delete and _Block"
 msgstr "حذ� و _مسدود کن"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2509
+#: ../libempathy-gtk/empathy-individual-view.c:2510
 #, c-format
 msgid "Do you really want to remove the linked contact '%s'? Note that this will remove all the contacts which make up this linked contact."
 msgstr "آیا واقعا می‌خواهید آشنای پیوند داده شده «%s» را حذ� کنید؟ دقت کنید که این کار باعث می‌شود تمام آشناهایی که به این آشنا پیوند داده شده‌اند حذ� شوند."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1672
+#: ../libempathy-gtk/empathy-individual-widget.c:1662
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2194,141 +2260,127 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "_لغو پیوند"
 
-#: ../libempathy-gtk/empathy-log-window.c:458
+#: ../libempathy-gtk/empathy-log-window.c:633
 msgid "History"
 msgstr "تاریخچه"
 
-#: ../libempathy-gtk/empathy-log-window.c:510
+#: ../libempathy-gtk/empathy-log-window.c:688
 msgid "Show"
 msgstr "نمایش"
 
-#: ../libempathy-gtk/empathy-log-window.c:532
+#: ../libempathy-gtk/empathy-log-window.c:710
 msgid "Search"
 msgstr "جستجو"
 
-#: ../libempathy-gtk/empathy-log-window.c:946
+#: ../libempathy-gtk/empathy-log-window.c:1158
 #, c-format
-#| msgid "Call with %s"
 msgid "Chat in %s"
 msgstr "گپ در %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:948
+#: ../libempathy-gtk/empathy-log-window.c:1160
 #, c-format
-#| msgid "Call with %s"
 msgid "Chat with %s"
 msgstr "گپ با %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:998
-#: ../libempathy-gtk/empathy-log-window.c:1176
-#| msgid "%A %B %d %Y"
+#: ../libempathy-gtk/empathy-log-window.c:1210
+#: ../libempathy-gtk/empathy-log-window.c:1357
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1118
+#: ../libempathy-gtk/empathy-log-window.c:1299
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1124
+#: ../libempathy-gtk/empathy-log-window.c:1305
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1195
-#: ../libempathy-gtk/empathy-log-window.c:1197
+#: ../libempathy-gtk/empathy-log-window.c:1376
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #: ../src/empathy-ft-manager.c:1026
 msgid "%"
 msgstr "Ùª"
 
-#: ../libempathy-gtk/empathy-log-window.c:1204
+#: ../libempathy-gtk/empathy-log-window.c:1385
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "تماس در %s گر�ته شد، در %s پایان یا�ت"
 
-#: ../libempathy-gtk/empathy-log-window.c:1536
+#: ../libempathy-gtk/empathy-log-window.c:1717
 msgid "Today"
 msgstr "امروز"
 
-#: ../libempathy-gtk/empathy-log-window.c:1540
-#| msgid "Western"
+#: ../libempathy-gtk/empathy-log-window.c:1721
 msgid "Yesterday"
 msgstr "دیروز"
 
-#: ../libempathy-gtk/empathy-log-window.c:1556
-#| msgid "%A %B %d %Y"
+#: ../libempathy-gtk/empathy-log-window.c:1737
 msgctxt "A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1637
-#: ../libempathy-gtk/empathy-log-window.c:3203
+#: ../libempathy-gtk/empathy-log-window.c:1818
+#: ../libempathy-gtk/empathy-log-window.c:3399
 msgid "Anytime"
 msgstr "هرزمانی"
 
-#: ../libempathy-gtk/empathy-log-window.c:1717
-#: ../libempathy-gtk/empathy-log-window.c:2154
-#| msgid "None"
+#: ../libempathy-gtk/empathy-log-window.c:1898
+#: ../libempathy-gtk/empathy-log-window.c:2328
 msgid "Anyone"
 msgstr "هرکسی"
 
-#: ../libempathy-gtk/empathy-log-window.c:2451
+#: ../libempathy-gtk/empathy-log-window.c:2640
 msgid "Who"
 msgstr "چه کسی"
 
-#: ../libempathy-gtk/empathy-log-window.c:2655
+#: ../libempathy-gtk/empathy-log-window.c:2844
 msgid "When"
 msgstr "چه زمانی"
 
-#: ../libempathy-gtk/empathy-log-window.c:2771
+#: ../libempathy-gtk/empathy-log-window.c:2960
 msgid "Anything"
 msgstr "هرچیزی"
 
-#: ../libempathy-gtk/empathy-log-window.c:2773
-#| msgid "Set status"
+#: ../libempathy-gtk/empathy-log-window.c:2962
 msgid "Text chats"
 msgstr "گپ‌های متنی"
 
-#: ../libempathy-gtk/empathy-log-window.c:2775
+#: ../libempathy-gtk/empathy-log-window.c:2964
 #: ../src/empathy-preferences.ui.h:4
-#| msgid "Call"
 msgid "Calls"
 msgstr "تماس‌ها"
 
-#: ../libempathy-gtk/empathy-log-window.c:2780
-#| msgid "Incoming call"
+#: ../libempathy-gtk/empathy-log-window.c:2969
 msgid "Incoming calls"
 msgstr "تماس‌های ورودی"
 
-#: ../libempathy-gtk/empathy-log-window.c:2781
-#| msgid "Outgoing voice call"
+#: ../libempathy-gtk/empathy-log-window.c:2970
 msgid "Outgoing calls"
 msgstr "تماس خروجی"
 
-#: ../libempathy-gtk/empathy-log-window.c:2782
-#| msgid "Missed call from %s"
+#: ../libempathy-gtk/empathy-log-window.c:2971
 msgid "Missed calls"
 msgstr "تماس‌های از دست ر�ته"
 
-#: ../libempathy-gtk/empathy-log-window.c:2804
-#| msgid "Chat"
+#: ../libempathy-gtk/empathy-log-window.c:2993
 msgid "What"
 msgstr "کدام"
 
-#: ../libempathy-gtk/empathy-log-window.c:3506
-#| msgid "Are you sure you want to block '%s' from contacting you again?"
+#: ../libempathy-gtk/empathy-log-window.c:3702
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "آیا مطمئنید که می‌خواهید تمام وقایع ثبت شده گ�تگوهای قبلی را حذ� کنید؟"
 
-#: ../libempathy-gtk/empathy-log-window.c:3510
-#| msgid "C_lear"
+#: ../libempathy-gtk/empathy-log-window.c:3706
 msgid "Clear All"
 msgstr "پاک کردن همه"
 
-#: ../libempathy-gtk/empathy-log-window.c:3517
+#: ../libempathy-gtk/empathy-log-window.c:3713
 msgid "Delete from:"
 msgstr "پاک کردن از:"
 
@@ -2336,14 +2388,6 @@ msgstr "پاک کردن از:"
 msgid "<span size=\"x-large\">Loading...</span>"
 msgstr "<span size=\"x-large\">بارگیری...</span>"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call"
-msgstr "تماس"
-
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
 #: ../src/empathy-chat-window.ui.h:3
 msgid "Chat"
@@ -2354,25 +2398,23 @@ msgid "Delete All History..."
 msgstr "پاک کردن تمام تاریخچه..."
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-#| msgid "Provide"
 msgid "Profile"
 msgstr "مجموعه تنظیمات"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:22
 #: ../src/empathy-streamed-media-window.ui.h:20
 msgid "Video"
 msgstr "ویدئو"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-call-window.ui.h:28
 #: ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window-menubar.ui.h:20
 msgid "_Edit"
 msgstr "_ویرایش"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-#| msgid "File"
 msgid "_File"
 msgstr "_پرونده"
 
@@ -2385,27 +2427,27 @@ msgid "Contact ID:"
 msgstr "شناسه‌ی آشنا:"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:258
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
 msgid "C_hat"
 msgstr "_Ú¯Ù¾"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:277
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
 msgstr "گ�تگوی جدید"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:231
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
 msgid "Send _Video"
 msgstr "�رستادن _ویدئو"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
 msgid "C_all"
 msgstr "_تماس"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:252
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "New Call"
 msgstr "تماس جدید"
 
@@ -2465,24 +2507,27 @@ msgid "New %s account"
 msgstr "حساب جدید %s"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "یا�تن بعدی"
+msgid "Find:"
+msgstr "یا�تن:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "یا�تن قبلی"
+#| msgid "Match case"
+msgid "Mat_ch case"
+msgstr "_تطابق کوچک و بزرگی حرو�"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Find:"
-msgstr "یا�تن:"
+msgid "Phrase not found"
+msgstr "عبارت یا�ت نشد"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "تطابق کوچک و بزرگی حرو�"
+#| msgid "_Next Tab"
+msgid "_Next"
+msgstr "_بعدی"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "Phrase not found"
-msgstr "عبارت یا�ت نشد"
+#| msgid "_Previous Tab"
+msgid "_Previous"
+msgstr "_قبلی"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2528,37 +2573,28 @@ msgstr "تماس صوتی پایان یا�ت"
 msgid "Edit Custom Messages"
 msgstr "پیام‌های س�ارشی را ویرایش کنید"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
-#: ../src/empathy-chatrooms-window.ui.h:3
-#| msgid "_Remove"
-msgid "Remove"
-msgstr "حذ�"
-
-#: ../libempathy-gtk/empathy-theme-adium.c:1121
+#: ../libempathy-gtk/empathy-theme-adium.c:1030
 #, c-format
-#| msgid "Message received"
 msgid "Message edited at %s"
 msgstr "پیام ویرایش شده در %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1943
-#| msgid "N_ormal Size"
+#: ../libempathy-gtk/empathy-theme-adium.c:1720
 msgid "Normal"
 msgstr "معمولی"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:75
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "کلاسیک"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:76
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "ساده"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:77
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "تمیز"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:78
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "آبی"
 
@@ -2632,24 +2668,24 @@ msgstr "این انتخاب را برای اتصال‌های آینده به خ
 msgid "Certificate Details"
 msgstr "جزئیات گواهی"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1653
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
 msgstr "بازکردن نشانی اینترنتی مقدور نیست"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1749
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
 msgstr "یک پرونده انتخاب کنید"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1821
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
 msgid "Insufficient free space to save file"
 msgstr "�ضای آزاد ناکا�ی برای ذخیره پرونده"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1829
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
 #, c-format
 msgid "%s of free space are required to save this file, but only %s is available. Please choose another location."
 msgstr "میزان %s �ضای آزاد برای ذخیره کردن این پرونده لازم است، اما �قط %s موجود است. لط�ا یک محل دیگر را انتخاب کنید."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1873
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid "Incoming file from %s"
 msgstr "در حال دریا�ت پرونده از %s"
@@ -2837,23 +2873,23 @@ msgstr "پیغام خطایی وجود ندارد"
 msgid "Instant Message (Empathy)"
 msgstr "پیام �وری (امپاتی)"
 
-#: ../src/empathy.c:354
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "امپاتی هنگام راه‌اندازی اولیه متصل نشود"
 
-#: ../src/empathy.c:358
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "در هنگام راه‌اندازی �هرست آشناها یا هر محاوره‌ی دیگری را نشان نده"
 
-#: ../src/empathy.c:373
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr "- کارگیر پیام رسانی اینترنتی امپاتی"
 
-#: ../src/empathy.c:560
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
 msgstr "خطا در برقراری ارتباط با مدیریت حساب"
 
-#: ../src/empathy.c:562
+#: ../src/empathy.c:639
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. The error was:\n"
@@ -3030,7 +3066,7 @@ msgstr "حساب جدید شما هنوز ذخیره نشده است."
 
 #: ../src/empathy-accounts-dialog.c:345
 #: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:653
+#: ../src/empathy-call-window.c:1164
 msgid "Connecting…"
 msgstr "در حال اتصال..."
 
@@ -3099,7 +3135,6 @@ msgstr ""
 "خواهد گر�ت. آیا مطمئنید که می‌خواهید ادامه دهید؟"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
-#| msgid "_Add…"
 msgid "Add…"
 msgstr "ا�زودن..."
 
@@ -3136,12 +3171,12 @@ msgid "People nearby"
 msgstr "ا�راد دور و بر"
 
 #: ../src/empathy-av.c:118
-#: ../src/empathy-call.c:124
+#: ../src/empathy-call.c:127
 msgid "- Empathy Audio/Video Client"
 msgstr "- کارگیر صوتی/تصویری امپاتی"
 
 #: ../src/empathy-av.c:134
-#: ../src/empathy-call.c:145
+#: ../src/empathy-call.c:152
 msgid "Empathy Audio/Video Client"
 msgstr "کارگیر صوتی/تصویری امپاتی"
 
@@ -3184,33 +3219,33 @@ msgstr "جزئیات"
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1043
+#: ../src/empathy-call-window.c:1672
 #, c-format
 msgid "Call with %s"
 msgstr "تماس با %s"
 
 #: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:1287
+#: ../src/empathy-call-window.c:1916
 msgid "The IP address as seen by the machine"
 msgstr "نشانی IP همانطور که توسط ماشین دیده می‌شود"
 
 #: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:1289
+#: ../src/empathy-call-window.c:1918
 msgid "The IP address as seen by a server on the Internet"
 msgstr "آدرس IP همانطور که توسط کارگزار روی اینترنت دیده می‌شود"
 
 #: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:1291
+#: ../src/empathy-call-window.c:1920
 msgid "The IP address of the peer as seen by the other side"
 msgstr "آدرس IP مربوط به peer همانطور که توسط طر� مقابل دیده می‌شود"
 
 #: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:1293
+#: ../src/empathy-call-window.c:1922
 msgid "The IP address of a relay server"
 msgstr "آدرس IP مربوط به سرور بازپخش"
 
 #: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:1295
+#: ../src/empathy-call-window.c:1924
 msgid "The IP address of the multicast group"
 msgstr "آدرس IP مربوط به گروه چندگانه"
 
@@ -3241,66 +3276,66 @@ msgid "Connected — %d:%02dm"
 msgstr "متصل شد — %Id: %I02dm"
 
 #: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2023
+#: ../src/empathy-call-window.c:2674
 msgid "Technical Details"
 msgstr "جزئیات �نی"
 
 #: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2061
+#: ../src/empathy-call-window.c:2712
 #, c-format
 msgid "%s's software does not understand any of the audio formats supported by your computer"
 msgstr "نرم‌ا�زار %s هیچ‌کدام از قالب‌های صوتی پشتیبانی شده توسط رایانه‌ی شما را تشخیص نمی‌دهد"
 
 #: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2066
+#: ../src/empathy-call-window.c:2717
 #, c-format
 msgid "%s's software does not understand any of the video formats supported by your computer"
 msgstr "نرم‌ا�زار %s هیچ‌کدام از قالب‌های ویدئویی پشتیبانی شده توسط رایانه‌ی شما را تشخیص نمی‌دهد"
 
 #: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2072
+#: ../src/empathy-call-window.c:2723
 #, c-format
 msgid "Can't establish a connection to %s. One of you might be on a network that does not allow direct connections."
 msgstr "نمی‌توان ارتباطی به %s برقرار کرد. ممکن است یکی از شما در شبکه‌ای باشد که اجازه‌ی اتصال مستقیم را نمی‌دهد."
 
 #: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2078
+#: ../src/empathy-call-window.c:2729
 msgid "There was a failure on the network"
 msgstr "یک خرابی در شبکه بوجود آمده بود"
 
 #: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2082
+#: ../src/empathy-call-window.c:2733
 msgid "The audio formats necessary for this call are not installed on your computer"
 msgstr "قالب‌های صوتی لازم برای برقراری این تماس روی رایانه‌ی شما نصب نشده‌اند"
 
 #: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2085
+#: ../src/empathy-call-window.c:2736
 msgid "The video formats necessary for this call are not installed on your computer"
 msgstr "قالب‌های ویدئویی لازم برای برقراری این تماس روی رایانه‌ی شما نصب نشده‌اند"
 
 #: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2097
+#: ../src/empathy-call-window.c:2748
 #, c-format
 msgid "Something unexpected happened in a Telepathy component. Please <a href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' window in the Help menu."
 msgstr "ات�اقی ناخواسته در یک مؤل�ه‌ی تله‌پاتی رخ داد. لط�ا <a href=\"%s\"> این ایراد را گزارش دهید</a> و ثبت وقایع جمع‌آوری شده از پنجره‌ی اشکال‌زدایی در منوی راهنما، را پیوست کنید."
 
 #: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2106
+#: ../src/empathy-call-window.c:2757
 msgid "There was a failure in the call engine"
 msgstr "یک خرابی در موتور تماس بوجود آمده بود"
 
 #: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2109
+#: ../src/empathy-call-window.c:2760
 msgid "The end of the stream was reached"
 msgstr "به انتهای جریان رسیدیم"
 
 #: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2149
+#: ../src/empathy-call-window.c:2800
 msgid "Can't establish audio stream"
 msgstr "نمی‌توان جریان صوتی را برقرار کرد"
 
 #: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2159
+#: ../src/empathy-call-window.c:2810
 msgid "Can't establish video stream"
 msgstr "نمی‌توان جریان ویدئویی را برقرار کرد"
 
@@ -3316,7 +3351,6 @@ msgid "Decoding Codec:"
 msgstr "رمزگشایی ک�دک:"
 
 #: ../src/empathy-call-window.ui.h:4
-#| msgid "_Disable"
 msgid "Disable camera"
 msgstr "غیر�عال‌کردن دوربین"
 
@@ -3363,12 +3397,10 @@ msgid "Send Audio"
 msgstr "�رستادن صدا"
 
 #: ../src/empathy-call-window.ui.h:14
-#| msgid "Send _Video"
 msgid "Send Video"
 msgstr "�رستادن ویدئو"
 
 #: ../src/empathy-call-window.ui.h:15
-#| msgid "Dialpad"
 msgid "Show dialpad"
 msgstr "نمایش شماره‌گیر"
 
@@ -3381,102 +3413,114 @@ msgid "Start an audio call"
 msgstr "شروع یک تماس صوتی"
 
 #: ../src/empathy-call-window.ui.h:18
+#| msgid "Disable camera"
+msgid "Swap camera"
+msgstr "جایجایی دوربین"
+
+#: ../src/empathy-call-window.ui.h:19
 #: ../src/empathy-streamed-media-window.ui.h:17
 msgid "Toggle audio transmission"
 msgstr "تغییر حالت ارسال صدا"
 
-#: ../src/empathy-call-window.ui.h:19
-#| msgid "Toggle audio transmission"
+#: ../src/empathy-call-window.ui.h:20
 msgid "Toggle video transmission"
 msgstr "تغییر حالت ارسال ویدئو"
 
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:1659
-#: ../src/empathy-call-window.c:1660
-#: ../src/empathy-call-window.c:1661
-#: ../src/empathy-call-window.c:1662
+#: ../src/empathy-call-window.c:2307
+#: ../src/empathy-call-window.c:2308
+#: ../src/empathy-call-window.c:2309
+#: ../src/empathy-call-window.c:2310
 msgid "Unknown"
 msgstr "ناشناخته"
 
-#: ../src/empathy-call-window.ui.h:22
-#| msgctxt "menu item"
-#| msgid "_Video Call"
+#: ../src/empathy-call-window.ui.h:23
 msgid "Video call"
 msgstr "تماس ویدئویی"
 
-#: ../src/empathy-call-window.ui.h:23
+#: ../src/empathy-call-window.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "_تماس"
 
-#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-call-window.ui.h:25
+#| msgid "Camera On"
+msgid "_Camera"
+msgstr "_دوربین"
+
+#: ../src/empathy-call-window.ui.h:26
 #: ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window-menubar.ui.h:18
 msgid "_Contents"
 msgstr "_محتویات"
 
-#: ../src/empathy-call-window.ui.h:25
-#: ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
 msgid "_Debug"
 msgstr "_اشکال‌زدایی"
 
-#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:29
 #: ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window-menubar.ui.h:22
 msgid "_Help"
 msgstr "_راهنما"
 
-#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:30
 msgid "_Microphone"
 msgstr "_میکرو�ون"
 
-#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:31
 msgid "_Settings"
 msgstr "_تنظیمات"
 
-#: ../src/empathy-chat-window.c:480
-#: ../src/empathy-chat-window.c:500
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
+msgid "_View"
+msgstr "_نما"
+
+#: ../src/empathy-chat-window.c:481
+#: ../src/empathy-chat-window.c:501
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%Id نخوانده)"
 msgstr[1] "%s (%Id نخوانده)"
 
-#: ../src/empathy-chat-window.c:492
+#: ../src/empathy-chat-window.c:493
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (و %Iu دیگر)"
 msgstr[1] "%s (و %Iu دیگر)"
 
-#: ../src/empathy-chat-window.c:508
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%Id نخوانده از بین دیگران)"
 msgstr[1] "%s (%Id نخوانده از بین دیگران)"
 
-#: ../src/empathy-chat-window.c:517
+#: ../src/empathy-chat-window.c:518
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%Id نخوانده از بین همه)"
 msgstr[1] "%s (%Id نخوانده از بین همه)"
 
-#: ../src/empathy-chat-window.c:732
+#: ../src/empathy-chat-window.c:733
 msgid "SMS:"
 msgstr "اس‌ام‌اس:"
 
-#: ../src/empathy-chat-window.c:742
+#: ../src/empathy-chat-window.c:743
 #, c-format
-#| msgid "Typing a message."
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "درحال ارسال %Id پیام"
 msgstr[1] "درحال ارسال %Id پیام"
 
-#: ../src/empathy-chat-window.c:764
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
 msgstr "درحال تایپ یک پیام."
 
@@ -3557,99 +3601,99 @@ msgstr "اتصال خودکار"
 msgid "Manage Favorite Rooms"
 msgstr "مدیریت اتاق‌های مورد پسند"
 
-#: ../src/empathy-event-manager.c:522
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming video call"
 msgstr "در حال دریا�ت تماس ویدئویی"
 
-#: ../src/empathy-event-manager.c:522
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming call"
 msgstr "در حال دریا�ت تماس"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:525
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "�رد %s تماس ویدئویی با شما گر�ته است، آیا جواب می‌دهید؟"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "�رد %s با شما تماس گر�ته است، آیا جواب می‌دهید؟"
 
-#: ../src/empathy-event-manager.c:530
-#: ../src/empathy-event-manager.c:731
-#: ../src/empathy-event-manager.c:764
+#: ../src/empathy-event-manager.c:529
+#: ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763
 #, c-format
 msgid "Incoming call from %s"
 msgstr "در حال دریا�ت تماس از %s"
 
-#: ../src/empathy-event-manager.c:555
+#: ../src/empathy-event-manager.c:554
 msgid "_Reject"
 msgstr "_رَد"
 
-#: ../src/empathy-event-manager.c:563
-#: ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:562
+#: ../src/empathy-event-manager.c:570
 msgid "_Answer"
 msgstr "_پاسخگویی"
 
-#: ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:570
 msgid "_Answer with video"
 msgstr "_پاسخگویی با ویدئو"
 
-#: ../src/empathy-event-manager.c:731
-#: ../src/empathy-event-manager.c:764
+#: ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "ویدئو ورودی از %s"
 
-#: ../src/empathy-event-manager.c:837
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
 msgstr "دعوتنامه‌ی اتاق"
 
-#: ../src/empathy-event-manager.c:839
+#: ../src/empathy-event-manager.c:838
 #, c-format
 msgid "Invitation to join %s"
 msgstr "دعوتنامه برای پیوستن به %s"
 
-#: ../src/empathy-event-manager.c:846
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "آشنای %s از شما دعوت می‌کند تا به %s بپیوندید"
 
-#: ../src/empathy-event-manager.c:854
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
 msgstr "_چشم پوشی"
 
-#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_پیوستن"
 
-#: ../src/empathy-event-manager.c:886
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "آشنای %s از شما دعوت کرد تا به %s بپیوندید"
 
-#: ../src/empathy-event-manager.c:892
+#: ../src/empathy-event-manager.c:891
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "شما دعوت شده‌اید تا به %s بپیوندید"
 
-#: ../src/empathy-event-manager.c:943
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "پرونده‌ی دریا�ت شده از %s"
 
-#: ../src/empathy-event-manager.c:1135
+#: ../src/empathy-event-manager.c:1134
 #: ../src/empathy-main-window.c:375
 msgid "Password required"
 msgstr "گذرواژه لازم است"
 
-#: ../src/empathy-event-manager.c:1191
+#: ../src/empathy-event-manager.c:1190
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "آشنا %s اجازه می‌خواهد تا ببیند چه زمانی برخط هستید"
 
-#: ../src/empathy-event-manager.c:1195
+#: ../src/empathy-event-manager.c:1194
 #, c-format
 msgid ""
 "\n"
@@ -3825,117 +3869,108 @@ msgid "Top up account credit"
 msgstr "بالا بردن مانده اعتبار"
 
 #. top up button
-#: ../src/empathy-main-window.c:1050
+#: ../src/empathy-main-window.c:1046
 msgid "Top Up..."
 msgstr "بالا بردن..."
 
-#: ../src/empathy-main-window.c:1817
+#: ../src/empathy-main-window.c:1789
 msgid "Contact"
 msgstr "تماس"
 
-#: ../src/empathy-main-window.c:2145
+#: ../src/empathy-main-window.c:2119
 msgid "Contact List"
 msgstr "�هرست آشناها"
 
-#: ../src/empathy-main-window.c:2263
-msgid "Show and edit accounts"
-msgstr "نمایش و ویرایش حساب‌ها"
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "آشناها روی یک _نقشه"
 
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-main-window-menubar.ui.h:2
 msgid "Credit Balance"
 msgstr "مانده اعتبار"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "جستجو در _�هرست آشناها"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "پیوستن به �هرست _علاقه‌مندی‌ها"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "مدیریت علاقه‌مندی‌ها"
 
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "ا_ندازه‌ی معمولی"
 
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window-menubar.ui.h:7
 #: ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "تماس _جدید..."
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "اندازه‌ی عادی به همراه آ_واتار"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "_ترجیحات"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "نشان دادن _قراردادها"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "مرتب‌سازی بر اساس _نام"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "مرتب‌سازی بر اساس _وضعیت"
 
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_حساب‌ها"
 
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "آشناهای _مسدود شده"
 
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "اندازه‌ی _�شرده"
 
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "انتقال _پرونده‌ها"
 
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "_پیوستن..."
 
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window-menubar.ui.h:24
 #: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "_گ�تگوی جدید..."
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "آ_شناهای برون‌خط"
 
-#: ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "_اطلاعات شخصی"
 
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "_اتاق"
 
-#: ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-main-window-menubar.ui.h:29
 msgid "_Search for Contacts…"
 msgstr "_جستجو برای آشناها..."
 
-#: ../src/empathy-main-window.ui.h:30
-#: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_نما"
-
 #: ../src/empathy-new-chatroom-dialog.c:337
 msgid "Chat Room"
 msgstr "اتاق گپ"
@@ -3996,82 +4031,79 @@ msgstr "�هرست اتاق"
 msgid "_Room:"
 msgstr "_اتاق:"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr "پیام دریا�ت شد"
 
-#: ../src/empathy-preferences.c:172
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr "پیام �رستاده‌شده"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
 msgstr "گ�تگوی جدید"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
 msgstr "آشنا برخط می‌شود"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
 msgstr "آشنا برون‌خط می‌شود"
 
-#: ../src/empathy-preferences.c:176
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
 msgstr "حساب متصل شد"
 
-#: ../src/empathy-preferences.c:177
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
 msgstr "حساب قطع شد"
 
-#: ../src/empathy-preferences.c:480
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr "زبان"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:730
-#| msgid "Client:"
+#: ../src/empathy-preferences.c:734
 msgid "Juliet"
 msgstr "ژولیت"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:737
-#| msgid "Room"
+#: ../src/empathy-preferences.c:741
 msgid "Romeo"
 msgstr "رومئو"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:743
+#: ../src/empathy-preferences.c:747
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
-msgstr ""
+msgstr "چه کار داری می‌کنی؟"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:746
+#: ../src/empathy-preferences.c:750
 msgid "Deny thy father and refuse thy name;"
-msgstr ""
+msgstr "م�ی می‌زنم."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:749
+#: ../src/empathy-preferences.c:753
 msgid "Or if thou wilt not, be but sworn my love"
-msgstr ""
+msgstr "م�ی می‌زنی که چی؟"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:752
+#: ../src/empathy-preferences.c:756
 msgid "And I'll no longer be a Capulet."
-msgstr ""
+msgstr "که �راموش کنم."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:755
+#: ../src/empathy-preferences.c:759
 msgid "Shall I hear more, or shall I speak at this?"
-msgstr ""
+msgstr "چی رو �راموش کنی؟"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:758
-#| msgid "%s has disconnected"
+#: ../src/empathy-preferences.c:762
 msgid "Juliet has disconnected"
 msgstr "ژولیت قطع شده است"
 
-#: ../src/empathy-preferences.c:1164
+#: ../src/empathy-preferences.c:1166
 msgid "Preferences"
 msgstr "ترجیحات"
 
@@ -4176,7 +4208,6 @@ msgid "Themes"
 msgstr "تم‌ها"
 
 #: ../src/empathy-preferences.ui.h:29
-#| msgid "Bearing:"
 msgid "Variant:"
 msgstr "گزینه:"
 
@@ -4380,7 +4411,6 @@ msgid "Show a particular service"
 msgstr "نمایش یک سرویس خاص"
 
 #: ../src/empathy-debugger.c:75
-#| msgid "Empathy Debugger"
 msgid "- Empathy Debugger"
 msgstr "- اشکال‌زدای امپاتی"
 
@@ -4423,43 +4453,49 @@ msgstr "پذیرش"
 msgid "Provide"
 msgstr "�راهم کردن"
 
-#: ../src/empathy-call-observer.c:135
+#: ../src/empathy-call-observer.c:134
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "لحظاتی پیش %s سعی کرد تا با شما تماس بگیرد، ولی شما در یک تماس دیگر بودید."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:560
-#: ../src/empathy-call-window.c:574
+#: ../src/empathy-call-window.c:1036
+#: ../src/empathy-call-window.c:1059
 msgid "i"
 msgstr "ر"
 
-#: ../src/empathy-call-window.c:1952
+#: ../src/empathy-call-window.c:2603
 msgid "On hold"
 msgstr "نگه داشتن پشت خط"
 
-#: ../src/empathy-call-window.c:1955
+#: ../src/empathy-call-window.c:2606
 msgid "Mute"
 msgstr "بی‌صدا"
 
-#: ../src/empathy-call-window.c:1957
-#| msgid "Location"
+#: ../src/empathy-call-window.c:2608
 msgid "Duration"
 msgstr "مدت"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:1960
+#: ../src/empathy-call-window.c:2611
 #, c-format
-#| msgid "Connected — %d:%02dm"
 msgid "%s — %d:%02dm"
 msgstr "%s — %Id:%I02dm"
 
 #: ../libempathy-gtk/empathy-search-bar.c:243
-#| msgid "Match case"
 msgid "_Match case"
 msgstr "_تطابق کوچک و بزرگی حرو�"
 
+#~ msgid "Find Next"
+#~ msgstr "یا�تن بعدی"
+
+#~ msgid "Find Previous"
+#~ msgstr "یا�تن قبلی"
+
+#~ msgid "Show and edit accounts"
+#~ msgstr "نمایش و ویرایش حساب‌ها"
+
 #~ msgid "All"
 #~ msgstr "همه"
 
diff --git a/po/fi.po b/po/fi.po
index 88fc266c7..45eb54680 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -12,17 +12,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
-"Report-Msgid-Bugs-To: "
-"http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&component=general\n"
-"POT-Creation-Date: 2010-11-13 22:40+0000\n"
-"PO-Revision-Date: 2010-11-15 13:51+0200\n"
-"Last-Translator: Ville-Pekka Vainio <vpivaini@cs.helsinki.fi>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-09-08 13:41+0300\n"
+"PO-Revision-Date: 2011-09-08 13:41+0300\n"
+"Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: Finnish <gnome-fi-laatu@lists.sourceforge.net>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Launchpad-Export-Date: 2010-09-13 15:12+0000\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
@@ -47,6 +46,22 @@ msgid "Always open a separate chat window for new chats."
 msgstr "Avaa aina uusi ikkuna uusille keskusteluille."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr "Puhelun äänenvoimakkuus"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr "Puhelun äänenvoimakkuus prosentteina."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Camera device"
+msgstr "Kamera"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "Kameran sijainti"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -54,46 +69,54 @@ msgstr ""
 "Lempinimen jälkeen lisättävä merkki, kun käytetään lempinimen täydennystä "
 "(sarkain) ryhmäkeskustelussa."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "Keskusteluikkunan teema"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+msgid "Chat window theme variant"
+msgstr "Keskusteluikkunan teemamuunnos"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "Pilkuilla eroteltu lista oikeinkirjoituksen tarkistusohjelman käyttämistä "
 "kielistä (esim. \"fi, en, fr\")."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "Pienikokoinen tuttavaluettelo"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "Yhteyden hallintaohjelmia tulisi käyttää"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "Tuttavaluettelon lajitteluperuste"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Oletuskamera videopuheluihin, esim. /dev/video0"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
 msgstr "Oletushakemisto, josta avatar-kuvat haetaan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr "Älä näytä ponnahdusikkunoita poissaollessa"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr "Älä soita ääniä poissaollessa"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
 msgstr "Näytä ajankohtaiset tapahtumat tilarivillä"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -101,238 +124,248 @@ msgstr ""
 "Näytä ajankohtaiset tapahtumat tilarivillä. Mikäli epätosi, näytä ne "
 "käyttäjälle välittömästi."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+msgid "Echo cancellation support"
+msgstr "Kaiun poiston tuki"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr "Empathy voi julkaista käyttäjän sijainnin"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy voi käyttää GPS:ää paikantamaan sijainnin"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy voi käyttää matkapuhelinverkkoa paikantamaan sijainnin"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy voi käyttää verkkoa paikantamaan sijainnin"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr "Empathyn noutojen oletuskansio"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Empathy has asked about importing accounts"
-msgstr "Empathy on kysynyt tilien tuonnista"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
 msgstr "Empathy on siirtänyt butterfly:n lokit"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr ""
 "Empathyn tulisi merkitä automaattisesti poissaolevaksi, mikäli konetta ei "
 "käytetä"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy yrittää yhdistää automaattisesti käynnistettäessä"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathyn pitää heikentää sijainnin tarkkuutta"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy yrittää käyttää tuttavan avatarta keskusteluikkunan kuvakkeena"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
-msgstr "Ota käyttöön WebKit-kehittäjän työkalut"
+msgstr "Käytä WebKit-kehittäjän työkaluja"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "Näytä ponnahdusikkuna uusille viesteille"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
-msgstr "Ota käyttöön oikeinkirjoituksen tarkistus"
+msgstr "Käytä oikeinkirjoituksen tarkistusta"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "Piilota pääikkuna"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "Piilota pääikkuna."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "Lempinimen täydennysmerkki"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "Avaa uusi ikkuna uusille keskusteluille"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "Käytettävän Adium-teeman sijainti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "Adium-teeman sijainti Adiumia keskustelun teemana käytettäessä."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Soita merkkiääni saapuville viesteille"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "Soita merkkiääni uusista keskusteluista"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Soita merkkiääni lähetettäville viesteille"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "Soita merkkiääni tuttavan kirjautuessa sisään"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "Soita merkkiääni tuttavan kirjautuessa ulos"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "Soita merkkiääni kirjauduttaessa sisään"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "Soita merkkiääni kirjauduttaessa ulos"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Ponnahdusilmoitus kohdistamattomasta keskustelusta"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "Ponnahdusilmoitus tuttavan kirjautuessa sisään"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "Ponnahdusilmoitus tuttavan kirjautuessa ulos"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+msgid "Show Balance in contact list"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "Näytä avatar-kuvat"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "Näytä tuttavaluettelo huoneissa"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr "Näytä vihje pääikkunan sulkemisesta"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr "Näytä linjoilta poissa olevat tuttavat"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
 msgstr "Näytä protokollat"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "Kielentarkastuksessa käytetyt kielet"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr "Oletuskansio, johon siirretyt tiedostot tallennetaan."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Viimeisin hakemisto, josta avatar-kuva oli valittu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
 msgstr "Keskusteluikkunan sivupaneelin sijainti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "Keskusteluikkunan sivupaneelin tallennettu sijainti (pikseleinä)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Keskusteluikkunoissa käytettävä teema."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr ""
+"Teemamuunnos jota käytetään näyttämään keskustelu keskusteluikkunoissa."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Käytä hymiökuvakkeita"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "Käytä merkkiääniä"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "Käytä teemaa keskusteluhuoneille"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Saako Empathy paljastaa käyttäjän sijainnin tuttaville."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Saako Empathy käyttää GPS:ää sijainnin arvaamiseen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Saako Empathy käyttää matkapuhelinverkkoa sijainnin arvaamiseen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Saako Empathy käyttää verkkoa sijainnin arvaamiseen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "Whether Empathy has asked about importing accounts from other programs."
-msgstr "Onko Empathy tiedustellut tilien tuomisesta."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "Onko Empathy siirtänyt butterfly-lokit."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr ""
 "Kirjautuuko Empathy tileillesi automaattisesti käynnistymisensä yhteydessä."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
 "Tulisiko Empathyn merkitä käyttäjä automaattisesti poissaolevaksi, mikäli "
 "konetta ei käytetä."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 "Alentaako Empathy sijaintitiedon tarkkuutta yksityisyyden suojaamiseksi."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 "Käyttääkö Empathy tuttavan avatar-kuvaketta keskusteluikkunan kuvakkeena."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "Otetaanko WebKit-kehittäjän työkalut, kuten Web-tutkain, käyttöön."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
@@ -340,61 +373,65 @@ msgstr ""
 "Käyttääkö Empathy yhteyksienhallintaa verkkoyhteyksien automaattiseen "
 "luomiseen ja katkaisuun."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "Tarkistetaanko kirjoitetut sanat oikolukukielellä."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "Näytetäänkö keskusteluiden hymiöt hymiökuvakkeina."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "Ilmoitetaanko tuttavien sisäänkirjautumisesta merkkiäänellä."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "Ilmoitetaanko tuttavien uloskirjautumisesta merkkiäänellä."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "Ilmoitetaanko tapahtumista merkkiäänin."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Ilmoitetaanko saapuvista viesteistä merkkiäänellä."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Ilmoitetaanko uusista keskusteluista merkkiäänellä."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Ilmoitetaanko lähtevistä viesteistä merkkiäänellä."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "Ilmoitetaanko verkkoon kirjautumisesta merkkiäänellä."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Ilmoitetaanko verkosta uloskirjautumisesta merkkiäänellä."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr "Ilmoitetaanko tapahtumista merkkiäänin varattuna tai poissa oltaessa."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "Näytetäänkö ponnahdusilmoitus tuttavan uloskirjautumisesta."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "Näytetäänkö ponnahdusilmoitus tuttavan sisäänkirjautumisesta."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -402,56 +439,60 @@ msgstr ""
 "Näytetäänkö avatussa, kohdistamattomassa keskustelussa saapuneesta uudesta "
 "viestistä ponnahdusilmoitus."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "Näytetäänkö uudesta viestistä ponnahdusilmoitus."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+msgid "Whether to show account balances in the contact list."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 "Näytetäänkö tuttavien avatar-kuvakkeet tuttavaluettelossa ja "
 "keskusteluikkunoissa."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "Näytetäänkö poissa linjoilta olevat tuttavat tuttavaluettelossa."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
 msgstr "Näytetäänkö ponnahdusilmoituksia varattuna tai poissa oltaessa."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "Näytetäänkö tuttavien yhteyskäytännöt tuttavaluettelossa."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Näytetäänkö tuttavaluettelo keskusteluhuoneissa."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "Näytetäänkö tuttavaluettelo pienoiskokoa käytettäessä."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
 msgstr "Pyydetäänkö pääikkunan sulkemisesta vahvistusta."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "Käytetäänkö teemaa keskusteluhuoneissa."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
 "the contact list by state."
 msgstr ""
 "Kuinka tuttavaluettelo järjestetään. Oletusarvolla \"name\" "
-"järjestelyperusteena on tuttavan nimi. Arvolla \"state\" luettelo järjestetään "
-"tuttavien tilan perusteella."
+"järjestelyperusteena on tuttavan nimi. Arvolla \"state\" luettelo "
+"järjestetään tuttavien tilan perusteella."
 
 #: ../data/empathy-accounts.desktop.in.in.h:1
 msgid "Manage Messaging and VoIP accounts"
@@ -459,187 +500,204 @@ msgstr "Hallitse viestimiä ja Internet-puheluiden (VoIP) käyttäjätilejä"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2156
+#: ../src/empathy-accounts-dialog.c:2324
 msgid "Messaging and VoIP Accounts"
 msgstr "Viestintä ja VoIP-käyttäjätilit"
 
-#: ../libempathy/empathy-ft-handler.c:851
-msgid "The hash of the received file and the sent one do not match"
-msgstr "Vastaanotetun ja lähetetyn tiedoston tiiviste ei täsmää"
+#: ../libempathy/empathy-ft-handler.c:825
+msgid "File transfer completed, but the file was corrupted"
+msgstr "Tiedostonsiirto valmistui, mutta tiedosto oli viallinen"
 
 #: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
 msgstr "Etäyhteys ei tue tiedostonsiirtoa"
 
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is not a regular file"
 msgstr "Valittu tiedosto ei ole tavanomainen tiedosto"
 
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1176
 msgid "The selected file is empty"
 msgstr "Valittu tiedosto on tyhjä"
 
-#: ../libempathy/empathy-tp-file.c:283
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#, c-format
+msgid "Missed call from %s"
+msgstr "Vastaamaton puhelu käyttäjältä %s"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, c-format
+msgid "Called %s"
+msgstr "Soitettiin käytäjälle %s"
+
+#: ../libempathy/empathy-message.c:422
+#, c-format
+msgid "Call from %s"
+msgstr "Puhelu käyttäjältä %s"
+
+#: ../libempathy/empathy-tp-file.c:268
 msgid "Socket type not supported"
 msgstr "Pistoketyyppi ei ole tuettu"
 
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-tp-file.c:387
 msgid "No reason was specified"
 msgstr "Syytä ei annettu"
 
-#: ../libempathy/empathy-tp-file.c:405
+#: ../libempathy/empathy-tp-file.c:390
 msgid "The change in state was requested"
 msgstr "Pyydettiin tilan muutosta"
 
-#: ../libempathy/empathy-tp-file.c:408
+#: ../libempathy/empathy-tp-file.c:393
 msgid "You canceled the file transfer"
 msgstr "Keskeytit tiedostonsiirron"
 
-#: ../libempathy/empathy-tp-file.c:411
+#: ../libempathy/empathy-tp-file.c:396
 msgid "The other participant canceled the file transfer"
 msgstr "Toinen osapuoli katkaisi tiedostonsiirron"
 
-#: ../libempathy/empathy-tp-file.c:414
+#: ../libempathy/empathy-tp-file.c:399
 msgid "Error while trying to transfer the file"
 msgstr "Virhe yritettäessä siirtää tiedostoa"
 
-#: ../libempathy/empathy-tp-file.c:417
+#: ../libempathy/empathy-tp-file.c:402
 msgid "The other participant is unable to transfer the file"
 msgstr "Toinen osapuoli ei voi siirtää tiedostoa"
 
-#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
 msgid "Unknown reason"
 msgstr "Tuntematon syy"
 
-#: ../libempathy/empathy-utils.c:246
+#: ../libempathy/empathy-utils.c:222
 msgid "Available"
 msgstr "Tavoitettavissa"
 
-#: ../libempathy/empathy-utils.c:248
+#: ../libempathy/empathy-utils.c:224
 msgid "Busy"
 msgstr "Varattu"
 
-#: ../libempathy/empathy-utils.c:251
+#: ../libempathy/empathy-utils.c:227
 msgid "Away"
 msgstr "Poissa"
 
-#: ../libempathy/empathy-utils.c:253
+#: ../libempathy/empathy-utils.c:229
 msgid "Invisible"
 msgstr "Näkymätön"
 
-#: ../libempathy/empathy-utils.c:255
+#: ../libempathy/empathy-utils.c:231
 msgid "Offline"
 msgstr "Poissa linjoilta"
 
-#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1903
-#: ../src/empathy-call-window.c:1904 ../src/empathy-call-window.c:1905
-#: ../src/empathy-call-window.c:1906 ../src/empathy-call-window.ui.h:18
+#. translators: presence type is unknown
+#: ../libempathy/empathy-utils.c:234
+msgctxt "presence"
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../libempathy/empathy-utils.c:296
+#: ../libempathy/empathy-utils.c:274
 msgid "No reason specified"
 msgstr "Erittelemätön syy"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
 msgid "Status is set to offline"
 msgstr "Tila on nyt �Poissa linjoilta�"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "Verkkovirhe"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
 msgid "Authentication failed"
 msgstr "Todennus epäonnistui"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
 msgid "Encryption error"
 msgstr "Salausvirhe"
 
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:284
 msgid "Name in use"
 msgstr "Nimi on käytössä"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
 msgid "Certificate not provided"
 msgstr "Varmennetta ei ole annettu"
 
-#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
 msgid "Certificate untrusted"
 msgstr "Varmenne ei ole luotettu"
 
-#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
 msgid "Certificate expired"
 msgstr "Varmenne on vanhentunut"
 
-#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
 msgid "Certificate not activated"
 msgstr "Varmenne ei ole vielä aktivoitu"
 
-#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
 msgid "Certificate hostname mismatch"
 msgstr "Varmenteen verkkonimi ei täsmää"
 
-#: ../libempathy/empathy-utils.c:318 ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate fingerprint mismatch"
 msgstr "Varmenteen sormenjälki ei täsmää"
 
-#: ../libempathy/empathy-utils.c:320 ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate self-signed"
 msgstr "Itseallekirjoitettu varmenne"
 
-#: ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:300
 msgid "Certificate error"
 msgstr "Varmennevirhe"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:334
 msgid "Encryption is not available"
 msgstr "Salausta ei ole käytettävissä"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:336
 msgid "Certificate is invalid"
 msgstr "Varmenne ei ole kelvollinen"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:338
 msgid "Connection has been refused"
 msgstr "Yhteys hylättiin"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:340
 msgid "Connection can't be established"
 msgstr "Yhteyttä ei voi muodostaa"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:342
 msgid "Connection has been lost"
 msgstr "Yhteys katkesi"
 
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:344
 msgid "This resource is already connected to the server"
 msgstr "Tämä resurssi on jo yhdistetty palvelimelle"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:346
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Yhteys on korvattu samaa resurssia käyttävällä uudella yhteydellä"
 
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:349
 msgid "The account already exists on the server"
-msgstr "Tunnus on jo olemassa palvelimella"
+msgstr "Tili on jo olemassa palvelimella"
 
-#: ../libempathy/empathy-utils.c:373
+#: ../libempathy/empathy-utils.c:351
 msgid "Server is currently too busy to handle the connection"
 msgstr "Palvelin on liian kiireinen käsitelläkseen tätä yhteyttä"
 
-#: ../libempathy/empathy-utils.c:375
+#: ../libempathy/empathy-utils.c:353
 msgid "Certificate has been revoked"
 msgstr "Varmenne on kumottu"
 
-#: ../libempathy/empathy-utils.c:377
+#: ../libempathy/empathy-utils.c:355
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "Varmenne käyttää heikkoa salausmenetelmää"
 
-#: ../libempathy/empathy-utils.c:380
+#: ../libempathy/empathy-utils.c:358
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -647,130 +705,144 @@ msgstr ""
 "Palvelinsertifikaatin pituus tai palvelinsertifikaattiketjun pituus ovat "
 "suurempia kuin salauskirjasto sallii"
 
-#: ../libempathy/empathy-utils.c:544
+#: ../libempathy/empathy-utils.c:519
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "Lähellä olevat ihmiset"
 
-#: ../libempathy/empathy-utils.c:549
+#: ../libempathy/empathy-utils.c:524
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:550
+#: ../libempathy/empathy-utils.c:553
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../libempathy/empathy-utils.c:554
 msgid "Facebook Chat"
 msgstr "Facebook-keskustelu"
 
-#: ../libempathy/empathy-time.c:137
+#: ../libempathy/empathy-time.c:88
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d sekunti sitten"
 msgstr[1] "%d sekuntia sitten"
 
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:93
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minuutti sitten"
 msgstr[1] "%d minuuttia sitten"
 
-#: ../libempathy/empathy-time.c:147
+#: ../libempathy/empathy-time.c:98
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d tunti sitten"
 msgstr[1] "%d tuntia sitten"
 
-#: ../libempathy/empathy-time.c:152
+#: ../libempathy/empathy-time.c:103
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d päivä sitten"
 msgstr[1] "%d päivää sitten"
 
-#: ../libempathy/empathy-time.c:157
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d viikko sitten"
 msgstr[1] "%d viikkoa sitten"
 
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:113
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d kuukausi sitten"
 msgstr[1] "%d kuukautta sitten"
 
-#: ../libempathy/empathy-time.c:167
+#: ../libempathy/empathy-time.c:136
 msgid "in the future"
 msgstr "tulevaisuudessa"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:463
-msgid "All"
-msgstr "Kaikki"
+#: ../libempathy-gtk/empathy-account-chooser.c:539
+msgid "All accounts"
+msgstr "Kaikki tilit"
 
-#: ../libempathy-gtk/empathy-account-widget.c:514
-#: ../libempathy-gtk/empathy-log-window.c:646
-#: ../src/empathy-import-widget.c:312
+#: ../libempathy-gtk/empathy-account-widget.c:694
+#: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "Käyttäjätili"
 
-#: ../libempathy-gtk/empathy-account-widget.c:515
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "Salasana"
 
-#: ../libempathy-gtk/empathy-account-widget.c:516
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Palvelin"
 
-#: ../libempathy-gtk/empathy-account-widget.c:517
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Portti"
 
-#: ../libempathy-gtk/empathy-account-widget.c:589
-#: ../libempathy-gtk/empathy-account-widget.c:646
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
 #: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "Omat WWW-tilit"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
+#, c-format
+msgid "The account %s is edited via %s."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget.c:1214
+#, c-format
+msgid "The account %s cannot be edited in Empathy."
+msgstr "Käyttäjätiliä %s ei voi muokata Empathyssä."
+
+#: ../libempathy-gtk/empathy-account-widget.c:1233
+msgid "Launch My Web Accounts"
+msgstr "Käynnistä Web-tilit"
+
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "Muokkaa %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Käyttäjänimi:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1521
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "_Toteuta"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1551
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
 msgstr "_Kirjaudu sisään"
 
-#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1617
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1401
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "Käyttäjätili:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1628
-msgid "_Enabled"
-msgstr "_Käytössä"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1693
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "Tämä tili on jo olemassa palvelimella"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1696
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "Luo uusi tili palvelimelle"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1789
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "_Peru"
 
@@ -779,19 +851,19 @@ msgstr "_Peru"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2077
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%s palvelimella %s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2103
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "%s-tili"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2107
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "Uusi tili"
 
@@ -803,6 +875,7 @@ msgstr "<b>Esimerkki:</b> Nimimerkkini"
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -816,38 +889,58 @@ msgstr "Lisäasetukset"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "Pass_word:"
 msgstr "S_alasana:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Remember Password"
+msgstr "Muista salasana"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-password-dialog.c:311
+msgid "Remember password"
+msgstr "Muista salasana"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 msgid "Screen _Name:"
 msgstr "Näyttö_nimi:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
 msgid "What is your AIM password?"
 msgstr "Mikä on AIM-salasanasi?"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Mikä on AIM-näyttönimesi?"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "_Port:"
 msgstr "_Portti:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
 #: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
 msgstr "Pal_velin:"
@@ -863,11 +956,11 @@ msgstr "<b>Esimerkki:</b> käyttäjänimi"
 msgid "Login I_D:"
 msgstr "_Käyttäjätunnus:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
 msgid "What is your GroupWise User ID?"
 msgstr "Mikä on GroupWise-käyttäjätunnuksesi?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise password?"
 msgstr "Mikä on GroupWise-salasanasi?"
 
@@ -884,84 +977,92 @@ msgstr "_Merkkikartta:"
 msgid "ICQ _UIN:"
 msgstr "ICQ _UIN:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
 msgid "What is your ICQ UIN?"
 msgstr "Mikä on ICQ UIN -tunnuksesi?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ password?"
 msgstr "Mikä on ICQ-salasanasi?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:183
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "Automaattinen"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:221
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "Rekisteröi"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:226
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "Valinnat"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Character set:"
 msgstr "Merkkikartta:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"Useimmat IRC-palvelimet eivät tarvitse salasanaa, joten jos et ole varma, "
+"älä syötä salasanaa."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Network"
 msgstr "Verkko"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Network:"
 msgstr "Verkko:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Nimimerkki:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "Salasana:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "Lopetusviesti:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "Oikea nimi:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Servers"
 msgstr "Palvelimet"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "What is your IRC nickname?"
 msgstr "Mikä on IRC-nimimerkkisi?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Mikä IRC-verkko?"
 
@@ -989,12 +1090,12 @@ msgstr "Ohita palvelimen asetukset"
 msgid "Priori_ty:"
 msgstr "_Prioriteetti:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 msgid "Reso_urce:"
 msgstr "Res_urssi:"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1005,42 +1106,42 @@ msgstr ""
 "sähköpostiosoite.\n"
 "Jos käyttäjänimesi on esimerkiksi facebook.com/<b>tunnus</b>, kirjoita "
 "<b>tunnus</b>.\n"
-"Jos et ole vielä luonut Facebook-käyttäjänimeä, voit luoda sellaisen <a "
-"href=\"http://www.facebook.com/username/\">tällä sivulla</a>."
+"Jos et ole vielä luonut Facebook-käyttäjänimeä, voit luoda sellaisen <a href="
+"\"http://www.facebook.com/username/\">tällä sivulla</a>."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "Use old SS_L"
 msgstr "Käytä vanhaa SS_L-porttia"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
 msgid "What is your Facebook password?"
 msgstr "Mikä on Facebook-salasanasi?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
 msgid "What is your Facebook username?"
 msgstr "Mikä on Facebook-käyttäjänimesi?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 msgid "What is your Google ID?"
 msgstr "Mikä on Google-tunnuksesi?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 msgid "What is your Google password?"
 msgstr "Mikä on Google-salasanasi?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
 msgid "What is your Jabber ID?"
 msgstr "Mikä on Jabber-tunnuksesi?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
 msgid "What is your Jabber password?"
 msgstr "Mikä on Jabber-salasanasi?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your desired Jabber ID?"
 msgstr "Mikä on haluamasi Jabber-tunnus?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber password?"
 msgstr "Mikä on haluamasi Jabber-salasana?"
 
@@ -1048,11 +1149,11 @@ msgstr "Mikä on haluamasi Jabber-salasana?"
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Esimerkki:</b> tunnus@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
 msgid "What is your Windows Live ID?"
 msgstr "Mikä on Windows Live -tunnuksesi?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live password?"
 msgstr "Mikä on Windows Live -salasanasi?"
 
@@ -1097,156 +1198,205 @@ msgid "Discover the STUN server automatically"
 msgstr "Havaitse STUN-palvelin automaattisesti"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "Ignore TLS Errors"
+msgstr "Sivuuta TLS-virheet"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Interval (seconds)"
 msgstr "Aikaväli (sekunneissa)"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
 msgid "Keep-Alive Options"
 msgstr "Käynnissä pitävät valinnat"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
 msgid "Loose Routing"
 msgstr "Löyhä reititys"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Mechanism:"
 msgstr "Mekanismi:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
 msgid "Miscellaneous Options"
 msgstr "Muut valinnat"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 msgid "NAT Traversal Options"
 msgstr "NAT-läpäisyn (NAT-T) asetukset"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 msgid "Port:"
 msgstr "Portti:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 msgid "Proxy Options"
 msgstr "Välipalvelinvalinnat"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "STUN Server:"
 msgstr "STUN-palvelin:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.c:347
 msgid "Server:"
 msgstr "Palvelin:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid "Transport:"
 msgstr "Siirto:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "Mikä on SIP-tilisi salasana?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Mikä on SIP-tilisi käyttäjätunnus?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
-msgstr "_Käyttäjätunnus:"
+msgstr "_Käyttäjänimi:"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
 msgid "I_gnore conference and chat room invitations"
 msgstr "_Älä huomioi konferenssi- ja keskusteluhuonekutsuja"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "What is your Yahoo! ID?"
 msgstr "Mikä on Yahoo! -tunnuksesi?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "What is your Yahoo! password?"
 msgstr "Mikä on Yahoo! -salasanasi?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
 msgid "Yahoo! I_D:"
 msgstr "Yahoo!-_tunnus:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "_Room List locale:"
 msgstr "_Huoneluettelon maa-asetusto:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:443
-#: ../libempathy-gtk/empathy-avatar-chooser.c:519
+#: ../libempathy-gtk/empathy-avatar-chooser.c:470
+#: ../libempathy-gtk/empathy-avatar-chooser.c:555
 msgid "Couldn't convert image"
 msgstr "Kuvaa ei voitu muuntaa"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:444
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
 msgid "None of the accepted image formats are supported on your system"
 msgstr ""
 "Järjestelmässäsi ei ole tukea yhdellekään hyväksytylle kuvatiedostomuodolle"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:935
+#: ../libempathy-gtk/empathy-avatar-chooser.c:818
+msgid "Couldn't save picture to file"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:934
 msgid "Select Your Avatar Image"
 msgstr "Valitse avatar-kuvasi"
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:938
+msgid "Take a picture..."
+msgstr "Ota kuva..."
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:941
 msgid "No Image"
 msgstr "Ei kuvaa"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
 msgid "Images"
 msgstr "Kuvat"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
 msgid "All Files"
 msgstr "Kaikki tiedostot"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:323
+#: ../libempathy-gtk/empathy-avatar-image.c:322
 msgid "Click to enlarge"
 msgstr "Suurenna napsauttamalla"
 
-#: ../libempathy-gtk/empathy-chat.c:642
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
+msgid "There was an error starting the call"
+msgstr "Puhelun aloittamisessa tapahtui virhe"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact doesn't support calls"
+msgstr "Valittu yhteystieto ei tue puheluja"
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is offline"
+msgstr "Valittu yhteystieto on poissa linjoilta"
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "The specified contact is not valid"
+msgstr "Valittu yhteystieto on virheellinen"
+
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "Emergency calls are not supported on this protocol"
+msgstr "Tämä protokolla ei tue hätäpuheluita"
+
+#: ../libempathy-gtk/empathy-chat.c:702
 msgid "Failed to open private chat"
 msgstr "Yksityiskeskustelun avaaminen epäonnistui"
 
-#: ../libempathy-gtk/empathy-chat.c:682
+#: ../libempathy-gtk/empathy-chat.c:763
 msgid "Topic not supported on this conversation"
 msgstr "Aihe ei ole tuettu tässä keskustelussa"
 
-#: ../libempathy-gtk/empathy-chat.c:688
+#: ../libempathy-gtk/empathy-chat.c:769
 msgid "You are not allowed to change the topic"
 msgstr "Sinulla ei ole oikeutta muuttaa aihetta"
 
-#: ../libempathy-gtk/empathy-chat.c:822
+#: ../libempathy-gtk/empathy-chat.c:973
+#, c-format
+msgid "“%s� is not a valid contact ID"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1030
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: pyyhi kaikki nykyisen keskustelun viestit pois näkyvistä"
 
-#: ../libempathy-gtk/empathy-chat.c:825
+#: ../libempathy-gtk/empathy-chat.c:1033
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <aihe>: aseta nykyisen keskustelun aihe"
 
-#: ../libempathy-gtk/empathy-chat.c:828
+#: ../libempathy-gtk/empathy-chat.c:1036
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <kanavan nimi>: liity kanavalle"
 
-#: ../libempathy-gtk/empathy-chat.c:831
+#: ../libempathy-gtk/empathy-chat.c:1039
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <kanavan nimi>: liity kanavalle"
 
-#: ../libempathy-gtk/empathy-chat.c:836
+#: ../libempathy-gtk/empathy-chat.c:1043
+msgid ""
+"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
+"current one"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1047
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <tuttavan tunnus> [<viesti>]: avaa yksityiskeskustelu"
 
-#: ../libempathy-gtk/empathy-chat.c:839
+#: ../libempathy-gtk/empathy-chat.c:1050
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <tuttavan tunnus> <viesti>: avaa yksityiskeskustelu"
 
-#: ../libempathy-gtk/empathy-chat.c:843
+#: ../libempathy-gtk/empathy-chat.c:1053
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nimi>: vaihda nimeä nykyisellä palvelimella"
 
-#: ../libempathy-gtk/empathy-chat.c:846
+#: ../libempathy-gtk/empathy-chat.c:1056
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <viesti>: lähetä TOIMINTO viesti tämänhetkiseen keskusteluun"
 
-#: ../libempathy-gtk/empathy-chat.c:849
+#: ../libempathy-gtk/empathy-chat.c:1059
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1256,7 +1406,11 @@ msgstr ""
 "Tätä toimintoa käytetään kun viestin halutaan alkavan merkillä \"/\", "
 "esimerkiksi: \"/say /join komentoa käytetään kanavalle liittymiseen\""
 
-#: ../libempathy-gtk/empathy-chat.c:854
+#: ../libempathy-gtk/empathy-chat.c:1064
+msgid "/whois <contact ID>: display information about a contact"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1067
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1264,84 +1418,113 @@ msgstr ""
 "/help [<komento>]: näyttää kaikki tuetut komennot. Jos <komento> on "
 "määritetty, näytä sen ohje."
 
-#: ../libempathy-gtk/empathy-chat.c:864
+#: ../libempathy-gtk/empathy-chat.c:1077
 #, c-format
 msgid "Usage: %s"
 msgstr "Käyttö: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:893
+#: ../libempathy-gtk/empathy-chat.c:1116
 msgid "Unknown command"
 msgstr "Tuntematon komento"
 
-#: ../libempathy-gtk/empathy-chat.c:1014
+#: ../libempathy-gtk/empathy-chat.c:1242
 msgid "Unknown command; see /help for the available commands"
 msgstr "Tuntematon komento; kirjoita /help nähdäksesi käytössä olevat komennot"
 
-#: ../libempathy-gtk/empathy-chat.c:1152
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1412
+msgid "insufficient balance to send message"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1414
+msgid "not capable"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1421
 msgid "offline"
 msgstr "poissa linjoilta"
 
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1424
 msgid "invalid contact"
 msgstr "virheellinen tuttava"
 
-#: ../libempathy-gtk/empathy-chat.c:1158
+#: ../libempathy-gtk/empathy-chat.c:1427
 msgid "permission denied"
 msgstr "lupa evätty"
 
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:1430
 msgid "too long message"
 msgstr "liian pitkä viesti"
 
-#: ../libempathy-gtk/empathy-chat.c:1164
+#: ../libempathy-gtk/empathy-chat.c:1433
 msgid "not implemented"
 msgstr "ei toteutettu"
 
-#: ../libempathy-gtk/empathy-chat.c:1168
+#: ../libempathy-gtk/empathy-chat.c:1437
 msgid "unknown"
 msgstr "tuntematon"
 
-#: ../libempathy-gtk/empathy-chat.c:1172
+#: ../libempathy-gtk/empathy-chat.c:1443
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Virhe lähetettäessä viestiä \"%s\": %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:691
+#: ../libempathy-gtk/empathy-chat.c:1447
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Virhe viestiä lähettäessä: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1508 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Aihe:"
 
-#: ../libempathy-gtk/empathy-chat.c:1294
+#: ../libempathy-gtk/empathy-chat.c:1520
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Aihe asetettu: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1296
+#: ../libempathy-gtk/empathy-chat.c:1522
 msgid "No topic defined"
 msgstr "Aihetta ei ole annettu"
 
-#: ../libempathy-gtk/empathy-chat.c:1775
+#: ../libempathy-gtk/empathy-chat.c:2031
 msgid "(No Suggestions)"
 msgstr "(Ei ehdotuksia)"
 
-#: ../libempathy-gtk/empathy-chat.c:1829
+#. translators: %s is the selected word
+#: ../libempathy-gtk/empathy-chat.c:2099
+#, c-format
+msgid "Add '%s' to Dictionary"
+msgstr "Lisää �%s� sanakirjaan"
+
+#. translators: first %s is the selected word,
+#. * second %s is the language name of the target dictionary
+#: ../libempathy-gtk/empathy-chat.c:2136
+#, c-format
+msgid "Add '%s' to %s Dictionary"
+msgstr "Lisää �%s� kielen %s sanakirjaan"
+
+#: ../libempathy-gtk/empathy-chat.c:2206
 msgid "Insert Smiley"
 msgstr "Lisää hymiö"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1847
-#: ../libempathy-gtk/empathy-ui-utils.c:1805
+#: ../libempathy-gtk/empathy-chat.c:2224
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "_Lähetä"
 
-#: ../libempathy-gtk/empathy-chat.c:1881
+#. Spelling suggestions
+#: ../libempathy-gtk/empathy-chat.c:2278
 msgid "_Spelling Suggestions"
 msgstr "_Kielentarkistuksen ehdotukset"
 
-#: ../libempathy-gtk/empathy-chat.c:1958
+#: ../libempathy-gtk/empathy-chat.c:2367
 msgid "Failed to retrieve recent logs"
 msgstr "Viimeisimpien lokien nouto epäonnistui"
 
-#: ../libempathy-gtk/empathy-chat.c:2064
+#: ../libempathy-gtk/empathy-chat.c:2504
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s katkaisi"
@@ -1349,12 +1532,12 @@ msgstr "%s katkaisi"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2071
+#: ../libempathy-gtk/empathy-chat.c:2511
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s potkaisi henkilön %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2514
 #, c-format
 msgid "%s was kicked"
 msgstr "%s potkaistiin"
@@ -1362,17 +1545,17 @@ msgstr "%s potkaistiin"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2082
+#: ../libempathy-gtk/empathy-chat.c:2522
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s esti henkilön %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2085
+#: ../libempathy-gtk/empathy-chat.c:2525
 #, c-format
 msgid "%s was banned"
 msgstr "%s estettiin"
 
-#: ../libempathy-gtk/empathy-chat.c:2089
+#: ../libempathy-gtk/empathy-chat.c:2529
 #, c-format
 msgid "%s has left the room"
 msgstr "%s on poistunut huoneesta"
@@ -1382,82 +1565,174 @@ msgstr "%s on poistunut huoneesta"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2098
+#: ../libempathy-gtk/empathy-chat.c:2538
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2123
+#: ../libempathy-gtk/empathy-chat.c:2563
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s on saapunut huoneeseen"
 
-#: ../libempathy-gtk/empathy-chat.c:2148
+#: ../libempathy-gtk/empathy-chat.c:2588
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s vaihtoi nimekseen %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1947
+#: ../libempathy-gtk/empathy-chat.c:2727
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:2355
 msgid "Disconnected"
 msgstr "Ei yhteyttä"
 
-#: ../libempathy-gtk/empathy-chat.c:2934
-msgid "Wrong password; please try again:"
-msgstr "Väärä salasana, yritä uudelleen:"
+#. Add message
+#: ../libempathy-gtk/empathy-chat.c:3374
+msgid "Would you like to store this password?"
+msgstr "Haluaisitteko tallentaa tämän salasanan?"
+
+#: ../libempathy-gtk/empathy-chat.c:3380
+msgid "Remember"
+msgstr "Muista"
+
+#: ../libempathy-gtk/empathy-chat.c:3390
+msgid "Not now"
+msgstr "Ei nyt"
 
-#: ../libempathy-gtk/empathy-chat.c:2935
+#: ../libempathy-gtk/empathy-chat.c:3434
 msgid "Retry"
 msgstr "Yritä uudelleen"
 
-#: ../libempathy-gtk/empathy-chat.c:2940
+#: ../libempathy-gtk/empathy-chat.c:3438
+msgid "Wrong password; please try again:"
+msgstr "Väärä salasana, yritä uudelleen:"
+
+#. Add message
+#: ../libempathy-gtk/empathy-chat.c:3568
 msgid "This room is protected by a password:"
 msgstr "Huone on salasanasuojattu:"
 
-#: ../libempathy-gtk/empathy-chat.c:2941
+#: ../libempathy-gtk/empathy-chat.c:3595
 msgid "Join"
 msgstr "Liity"
 
-#: ../libempathy-gtk/empathy-chat.c:3081
+#: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "Yhdistetty"
 
-#: ../libempathy-gtk/empathy-chat.c:3134
-#: ../libempathy-gtk/empathy-log-window.c:653
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "Conversation"
 msgstr "Keskustelu"
 
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:3857
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (SMS)"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+msgid "Unknown or invalid identifier"
+msgstr "Tuntematon tai virheellinen tunniste"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+msgid "Contact blocking temporarily unavailable"
+msgstr "Yhteyshenkilöiden esto tilapäisesti poissa"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+msgid "Contact blocking unavailable"
+msgstr "Yhteyshenkilöiden esto poissa"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+msgid "Permission Denied"
+msgstr "Pääsy evätty"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+msgid "Could not block contact"
+msgstr "Yhteystietoa ei voitu estää"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+msgid "Edit Blocked Contacts"
+msgstr "Muokkaa estettyjä yhteystietoja"
+
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1485
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Account:"
+msgstr "Käyttäjätili:"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "Estetyt yhteyshenkilöt"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Poista"
+
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:791
+#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Kopioi linkin osoite"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:331
-#: ../libempathy-gtk/empathy-theme-adium.c:798
+#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Avaa linkki"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:424
+#: ../libempathy-gtk/empathy-chat-text-view.c:415
 msgid "%A %B %d %Y"
 msgstr "%A %d. %Bta %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:241
+#: ../libempathy-gtk/empathy-contact-dialogs.c:299
 #: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
 msgid "Edit Contact Information"
 msgstr "Muokkaa tuttavan tietoja"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:292
+#: ../libempathy-gtk/empathy-contact-dialogs.c:350
 msgid "Personal Information"
 msgstr "Henkilökohtaiset tiedot"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:397
-#: ../libempathy-gtk/empathy-individual-dialogs.c:111
+#: ../libempathy-gtk/empathy-contact-dialogs.c:459
+#: ../libempathy-gtk/empathy-individual-dialogs.c:119
 msgid "New Contact"
 msgstr "Uusi tuttava"
 
+#: ../libempathy-gtk/empathy-contact-dialogs.c:533
+#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#, c-format
+msgid "Block %s?"
+msgstr "Estetäänkö %s?"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:538
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#, c-format
+msgid "Are you sure you want to block '%s' from contacting you again?"
+msgstr "Oletko varma käyttäjän '%s' estämisestä?"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:543
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+msgid "_Block"
+msgstr "_Estä"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:559
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+msgid "_Report this contact as abusive"
+msgid_plural "_Report these contacts as abusive"
+msgstr[0] "_Raportoi tämä yhteyshenkilö loukkaavana"
+msgstr[1] "_Raportoi nämä yhteyshenkilöt loukkaavina"
+
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
 msgstr "_Päätä myöhemmin"
@@ -1466,6 +1741,10 @@ msgstr "_Päätä myöhemmin"
 msgid "Subscription Request"
 msgstr "Liittymispyyntö"
 
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "_Block User"
+msgstr "Es_tä käyttäjä"
+
 #: ../libempathy-gtk/empathy-contact-list-store.h:71
 msgid "Ungrouped"
 msgstr "Ryhmittelemättömät"
@@ -1474,280 +1753,331 @@ msgstr "Ryhmittelemättömät"
 msgid "Favorite People"
 msgstr "Suosikkihenkilöt"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2232
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Haluatko varmasti poistaa ryhmän \"%s\"?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2006
-#: ../libempathy-gtk/empathy-individual-view.c:2235
+#: ../libempathy-gtk/empathy-contact-list-view.c:1988
+#: ../libempathy-gtk/empathy-individual-view.c:2379
 msgid "Removing group"
 msgstr "Poistetaan ryhmää"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2055
-#: ../libempathy-gtk/empathy-contact-list-view.c:2132
-#: ../libempathy-gtk/empathy-individual-view.c:2289
-#: ../libempathy-gtk/empathy-individual-view.c:2387
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../libempathy-gtk/empathy-contact-list-view.c:2037
+#: ../libempathy-gtk/empathy-contact-list-view.c:2114
+#: ../libempathy-gtk/empathy-individual-view.c:2434
+#: ../libempathy-gtk/empathy-individual-view.c:2637
 msgid "_Remove"
 msgstr "_Poista"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2320
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
+#: ../libempathy-gtk/empathy-individual-view.c:2501
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Haluatko varmasti poistaa tuttavan \"%s\" yhteystiedot?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2087
-#: ../libempathy-gtk/empathy-individual-view.c:2322
+#: ../libempathy-gtk/empathy-contact-list-view.c:2069
+#: ../libempathy-gtk/empathy-individual-view.c:2522
 msgid "Removing contact"
 msgstr "Poistetaan tuttava"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:203
-#: ../src/empathy-main-window.ui.h:13
+#: ../libempathy-gtk/empathy-contact-menu.c:220
+#: ../src/empathy-main-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "_Lisää tuttava…"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:230
-#: ../libempathy-gtk/empathy-individual-menu.c:516
-#: ../src/empathy-main-window.ui.h:14
+#: ../libempathy-gtk/empathy-contact-menu.c:300
+msgid "_Block Contact"
+msgstr "Es_tä yhteystieto"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:329
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "_Keskustele"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:260
-#: ../libempathy-gtk/empathy-individual-menu.c:559
+#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Äänipuhelu"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:290
-#: ../libempathy-gtk/empathy-individual-menu.c:601
+#: ../libempathy-gtk/empathy-contact-menu.c:394
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Videopuhelu"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:330
-#: ../libempathy-gtk/empathy-individual-menu.c:644
-#: ../src/empathy-main-window.ui.h:25
+#: ../libempathy-gtk/empathy-contact-menu.c:440
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "_Aiemmat keskustelut"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:352
-#: ../libempathy-gtk/empathy-individual-menu.c:685
+#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "Lähetä tiedosto"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:374
-#: ../libempathy-gtk/empathy-individual-menu.c:727
+#: ../libempathy-gtk/empathy-contact-menu.c:485
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
 msgstr "Jaa työpöytäni"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:414
-#: ../libempathy-gtk/empathy-contact-widget.c:1570
-#: ../libempathy-gtk/empathy-individual-menu.c:761
-#: ../libempathy-gtk/empathy-individual-widget.c:1292
+#: ../libempathy-gtk/empathy-contact-menu.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:1886
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:1373
 msgid "Favorite"
 msgstr "Suosikki"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:443
-#: ../libempathy-gtk/empathy-individual-menu.c:788
+#: ../libempathy-gtk/empathy-contact-menu.c:554
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "_Tietoja"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:489
+#: ../libempathy-gtk/empathy-contact-menu.c:600
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:543
-#: ../libempathy-gtk/empathy-individual-menu.c:972
-#: ../src/empathy-chat-window.c:903
+#: ../libempathy-gtk/empathy-contact-menu.c:654
+#: ../libempathy-gtk/empathy-individual-menu.c:1283
+#: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "Kutsuu sinut tähän keskusteluhuoneeseen"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:574
-#: ../libempathy-gtk/empathy-individual-menu.c:1019
+#: ../libempathy-gtk/empathy-contact-menu.c:685
+#: ../libempathy-gtk/empathy-individual-menu.c:1329
 msgid "_Invite to Chat Room"
 msgstr "_Kutsu keskusteluhuoneeseen"
 
+#. Title
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+msgid "Search contacts"
+msgstr "Etsi yhteystietoja"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+msgid "Search: "
+msgstr "Etsi: "
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+msgid "_Add Contact"
+msgstr "_Lisää yhteystieto"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+msgid "No contacts found"
+msgstr "Yhteystietoa ei löytynyt"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
+msgstr ""
+
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "Valitse tuttava"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:226
-#: ../libempathy-gtk/empathy-individual-widget.c:148
+#: ../libempathy-gtk/empathy-contact-widget.c:336
+#: ../libempathy-gtk/empathy-individual-widget.c:153
 msgid "Full name:"
 msgstr "Koko nimi:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:227
-#: ../libempathy-gtk/empathy-individual-widget.c:149
+#: ../libempathy-gtk/empathy-contact-widget.c:337
+#: ../libempathy-gtk/empathy-individual-widget.c:154
 msgid "Phone number:"
 msgstr "Puhelinnumero:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:228
-#: ../libempathy-gtk/empathy-individual-widget.c:150
+#: ../libempathy-gtk/empathy-contact-widget.c:338
+#: ../libempathy-gtk/empathy-individual-widget.c:155
 msgid "E-mail address:"
 msgstr "Sähköpostiosoite:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:229
-#: ../libempathy-gtk/empathy-individual-widget.c:151
+#: ../libempathy-gtk/empathy-contact-widget.c:339
+#: ../libempathy-gtk/empathy-individual-widget.c:156
 msgid "Website:"
 msgstr "Kotisivu:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:230
-#: ../libempathy-gtk/empathy-individual-widget.c:152
+#: ../libempathy-gtk/empathy-contact-widget.c:340
+#: ../libempathy-gtk/empathy-individual-widget.c:157
 msgid "Birthday:"
 msgstr "Syntymäpäivä:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:609
-#: ../libempathy-gtk/empathy-individual-widget.c:454
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:346
+msgid "Last seen:"
+msgstr "Viimeksi nähty:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:348
+msgid "Connected from:"
+msgstr "Yhdisti kohteesta:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:353
+msgid "Away message:"
+msgstr "Poissaoloviesti:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+msgid "Channels:"
+msgstr "Kanavat:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
 msgstr "Maan ISO-tunnus:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:611
-#: ../libempathy-gtk/empathy-individual-widget.c:456
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Country:"
 msgstr "Maa:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:613
-#: ../libempathy-gtk/empathy-individual-widget.c:458
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "State:"
 msgstr "Osavaltio:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:615
-#: ../libempathy-gtk/empathy-individual-widget.c:460
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "City:"
 msgstr "Kaupunki:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:617
-#: ../libempathy-gtk/empathy-individual-widget.c:462
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Area:"
 msgstr "Alue:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:619
-#: ../libempathy-gtk/empathy-individual-widget.c:464
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
 msgstr "Postinumero:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:621
-#: ../libempathy-gtk/empathy-individual-widget.c:466
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Street:"
 msgstr "Katu:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:623
-#: ../libempathy-gtk/empathy-individual-widget.c:468
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
 msgstr "Rakennus:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:625
-#: ../libempathy-gtk/empathy-individual-widget.c:470
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Floor:"
 msgstr "Kerros:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:627
-#: ../libempathy-gtk/empathy-individual-widget.c:472
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Room:"
 msgstr "Huone:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:629
-#: ../libempathy-gtk/empathy-individual-widget.c:474
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Text:"
 msgstr "Teksti:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:631
-#: ../libempathy-gtk/empathy-individual-widget.c:476
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Description:"
 msgstr "Kuvaus:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:633
-#: ../libempathy-gtk/empathy-individual-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:635
-#: ../libempathy-gtk/empathy-individual-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
 msgstr "Tarkkuustaso:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:637
-#: ../libempathy-gtk/empathy-individual-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr "Virhe:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:639
-#: ../libempathy-gtk/empathy-individual-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
 msgstr "Vertikaalinen virhe (metriä):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:641
-#: ../libempathy-gtk/empathy-individual-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
 msgstr "Horisontaalinen virhe (metriä):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:643
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr "Nopeus:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:645
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Bearing:"
 msgstr "Suuntima:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:647
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
 msgstr "Kiipeämisvauhti:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:649
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
 msgstr "Viimeksi päivitetty:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:651
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
 msgstr "Pituuspiiri:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:653
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
 msgstr "Leveyspiiri:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:655
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
 msgstr "Korkeus:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:718
-#: ../libempathy-gtk/empathy-contact-widget.c:735
-#: ../libempathy-gtk/empathy-individual-widget.c:582
-#: ../libempathy-gtk/empathy-individual-widget.c:599
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:16
 msgid "Location"
 msgstr "Sijainti"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:737
-#: ../libempathy-gtk/empathy-individual-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:789
-#: ../libempathy-gtk/empathy-individual-widget.c:650
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e. %Bta %Y klo %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:872
-#: ../libempathy-gtk/empathy-individual-widget.c:841
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
 msgid "Save Avatar"
 msgstr "Tallenna vastaus"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:928
-#: ../libempathy-gtk/empathy-individual-widget.c:899
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
 msgid "Unable to save avatar"
 msgstr "Avataria ei voitu tallentaa"
 
@@ -1757,7 +2087,7 @@ msgstr "<b>Sijainti</b> hetkellä (pvm)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1227
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr "Nimimerkki:"
 
@@ -1777,7 +2107,7 @@ msgstr "Tuttavan tiedot"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1431
+#: ../libempathy-gtk/empathy-individual-widget.c:1515
 msgid "Identifier:"
 msgstr "Tunniste:"
 
@@ -1794,11 +2124,11 @@ msgstr "Käyttöjärjestelmä:"
 msgid "Version:"
 msgstr "Versio:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:332
+#: ../libempathy-gtk/empathy-groups-widget.c:333
 msgid "Groups"
 msgstr "Ryhmät"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:344
+#: ../libempathy-gtk/empathy-groups-widget.c:345
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -1806,34 +2136,46 @@ msgstr ""
 "Valitse ryhmät, joissa haluat tämän tuttavan näkyvän. Huomaa että voit "
 "valita useita ryhmiä tai olla valitsematta yhtään ryhmää."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:363
+#: ../libempathy-gtk/empathy-groups-widget.c:364
 msgid "_Add Group"
 msgstr "_Lisää ryhmä"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:397
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:554
+#: ../libempathy-gtk/empathy-groups-widget.c:399
+msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Valitse"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:407
-#: ../src/empathy-main-window.c:1250
+#: ../libempathy-gtk/empathy-groups-widget.c:409
+#: ../src/empathy-main-window.c:1807
 msgid "Group"
 msgstr "Ryhmä"
 
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+msgid "The following identity will be blocked:"
+msgid_plural "The following identities will be blocked:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+msgid "The following identity can not be blocked:"
+msgid_plural "The following identities can not be blocked:"
+msgstr[0] ""
+msgstr[1] ""
+
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
 msgstr "Linkitetyt yhteystiedot"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:354
+#: ../libempathy-gtk/empathy-individual-linker.c:370
 msgid "Select contacts to link"
 msgstr "Valitse linkitettävät yhteystiedot"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:428
+#: ../libempathy-gtk/empathy-individual-linker.c:444
 msgid "New contact preview"
 msgstr "Uuden yhteystiedon esikatselu"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:472
+#: ../libempathy-gtk/empathy-individual-linker.c:488
 msgid "Contacts selected in the list on the left will be linked together."
 msgstr ""
 "Vasemmanpuoleisesta luettelosta valitut yhteystiedot linkitetään yhteen."
@@ -1841,42 +2183,97 @@ msgstr ""
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:132
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:839
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "Valitse soittoon käytettävä tili"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "Soita"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+msgid "Mobile"
+msgstr "Matkapuhelin"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "Työ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "Koti"
+
+#. add an SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+msgid "_SMS"
+msgstr "_SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1141
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Muokkaa"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:865
+#: ../libempathy-gtk/empathy-individual-menu.c:1167
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "_Linkitä yhteystiedot…"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1569
+#: ../libempathy-gtk/empathy-individual-view.c:2341
+msgid "Delete and _Block"
+msgstr "Poista ja _estä"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2510
 #, c-format
-msgid "Meta-contact containing %u contact"
-msgid_plural "Meta-contact containing %u contacts"
-msgstr[0] "Metayhteystieto, joka sisältää %u yhteystiedon"
-msgstr[1] "Metayhteystieto, joka sisältää %u yhteystietoa"
+msgid ""
+"Do you really want to remove the linked contact '%s'? Note that this will "
+"remove all the contacts which make up this linked contact."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1662
+#, c-format
+msgid "Linked contact containing %u contact"
+msgid_plural "Linked contacts containing %u contacts"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:1
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Sijainti</b> hetkellä (pvm)"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Online from a phone or mobile device"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
 msgid "New Network"
 msgstr "Uusi verkko"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:495
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
 msgid "Choose an IRC network"
 msgstr "Valitse IRC-verkko"
 
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+msgid "Reset _Networks List"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+msgctxt "verb displayed on a button to select an IRC network"
+msgid "Select"
+msgstr "Valitse"
+
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:280
 msgid "new server"
 msgstr "uusi palvelin"
@@ -1899,8 +2296,8 @@ msgstr "_Poista linkitys…"
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:121
 msgid ""
-"Completely split the displayed meta-contact into the contacts it contains."
-msgstr "Jaa näytettävä metayhteystieto sen sisältämiin yhteystietoihin."
+"Completely split the displayed linked contacts into the separate contacts."
+msgstr ""
 
 #. Add button
 #. Translators: this is an action button in the linking dialogue. "Link" is
@@ -1910,286 +2307,451 @@ msgstr "Jaa näytettävä metayhteystieto sen sisältämiin yhteystietoihin."
 msgid "_Link"
 msgstr "_Linkitä"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:182
+#: ../libempathy-gtk/empathy-linking-dialog.c:183
 #, c-format
-msgid "Unlink meta-contact '%s'?"
-msgstr "Poistetaanko metayhteystiedon �%s� linkitys?"
+msgid "Unlink linked contacts '%s'?"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:185
+#: ../libempathy-gtk/empathy-linking-dialog.c:186
 msgid ""
-"Are you sure you want to unlink this meta-contact? This will completely "
-"split the meta-contact into the contacts it contains."
+"Are you sure you want to unlink these linked contacts? This will completely "
+"split the linked contacts into separate contacts."
 msgstr ""
-"Haluatko varmasti poistaa tämän metayhteystiedon linkityksen? "
-"Metayhteystieto jaetaan sen sisältämiin yhteystietoihin."
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:190
 msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "_Poista linkitys"
 
-#: ../libempathy-gtk/empathy-log-window.c:663
-msgid "Date"
-msgstr "Päivämäärä"
+#: ../libempathy-gtk/empathy-log-window.c:633
+msgid "History"
+msgstr "Historia"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
-msgstr "Keskustelut"
+#: ../libempathy-gtk/empathy-log-window.c:688
+msgid "Show"
+msgstr "Näytä"
+
+#: ../libempathy-gtk/empathy-log-window.c:710
+msgid "Search"
+msgstr "Etsi"
+
+#: ../libempathy-gtk/empathy-log-window.c:1158
+#, c-format
+msgid "Chat in %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:1160
+#, c-format
+msgid "Chat with %s"
+msgstr "Keskustele käyttäjän %s kanssa"
+
+#: ../libempathy-gtk/empathy-log-window.c:1210
+#: ../libempathy-gtk/empathy-log-window.c:1357
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr ""
+
+#. Translators: this is an emote: '* Danielle waves'
+#: ../libempathy-gtk/empathy-log-window.c:1299
+#, c-format
+msgid "<i>* %s %s</i>"
+msgstr "<i>* %s %s</i>"
+
+#. Translators: this is a message: 'Danielle: hello'
+#. * The string in bold is the sender's name
+#: ../libempathy-gtk/empathy-log-window.c:1305
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1376
+#: ../libempathy-gtk/empathy-log-window.c:1378
+#: ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "%"
+
+#: ../libempathy-gtk/empathy-log-window.c:1385
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "Puhelun kesto %s, puhelu päättyi %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1717
+msgid "Today"
+msgstr "Tänään"
+
+#: ../libempathy-gtk/empathy-log-window.c:1721
+msgid "Yesterday"
+msgstr "Eilen"
+
+#: ../libempathy-gtk/empathy-log-window.c:1737
+msgctxt ""
+"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+msgid "%e %B %Y"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:1818
+#: ../libempathy-gtk/empathy-log-window.c:3399
+msgid "Anytime"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:1898
+#: ../libempathy-gtk/empathy-log-window.c:2328
+msgid "Anyone"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:2640
+msgid "Who"
+msgstr "Kuka"
+
+#: ../libempathy-gtk/empathy-log-window.c:2844
+msgid "When"
+msgstr "Milloin"
+
+#: ../libempathy-gtk/empathy-log-window.c:2960
+msgid "Anything"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:2962
+msgid "Text chats"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:2964
+#: ../src/empathy-preferences.ui.h:4
+msgid "Calls"
+msgstr "Puhelut"
+
+#: ../libempathy-gtk/empathy-log-window.c:2969
+msgid "Incoming calls"
+msgstr "Saapuneet puhelut"
+
+#: ../libempathy-gtk/empathy-log-window.c:2970
+msgid "Outgoing calls"
+msgstr "Soitetut puhelut"
+
+#: ../libempathy-gtk/empathy-log-window.c:2971
+msgid "Missed calls"
+msgstr "Vastaamattomat puhelut"
+
+#: ../libempathy-gtk/empathy-log-window.c:2993
+msgid "What"
+msgstr "Mitä"
+
+#: ../libempathy-gtk/empathy-log-window.c:3702
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr ""
+"Haluatko varmasti poistaa kaikki aikaisempien keskusteluiden historiatiedot?"
+
+#: ../libempathy-gtk/empathy-log-window.c:3706
+msgid "Clear All"
+msgstr "Tyhjennä kaikki"
+
+#: ../libempathy-gtk/empathy-log-window.c:3713
+msgid "Delete from:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Ladataan...</span>"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "Etsi seuraava"
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Chat"
+msgstr "Keskustelu"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "Etsi edellinen"
+msgid "Delete All History..."
+msgstr "Poista kaikki historia..."
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr "Aikaisemmat keskustelut"
+msgid "Profile"
+msgstr "Profiili"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Video"
+msgstr "Video"
 
-#. Tab Label
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "Etsi"
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:20
+msgid "_Edit"
+msgstr "_Muokkaa"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "_File"
+msgstr "_Tiedosto"
 
-#. Searching *for* something
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "_Ajalta:"
+msgid "page 2"
+msgstr "sivu 2"
 
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
 msgid "Contact ID:"
 msgstr "Tuttavan tunniste:"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:145
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
 msgid "C_hat"
 msgstr "_Keskustele"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:155
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
 msgstr "Uusi keskustelu"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:205
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
 msgid "Send _Video"
 msgstr "Lähetä _videota"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:213
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
 msgid "C_all"
 msgstr "_Soita"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "New Call"
 msgstr "Uusi puhelu"
 
+#: ../libempathy-gtk/empathy-password-dialog.c:274
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+"Anna salasana tilille\n"
+"<b>%s</b>"
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:168
-#: ../libempathy-gtk/empathy-presence-chooser.c:204
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Message…"
 msgstr "Oma viesti…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:221
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messages…"
 msgstr "Muokkaa omia viestejä…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:346
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
 msgstr "Napsauta poistaaksesi tämän tilan suosikeista"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:355
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
 msgstr "Napsauta tehdäksesi tästä tilasta suosikin"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:389
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
 msgstr "Aseta tila"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:939
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
 msgid "Set your presence and current status"
 msgstr "Aseta läsnäolosi ja nykyinen tilasi"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1124
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
 msgid "Custom messages…"
 msgstr "Omat viestit…"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#. Create account
+#. To translator: %s is the name of the protocol, such as "Google Talk" or
+#. * "Yahoo!"
+#.
+#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#, c-format
+msgid "New %s account"
+msgstr "Uusi %s-tili"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "Etsi:"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "Huomioi kirjainkoko"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Mat_ch case"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
 msgid "Phrase not found"
 msgstr "Lausetta ei löydy"
 
-#: ../libempathy-gtk/empathy-sound.c:50
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "_Next"
+msgstr "_Seuraava"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+msgid "_Previous"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
 msgstr "Vastaanotettiin pikaviesti"
 
-#: ../libempathy-gtk/empathy-sound.c:52
+#: ../libempathy-gtk/empathy-sound-manager.c:53
 msgid "Sent an instant message"
 msgstr "Lähetettiin pikaviesti"
 
-#: ../libempathy-gtk/empathy-sound.c:54
+#: ../libempathy-gtk/empathy-sound-manager.c:55
 msgid "Incoming chat request"
 msgstr "Saapuva keskustelupyyntö"
 
-#: ../libempathy-gtk/empathy-sound.c:56
+#: ../libempathy-gtk/empathy-sound-manager.c:57
 msgid "Contact connected"
 msgstr "Tuttava yhdistetty"
 
-#: ../libempathy-gtk/empathy-sound.c:58
+#: ../libempathy-gtk/empathy-sound-manager.c:59
 msgid "Contact disconnected"
 msgstr "Yhteys tuttavaan katkaistu"
 
-#: ../libempathy-gtk/empathy-sound.c:60
+#: ../libempathy-gtk/empathy-sound-manager.c:61
 msgid "Connected to server"
 msgstr "Yhdistetty palvelimeen"
 
-#: ../libempathy-gtk/empathy-sound.c:62
+#: ../libempathy-gtk/empathy-sound-manager.c:63
 msgid "Disconnected from server"
 msgstr "Yhteys palvelimeen katkaistu"
 
-#: ../libempathy-gtk/empathy-sound.c:64
+#: ../libempathy-gtk/empathy-sound-manager.c:65
 msgid "Incoming voice call"
 msgstr "Saapuva puhelu"
 
-#: ../libempathy-gtk/empathy-sound.c:66
+#: ../libempathy-gtk/empathy-sound-manager.c:67
 msgid "Outgoing voice call"
 msgstr "Lähetä puhelu"
 
-#: ../libempathy-gtk/empathy-sound.c:68
+#: ../libempathy-gtk/empathy-sound-manager.c:69
 msgid "Voice call ended"
 msgstr "Puhelu päättyi"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "Syötä itse määritelty viesti"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
 msgstr "Muokkaa itse määriteltyjä viestejä"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Add _New Preset"
-msgstr "Lisää _uusi esitieto"
+#: ../libempathy-gtk/empathy-theme-adium.c:1030
+#, c-format
+msgid "Message edited at %s"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Presets"
-msgstr "Tallennetut esitiedot"
+#: ../libempathy-gtk/empathy-theme-adium.c:1720
+msgid "Normal"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "Perinteinen"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "Yksinkertainen"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "Siisti"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "Sininen"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:150
-msgid "The identity provided by the chat server cannot be verified.\n"
-msgstr "Keskustelupalvelimen antamaa tunnistetta ei voida varmistaa.\n"
+msgid "The identity provided by the chat server cannot be verified."
+msgstr ""
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:156
-msgid "The certificate is not signed by a Certification Authority"
-msgstr "Varmennetta ei ole virallisesti allekirjoitettu"
+#: ../libempathy-gtk/empathy-tls-dialog.c:157
+msgid "The certificate is not signed by a Certification Authority."
+msgstr ""
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:160
-msgid "The certificate has expired"
-msgstr "Varmenne on vanhentunut"
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
+msgid "The certificate has expired."
+msgstr "Varmenne on vanhentunut."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:163
-msgid "The certificate hasn't yet been activated"
-msgstr "Varmennetta ei ole vielä aktivoitu"
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
+msgid "The certificate hasn't yet been activated."
+msgstr "Varmennetta ei ole vielä aktivoitu."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:166
-msgid "The certificate does not have the expected fingerprint"
-msgstr "Varmenteessa ei ole odotettua sormenjälkeä"
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
+msgid "The certificate does not have the expected fingerprint."
+msgstr ""
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:169
-msgid "The hostname verified by the certificate doesn't match the server name"
-msgstr "Varmenteessa ilmoitettu isäntänimi ei täsmää palvelimen nimen kanssa"
+#: ../libempathy-gtk/empathy-tls-dialog.c:170
+msgid "The hostname verified by the certificate doesn't match the server name."
+msgstr ""
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:173
-msgid "The certificate is self-signed"
-msgstr "Varmenne on itsetehty"
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
+msgid "The certificate is self-signed."
+msgstr "Varmenne on allekirjoitettu itse."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:176
-msgid "The certificate has been revoked by the issuing Certification Authority"
-msgstr "Varmenne on peruutettu varmenteen myöntäjän toimesta"
+#: ../libempathy-gtk/empathy-tls-dialog.c:177
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
+msgstr ""
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:180
-msgid "The certificate is cryptographically weak"
-msgstr "Varmenteen salausmenetelmä on heikko"
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
+msgid "The certificate is cryptographically weak."
+msgstr ""
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:183
-msgid "The certificate length exceeds verifiable limits"
-msgstr "Varmenteen pituus ylittää sallitut rajat"
+#: ../libempathy-gtk/empathy-tls-dialog.c:184
+msgid "The certificate length exceeds verifiable limits."
+msgstr ""
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:187
-msgid "The certificate is malformed"
-msgstr "Varmenne on muodostettu väärin"
+#: ../libempathy-gtk/empathy-tls-dialog.c:188
+msgid "The certificate is malformed."
+msgstr ""
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:205
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
 msgid "Expected hostname: %s"
 msgstr "Odotettu isäntänimi: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:208
+#: ../libempathy-gtk/empathy-tls-dialog.c:209
 #, c-format
 msgid "Certificate hostname: %s"
 msgstr "Varmenteen ilmoittama isäntänimi: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:263
+#: ../libempathy-gtk/empathy-tls-dialog.c:281
 msgid "Continue"
 msgstr "Jatka"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:269
+#: ../libempathy-gtk/empathy-tls-dialog.c:287
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Yhteys ei ole luotettava. Haluatko kuitenkin jatkaa?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:286
+#: ../libempathy-gtk/empathy-tls-dialog.c:297
 msgid "Remember this choice for future connections"
 msgstr "Muista tämä valinta tulevia yhteyksiä varten"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:294
+#: ../libempathy-gtk/empathy-tls-dialog.c:303
 msgid "Certificate Details"
 msgstr "Varmenteen tiedot"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1702
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
 msgstr "URI:a ei voi avata"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1797
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1866
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
+msgid "Insufficient free space to save file"
+msgstr "Tiedoston tallennukseen ei ole riittävästi tilaa"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#, c-format
+msgid ""
+"%s of free space are required to save this file, but only %s is available. "
+"Please choose another location."
+msgstr ""
+"Tiedoston tallennukseen vaaditaan tilaa vähintään %s, mutta vain %s on "
+"saatavilla. Valitse toinen tallennussijainti."
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Saapuva tiedosto käyttäjältä %s"
@@ -2377,19 +2939,35 @@ msgstr "Ei virheilmoitusta"
 msgid "Instant Message (Empathy)"
 msgstr "Pikaviesti (Empathy)"
 
-#: ../src/empathy.c:414
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "Älä yhdistä käynnistettäessä"
 
-#: ../src/empathy.c:418
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Älä näytä tuttavalistaa tai muita dialogeja käynnistyksessä"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr "- Empathy-pikaviestin"
 
-#: ../src/empathy-about-dialog.c:85
+#: ../src/empathy.c:637
+msgid "Error contacting the Account Manager"
+msgstr "Virhe yhdistettäessä tilienhallintaan"
+
+#: ../src/empathy.c:639
+#, c-format
+msgid ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+msgstr ""
+"Yhdistettäessä Empathyn tilienhallintaan tapahtui virhe:\n"
+"\n"
+"%s"
+
+#: ../src/empathy-about-dialog.c:81
 msgid ""
 "Empathy 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 "
@@ -2401,7 +2979,7 @@ msgstr ""
 "Software Foundation on ne julkaissut; joko lisenssin version 2, tai "
 "(valinnan mukaan) minkä tahansa myöhemmän version mukaisesti."
 
-#: ../src/empathy-about-dialog.c:89
+#: ../src/empathy-about-dialog.c:85
 msgid ""
 "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -2413,7 +2991,7 @@ msgstr ""
 "laadusta tai soveltuvuudesta tiettyyn tarkoitukseen. Katso GPL lisenssistä "
 "lisää yksityiskohtia."
 
-#: ../src/empathy-about-dialog.c:93
+#: ../src/empathy-about-dialog.c:89
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
@@ -2423,11 +3001,11 @@ msgstr ""
 "kirjoita osoitteeseen Free Software Foundation Inc., 51 Franklin St, Fifth "
 "Floor, Boston, MA 02110-1301, USA."
 
-#: ../src/empathy-about-dialog.c:121
+#: ../src/empathy-about-dialog.c:107
 msgid "An Instant Messaging client for GNOME"
 msgstr "Gnomen pikaviestiohjelma"
 
-#: ../src/empathy-about-dialog.c:127
+#: ../src/empathy-about-dialog.c:113
 msgid "translator-credits"
 msgstr ""
 "Samuli Seppänen ja Henna Nykänen, 2006.\n"
@@ -2447,18 +3025,22 @@ msgstr ""
 "  Ilkka Tuohela https://launchpad.net/~hile\n"
 "  Ilkka Tuohela https://launchpad.net/~hile-utu\n"
 "  Jammi Vesterinen https://launchpad.net/~jmov\n"
-"  Jani Uusitalo https://launchpad.net/~jani-uusitalo\n"
+"  Jani Uusitalo https://launchpad.net/~uusijani\n"
 "  Jere Sokka https://launchpad.net/~jerry-sokka\n"
 "  Jiri Grönroos https://launchpad.net/~jiri-gronroos\n"
-"  Jussi Aalto https://launchpad.net/~jtaalto\n"
+"  Joonas Pajuniva https://launchpad.net/~joonas-pajuniva\n"
+"  Jussi Aalto https://launchpad.net/~jtaalto-deactivatedaccount\n"
+"  Kristian Kurki https://launchpad.net/~kristian-kurki\n"
 "  Matti Karnaattu https://launchpad.net/~mattikarnaattu\n"
-"  Mika Suomalainen https://launchpad.net/~s-mika\n"
+"  Mika Suomalainen https://launchpad.net/~mkaysi\n"
 "  Mikko Nissinen https://launchpad.net/~mikko\n"
+"  Miko-Matias Grönvall https://launchpad.net/~matias-gronvall\n"
 "  Ncl8 https://launchpad.net/~crofle\n"
 "  Timo Jyrinki https://launchpad.net/~timo-jyrinki\n"
 "  Tomi Juntunen https://launchpad.net/~tojuntu\n"
 "  Tommi Saira https://launchpad.net/~tommisaira\n"
 "  Tommi Vainikainen https://launchpad.net/~thv\n"
+"  Ville-Pekka Vainio https://launchpad.net/~vpvainio\n"
 "  papukaija https://launchpad.net/~papukaija"
 
 #: ../src/empathy-account-assistant.c:167
@@ -2471,7 +3053,7 @@ msgstr "Virhe jäsennettäessä käyttäjätilien asetuksia."
 
 #: ../src/empathy-account-assistant.c:173
 msgid "There was an error while creating the account."
-msgstr "Tunnusta luodessa tapahtui virhe."
+msgstr "Tiliä luodessa tapahtui virhe."
 
 #: ../src/empathy-account-assistant.c:175
 msgid "There was an error."
@@ -2491,92 +3073,81 @@ msgstr ""
 "tämän apulaisen ja lisätä tilit myöhemmin Muokkaa-valikosta."
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1315
+#: ../src/empathy-account-assistant.c:1271
 msgid "An error occurred"
 msgstr "Tapahtui virhe"
 
-#. To translator: %s is the protocol name
-#. Create account
-#. To translator: %s is the name of the protocol, such as "Google Talk" or
-#. * "Yahoo!"
-#.
-#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:614
-#, c-format
-msgid "New %s account"
-msgstr "Uusi %s-tili"
-
-#: ../src/empathy-account-assistant.c:514
+#: ../src/empathy-account-assistant.c:467
 msgid "What kind of chat account do you have?"
 msgstr "Minkä tyyppinen pikaviestintili sinulla on?"
 
-#: ../src/empathy-account-assistant.c:520
+#: ../src/empathy-account-assistant.c:473
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "Onko sinulla muita tilejä, jotka haluaisit määritellä?"
 
-#: ../src/empathy-account-assistant.c:526
+#: ../src/empathy-account-assistant.c:479
 msgid "Enter your account details"
 msgstr "Syötä tilisi tiedot"
 
-#: ../src/empathy-account-assistant.c:531
+#: ../src/empathy-account-assistant.c:484
 msgid "What kind of chat account do you want to create?"
 msgstr "Minkä tyyppisen pikaviestintilin haluat luoda?"
 
-#: ../src/empathy-account-assistant.c:537
+#: ../src/empathy-account-assistant.c:490
 msgid "Do you want to create other chat accounts?"
 msgstr "Haluatko luoda muita pikaviestintilejä?"
 
-#: ../src/empathy-account-assistant.c:544
+#: ../src/empathy-account-assistant.c:497
 msgid "Enter the details for the new account"
 msgstr "Syötä uuden käyttäjätilin tiedot"
 
-#: ../src/empathy-account-assistant.c:659
+#: ../src/empathy-account-assistant.c:612
 msgid ""
 "With Empathy you can chat with people online nearby and with friends and "
 "colleagues who use Google Talk, AIM, Windows Live and many other chat "
 "programs. With a microphone or a webcam you can also have audio or video "
 "calls."
 msgstr ""
-"Empathya käyttäen voit keskustella verkossa olevien tuttujen kanssa, jotka "
-"käyttävät Google Talkia, AIM:ää, Windows Liveä ja monia muita pikaviestimiä. "
-"Mikrofonin ja web-kameran avulla voit myös soittaa puheluita sekä "
-"videopuheluita."
+"Keskustele Empathyn avulla verkossa olevien tuttujen kanssa, joilla on "
+"esimerkiksi Google Talk, AIM, Windows Live tai muu pikaviestintili käytössä. "
+"Mikrofonin ja web-kameran avulla voit myös soittaa ääni- tai videopuheluita."
 
-#: ../src/empathy-account-assistant.c:676
+#: ../src/empathy-account-assistant.c:629
 msgid "Do you have an account you've been using with another chat program?"
 msgstr ""
 "Onko sinulla käyttäjätili, jota olet käyttänyt toisessa pikaviestimessä?"
 
-#: ../src/empathy-account-assistant.c:699
+#: ../src/empathy-account-assistant.c:652
 msgid "Yes, import my account details from "
 msgstr "Kyllä, tuo tilitiedot ohjelmasta "
 
-#: ../src/empathy-account-assistant.c:720
+#: ../src/empathy-account-assistant.c:673
 msgid "Yes, I'll enter my account details now"
 msgstr "Kyllä, syötän tilitietoni nyt"
 
-#: ../src/empathy-account-assistant.c:742
+#: ../src/empathy-account-assistant.c:695
 msgid "No, I want a new account"
 msgstr "Ei, haluan uuden käyttäjätilin"
 
-#: ../src/empathy-account-assistant.c:752
+#: ../src/empathy-account-assistant.c:705
 msgid "No, I just want to see people online nearby for now"
 msgstr "Ei, haluan vain nähdä samassa lähiverkossa linjoilla olevat henkilöt"
 
-#: ../src/empathy-account-assistant.c:773
+#: ../src/empathy-account-assistant.c:726
 msgid "Select the accounts you want to import:"
 msgstr "Valitse tilit, jotka haluat tuoda:"
 
-#: ../src/empathy-account-assistant.c:857
-#: ../src/empathy-new-chatroom-dialog.c:609
-#: ../src/empathy-new-chatroom-dialog.c:610
+#: ../src/empathy-account-assistant.c:813
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "Yes"
 msgstr "Kyllä"
 
-#: ../src/empathy-account-assistant.c:864
+#: ../src/empathy-account-assistant.c:820
 msgid "No, that's all for now"
 msgstr "Ei, tässä oli kaikki"
 
-#: ../src/empathy-account-assistant.c:1129
+#: ../src/empathy-account-assistant.c:1085
 msgid ""
 "Empathy can automatically discover and chat with the people connected on the "
 "same network as you. If you want to use this feature, please check that the "
@@ -2586,19 +3157,19 @@ msgstr ""
 "Empathy voi automaattisesti löytää ja keskustella kanssasi samaan verkkoon "
 "yhdistettyjen ihmisten kanssa. Jos haluat käyttää tätä toimintoa, tarkista "
 "että alla olevat yksityiskohdat pitävät paikkansa. Voit helposti muuttaa "
-"näitä yksityiskohtia myöhemmin tai estää tämän toiminnon käyttämällä "
-"�Tilit�-valintaikkunaa."
+"näitä yksityiskohtia myöhemmin tai estää tämän toiminnon käyttämällä �Tilit�-"
+"valintaikkunaa."
 
-#: ../src/empathy-account-assistant.c:1135
-#: ../src/empathy-account-assistant.c:1191
+#: ../src/empathy-account-assistant.c:1091
+#: ../src/empathy-account-assistant.c:1147
 msgid "Edit->Accounts"
 msgstr "Muokkaa->Tilit"
 
-#: ../src/empathy-account-assistant.c:1151
-msgid "I don't want to enable this feature for now"
-msgstr "En halua ottaa tätä toimintoa käyttöön nyt"
+#: ../src/empathy-account-assistant.c:1107
+msgid "I do _not want to enable this feature for now"
+msgstr "En _halua käyttää tätä ominaisuutta juuri nyt"
 
-#: ../src/empathy-account-assistant.c:1187
+#: ../src/empathy-account-assistant.c:1143
 msgid ""
 "You won't be able to chat with people connected to your local network, as "
 "telepathy-salut is not installed. If you want to enable this feature, please "
@@ -2607,69 +3178,71 @@ msgid ""
 msgstr ""
 "Et voi keskustella paikalliseen verkkoon liittyneiden ihmisten kanssa sillä "
 "telepathy-salut ei ole asennettu. Jos haluat ottaa tämän ominaisuuden "
-"käyttöön, asenna telepathy-salut paketti ja luo läheiset ihmiset -tili "
-"Tilit-ikkunassa."
+"käyttöön, asenna telepathy-salut paketti ja luo läheiset ihmiset -tili Tilit-"
+"ikkunassa."
 
-#: ../src/empathy-account-assistant.c:1193
+#: ../src/empathy-account-assistant.c:1149
 msgid "telepathy-salut not installed"
 msgstr "pakettia telepathy-salut ei ole asennettu"
 
-#: ../src/empathy-account-assistant.c:1239
+#: ../src/empathy-account-assistant.c:1195
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "Viestintä- ja VoIP-käyttäjätilien apulainen"
 
-#: ../src/empathy-account-assistant.c:1273
+#: ../src/empathy-account-assistant.c:1229
 msgid "Welcome to Empathy"
 msgstr "Tervetuloa Empathyyn"
 
-#: ../src/empathy-account-assistant.c:1282
+#: ../src/empathy-account-assistant.c:1238
 msgid "Import your existing accounts"
 msgstr "Tuo olemassa olevat käyttäjätilit"
 
-#: ../src/empathy-account-assistant.c:1300
+#: ../src/empathy-account-assistant.c:1256
 msgid "Please enter personal details"
 msgstr "Syötä henkilökohtaiset tiedot"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:65
+#: ../src/empathy-accounts-dialog.c:64
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Tilille %s tehtyjä muutoksia ei ole tallennettu."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:68
 msgid "Your new account has not been saved yet."
-msgstr "Uutta tunnustasi ei ole vielä tallennettu."
+msgstr "Uutta tiliäsi ei ole vielä tallennettu."
 
-#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:818
+#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1164
 msgid "Connecting…"
 msgstr "Yhdistetään…"
 
-#: ../src/empathy-accounts-dialog.c:322
+#: ../src/empathy-accounts-dialog.c:386
 #, c-format
 msgid "Offline — %s"
 msgstr "Poissa linjoilta — %s"
 
-#: ../src/empathy-accounts-dialog.c:334
+#: ../src/empathy-accounts-dialog.c:398
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Yhteys katkaistu — %s"
 
-#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-accounts-dialog.c:409
 msgid "Offline — No Network Connection"
 msgstr "Poissa linjoilta — Ei verkkoyhteyttä"
 
-#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-accounts-dialog.c:416
 msgid "Unknown Status"
 msgstr "Tuntematon tila"
 
-#: ../src/empathy-accounts-dialog.c:364
+#: ../src/empathy-accounts-dialog.c:428
 msgid "Offline — Account Disabled"
 msgstr "Poissa linjoilta — Tili ei ole käytettävissä"
 
-#: ../src/empathy-accounts-dialog.c:810
+#: ../src/empathy-accounts-dialog.c:831
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2677,16 +3250,16 @@ msgstr ""
 "Olet luomassa uutta käyttäjätiliä. Uuden tilin luonti hylkää\n"
 "tehdyt muutokset. Haluatko varmasti jatkaa?"
 
-#: ../src/empathy-accounts-dialog.c:1157
+#: ../src/empathy-accounts-dialog.c:1192
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Haluatko poistaa tilin �%s� tietokoneeltasi?"
 
-#: ../src/empathy-accounts-dialog.c:1161
+#: ../src/empathy-accounts-dialog.c:1196
 msgid "This will not remove your account on the server."
 msgstr "Tämä ei poista tiliäsi palvelimelta."
 
-#: ../src/empathy-accounts-dialog.c:1399
+#: ../src/empathy-accounts-dialog.c:1432
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2694,7 +3267,16 @@ msgstr ""
 "Olet vaihtamassa käyttäjätiliä. Tilin vaihtamineen hylkää\n"
 "tehdyt muutokset. Haluatko varmasti jatkaa?"
 
-#: ../src/empathy-accounts-dialog.c:2002
+#. Menu items: to enabled/disable the account
+#: ../src/empathy-accounts-dialog.c:1643
+msgid "_Enable"
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:1644
+msgid "_Disable"
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:2154
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2703,18 +3285,22 @@ msgstr ""
 "tehdyt muutokset. Haluatko varmasti jatkaa?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Lisää..."
+
+#: ../src/empathy-accounts-dialog.ui.h:2
 msgid "Loading account information"
 msgstr "Ladataan tilin tietoja"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "No protocol installed"
 msgstr "Protokollaa ei ole asennettu"
 
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Protocol:"
 msgstr "Yhteyskäytäntö:"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -2722,19 +3308,15 @@ msgstr ""
 "Ennen kuin voit lisätä tilin, sinun täytyy asentaa kullekin käytettävälle "
 "protokollalle tarvittava taustajärjestelmä."
 
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add…"
-msgstr "_Lisää…"
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Import…"
 msgstr "_Tuo…"
 
-#: ../src/empathy-auth-client.c:217
+#: ../src/empathy-auth-client.c:249
 msgid " - Empathy authentication client"
 msgstr " - Empathyn tunnistautumisasiakas"
 
-#: ../src/empathy-auth-client.c:233
+#: ../src/empathy-auth-client.c:265
 msgid "Empathy authentication client"
 msgstr "Empathyn tunnistautumisasiakas"
 
@@ -2742,108 +3324,132 @@ msgstr "Empathyn tunnistautumisasiakas"
 msgid "People nearby"
 msgstr "Lähellä olevat ihmiset"
 
-#: ../src/empathy-av.c:133
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:127
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathyn audio/video-asiakas"
 
-#: ../src/empathy-av.c:149
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:152
 msgid "Empathy Audio/Video Client"
 msgstr "Empathyn audio/video-asiakas"
 
-#: ../src/empathy-call-window.c:479
+#: ../src/empathy-streamed-media-window.c:431
 msgid "Contrast"
 msgstr "Kontrasti"
 
-#: ../src/empathy-call-window.c:482
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Brightness"
 msgstr "Kirkkaus"
 
-#: ../src/empathy-call-window.c:485
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-call-window.c:590
+#: ../src/empathy-streamed-media-window.c:542
 msgid "Volume"
 msgstr "Äänenvoimakkuus"
 
-#: ../src/empathy-call-window.c:1175
+#: ../src/empathy-streamed-media-window.c:1110
 msgid "_Sidebar"
 msgstr "_Sivupalkki"
 
-#: ../src/empathy-call-window.c:1194
+#: ../src/empathy-streamed-media-window.c:1130
 msgid "Audio input"
 msgstr "Äänisyöte"
 
-#: ../src/empathy-call-window.c:1198
+#: ../src/empathy-streamed-media-window.c:1134
 msgid "Video input"
 msgstr "Videosyöte"
 
-#: ../src/empathy-call-window.c:1202
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Dialpad"
 msgstr "Valintalevy"
 
-#: ../src/empathy-call-window.c:1207
+#: ../src/empathy-streamed-media-window.c:1151
 msgid "Details"
 msgstr "Tiedot"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1275
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1672
 #, c-format
 msgid "Call with %s"
 msgstr "Soita tuttavalle %s"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-call-window.c:1354
-msgid "Call"
-msgstr "Soita"
-
-#: ../src/empathy-call-window.c:1508
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:1916
 msgid "The IP address as seen by the machine"
 msgstr "Tämän koneen näkemä IP-osoite"
 
-#: ../src/empathy-call-window.c:1510
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:1918
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Internetissä olevan palvelimen näkemä IP-osoite"
 
-#: ../src/empathy-call-window.c:1512
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:1920
 msgid "The IP address of the peer as seen by the other side"
-msgstr ""
+msgstr "Vertaisen IP-osoite toiselta puolen nähtynä"
 
-#: ../src/empathy-call-window.c:1514
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:1922
 msgid "The IP address of a relay server"
-msgstr ""
+msgstr "Välityspalvelimen IP-osoite"
 
-#: ../src/empathy-call-window.c:1516
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:1924
 msgid "The IP address of the multicast group"
 msgstr "Ryhmälähetysryhmän IP-osoite"
 
+#: ../src/empathy-streamed-media-window.c:1843
+msgctxt "encoding video codec"
+msgid "Unknown"
+msgstr "Tuntematon"
+
+#: ../src/empathy-streamed-media-window.c:1846
+msgctxt "encoding audio codec"
+msgid "Unknown"
+msgstr "Tuntematon"
+
+#: ../src/empathy-streamed-media-window.c:1849
+msgctxt "decoding video codec"
+msgid "Unknown"
+msgstr "Tuntematon"
+
+#: ../src/empathy-streamed-media-window.c:1852
+msgctxt "decoding audio codec"
+msgid "Unknown"
+msgstr "Tuntematon"
+
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2263
+#: ../src/empathy-streamed-media-window.c:2144
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Yhdistetty -- %d:%02d min"
 
-#: ../src/empathy-call-window.c:2324
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2674
 msgid "Technical Details"
 msgstr "Tekniset tiedot"
 
-#: ../src/empathy-call-window.c:2362
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2712
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "%s:n ohjelmisto ei ymmärrä mitään äänimuotoja mitä tietokoneesi tukee"
 
-#: ../src/empathy-call-window.c:2367
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2717
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "%s:n ohjelmisto ei ymmärrä mitään videomuotoja mitä tietokoneesi tukee"
 
-#: ../src/empathy-call-window.c:2373
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2723
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -2852,25 +3458,29 @@ msgstr ""
 "Yhteyttä ei voi muodostaa kohteeseen %s. Yksi teistä voi ehkä olla verkossa, "
 "joka ei salli suoria yhteyksiä."
 
-#: ../src/empathy-call-window.c:2379
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2729
 msgid "There was a failure on the network"
 msgstr "Verkkoyhteydessä tapahtui virhe"
 
-#: ../src/empathy-call-window.c:2383
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2733
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Tähän puheluun vaadittavia äänitiedostomuotoja ei ole asennettu tälle "
 "tietokoneelle"
 
-#: ../src/empathy-call-window.c:2386
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2736
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Tähän puheluun vaadittavia videotiedostomuotoja ei ole asennettu tälle "
 "tietokoneelle"
 
-#: ../src/empathy-call-window.c:2396
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2748
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2878,150 +3488,203 @@ msgid ""
 "the Help menu."
 msgstr ""
 "Telepathy-komponentin kanssa tapahtui jotain odottamatonta. Ole hyvä ja <a "
-"href=\"%s\">raportoi tämä ohjelmavirhe</a> sekä liitä 'Vianjäljitys'-ikkunasta "
-"kerätyt lokit \"Apua\"-valikosta."
+"href=\"%s\">raportoi tämä ohjelmavirhe</a> sekä liitä 'Vianjäljitys'-"
+"ikkunasta kerätyt lokit \"Apua\"-valikosta."
 
-#: ../src/empathy-call-window.c:2404
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2757
 msgid "There was a failure in the call engine"
 msgstr "Virhe soitettaessa"
 
-#: ../src/empathy-call-window.c:2407
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2760
 msgid "The end of the stream was reached"
 msgstr "Virran loppu saavutettiin"
 
-#: ../src/empathy-call-window.c:2447
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2800
 msgid "Can't establish audio stream"
 msgstr "Ääniyhteyden muodostus ei onnistunut"
 
-#: ../src/empathy-call-window.c:2457
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2810
 msgid "Can't establish video stream"
 msgstr "Videoyhteyden muodostus ei onnistunut"
 
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "Audio"
 msgstr "Ääni"
 
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Soita tuttavalle uudelleen"
-
 #: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "Kamera pois"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "Purkamiskoodekki:"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "Kamera päällä"
+msgid "Disable camera"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Purkamiskoodekki:"
+msgid "Display the dialpad"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Kytke kamera poista käytöstä ja lopeta videokuvan lähetys"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "Pakkauskoodekki:"
 
 #: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Ota kamera käyttöön ja lähetä videokuvaa"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Hang up"
+msgstr "Katkaise"
 
 #: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Ota kamera käyttöön, mutta älä lähetä videokuvaa"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Hang up current call"
+msgstr "Lopeta nykyinen puhelu"
 
 #: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Pakkauskoodekki:"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "Paikallisehdokas:"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "Katkaise"
+msgid "Maximise me"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Lopeta nykyinen puhelu"
+msgid "Minimise me"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
-msgstr ""
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "Etäehdokas:"
 
 #: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "Esikatselu"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Send Audio"
+msgstr "Lähetä ääntä"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "Yhdistä uudelleen"
+msgid "Send Video"
+msgstr "Lähetä video"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
+msgid "Show dialpad"
 msgstr ""
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "Lähetä ääntä"
+msgid "Start a video call"
+msgstr "Aloita videopuhelu"
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Äänen lähetys päälle/pois"
+msgid "Start an audio call"
+msgstr "Aloita äänipuhelu"
+
+#: ../src/empathy-call-window.ui.h:18
+msgid "Swap camera"
+msgstr "Vaihda kamera"
 
 #: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ideo"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr "Äänen lähetys päälle/pois"
 
 #: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "Video"
+msgid "Toggle video transmission"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "Video pois"
-
-#: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "Video päällä"
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:2307 ../src/empathy-call-window.c:2308
+#: ../src/empathy-call-window.c:2309 ../src/empathy-call-window.c:2310
+msgid "Unknown"
+msgstr "Tuntematon"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "Videon esikatselu"
+msgid "Video call"
+msgstr "Videopuhelu"
 
 #: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "_Soita"
 
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:25
+msgid "_Camera"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:18
+msgid "_Contents"
+msgstr "_Sisältö"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
+msgid "_Debug"
+msgstr "_Vianetsintä"
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:22
+msgid "_Help"
+msgstr "O_hje"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Microphone"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "_Settings"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_Näytä"
 
-#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
+#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d lukematon)"
 msgstr[1] "%s (%d lukematonta)"
 
-#: ../src/empathy-chat-window.c:464
+#: ../src/empathy-chat-window.c:493
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (ja %u muu)"
 msgstr[1] "%s (ja %u muuta)"
 
-#: ../src/empathy-chat-window.c:480
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d lukematon muilta)"
 msgstr[1] "%s (%d lukematonta muilta)"
 
-#: ../src/empathy-chat-window.c:489
+#: ../src/empathy-chat-window.c:518
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d lukematon kaikilta)"
 msgstr[1] "%s (%d lukematonta kaikilta)"
 
-#: ../src/empathy-chat-window.c:695
+#: ../src/empathy-chat-window.c:733
+msgid "SMS:"
+msgstr "SMS:"
+
+#: ../src/empathy-chat-window.c:743
+#, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
 msgstr "Kirjoittaa viestiä."
 
@@ -3033,10 +3696,6 @@ msgstr "_Tyhjennä"
 msgid "C_ontact"
 msgstr "T_uttava"
 
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Keskustelu"
-
 #: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
 msgstr "Lisää _hymiö"
@@ -3057,10 +3716,6 @@ msgstr "Siirrä välilehti _oikealle"
 msgid "Notify for All Messages"
 msgstr "Ilmoita kaikista viesteistä"
 
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
-msgid "_Contents"
-msgstr "_Sisältö"
-
 #: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "_Keskustelu"
@@ -3069,18 +3724,10 @@ msgstr "_Keskustelu"
 msgid "_Detach Tab"
 msgstr "_Irrota välilehti"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
-msgid "_Edit"
-msgstr "_Muokkaa"
-
 #: ../src/empathy-chat-window.ui.h:13
 msgid "_Favorite Chat Room"
 msgstr "_Suosikkikeskusteluhuone"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
-msgid "_Help"
-msgstr "O_hje"
-
 #: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "_Seuraava välilehti"
@@ -3101,15 +3748,15 @@ msgstr "V_älilehdet"
 msgid "_Undo Close Tab"
 msgstr "_Kumoa Sulje välilehti"
 
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "Nimi"
 
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
 msgstr "Huone"
 
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "Yhdistä automaattisesti"
 
@@ -3117,86 +3764,95 @@ msgstr "Yhdistä automaattisesti"
 msgid "Manage Favorite Rooms"
 msgstr "Hallitse suosikkihuoneita"
 
-#: ../src/empathy-event-manager.c:468
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming video call"
 msgstr "Saapuva videopuhelu"
 
-#: ../src/empathy-event-manager.c:468
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming call"
 msgstr "Saapuva puhelu"
 
-#: ../src/empathy-event-manager.c:472
+#: ../src/empathy-event-manager.c:525
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s soittaa videopuhelun sinulle. Haluatko vastata?"
 
-#: ../src/empathy-event-manager.c:473
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s soittaa sinulle. Haluatko vastata?"
 
-#: ../src/empathy-event-manager.c:476 ../src/empathy-event-manager.c:618
+#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Puhelu käyttäjältä %s"
 
-#: ../src/empathy-event-manager.c:501
+#: ../src/empathy-event-manager.c:554
 msgid "_Reject"
 msgstr "_Hylkää"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
 msgid "_Answer"
 msgstr "_Vastaa"
 
-#: ../src/empathy-event-manager.c:618
+#: ../src/empathy-event-manager.c:570
+msgid "_Answer with video"
+msgstr "_Vastaa käyttäen videota"
+
+#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Saapuva videopuhelu taholta %s"
 
-#: ../src/empathy-event-manager.c:695
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
 msgstr "Kutsu huoneeseen"
 
-#: ../src/empathy-event-manager.c:697
+#: ../src/empathy-event-manager.c:838
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Kutsu liittyä kohteeseen %s"
 
-#: ../src/empathy-event-manager.c:704
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s kutsui sinut liittymään kohteeseen %s"
 
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
 msgstr "_Kieltäydy"
 
-#: ../src/empathy-event-manager.c:717
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Liity"
 
-#: ../src/empathy-event-manager.c:743
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s kutsui sinut liittymään kohteeseen %s"
 
-#: ../src/empathy-event-manager.c:749
+#: ../src/empathy-event-manager.c:891
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Sinut on kutsuttu liittymään kohteeseen %s"
 
-#: ../src/empathy-event-manager.c:797
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Saapuva tiedostonsiirto tuttavalta %s"
 
-#: ../src/empathy-event-manager.c:1005
+#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+msgid "Password required"
+msgstr "Salasana vaaditaan"
+
+#: ../src/empathy-event-manager.c:1190
 #, c-format
-msgid "Subscription requested by %s"
-msgstr "Liittymispyyntö tuttavalta %s"
+msgid "%s would like permission to see when you are online"
+msgstr ""
 
-#: ../src/empathy-event-manager.c:1009
+#: ../src/empathy-event-manager.c:1194
 #, c-format
 msgid ""
 "\n"
@@ -3205,116 +3861,102 @@ msgstr ""
 "\n"
 "Viesti: %s"
 
-#: ../src/empathy-event-manager.c:1052
-#, c-format
-msgid "%s is now offline."
-msgstr "%s on nyt poissa linjoilta."
-
-#: ../src/empathy-event-manager.c:1072
-#, c-format
-msgid "%s is now online."
-msgstr "%s on nyt linjoilla."
-
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:100
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:102
+#: ../src/empathy-ft-manager.c:103
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:179
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s / %s nopeudella %s/s"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:275
 #, c-format
 msgid "%s of %s"
 msgstr "%s / %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:305
+#: ../src/empathy-ft-manager.c:306
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Vastaanotetaan \"%s\" tuttavalta %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:309
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Lähetetään \"%s\" tuttavalle %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:338
+#: ../src/empathy-ft-manager.c:339
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Virhe vastaanotettaessa \"%s\" tuttavalta %s"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:342
 msgid "Error receiving a file"
 msgstr "Virhe vastaanotettaessa tiedostoa"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:347
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Virhe lähetettäessä \"%s\" tuttavalle %s"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:350
 msgid "Error sending a file"
 msgstr "Virhe lähetettäessä tiedostoa"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:489
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" vastaanotettu tuttavalta %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:493
+#: ../src/empathy-ft-manager.c:494
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" lähetetty tuttavalle %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:497
 msgid "File transfer completed"
 msgstr "Tiedostonsiirto valmistui"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
 msgid "Waiting for the other participant's response"
 msgstr "Odotetaan toisen osallistujan vastausta"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Tarkistetaan tiedoston �%s� eheyttä"
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Lasketaan tiivistettä tiedostolle �%s�"
 
-#: ../src/empathy-ft-manager.c:996
-msgid "%"
-msgstr "%"
-
-#: ../src/empathy-ft-manager.c:1008
+#: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "Tiedosto"
 
-#: ../src/empathy-ft-manager.c:1030
+#: ../src/empathy-ft-manager.c:1060
 msgid "Remaining"
 msgstr "Jäljellä"
 
@@ -3339,137 +3981,166 @@ msgid "Import Accounts"
 msgstr "Tuo tilejä"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:292
+#: ../src/empathy-import-widget.c:301
 msgid "Import"
 msgstr "Tuo"
 
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:310
 msgid "Protocol"
 msgstr "Protokolla"
 
-#: ../src/empathy-import-widget.c:325
+#: ../src/empathy-import-widget.c:334
 msgid "Source"
 msgstr "Lähde"
 
-#: ../src/empathy-main-window.c:383
+#: ../src/empathy-main-window.c:392
+msgid "Provide Password"
+msgstr "Anna salasana"
+
+#: ../src/empathy-main-window.c:398
+msgid "Disconnect"
+msgstr "Katkaise yhteys"
+
+#: ../src/empathy-main-window.c:622
 msgid "No match found"
 msgstr "Vastinetta ei löytynyt"
 
-#: ../src/empathy-main-window.c:538
+#: ../src/empathy-main-window.c:777
 msgid "Reconnect"
 msgstr "Yhdistä uudelleen"
 
-#: ../src/empathy-main-window.c:544
+#: ../src/empathy-main-window.c:783
 msgid "Edit Account"
 msgstr "Muokkaa tiliä"
 
-#: ../src/empathy-main-window.c:550
+#: ../src/empathy-main-window.c:789
 msgid "Close"
 msgstr "Sulje"
 
-#: ../src/empathy-main-window.c:1232
+#. Translators: this string will be something like:
+#. *   Top up My Account ($1.23)..."
+#: ../src/empathy-main-window.c:928
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr ""
+
+#: ../src/empathy-main-window.c:975
+msgid "Top up account credit"
+msgstr ""
+
+#. top up button
+#: ../src/empathy-main-window.c:1046
+msgid "Top Up..."
+msgstr ""
+
+#: ../src/empathy-main-window.c:1789
 msgid "Contact"
 msgstr "Tuttava"
 
-#: ../src/empathy-main-window.c:1557
+#: ../src/empathy-main-window.c:2119
 msgid "Contact List"
 msgstr "Tuttavaluettelo"
 
-#: ../src/empathy-main-window.c:1666
-msgid "Show and edit accounts"
-msgstr "Näytä ja muokkaa tilejä"
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "Tuttavat _kartalla"
 
-#: ../src/empathy-main-window.ui.h:2
-msgid "Context"
-msgstr "Yhteys"
+#: ../src/empathy-main-window-menubar.ui.h:2
+msgid "Credit Balance"
+msgstr ""
+
+#: ../src/empathy-main-window-menubar.ui.h:3
+msgid "Find in Contact _List"
+msgstr "Etsi _tuttavaluettelosta"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "Liity _suosikkeihin"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "Hallitse suosikkeja"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "_Normaali koko"
 
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "Uusi _puhelu…"
 
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "Normaali koko _avatarien kera"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "_Asetukset"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "Näytä p_rotokollat"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "Lajittele _nimen mukaan"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "Lajittele _tilan mukaan"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Käyttäjätilit"
 
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window-menubar.ui.h:15
+msgid "_Blocked Contacts"
+msgstr "_Estetyt yhteystiedot"
+
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "_Tiivis koko"
 
-#: ../src/empathy-main-window.ui.h:17
-msgid "_Debug"
-msgstr "_Vianetsintä"
-
-#: ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "_Tiedostosiirrot"
 
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "_Liity…"
 
-#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "_Uusi keskustelu…"
 
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "_Poissa linjoilta olevat tuttavat"
 
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "_Henkilötiedot"
 
-#: ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "_Huone"
 
-#: ../src/empathy-new-chatroom-dialog.c:379
+#: ../src/empathy-main-window-menubar.ui.h:29
+msgid "_Search for Contacts…"
+msgstr "Etsi _yhteystietoja..."
+
+#: ../src/empathy-new-chatroom-dialog.c:337
 msgid "Chat Room"
 msgstr "Keskusteluhuone"
 
-#: ../src/empathy-new-chatroom-dialog.c:395
+#: ../src/empathy-new-chatroom-dialog.c:353
 msgid "Members"
 msgstr "Jäsenet"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:607
+#: ../src/empathy-new-chatroom-dialog.c:553
 #, c-format
 msgid ""
 "%s\n"
@@ -3482,16 +4153,16 @@ msgstr ""
 "Vaaditaan salasana: %s\n"
 "Jäseniä: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:609
-#: ../src/empathy-new-chatroom-dialog.c:610
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "No"
 msgstr "Ei"
 
-#: ../src/empathy-new-chatroom-dialog.c:638
+#: ../src/empathy-new-chatroom-dialog.c:584
 msgid "Could not start room listing"
 msgstr "Ei voitu aloittaa huoneluettelointia"
 
-#: ../src/empathy-new-chatroom-dialog.c:648
+#: ../src/empathy-new-chatroom-dialog.c:594
 msgid "Could not stop room listing"
 msgstr "Ei voitu lopettaa huoneluettelointia"
 
@@ -3526,39 +4197,79 @@ msgstr "Huoneluettelo"
 msgid "_Room:"
 msgstr "_Keskusteluhuone:"
 
-#: ../src/empathy-preferences.c:138
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr "Viesti vastaanotettu"
 
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr "Viesti lähetetty"
 
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
 msgstr "Uusi keskustelu"
 
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
 msgstr "Tuttava saapui linjoille"
 
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
 msgstr "Tuttava poistui linjoilta"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
 msgstr "Tili yhdistetty"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
 msgstr "Tilin yhteys katkaistu"
 
-#: ../src/empathy-preferences.c:445
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr "Kieli"
 
-#: ../src/empathy-preferences.c:882
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:734
+msgid "Juliet"
+msgstr ""
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:741
+msgid "Romeo"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:747
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:750
+msgid "Deny thy father and refuse thy name;"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:753
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:756
+msgid "And I'll no longer be a Capulet."
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:759
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:762
+msgid "Juliet has disconnected"
+msgstr ""
+
+#: ../src/empathy-preferences.c:1166
 msgid "Preferences"
 msgstr "Asetukset"
 
@@ -3566,67 +4277,75 @@ msgstr "Asetukset"
 msgid "Appearance"
 msgstr "Ulkoasu"
 
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
 msgstr "Käytös"
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
 msgid "Chat Th_eme:"
 msgstr "Keskustelun _teema:"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
 msgid "Disable notifications when _away or busy"
 msgstr "Poista huomautukset käytöstä oltaessa _poissa tai kiireinen"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
 msgid "Disable sounds when _away or busy"
 msgstr "Poista äänet käytöstä oltaessa _poissa tai kiireinen"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Näytä tulevat tapahtumat tilarivillä"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
 msgid "Enable notifications when a contact comes online"
-msgstr "Ota käyttöön ponnahdusikkunat, kun tuttava tulee linjoille"
+msgstr "Näytä ponnahdusikkuna, kun tuttava tulee linjoille"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact goes offline"
-msgstr "Ota käyttöön ponnahdusikkunat, kun tuttava lähtee linjoilta"
+msgstr "Näytä ponnahdusikkuna, kun tuttava lähtee linjoilta"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Näytä huomautuksia, kun _keskustelu ei ole kohdistettu"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable spell checking for languages:"
 msgstr "Käytä kielentarkistusta kielille:"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:13
 msgid "General"
 msgstr "Yleinen"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
+msgid "Input level"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input volume"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location sources:"
 msgstr "Sijainti:"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:18
 msgid "Log conversations"
 msgstr "Tallenna keskustelut lokitiedostoon"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:19
 msgid "Notifications"
 msgstr "Huomautukset"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:20
 msgid "Play sound for events"
 msgstr "Soita ääniä tapahtumille"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:21
 msgid "Privacy"
 msgstr "Yksityisyys"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:22
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -3635,23 +4354,23 @@ msgstr ""
 "Heikennetty sijaintitiedon tarkkuus tarkoittaa, että ainoastaan kaupunkisi "
 "ja maasi julkaistaan. GPS-koordinaattien tarkkuus on yksi desimaali."
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:23
 msgid "Show _smileys as images"
 msgstr "Näytä _hymiöt hymiökuvakkeina"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show contact _list in rooms"
 msgstr "Näytä tuttava_luettelo huoneissa"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:25
 msgid "Sounds"
 msgstr "Äänet"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:26
 msgid "Spell Checking"
 msgstr "Kielentarkastus"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:27
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
@@ -3659,67 +4378,51 @@ msgstr ""
 "Luettelo kielistä sisältää ainoastaan ne kielet, joille tietokoneessasi on "
 "asennettu sanakirja."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:28
 msgid "Themes"
 msgstr "Teemat"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:29
+msgid "Variant:"
+msgstr "Muunnelma:"
+
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Automatically connect on startup"
 msgstr "_Yhdistä automaattisesti käynnistyksen yhteydessä"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Cellphone"
 msgstr "_Matkapuhelin"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Enable bubble notifications"
 msgstr "_Käytä ponnahdusikkunahuomautuksia"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable sound notifications"
 msgstr "_Käytä merkkiääniä"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:34
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:35
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Verkko (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Open new chats in separate windows"
 msgstr "_Avaa uusi ikkuna uusille keskusteluille"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Publish location to my contacts"
 msgstr "_Julkaise sijainti tuttavilleni"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:39
 msgid "_Reduce location accuracy"
 msgstr "_Heikennä sijaintitiedon tarkkuutta"
 
-#: ../src/empathy-status-icon.c:141
-msgid "Respond"
-msgstr "Vastaa"
-
-#: ../src/empathy-status-icon.c:147
-msgid "Reject"
-msgstr "Hylkää"
-
-#: ../src/empathy-status-icon.c:151
-msgid "Answer"
-msgstr "Vastaa"
-
-#: ../src/empathy-status-icon.c:158
-msgid "Decline"
-msgstr "Kieltäydy"
-
-#: ../src/empathy-status-icon.c:162
-msgid "Accept"
-msgstr "Hyväksy"
-
 #: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "Tila"
@@ -3728,249 +4431,379 @@ msgstr "Tila"
 msgid "_Quit"
 msgstr "_Lopeta"
 
-#: ../src/empathy-map-view.c:452
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "Soita tuttavalle uudelleen"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "Kamera pois"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "Kamera päällä"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "Kytke kamera poista käytöstä ja lopeta videokuvan lähetys"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "Ota kamera käyttöön ja lähetä videokuvaa"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "Ota kamera käyttöön, mutta älä lähetä videokuvaa"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "Esikatselu"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "Yhdistä uudelleen"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "V_ideo"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "Video pois"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "Video päällä"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "Videon esikatselu"
+
+#: ../src/empathy-map-view.c:448
 msgid "Contact Map View"
 msgstr "Tuttavien karttanäkymä"
 
-#: ../src/empathy-debug-window.c:1219
+#: ../src/empathy-debug-window.c:1228
 msgid "Save"
 msgstr "Tallenna"
 
-#: ../src/empathy-debug-window.c:1395
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
 msgstr "Vianetsintäikkuna"
 
-#: ../src/empathy-debug-window.c:1475
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
 msgstr "Pysäytä"
 
-#: ../src/empathy-debug-window.c:1487
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
 msgstr "Taso "
 
-#: ../src/empathy-debug-window.c:1507
+#: ../src/empathy-debug-window.c:1549
 msgid "Debug"
 msgstr "Virheenjäljitys"
 
-#: ../src/empathy-debug-window.c:1513
+#: ../src/empathy-debug-window.c:1555
 msgid "Info"
 msgstr "Tietoa"
 
-#: ../src/empathy-debug-window.c:1519 ../src/empathy-debug-window.c:1568
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
 msgid "Message"
 msgstr "Viesti"
 
-#: ../src/empathy-debug-window.c:1525
+#: ../src/empathy-debug-window.c:1567
 msgid "Warning"
 msgstr "Varoitus"
 
-#: ../src/empathy-debug-window.c:1531
+#: ../src/empathy-debug-window.c:1573
 msgid "Critical"
 msgstr "Kriittinen"
 
-#: ../src/empathy-debug-window.c:1537
+#: ../src/empathy-debug-window.c:1579
 msgid "Error"
 msgstr "Virhe"
 
-#: ../src/empathy-debug-window.c:1556
+#: ../src/empathy-debug-window.c:1598
 msgid "Time"
 msgstr "Aika"
 
-#: ../src/empathy-debug-window.c:1559
+#: ../src/empathy-debug-window.c:1601
 msgid "Domain"
 msgstr "Alue"
 
-#: ../src/empathy-debug-window.c:1561
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
 msgstr "Luokka"
 
-#: ../src/empathy-debug-window.c:1563
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "Taso"
 
-#: ../src/empathy-debug-window.c:1600
+#: ../src/empathy-debug-window.c:1642
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "Valittu yhteyshallinta ei tue etävianetsintälaajennusta."
 
-#: ../src/empathy-invite-participant-dialog.c:34
-#: ../src/empathy-invite-participant-dialog.c:48
+#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:231
 msgid "Invite Participant"
 msgstr "Kutsu osanottaja"
 
-#: ../src/empathy-invite-participant-dialog.c:35
+#: ../src/empathy-invite-participant-dialog.c:206
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Valitse keskusteluun kutsuttava tuttava:"
 
-#: ../src/empathy-invite-participant-dialog.c:45
+#: ../src/empathy-invite-participant-dialog.c:227
 msgid "Invite"
 msgstr "Kutsu"
 
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:183
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "Älä näytä mitään valintaikkunoita; tee mitä tahansa työtä (esim. tuonti) ja "
 "poistu"
 
-#: ../src/empathy-accounts.c:186
-msgid "Don't display any dialogs if there are any non-Salut accounts"
+#: ../src/empathy-accounts.c:187
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
-"Älä näytä mitään valintaikkunoita, paitsi jos käytössä on vain �Lähellä "
-"olevat ihmiset� -tilejä"
 
-#: ../src/empathy-accounts.c:190
+#: ../src/empathy-accounts.c:191
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "Valitse tili alussa (esim. gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:193
 msgid "<account-id>"
 msgstr "<käyttäjätunnus>"
 
-#: ../src/empathy-accounts.c:200
+#: ../src/empathy-accounts.c:198
 msgid "- Empathy Accounts"
 msgstr "- Empathy-tilit"
 
-#: ../src/empathy-accounts.c:216
+#: ../src/empathy-accounts.c:237
 msgid "Empathy Accounts"
 msgstr "Empathy-tilit"
 
-#: ../src/empathy-debugger.c:40
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr ""
+
+#: ../src/empathy-debugger.c:75
+msgid "- Empathy Debugger"
+msgstr ""
+
+#: ../src/empathy-debugger.c:114
 msgid "Empathy Debugger"
 msgstr "Empathyn virheenjäljitin"
 
-#~ msgid "Use _Yahoo! Japan"
-#~ msgstr "Käytä _Yahoo! Japania"
+#: ../src/empathy-chat.c:107
+msgid "- Empathy Chat Client"
+msgstr "- Empathy-keskusteluasiakas"
 
-#~ msgid "Show incoming messages in the messaging menu"
-#~ msgstr "Näytä saapuvat viestit viestivalikossa"
+#: ../src/empathy-notifications-approver.c:203
+msgid "Respond"
+msgstr "Vastaa"
 
-#~ msgid "Pri_ority:"
-#~ msgstr "_Tärkeys:"
+#: ../src/empathy-notifications-approver.c:217
+msgid "Reject"
+msgstr "Hylkää"
 
-#~ msgid "_Encryption required (TLS/SSL)"
-#~ msgstr "_Vaadi salaus (TLS/SSL)"
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:227
+msgid "Answer"
+msgstr "Vastaa"
 
-#~ msgid "_Ignore SSL certificate errors"
-#~ msgstr "Älä _huomioi SSL-varmenteiden virheitä"
+#: ../src/empathy-notifications-approver.c:227
+msgid "Answer with video"
+msgstr "Vastaa videon kanssa"
 
-#~ msgid "_Nickname:"
-#~ msgstr "_Nimimerkki:"
+#: ../src/empathy-notifications-approver.c:235
+#: ../src/empathy-notifications-approver.c:245
+msgid "Decline"
+msgstr "Kieltäydy"
 
-#~ msgid "Send file"
-#~ msgstr "Lähetä tiedosto"
+#: ../src/empathy-notifications-approver.c:239
+#: ../src/empathy-notifications-approver.c:250
+msgid "Accept"
+msgstr "Hyväksy"
 
-#~ msgid "Enabled"
-#~ msgstr "Käytössä"
+#: ../src/empathy-notifications-approver.c:260
+msgid "Provide"
+msgstr ""
 
-#~ msgid "Automatically _connect on startup "
-#~ msgstr "Yhdistä _käynnistettäessä "
+#: ../src/empathy-call-observer.c:134
+#, c-format
+msgid "%s just tried to call you, but you were in another call."
+msgstr ""
+"%s yritti juuri soittaa sinulle, mutta sinulla oli toinen puhelu kesken."
 
-#~ msgid "Failed to reconnect this chat"
-#~ msgstr "Uudelleenyhdistäminen tähän keskusteluun epäonnistui"
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1036 ../src/empathy-call-window.c:1059
+msgid "i"
+msgstr ""
 
-#~ msgid "<b>Location</b>, "
-#~ msgstr "<b>Sijainti</b>, "
+#: ../src/empathy-call-window.c:2603
+msgid "On hold"
+msgstr "Pidossa"
 
-#~ msgid "Select a destination"
-#~ msgstr "Valitse kohde"
+#: ../src/empathy-call-window.c:2606
+msgid "Mute"
+msgstr "Vaimenna"
 
-#~ msgid "Empathy IM Client"
-#~ msgstr "Empathy-pikaviestin"
+#: ../src/empathy-call-window.c:2608
+msgid "Duration"
+msgstr "Kesto"
 
-#~ msgid "Send and receive messages"
-#~ msgstr "Lähetä ja vastaanota viestejä"
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2611
+#, c-format
+msgid "%s — %d:%02dm"
+msgstr ""
 
-#~ msgid "Share my desktop"
-#~ msgstr "Jaa työpöytäni"
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr ""
 
-#~ msgid "MC 4 accounts have been imported"
-#~ msgstr "MC 4 -tilit on tuotu"
+#~ msgid "%s is sending you a file. Do you want to accept it?"
+#~ msgstr "%s haluaa lähettää sinulle tiedoston. Haluatko vastaanottaa sen?"
 
-#~ msgid "MC 4 accounts have been imported."
-#~ msgstr "MC 4 -tilit on tuotu."
+#~ msgid "_Accept"
+#~ msgstr "_Hyväksy"
 
-#~ msgid "%s account"
-#~ msgstr "%s-tili"
+#~ msgid "Empathy has asked about importing accounts"
+#~ msgstr "Empathy on kysynyt tilien tuonnista"
 
-#~ msgid "Use the messaging indicator"
-#~ msgstr "Käytä viesti-ilmoittimia"
+#~ msgid "All"
+#~ msgstr "Kaikki"
 
-#~ msgid ""
-#~ "Whether or not to use the messaging indicator, if false the icon in the "
-#~ "notification area will be displayed."
-#~ msgstr ""
-#~ "Näytetäänkö viesti-ilmoitin, jos ei, ilmoitusalueella näytetään ikoni."
+#~ msgid "Select"
+#~ msgstr "Valitse"
 
-#~ msgid "Failed to join chat room"
-#~ msgstr "Keskusteluhuoneeseen liittyminen epäonnistui"
+#~ msgid "Date"
+#~ msgstr "Päivämäärä"
 
-#~ msgid "_Character set:"
-#~ msgstr "_Merkkikartta:"
+#~ msgid "Conversations"
+#~ msgstr "Keskustelut"
+
+#~ msgid "Previous Conversations"
+#~ msgstr "Aikaisemmat keskustelut"
+
+#~ msgid "_For:"
+#~ msgstr "_Ajalta:"
+
+#~ msgid "Show and edit accounts"
+#~ msgstr "Näytä ja muokkaa tilejä"
+
+#~ msgid "The hash of the received file and the sent one do not match"
+#~ msgstr "Vastaanotetun ja lähetetyn tiedoston tiiviste ei täsmää"
+
+#~ msgid "Enter Custom Message"
+#~ msgstr "Syötä itse määritelty viesti"
+
+#~ msgid "Add _New Preset"
+#~ msgstr "Lisää _uusi esitieto"
+
+#~ msgid "Saved Presets"
+#~ msgstr "Tallennetut esitiedot"
 
 #~ msgid ""
-#~ "<b>%s</b>\n"
-#~ "Invite required: %s\n"
-#~ "Password required: %s\n"
-#~ "Members: %s"
-#~ msgstr ""
-#~ "<b>%s</b>\n"
-#~ "Kutsu vaaditaan: %s\n"
-#~ "Salasana vaaditaan: %s\n"
-#~ "Jäsenet: %s"
+#~ "Whether Empathy has asked about importing accounts from other programs."
+#~ msgstr "Onko Empathy tiedustellut tilien tuomisesta."
 
-#~ msgid "_E-mail address:"
-#~ msgstr "_Sähköpostiosoite:"
+#~ msgid "Show incoming messages in the messaging menu"
+#~ msgstr "Näytä saapuvat viestit viestivalikossa"
 
-#~ msgid "File transfer completed, but the file was corrupted"
-#~ msgstr "Tiedostonsiirto valmistui, mutta tiedosto oli viallinen"
+#~ msgid "Match case"
+#~ msgstr "Huomioi kirjainkoko"
 
-#~ msgid "Google Talk"
-#~ msgstr "Google Talk"
+#~ msgid "_Add…"
+#~ msgstr "_Lisää…"
 
-#~ msgid "The account %s is edited via My Web Accounts."
-#~ msgstr "Tiliä %s muokataan Web-tilien kautta."
+#~ msgid "Find Next"
+#~ msgstr "Etsi seuraava"
 
-#~ msgid "The account %s cannot be edited in Empathy."
-#~ msgstr "Käyttäjätiliä %s ei voi muokata Empathyssä."
+#~ msgid "Find Previous"
+#~ msgstr "Etsi edellinen"
 
-#~ msgid "Launch My Web Accounts"
-#~ msgstr "Käynnistä Web-tilit"
+#~ msgid "The certificate has expired"
+#~ msgstr "Varmenne on vanhentunut"
 
-#~ msgid "Add '%s' to Dictionary"
-#~ msgstr "Lisää �%s� sanakirjaan"
+#~ msgid ""
+#~ "The certificate has been revoked by the issuing Certification Authority"
+#~ msgstr "Varmenne on peruutettu varmenteen myöntäjän toimesta"
 
-#~ msgid "Add '%s' to %s Dictionary"
-#~ msgstr "Lisää �%s� kielen %s sanakirjaan"
+#~ msgid "The certificate hasn't yet been activated"
+#~ msgstr "Varmennetta ei ole vielä aktivoitu"
 
-#~ msgctxt "verb displayed on a button to select an IRC network"
-#~ msgid "Select"
-#~ msgstr "Valitse"
+#~ msgid "The certificate is self-signed"
+#~ msgstr "Varmenne on itsetehty"
 
-#~ msgid "Save _New Status Message"
-#~ msgstr "Tallenna _uusi tilaviesti"
+#~ msgid "The certificate is malformed"
+#~ msgstr "Varmenne on muodostettu väärin"
 
-#~ msgid "Saved Status Messages"
-#~ msgstr "Tallennetut tilaviestit"
+#~ msgid "The identity provided by the chat server cannot be verified.\n"
+#~ msgstr "Keskustelupalvelimen antamaa tunnistetta ei voida varmistaa.\n"
 
-#~ msgid "Error contacting the Account Manager"
-#~ msgstr "Virhe yhdistettäessä tilienhallintaan"
+#~ msgid "The certificate is cryptographically weak"
+#~ msgstr "Varmenteen salausmenetelmä on heikko"
 
 #~ msgid ""
-#~ "There was an error while trying to connect to the Telepathy Account "
-#~ "Manager. The error was:\n"
-#~ "\n"
-#~ "%s"
+#~ "The hostname verified by the certificate doesn't match the server name"
 #~ msgstr ""
-#~ "Yhdistettäessä Empathyn tilienhallintaan tapahtui virhe:\n"
-#~ "\n"
-#~ "%s"
+#~ "Varmenteessa ilmoitettu isäntänimi ei täsmää palvelimen nimen kanssa"
+
+#~ msgid "The certificate length exceeds verifiable limits"
+#~ msgstr "Varmenteen pituus ylittää sallitut rajat"
+
+#~ msgid "_Enabled"
+#~ msgstr "_Käytössä"
+
+#~ msgid "Meta-contact containing %u contact"
+#~ msgid_plural "Meta-contact containing %u contacts"
+#~ msgstr[0] "Metayhteystieto, joka sisältää %u yhteystiedon"
+#~ msgstr[1] "Metayhteystieto, joka sisältää %u yhteystietoa"
+
+#~ msgid ""
+#~ "Completely split the displayed meta-contact into the contacts it contains."
+#~ msgstr "Jaa näytettävä metayhteystieto sen sisältämiin yhteystietoihin."
+
+#~ msgid "Unlink meta-contact '%s'?"
+#~ msgstr "Poistetaanko metayhteystiedon �%s� linkitys?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink this meta-contact? This will completely "
+#~ "split the meta-contact into the contacts it contains."
+#~ msgstr ""
+#~ "Haluatko varmasti poistaa tämän metayhteystiedon linkityksen? "
+#~ "Metayhteystieto jaetaan sen sisältämiin yhteystietoihin."
+
+#~ msgid "The certificate is not signed by a Certification Authority"
+#~ msgstr "Varmennetta ei ole virallisesti allekirjoitettu"
+
+#~ msgid "The certificate does not have the expected fingerprint"
+#~ msgstr "Varmenteessa ei ole odotettua sormenjälkeä"
+
+#~ msgid "Don't display any dialogs if there are any non-Salut accounts"
+#~ msgstr ""
+#~ "Älä näytä mitään valintaikkunoita, paitsi jos käytössä on vain �Lähellä "
+#~ "olevat ihmiset� -tilejä"
+
+#~ msgid "Are you sure you want to remove '%s' from your contacts?"
+#~ msgstr "Haluatko varmasti poistaa kohteen '%s' yhteystiedoistasi?"
+
+#~ msgid "Your software is too old"
+#~ msgstr "Sovelluksesi on liian vanha"
+
+#~ msgid "Update software..."
+#~ msgstr "Päivitä sovellus..."
 
-#~ msgid "%s would like permission to see when you are available"
-#~ msgstr "%s haluaisi oikeuden nähdä, milloin olet tavoitettavissa"
+#~ msgid "Unavailable"
+#~ msgstr "Ei käytettävissä"
 
-#~ msgid "Find in Contact _List"
-#~ msgstr "Etsi _tuttavaluettelosta"
+#~ msgid "Off"
+#~ msgstr "Kiinni"
 
-#~ msgid "- Empathy Chat Client"
-#~ msgstr "- Empathy-keskusteluasiakas"
+#~ msgid "On"
+#~ msgstr "Päällä"
diff --git a/po/fr.po b/po/fr.po
index b121c5cb0..d98b120c9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,16 +21,17 @@
 # Emmanuel Sunyer <emmanuel.sunyer@dbmail.com>, 2009.
 # Bruno Brouard <annoa.b@gmail.com>, 2010-2011.
 # Pablo Martin-Gomez <pablo.martin-gomez@laposte.net>, 2009-2010.
+# Alexandre Daubois <alex.daubois@gmail.com>, 2011
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=empathy&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-03-16 15:59+0000\n"
-"PO-Revision-Date: 2011-03-16 17:09+0100\n"
+"product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2011-09-15 13:17+0000\n"
+"PO-Revision-Date: 2011-09-15 23:39+0200\n"
 "Last-Translator: Bruno Brouard <annoa.b@gmail.com>\n"
-"Language-Team: GNOME French Team  <gnomefr@traduc.org>\n"
+"Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -59,297 +60,343 @@ msgstr ""
 "discussions."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr "Volume des conversations"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr "Volume des conversations, en pourcentage."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Camera device"
+msgstr "Périphérique caméra"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "Position de la caméra"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 "Caractère à ajouter à la suite du pseudonyme lors de l'utilisation de l'auto-"
-"complétion du pseudonyme (tab) dans un groupe de discussion."
+"complétion du pseudonyme (tabulation) dans un groupe de discussion."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "Thème de la fenêtre de discussion"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+msgid "Chat window theme variant"
+msgstr "Variante du thème de la fenêtre de discussion"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "Liste séparée par des virgules des langues à utiliser pour la correction "
 "orthographique (par ex. : en, fr, nl)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "Liste compacte des contacts"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "Les gestionnaires de connexion doivent être utilisés"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "Critère de tri pour la liste des contacts"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr ""
+"Périphérique caméra utilisé par défaut lors des appels vidéos, par ex. /dev/"
+"video0."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
 msgstr "Répertoire par défaut où choisir un avatar"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr "Désactiver les bulles de notification en mode absent"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr "Désactiver les sons en mode absent"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
-msgstr "Afficher les évènements entrants dans la zone d'état"
+msgstr "Afficher les événements entrants dans la zone d'état"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
 msgstr ""
-"Afficher les évènements entrants dans la zone d'état. Si défini à faux, les "
-"évènements sont immédiatement présentés à l'utilisateur."
+"Afficher les événements entrants dans la zone d'état. Si défini à faux, les "
+"événements sont immédiatement présentés à l'utilisateur."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+msgid "Echo cancellation support"
+msgstr "Prise en charge de l'annulation d'écho"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr "Empathy peut publier la position de l'utilisateur"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy peut utiliser le GPS pour découvrir la position"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy peut utiliser le réseau cellulaire pour découvrir la position"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy peut utiliser le réseau pour découvrir la position"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
-msgstr "Dossier de téléchargement par défaut d'Empathy"
+msgstr "Dossier de téléchargement par défaut de Empathy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+# NDT: butterfly is the MSN backend
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
-msgstr "Empathy a migré les journaux butterfly"
+msgstr "Empathy a migré les journaux de Butterfly"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr ""
 "Empathy doit se mettre automatiquement en mode absent en cas d'inactivité"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy doit se connecter automatiquement au démarrage"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy doit réduire la précision de la position"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
 "Empathy doit utiliser l'avatar du contact comme icône de fenêtre de "
 "discussion"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr "Activer les outils de développement WebKit"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "Activer les bulles de notification pour les nouveaux messages"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "Activer le correcteur orthographique"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "Masquer la fenêtre principale"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "Masque la fenêtre principale."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "Caractère d'auto-complétion du pseudonyme"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "Ouvrir les nouvelles discussions dans des fenêtres séparées"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "Chemin vers le thème Adium à utiliser"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
 "Chemin vers le thème Adium à utiliser si un thème Adium est choisi pour les "
 "discussions."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Jouer un son lors de la réception des messages"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "Jouer un son lors de nouvelles discussions"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Jouer un son lors de l'envoi des messages"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "Jouer un son lorsqu'un contact se connecte"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "Jouer un son lorsqu'un contact se déconnecte"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "Jouer un son lors de la connexion"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "Jouer un son lors de la déconnexion"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Bulles de notification si la discussion n'est pas au premier plan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "Bulles de notification lorsqu'un contact se connecte"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "Bulles de notification lorsqu'un contact se déconnecte"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr "Position de la prévisualisation de la caméra pendant un appel."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+msgid "Show Balance in contact list"
+msgstr "Afficher le solde dans la liste des contacts"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "Afficher les avatars"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "Afficher la liste des contacts dans les salons"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr "Afficher une astuce sur la fermeture de la fenêtre principale"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr "Afficher les contacts déconnectés"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
 msgstr "Afficher les protocoles"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "Langues de la correction orthographique"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr "Le dossier par défaut pour enregistrer les transferts de fichiers."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Dernier répertoire où un avatar a été choisi."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
 msgstr "La position du volet latéral de la fenêtre de discussion"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr ""
 "La position enregistrée (en pixels) du volet latéral de la fenêtre de "
 "discussion."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Le thème utilisé pour l'affichage dans les fenêtres de discussion."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr ""
+"La variante de thème utilisée pour l'affichage des conversations dans les "
+"fenêtres de discussion."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Utiliser des frimousses graphiques"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "Utiliser des sons de notification"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "Utiliser des thèmes pour les salons de discussion"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr ""
 "Indique si Empathy peut publier la position de l'utilisateur à ses contacts."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Indique si Empathy peut utiliser le GPS pour découvrir la position."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
 "Indique si Empathy peut utiliser le réseau cellulaire pour découvrir la "
 "position."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Indique si Empathy peut utiliser le réseau pour découvrir la position."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "Indique si Empathy a effectué la migration des journaux butterfly."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr ""
 "Indique si Empathy doit se connecter automatiquement à vos comptes au "
 "démarrage."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
 "Indique si Empathy doit se mettre automatiquement en mode absent si "
 "l'utilisateur est inactif."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 "Indique si Empathy doit réduire la précision de la position pour des raisons "
 "de confidentialité."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 "Indique si Empathy doit utiliser l'avatar des contacts comme icône de "
 "fenêtre de discussion."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Indique si les outils de développement WebKit, tels que Web Inspector, "
 "doivent être activés."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
@@ -357,73 +404,78 @@ msgstr ""
 "Indique si les gestionnaires de connectivité doivent être utilisés pour se "
 "déconnecter ou se reconnecter automatiquement."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr ""
 "Indique s'il faut vérifier l'orthographe des mots saisis selon les langues "
 "choisies."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr ""
 "Indique s'il faut changer les frimousses en images graphiques dans les "
 "conversations."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr ""
+"Indique s'il faut utiliser Pulseaudio pour utiliser le filtre anti-écho."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr ""
 "Indique s'il faut jouer un son pour avertir lorsque des contacts se "
 "connectent au réseau."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
 "Indique s'il faut jouer un son pour avertir lorsque des contacts se "
 "déconnectent du réseau."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "Indique s'il faut jouer un son pour signaler des événements."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Indique s'il faut jouer un son pour avertir de l'arrivée de messages."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr ""
 "Indique s'il faut jouer un son pour signaler de nouvelles conversations."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Indique s'il faut jouer un son pour signaler qu'un message est envoyé."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "Indique s'il faut jouer un son lors de la connexion à un réseau."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Indique s'il faut jouer un son lors de la déconnexion d'un réseau."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr ""
 "Indique s'il faut émettre des sons en cas d'absence ou d'indisponibilité."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr ""
 "Indique s'il faut afficher des notifications lorsqu'un contact se déconnecte."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr ""
 "Indique s'il faut afficher des notifications lorsqu'un contact se connecte."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -431,48 +483,53 @@ msgstr ""
 "Indique s'il faut afficher une bulle de notification lorsqu'un message est "
 "reçu, même si la discussion est ouverte, mais sans être au premier plan."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr ""
 "Indique s'il faut afficher une bulle de notification lorsqu'un message est "
 "reçu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+msgid "Whether to show account balances in the contact list."
+msgstr ""
+"Indique s'il faut afficher les soldes de compte dans la liste des contacts."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 "Indique s'il faut afficher les avatars des contacts dans la liste des "
 "contacts et les fenêtres de discussion."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr ""
 "Indique s'il faut afficher les contacts qui sont déconnectés dans la liste "
 "des contacts."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
 msgstr ""
 "Indique s'il faut afficher des notifications en cas d'absence ou "
 "d'indisponibilité."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr ""
 "Indique s'il faut afficher les protocoles des contacts dans la liste des "
 "contacts."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr ""
 "Indique s'il faut afficher la liste des contacts dans les salons de "
 "discussion."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "Indique s'il faut afficher la liste des contacts en mode compact."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -480,11 +537,11 @@ msgstr ""
 "Indique s'il faut afficher la boîte de dialogue au sujet de la fermeture de "
 "la fenêtre principale avec le bouton « x » dans la barre de titre."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "Indique s'il faut utiliser les thèmes pour les salons de discussion."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -500,7 +557,7 @@ msgstr "Gestion des comptes de messagerie et VoIP"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2242
+#: ../src/empathy-accounts-dialog.c:2324
 msgid "Messaging and VoIP Accounts"
 msgstr "Comptes de messagerie et VoIP"
 
@@ -508,19 +565,35 @@ msgstr "Comptes de messagerie et VoIP"
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Transfert de fichier terminé, mais le fichier était corrompu"
 
-#: ../libempathy/empathy-ft-handler.c:1116
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
 msgstr ""
 "Le transfert de fichiers n'est pas pris en charge par le contact distant"
 
-#: ../libempathy/empathy-ft-handler.c:1172
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is not a regular file"
 msgstr "Le fichier sélectionné n'est pas un fichier conventionnel"
 
-#: ../libempathy/empathy-ft-handler.c:1181
+#: ../libempathy/empathy-ft-handler.c:1176
 msgid "The selected file is empty"
 msgstr "Le fichier sélectionné est vide"
 
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#, c-format
+msgid "Missed call from %s"
+msgstr "Appel manqué de %s"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, c-format
+msgid "Called %s"
+msgstr "Conversation avec %s"
+
+#: ../libempathy/empathy-message.c:422
+#, c-format
+msgid "Call from %s"
+msgstr "Appel de %s"
+
 #: ../libempathy/empathy-tp-file.c:268
 msgid "Socket type not supported"
 msgstr "Le type de connecteur réseau (socket) n'est pas pris en charge"
@@ -549,298 +622,290 @@ msgstr "Erreur lors du téléchargement du fichier"
 msgid "The other participant is unable to transfer the file"
 msgstr "Le correspondant n'est pas capable de transférer le fichier"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:383
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
 msgid "Unknown reason"
 msgstr "Raison inconnue"
 
-#: ../libempathy/empathy-utils.c:305
+#: ../libempathy/empathy-utils.c:222
 msgid "Available"
 msgstr "Disponible"
 
-#: ../libempathy/empathy-utils.c:307
+#: ../libempathy/empathy-utils.c:224
 msgid "Busy"
 msgstr "Occupé"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:227
 msgid "Away"
 msgstr "Absent"
 
-#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:229
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:231
 msgid "Offline"
 msgstr "Déconnecté"
 
-#: ../libempathy/empathy-utils.c:316
-#: ../src/empathy-streamed-media-window.c:1904
-#: ../src/empathy-streamed-media-window.c:1905
-#: ../src/empathy-streamed-media-window.c:1906
-#: ../src/empathy-streamed-media-window.c:1907
-#: ../src/empathy-call-window.ui.h:18
+#. translators: presence type is unknown
+#: ../libempathy/empathy-utils.c:234
+msgctxt "presence"
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:274
 msgid "No reason specified"
 msgstr "Aucune raison n'a été indiquée"
 
-#: ../libempathy/empathy-utils.c:357 ../libempathy/empathy-utils.c:413
+#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
 msgid "Status is set to offline"
 msgstr "L'état est « déconnecté »"
 
-#: ../libempathy/empathy-utils.c:359 ../libempathy/empathy-utils.c:393
+#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "Erreur réseau"
 
-#: ../libempathy/empathy-utils.c:361 ../libempathy/empathy-utils.c:395
+#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
 msgid "Authentication failed"
 msgstr "L'authentification a échoué"
 
-#: ../libempathy/empathy-utils.c:363 ../libempathy/empathy-utils.c:397
+#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
 msgid "Encryption error"
 msgstr "Erreur de chiffrement"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:284
 msgid "Name in use"
 msgstr "Nom déjà utilisé"
 
-#: ../libempathy/empathy-utils.c:367 ../libempathy/empathy-utils.c:399
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
 msgid "Certificate not provided"
 msgstr "Certificat non fourni"
 
-#: ../libempathy/empathy-utils.c:369 ../libempathy/empathy-utils.c:401
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
 msgid "Certificate untrusted"
 msgstr "Certificat non validé"
 
-#: ../libempathy/empathy-utils.c:371 ../libempathy/empathy-utils.c:403
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
 msgid "Certificate expired"
 msgstr "Le certificat a expiré"
 
-#: ../libempathy/empathy-utils.c:373 ../libempathy/empathy-utils.c:405
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
 msgid "Certificate not activated"
 msgstr "Certificat non activé"
 
-#: ../libempathy/empathy-utils.c:375 ../libempathy/empathy-utils.c:407
+#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
 msgid "Certificate hostname mismatch"
 msgstr "Le nom de l'hôte du certificat ne correspond pas"
 
-#: ../libempathy/empathy-utils.c:377 ../libempathy/empathy-utils.c:409
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate fingerprint mismatch"
 msgstr "L'empreinte du certificat ne correspond pas"
 
-#: ../libempathy/empathy-utils.c:379 ../libempathy/empathy-utils.c:411
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate self-signed"
 msgstr "Certificat auto-signé"
 
-#: ../libempathy/empathy-utils.c:381
+#: ../libempathy/empathy-utils.c:300
 msgid "Certificate error"
 msgstr "Erreur de certificat"
 
-#: ../libempathy/empathy-utils.c:415
+#: ../libempathy/empathy-utils.c:334
 msgid "Encryption is not available"
 msgstr "Chiffrement non disponible"
 
-#: ../libempathy/empathy-utils.c:417
+#: ../libempathy/empathy-utils.c:336
 msgid "Certificate is invalid"
 msgstr "Le certificat n'est pas valide"
 
-#: ../libempathy/empathy-utils.c:419
+#: ../libempathy/empathy-utils.c:338
 msgid "Connection has been refused"
 msgstr "La connexion a été refusée"
 
-#: ../libempathy/empathy-utils.c:421
+#: ../libempathy/empathy-utils.c:340
 msgid "Connection can't be established"
 msgstr "La connexion ne peut pas être établie"
 
-#: ../libempathy/empathy-utils.c:423
+#: ../libempathy/empathy-utils.c:342
 msgid "Connection has been lost"
 msgstr "La connexion a été perdue"
 
-#: ../libempathy/empathy-utils.c:425
+#: ../libempathy/empathy-utils.c:344
 msgid "This resource is already connected to the server"
 msgstr "Cette ressource est déjà connectée au serveur"
 
-#: ../libempathy/empathy-utils.c:427
+#: ../libempathy/empathy-utils.c:346
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "La connexion a été remplacée par une nouvelle connexion utilisant la même "
 "ressource"
 
-#: ../libempathy/empathy-utils.c:430
+#: ../libempathy/empathy-utils.c:349
 msgid "The account already exists on the server"
 msgstr "Ce compte existe déjà sur le serveur"
 
-#: ../libempathy/empathy-utils.c:432
+#: ../libempathy/empathy-utils.c:351
 msgid "Server is currently too busy to handle the connection"
 msgstr "Le serveur est actuellement trop chargé pour traiter la connexion"
 
-#: ../libempathy/empathy-utils.c:434
+#: ../libempathy/empathy-utils.c:353
 msgid "Certificate has been revoked"
 msgstr "Le certificat a été révoqué"
 
-#: ../libempathy/empathy-utils.c:436
+#: ../libempathy/empathy-utils.c:355
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Le certificat utilise un algorithme de chiffrement douteux ou est "
 "cryptographiquement faible"
 
-#: ../libempathy/empathy-utils.c:439
+#: ../libempathy/empathy-utils.c:358
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr ""
 "La longueur du certificat du serveur ou la profondeur de la chaîne du "
-"certificat du serveur dépasse les limites imposées par la bibliothèque "
-"cryptographique"
+"certificat du serveur dépasse les limites imposées par la bibliothèque de "
+"cryptographie"
 
-#: ../libempathy/empathy-utils.c:602
+#: ../libempathy/empathy-utils.c:519
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "Personnes à proximité"
 
-#: ../libempathy/empathy-utils.c:607
+#: ../libempathy/empathy-utils.c:524
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japon"
 
-#: ../libempathy/empathy-utils.c:636
+#: ../libempathy/empathy-utils.c:553
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:637
+#: ../libempathy/empathy-utils.c:554
 msgid "Facebook Chat"
 msgstr "Discussion Facebook"
 
-#: ../libempathy/empathy-time.c:137
+#: ../libempathy/empathy-time.c:88
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "il y a %d seconde"
 msgstr[1] "il y a %d secondes"
 
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:93
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "il y a %d minute"
 msgstr[1] "il y a %d minutes"
 
-#: ../libempathy/empathy-time.c:147
+#: ../libempathy/empathy-time.c:98
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "il y a %d heure"
 msgstr[1] "il y a %d heures"
 
-#: ../libempathy/empathy-time.c:152
+#: ../libempathy/empathy-time.c:103
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "il y a %d jour"
 msgstr[1] "il y a %d jours"
 
-#: ../libempathy/empathy-time.c:157
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "il y a %d semaine"
 msgstr[1] "il y a %d semaines"
 
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:113
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "il y a %d mois"
 msgstr[1] "il y a %d mois"
 
-#: ../libempathy/empathy-time.c:167
+#: ../libempathy/empathy-time.c:136
 msgid "in the future"
 msgstr "dans le futur"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:501
-msgid "All"
-msgstr "Toutes"
+#: ../libempathy-gtk/empathy-account-chooser.c:540
+msgid "All accounts"
+msgstr "Tous les comptes"
 
-#: ../libempathy-gtk/empathy-account-widget.c:679
-#: ../libempathy-gtk/empathy-log-window.c:647
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "Compte"
 
-#: ../libempathy-gtk/empathy-account-widget.c:680
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "Mot de passe"
 
-#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Serveur"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:754
-#: ../libempathy-gtk/empathy-account-widget.c:811
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s :"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1163
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "Mes comptes Web"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "Le compte %s est modifié via « Mes comptes Web »."
+msgid "The account %s is edited via %s."
+msgstr "Le compte %s est modifié via %s."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1169
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "Le compte %s ne peut pas être modifié dans Empathy."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1189
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
 msgstr "Lancer Mes comptes Web"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1527
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "Modifier %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Nom d'utilisateur :"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1894
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "A_ppliquer"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1924
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
 msgstr "Se _connecter"
 
-#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1990
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:517
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1481
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "Compte :"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2001
-msgid "_Enabled"
-msgstr "_Activé"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2066
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "Ce compte existe déjà sur le serveur"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2069
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "Créer un nouveau compte sur le serveur"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2261
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "A_nnuler"
 
@@ -849,19 +914,19 @@ msgstr "A_nnuler"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2558
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s sur %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2584
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "Compte %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2588
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "Nouveau compte"
 
@@ -873,6 +938,7 @@ msgstr "<b>Exemple :</b> MonNomEcran"
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -886,7 +952,7 @@ msgstr "Avancé"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "Pass_word:"
 msgstr "_Mot de passe :"
@@ -896,7 +962,7 @@ msgstr "_Mot de passe :"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
 msgid "Remember Password"
 msgstr "Se souvenir du mot de passe"
 
@@ -906,7 +972,7 @@ msgstr "Se souvenir du mot de passe"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 #: ../libempathy-gtk/empathy-password-dialog.c:311
 msgid "Remember password"
@@ -982,76 +1048,84 @@ msgstr "Quel est votre UIN ICQ ?"
 msgid "What is your ICQ password?"
 msgstr "Quel est votre mot de passe ICQ ?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:183
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "Auto"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:221
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "Enregistrer"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:226
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "Options"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "Aucun"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Character set:"
 msgstr "Jeu de caractères :"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"La plupart des serveurs IRC ne nécessitent pas de mot de passe. Si vous "
+"n'êtes pas sûr, n'en saisissez pas."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Network"
 msgstr "Réseau"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Network:"
 msgstr "Réseau :"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Pseudonyme :"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "Message de départ :"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "Nom réel :"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Servers"
 msgstr "Serveurs"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "What is your IRC nickname?"
 msgstr "Quel est votre pseudonyme IRC ?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Quel réseau IRC ?"
 
@@ -1186,59 +1260,69 @@ msgid "Discover the STUN server automatically"
 msgstr "Découvrir automatiquement le serveur STUN"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "Ignore TLS Errors"
+msgstr "Ignorer les erreurs TLS"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Interval (seconds)"
 msgstr "Intervalle (secondes)"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
 msgid "Keep-Alive Options"
 msgstr "Options de connexions persistantes"
 
 # Je ne trouve pas de traduction donc j'ai laissé en anglais et mis le terme approximatif entre parenthèses
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
 msgid "Loose Routing"
 msgstr "Loose Routing (routage non strict)"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Mechanism:"
 msgstr "Mécanisme :"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
 msgid "Miscellaneous Options"
 msgstr "Options diverses"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 msgid "NAT Traversal Options"
 msgstr "Options de parcours NAT"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 msgid "Port:"
 msgstr "Port :"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 msgid "Proxy Options"
 msgstr "Options de serveur mandataire"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "STUN Server:"
 msgstr "Serveur STUN :"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.c:347
 msgid "Server:"
 msgstr "Serveur :"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid "Transport:"
 msgstr "Transport :"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr ""
+"Utiliser ce compte pour appeler des _lignes fixes ou des téléphones mobiles"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "Quel est votre mot de passe de compte SIP ?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Quel est votre identifiant de connexion SIP ?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "_Nom d'utilisateur :"
 
@@ -1263,21 +1347,29 @@ msgstr "I_dentifiant Yahoo! :"
 msgid "_Room List locale:"
 msgstr "Codage de la liste des _salons :"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:448
-#: ../libempathy-gtk/empathy-avatar-chooser.c:524
+#: ../libempathy-gtk/empathy-avatar-chooser.c:470
+#: ../libempathy-gtk/empathy-avatar-chooser.c:555
 msgid "Couldn't convert image"
 msgstr "Impossible de convertir l'image"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
 msgid "None of the accepted image formats are supported on your system"
 msgstr ""
 "Aucun des formats d'image acceptés n'est pris en charge par votre système"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:936
+#: ../libempathy-gtk/empathy-avatar-chooser.c:818
+msgid "Couldn't save picture to file"
+msgstr "Impossible d'enregistrer l'image dans le fichier"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:934
 msgid "Select Your Avatar Image"
 msgstr "Sélection de l'image d'avatar"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:939
+#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+msgid "Take a picture..."
+msgstr "Prendre une photo..."
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:941
 msgid "No Image"
 msgstr "Aucune image"
 
@@ -1293,61 +1385,88 @@ msgstr "Tous les fichiers"
 msgid "Click to enlarge"
 msgstr "Cliquer pour agrandir"
 
-#: ../libempathy-gtk/empathy-chat.c:655
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
+msgid "There was an error starting the call"
+msgstr "Une erreur est survenue au démarrage de l'appel"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact doesn't support calls"
+msgstr "Le contact spécifié ne prend pas en charge les appels"
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is offline"
+msgstr "Le contact spécifié est hors ligne."
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "The specified contact is not valid"
+msgstr "Le contact spécifié n'est pas valable"
+
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "Emergency calls are not supported on this protocol"
+msgstr ""
+"L'utilisation des appels d'urgence n'est pas pris en charge par ce protocole"
+
+#: ../libempathy-gtk/empathy-chat.c:702
 msgid "Failed to open private chat"
 msgstr "Impossible d'ouvrir une discussion privée"
 
-#: ../libempathy-gtk/empathy-chat.c:720
+#: ../libempathy-gtk/empathy-chat.c:763
 msgid "Topic not supported on this conversation"
 msgstr ""
 "L'utilisation d'un sujet n'est pas pris en charge par cette conversation"
 
-#: ../libempathy-gtk/empathy-chat.c:726
+#: ../libempathy-gtk/empathy-chat.c:769
 msgid "You are not allowed to change the topic"
 msgstr "Vous n'êtes pas autorisé à modifier le sujet"
 
-#: ../libempathy-gtk/empathy-chat.c:909
+#: ../libempathy-gtk/empathy-chat.c:973
+#, c-format
+msgid "“%s� is not a valid contact ID"
+msgstr "« %s » n'est pas un identifiant de contact valide"
+
+#: ../libempathy-gtk/empathy-chat.c:1058
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear : efface tous les messages dans cette conversation"
 
-#: ../libempathy-gtk/empathy-chat.c:912
+#: ../libempathy-gtk/empathy-chat.c:1061
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <sujet> : définit le sujet de la conversation actuelle"
 
-#: ../libempathy-gtk/empathy-chat.c:915
+#: ../libempathy-gtk/empathy-chat.c:1064
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <id du salon> : rejoint un nouveau salon de discussion"
 
-#: ../libempathy-gtk/empathy-chat.c:918
+#: ../libempathy-gtk/empathy-chat.c:1067
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <id du salon> : rejoint un nouveau salon de discussion"
 
-#: ../libempathy-gtk/empathy-chat.c:923
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr ""
-"/part [<chat room ID>] [<reason>] : quitte le salon de discussion, par "
-"défaut, l'actuel"
+"/part [<id du salon>] [<raison>] : quitte le salon de discussion ; par "
+"défaut, le salon actuel"
 
-#: ../libempathy-gtk/empathy-chat.c:928
+#: ../libempathy-gtk/empathy-chat.c:1075
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <id du contact> [<message>] : ouvre une discussion privée"
 
-#: ../libempathy-gtk/empathy-chat.c:931
+#: ../libempathy-gtk/empathy-chat.c:1078
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <id du contact> <message> : ouvre une discussion privée"
 
-#: ../libempathy-gtk/empathy-chat.c:934
+#: ../libempathy-gtk/empathy-chat.c:1081
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <pseudonyme> : modifie votre pseudonyme sur le serveur actuel"
 
-#: ../libempathy-gtk/empathy-chat.c:937
+#: ../libempathy-gtk/empathy-chat.c:1084
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr ""
 "/me <message> : envoie un message d'action dans la conversation actuelle"
 
-#: ../libempathy-gtk/empathy-chat.c:940
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1357,7 +1476,12 @@ msgstr ""
 "pour envoyer un message commençant par un « / ». Par exemple : « /say /join "
 "est utilisé pour rejoindre un nouveau salon de discussion »"
 
-#: ../libempathy-gtk/empathy-chat.c:945
+#: ../libempathy-gtk/empathy-chat.c:1092
+msgid "/whois <contact ID>: display information about a contact"
+msgstr ""
+"/whois <id du contact> : affiche les informations à propos de ce contact"
+
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1365,99 +1489,114 @@ msgstr ""
 "/help [<commande>] : affiche toutes les commandes prises en charge. Si "
 "<commande> est définie, affiche son utilisation."
 
-#: ../libempathy-gtk/empathy-chat.c:955
+#: ../libempathy-gtk/empathy-chat.c:1112
 #, c-format
 msgid "Usage: %s"
 msgstr "Utilisation : %s"
 
-#: ../libempathy-gtk/empathy-chat.c:997
+#: ../libempathy-gtk/empathy-chat.c:1157
 msgid "Unknown command"
 msgstr "Commande inconnue"
 
-#: ../libempathy-gtk/empathy-chat.c:1123
+#: ../libempathy-gtk/empathy-chat.c:1283
 msgid "Unknown command; see /help for the available commands"
 msgstr ""
 "Commande inconnue ; utilisez /help pour obtenir les commandes disponibles"
 
-#: ../libempathy-gtk/empathy-chat.c:1263
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1453
+msgid "insufficient balance to send message"
+msgstr "solde insuffisant pour envoyer un message"
+
+#: ../libempathy-gtk/empathy-chat.c:1455
+msgid "not capable"
+msgstr "non capable"
+
+#: ../libempathy-gtk/empathy-chat.c:1462
 msgid "offline"
 msgstr "déconnecté"
 
-#: ../libempathy-gtk/empathy-chat.c:1266
+#: ../libempathy-gtk/empathy-chat.c:1465
 msgid "invalid contact"
 msgstr "contact non valide"
 
-#: ../libempathy-gtk/empathy-chat.c:1269
+#: ../libempathy-gtk/empathy-chat.c:1468
 msgid "permission denied"
 msgstr "permission refusée"
 
-#: ../libempathy-gtk/empathy-chat.c:1272
+#: ../libempathy-gtk/empathy-chat.c:1471
 msgid "too long message"
 msgstr "message trop long"
 
-#: ../libempathy-gtk/empathy-chat.c:1275
+#: ../libempathy-gtk/empathy-chat.c:1474
 msgid "not implemented"
 msgstr "non implémenté"
 
-#: ../libempathy-gtk/empathy-chat.c:1279
+#: ../libempathy-gtk/empathy-chat.c:1478
 msgid "unknown"
 msgstr "inconnu"
 
-#: ../libempathy-gtk/empathy-chat.c:1283
+#: ../libempathy-gtk/empathy-chat.c:1484
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Erreur à l'envoi du message « %s » : %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1344 ../src/empathy-chat-window.c:707
+#: ../libempathy-gtk/empathy-chat.c:1488
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Erreur à l'envoi du message : %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1549 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Sujet :"
 
-#: ../libempathy-gtk/empathy-chat.c:1356
+#: ../libempathy-gtk/empathy-chat.c:1561
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Sujet défini : %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1358
+#: ../libempathy-gtk/empathy-chat.c:1563
 msgid "No topic defined"
 msgstr "Pas de sujet défini"
 
-#: ../libempathy-gtk/empathy-chat.c:1857
+#: ../libempathy-gtk/empathy-chat.c:2072
 msgid "(No Suggestions)"
 msgstr "(aucune suggestion)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1925
+#: ../libempathy-gtk/empathy-chat.c:2140
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Ajouter « %s » au dictionnaire"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1962
+#: ../libempathy-gtk/empathy-chat.c:2177
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Ajouter « %s » au dictionnaire %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2021
+#: ../libempathy-gtk/empathy-chat.c:2247
 msgid "Insert Smiley"
 msgstr "Insérer une frimousse"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2039
-#: ../libempathy-gtk/empathy-ui-utils.c:1810
+#: ../libempathy-gtk/empathy-chat.c:2265
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "_Envoyer"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2319
 msgid "_Spelling Suggestions"
 msgstr "_Suggestions orthographiques"
 
-#: ../libempathy-gtk/empathy-chat.c:2163
+#: ../libempathy-gtk/empathy-chat.c:2408
 msgid "Failed to retrieve recent logs"
 msgstr "Impossible de retrouver les journaux récents"
 
-#: ../libempathy-gtk/empathy-chat.c:2274
+#: ../libempathy-gtk/empathy-chat.c:2545
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s s'est déconnecté"
@@ -1465,12 +1604,12 @@ msgstr "%s s'est déconnecté"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2281
+#: ../libempathy-gtk/empathy-chat.c:2552
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s a été expulsé par %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2284
+#: ../libempathy-gtk/empathy-chat.c:2555
 #, c-format
 msgid "%s was kicked"
 msgstr "%s a été expulsé"
@@ -1478,17 +1617,17 @@ msgstr "%s a été expulsé"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2292
+#: ../libempathy-gtk/empathy-chat.c:2563
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s a été banni par %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2295
+#: ../libempathy-gtk/empathy-chat.c:2566
 #, c-format
 msgid "%s was banned"
 msgstr "%s a été banni"
 
-#: ../libempathy-gtk/empathy-chat.c:2299
+#: ../libempathy-gtk/empathy-chat.c:2570
 #, c-format
 msgid "%s has left the room"
 msgstr "%s a quitté la salle"
@@ -1498,105 +1637,137 @@ msgstr "%s a quitté la salle"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2308
+#: ../libempathy-gtk/empathy-chat.c:2579
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2333
+#: ../libempathy-gtk/empathy-chat.c:2604
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s a rejoint le salon"
 
-#: ../libempathy-gtk/empathy-chat.c:2358
+#: ../libempathy-gtk/empathy-chat.c:2629
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s est maintenant connu sous le nom de %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2497
-#: ../src/empathy-streamed-media-window.c:1949
-#: ../src/empathy-event-manager.c:1122
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2768
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1391
+#: ../src/empathy-call-window.c:1441 ../src/empathy-call-window.c:2479
 msgid "Disconnected"
 msgstr "Déconnecté"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3127
+#: ../libempathy-gtk/empathy-chat.c:3415
 msgid "Would you like to store this password?"
 msgstr "Souhaitez-vous enregistrer ce mot de passe ?"
 
-#: ../libempathy-gtk/empathy-chat.c:3133
+#: ../libempathy-gtk/empathy-chat.c:3421
 msgid "Remember"
 msgstr "Conserver"
 
-#: ../libempathy-gtk/empathy-chat.c:3143
+#: ../libempathy-gtk/empathy-chat.c:3431
 msgid "Not now"
 msgstr "Pas maintenant"
 
-#: ../libempathy-gtk/empathy-chat.c:3187
+#: ../libempathy-gtk/empathy-chat.c:3475
 msgid "Retry"
 msgstr "Réessayer"
 
-#: ../libempathy-gtk/empathy-chat.c:3191
+#: ../libempathy-gtk/empathy-chat.c:3479
 msgid "Wrong password; please try again:"
 msgstr "Mot de passe incorrect ; essayez de nouveau :"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3308
+#: ../libempathy-gtk/empathy-chat.c:3609
 msgid "This room is protected by a password:"
 msgstr "Ce salon est protégé par un mot de passe :"
 
-#: ../libempathy-gtk/empathy-chat.c:3335
+#: ../libempathy-gtk/empathy-chat.c:3636
 msgid "Join"
 msgstr "Rejoindre"
 
-#: ../libempathy-gtk/empathy-chat.c:3505 ../src/empathy-event-manager.c:1144
+#: ../libempathy-gtk/empathy-chat.c:3838 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "Connecté"
 
-#: ../libempathy-gtk/empathy-chat.c:3558
-#: ../libempathy-gtk/empathy-log-window.c:654
+#: ../libempathy-gtk/empathy-chat.c:3893
 msgid "Conversation"
 msgstr "Conversation"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:422
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:3898
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (SMS)"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
 msgid "Unknown or invalid identifier"
 msgstr "Identifiant inconnu ou non valide"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
 msgid "Contact blocking temporarily unavailable"
 msgstr "Blocage de contacts temporairement non disponible"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
 msgid "Contact blocking unavailable"
 msgstr "Blocage de contacts non disponible"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
 msgid "Permission Denied"
 msgstr "permission refusée"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
 msgid "Could not block contact"
 msgstr "Impossible de bloquer le contact"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:701
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
 msgid "Edit Blocked Contacts"
 msgstr "Modifier les contacts bloqués"
 
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Account:"
+msgstr "Compte :"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "Contacts bloqués"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Supprimer"
+
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:794
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Copier l'adresse du lien"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:801
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Ouvrir le lien"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:420
+#: ../libempathy-gtk/empathy-chat-text-view.c:415
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
@@ -1614,25 +1785,25 @@ msgstr "Informations personnelles"
 msgid "New Contact"
 msgstr "Nouveau contact"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:532
-#: ../libempathy-gtk/empathy-individual-dialogs.c:198
+#: ../libempathy-gtk/empathy-contact-dialogs.c:533
+#: ../libempathy-gtk/empathy-individual-dialogs.c:200
 #, c-format
 msgid "Block %s?"
 msgstr "Bloquer %s ?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:537
-#: ../libempathy-gtk/empathy-individual-dialogs.c:239
+#: ../libempathy-gtk/empathy-contact-dialogs.c:538
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Voulez-vous vraiment empêcher « %s » de vous contacter à nouveau ?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:542
-#: ../libempathy-gtk/empathy-individual-dialogs.c:261
+#: ../libempathy-gtk/empathy-contact-dialogs.c:543
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
 msgid "_Block"
 msgstr "_Bloquer"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:552
-#: ../libempathy-gtk/empathy-individual-dialogs.c:270
+#: ../libempathy-gtk/empathy-contact-dialogs.c:559
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Signaler ce contact comme abusif"
@@ -1658,302 +1829,332 @@ msgstr "Non groupés"
 msgid "Favorite People"
 msgstr "Contacts favoris"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2012
-#: ../libempathy-gtk/empathy-individual-view.c:2337
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Voulez-vous vraiment supprimer le groupe « %s » ?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2014
-#: ../libempathy-gtk/empathy-individual-view.c:2340
+#: ../libempathy-gtk/empathy-contact-list-view.c:1988
+#: ../libempathy-gtk/empathy-individual-view.c:2379
 msgid "Removing group"
 msgstr "Suppression du groupe"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2063
-#: ../libempathy-gtk/empathy-contact-list-view.c:2140
-#: ../libempathy-gtk/empathy-individual-view.c:2395
-#: ../libempathy-gtk/empathy-individual-view.c:2563
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../libempathy-gtk/empathy-contact-list-view.c:2037
+#: ../libempathy-gtk/empathy-contact-list-view.c:2114
+#: ../libempathy-gtk/empathy-individual-view.c:2434
+#: ../libempathy-gtk/empathy-individual-view.c:2637
 msgid "_Remove"
 msgstr "_Supprimer"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2093
-#: ../libempathy-gtk/empathy-individual-view.c:2448
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
+#: ../libempathy-gtk/empathy-individual-view.c:2501
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Voulez-vous vraiment supprimer le contact « %s » ?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2095
-#: ../libempathy-gtk/empathy-individual-view.c:2469
+#: ../libempathy-gtk/empathy-contact-list-view.c:2069
+#: ../libempathy-gtk/empathy-individual-view.c:2522
 msgid "Removing contact"
 msgstr "Suppression du contact"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:219
-#: ../src/empathy-main-window.ui.h:13
+#: ../libempathy-gtk/empathy-contact-menu.c:220
+#: ../src/empathy-main-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "A_jouter un contact…"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:296
+#: ../libempathy-gtk/empathy-contact-menu.c:300
 msgid "_Block Contact"
 msgstr "_Bloquer le contact"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:325
-#: ../libempathy-gtk/empathy-individual-menu.c:517
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:329
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "Dis_cussion"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:356
-#: ../libempathy-gtk/empathy-individual-menu.c:560
+#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "Appel _audio"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:387
-#: ../libempathy-gtk/empathy-individual-menu.c:602
+#: ../libempathy-gtk/empathy-contact-menu.c:394
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "Appel _vidéo"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:433
-#: ../libempathy-gtk/empathy-individual-menu.c:645
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:440
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "Conversations _précédentes"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:455
-#: ../libempathy-gtk/empathy-individual-menu.c:686
+#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "Envoyer un fichier"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:478
-#: ../libempathy-gtk/empathy-individual-menu.c:728
+#: ../libempathy-gtk/empathy-contact-menu.c:485
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
 msgstr "Partager mon bureau"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:518
-#: ../libempathy-gtk/empathy-contact-widget.c:1763
-#: ../libempathy-gtk/empathy-individual-menu.c:763
+#: ../libempathy-gtk/empathy-contact-menu.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:1886
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
 #: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "Favori"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:547
-#: ../libempathy-gtk/empathy-individual-menu.c:791
+#: ../libempathy-gtk/empathy-contact-menu.c:554
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "Infor_mations"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:593
+#: ../libempathy-gtk/empathy-contact-menu.c:600
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "Mo_difier"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:647
-#: ../libempathy-gtk/empathy-individual-menu.c:972
-#: ../src/empathy-chat-window.c:919
+#: ../libempathy-gtk/empathy-contact-menu.c:654
+#: ../libempathy-gtk/empathy-individual-menu.c:1283
+#: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "Vous invite à ce salon"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:678
-#: ../libempathy-gtk/empathy-individual-menu.c:1019
+#: ../libempathy-gtk/empathy-contact-menu.c:685
+#: ../libempathy-gtk/empathy-individual-menu.c:1329
 msgid "_Invite to Chat Room"
 msgstr "_Inviter à un salon de discussion"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:510
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
 msgid "Search contacts"
 msgstr "Recherche de contacts"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:540
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
 msgid "Search: "
 msgstr "Rechercher : "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:598
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
 msgid "_Add Contact"
 msgstr "A_jouter le contact"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:616
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
 msgid "No contacts found"
 msgstr "Aucun contact trouvé"
 
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr "Le message vous présentant :"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
+msgstr "Merci de m'autoriser à voir quand vous êtes connecté !"
+
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "Sélectionner un contact"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:295
+#: ../libempathy-gtk/empathy-contact-widget.c:336
 #: ../libempathy-gtk/empathy-individual-widget.c:153
 msgid "Full name:"
 msgstr "Nom complet :"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:296
+#: ../libempathy-gtk/empathy-contact-widget.c:337
 #: ../libempathy-gtk/empathy-individual-widget.c:154
 msgid "Phone number:"
 msgstr "Numéro de téléphone :"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:297
+#: ../libempathy-gtk/empathy-contact-widget.c:338
 #: ../libempathy-gtk/empathy-individual-widget.c:155
 msgid "E-mail address:"
 msgstr "Adresse électronique :"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:298
+#: ../libempathy-gtk/empathy-contact-widget.c:339
 #: ../libempathy-gtk/empathy-individual-widget.c:156
 msgid "Website:"
 msgstr "Site Web :"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:299
+#: ../libempathy-gtk/empathy-contact-widget.c:340
 #: ../libempathy-gtk/empathy-individual-widget.c:157
 msgid "Birthday:"
 msgstr "Anniversaire :"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:346
+msgid "Last seen:"
+msgstr "Dernière consultation :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:348
+msgid "Connected from:"
+msgstr "Connecté de :"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:353
+msgid "Away message:"
+msgstr "Message d'absence :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+msgid "Channels:"
+msgstr "Canaux :"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
 msgstr "Code ISO du pays :"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Country:"
 msgstr "Pays :"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "State:"
 msgstr "État :"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:768
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "City:"
 msgstr "Ville :"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:770
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Area:"
 msgstr "Région :"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:772
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
 msgstr "Code postal :"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:774
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Street:"
 msgstr "Rue :"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:776
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
 msgstr "Bâtiment :"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:778
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Floor:"
 msgstr "Étage :"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:780
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Room:"
 msgstr "Salon :"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:782
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Text:"
 msgstr "Texte :"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:784
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Description:"
 msgstr "Description :"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:786
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
 msgstr "URI :"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
 msgstr "Niveau de précision :"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:790
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr "Erreur :"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:792
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
 msgstr "Erreur verticale (mètres) :"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:794
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
 msgstr "Erreur horizontale (mètres) :"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr "Vitesse :"
 
 # http://fr.wikipedia.org/wiki/Rel%C3%A8vement
-#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Bearing:"
 msgstr "Relèvement :"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:800
-#: ../libempathy-gtk/empathy-individual-widget.c:526
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
 msgstr "Vitesse ascensionnelle :"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:802
-#: ../libempathy-gtk/empathy-individual-widget.c:528
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
 msgstr "Dernière mise à jour le :"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:804
-#: ../libempathy-gtk/empathy-individual-widget.c:530
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
 msgstr "Longitude :"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:806
-#: ../libempathy-gtk/empathy-individual-widget.c:532
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
 msgstr "Latitude :"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:808
-#: ../libempathy-gtk/empathy-individual-widget.c:534
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
 msgstr "Altitude :"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:871
-#: ../libempathy-gtk/empathy-contact-widget.c:888
-#: ../libempathy-gtk/empathy-individual-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:633
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "Position"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:890
-#: ../libempathy-gtk/empathy-individual-widget.c:635
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:942
-#: ../libempathy-gtk/empathy-individual-widget.c:684
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e %B %Y à %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1024
-#: ../libempathy-gtk/empathy-individual-widget.c:919
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
 msgid "Save Avatar"
 msgstr "Enregistrer l'avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1080
-#: ../libempathy-gtk/empathy-individual-widget.c:977
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
 msgid "Unable to save avatar"
 msgstr "Impossible d'enregistrer l'avatar"
 
@@ -1963,7 +2164,7 @@ msgstr "<b>Position</b> le (date)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1307
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr "Alias :"
 
@@ -1983,7 +2184,7 @@ msgstr "Détails sur le contact"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "Identifiant :"
 
@@ -2000,11 +2201,11 @@ msgstr "OS :"
 msgid "Version:"
 msgstr "Version :"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:332
+#: ../libempathy-gtk/empathy-groups-widget.c:333
 msgid "Groups"
 msgstr "Groupes"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:344
+#: ../libempathy-gtk/empathy-groups-widget.c:345
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2012,74 +2213,105 @@ msgstr ""
 "Sélectionnez les groupes auxquels ce contact appartiendra ; vous pouvez "
 "sélectionner plus d'un groupe ou aucun groupe."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:363
+#: ../libempathy-gtk/empathy-groups-widget.c:364
 msgid "_Add Group"
 msgstr "_Ajouter un groupe"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:398
+#: ../libempathy-gtk/empathy-groups-widget.c:399
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Sélectionner"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1436
+#: ../libempathy-gtk/empathy-groups-widget.c:409
+#: ../src/empathy-main-window.c:1807
 msgid "Group"
 msgstr "Groupe"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:244
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "La personne suivante va être bloquée :"
 msgstr[1] "Les personnes suivantes vont être bloquées :"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:251
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "La personne suivante ne peut pas être bloquée :"
 msgstr[1] "Les personnes suivantes ne peuvent pas être bloquées :"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
 msgstr "Contacts liés"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:354
+#: ../libempathy-gtk/empathy-individual-linker.c:370
 msgid "Select contacts to link"
 msgstr "Sélectionner les contacts à lier"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:428
+#: ../libempathy-gtk/empathy-individual-linker.c:444
 msgid "New contact preview"
 msgstr "Aperçu du nouveau contact"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:472
+#: ../libempathy-gtk/empathy-individual-linker.c:488
 msgid "Contacts selected in the list on the left will be linked together."
 msgstr "Les contacts sélectionnés dans la liste de gauche vont être reliés."
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:131
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:839
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "Sélectionner le compte à utiliser pour passer l'appel"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "Appel"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+msgid "Mobile"
+msgstr "Mobile"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "Travail"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "Maison"
+
+#. add an SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+msgid "_SMS"
+msgstr "_SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1141
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Modifier"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:865
+#: ../libempathy-gtk/empathy-individual-menu.c:1167
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "_Lier des contacts…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2302
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 msgid "Delete and _Block"
 msgstr "Supprimer et _bloquer"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2457
+#: ../libempathy-gtk/empathy-individual-view.c:2510
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2088,7 +2320,7 @@ msgstr ""
 "Voulez-vous vraiment supprimer le contact lié « %s » ? Sachez que cela "
 "supprimera tous les contacts qui composent ce contact lié."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2171,67 +2403,202 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "_Séparer"
 
-#: ../libempathy-gtk/empathy-log-window.c:664
-msgid "Date"
-msgstr "Date"
+#: ../libempathy-gtk/empathy-log-window.c:634
+msgid "History"
+msgstr "Historique"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
-msgstr "Conversations"
+#: ../libempathy-gtk/empathy-log-window.c:689
+msgid "Show"
+msgstr "Afficher"
+
+#: ../libempathy-gtk/empathy-log-window.c:711
+msgid "Search"
+msgstr "Rechercher"
+
+#: ../libempathy-gtk/empathy-log-window.c:1159
+#, c-format
+msgid "Chat in %s"
+msgstr "Discussion par %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1161
+#, c-format
+msgid "Chat with %s"
+msgstr "Discussion avec %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%A %e %B %Y %X"
+
+#. Translators: this is an emote: '* Danielle waves'
+#: ../libempathy-gtk/empathy-log-window.c:1300
+#, c-format
+msgid "<i>* %s %s</i>"
+msgstr "<i>* %s %s</i>"
+
+#. Translators: this is a message: 'Danielle: hello'
+#. * The string in bold is the sender's name
+#: ../libempathy-gtk/empathy-log-window.c:1306
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s :</b> %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1382
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s seconde"
+msgstr[1] "%s secondes"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s minute"
+msgstr[1] "%s minutes"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "Appel de %s, terminé le %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1729
+msgid "Today"
+msgstr "Aujourd'hui"
+
+#: ../libempathy-gtk/empathy-log-window.c:1733
+msgid "Yesterday"
+msgstr "Hier"
+
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
+msgid "%e %B %Y"
+msgstr "%e %B %Y"
+
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3425
+msgid "Anytime"
+msgstr "N'importe quand"
+
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2353
+msgid "Anyone"
+msgstr "N'importe qui"
+
+#: ../libempathy-gtk/empathy-log-window.c:2666
+msgid "Who"
+msgstr "Qui"
+
+#: ../libempathy-gtk/empathy-log-window.c:2870
+msgid "When"
+msgstr "Quand"
+
+#: ../libempathy-gtk/empathy-log-window.c:2986
+msgid "Anything"
+msgstr "N'importe quoi"
+
+#: ../libempathy-gtk/empathy-log-window.c:2988
+msgid "Text chats"
+msgstr "Textes de discussion"
+
+#: ../libempathy-gtk/empathy-log-window.c:2990
+#: ../src/empathy-preferences.ui.h:4
+msgid "Calls"
+msgstr "Appels"
+
+#: ../libempathy-gtk/empathy-log-window.c:2995
+msgid "Incoming calls"
+msgstr "Appels entrants"
+
+#: ../libempathy-gtk/empathy-log-window.c:2996
+msgid "Outgoing calls"
+msgstr "Appels sortants"
+
+#: ../libempathy-gtk/empathy-log-window.c:2997
+msgid "Missed calls"
+msgstr "Appels manqués"
+
+#: ../libempathy-gtk/empathy-log-window.c:3019
+msgid "What"
+msgstr "Quoi"
+
+#: ../libempathy-gtk/empathy-log-window.c:3728
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr ""
+"Vouez-vous vraiment effacer tout l'historique des conversations précédentes ?"
+
+#: ../libempathy-gtk/empathy-log-window.c:3732
+msgid "Clear All"
+msgstr "Tout effacer"
+
+#: ../libempathy-gtk/empathy-log-window.c:3739
+msgid "Delete from:"
+msgstr "Effacer à partir de :"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Chargement...</span>"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "Suivant"
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Chat"
+msgstr "Discuter"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "Précédent"
+msgid "Delete All History..."
+msgstr "Effacer tout l'historique..."
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr "Conversations précédentes"
+msgid "Profile"
+msgstr "Profil"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Video"
+msgstr "Vidéo"
 
-#. Tab Label
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "Rechercher"
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:20
+msgid "_Edit"
+msgstr "É_dition"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "_File"
+msgstr "_Fichier"
 
-# Search est le titre de l'onglet, et est suivi de _For placé devant la zone de
-# texte à rechercher, j'ai donc essayé d'adapter au mieux.
-#. Searching *for* something
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "ce _terme :"
+msgid "page 2"
+msgstr "page 2"
 
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
 msgid "Contact ID:"
 msgstr "Identifiant du contact :"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:171
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
 msgid "C_hat"
 msgstr "_Discuter"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:181
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
 msgstr "Nouvelle conversation"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:252
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
 msgid "Send _Video"
 msgstr "Envoyer la _vidéo"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:260
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
 msgid "C_all"
 msgstr "_Appeler"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:270
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "New Call"
 msgstr "Nouvel appel"
 
@@ -2250,34 +2617,34 @@ msgstr ""
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Message…"
 msgstr "Message personnalisé…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messages…"
 msgstr "Édition des messages personnalisés…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
 msgstr "Cliquez pour supprimer cet état des favoris"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
 msgstr "Cliquez pour ajouter cet état aux favoris"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
 msgstr "Changer l'état"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:948
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
 msgid "Set your presence and current status"
 msgstr "Définit votre état de présence actuel"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1136
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
 msgid "Custom messages…"
 msgstr "Messages personnalisés…"
 
@@ -2290,18 +2657,26 @@ msgstr "Messages personnalisés…"
 msgid "New %s account"
 msgstr "Nouveau compte %s"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "Rechercher :"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "Respecter la casse"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Mat_ch case"
+msgstr "Respe_cter la casse"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
 msgid "Phrase not found"
 msgstr "Phrase introuvable"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "_Next"
+msgstr "_Suivant"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+msgid "_Previous"
+msgstr "_Précédent"
+
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
 msgstr "Réception d'un message instantané"
@@ -2342,35 +2717,32 @@ msgstr "Appel vocal sortant"
 msgid "Voice call ended"
 msgstr "Appel vocal terminé"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "Saisissez un message personnalisé"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
 msgstr "Édition des messages personnalisés"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr "Enregistrer un _nouveau message d'état"
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#, c-format
+msgid "Message edited at %s"
+msgstr "Message modifié à %s"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Status Messages"
-msgstr "Messages d'état enregistrés"
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
+msgid "Normal"
+msgstr "Normal"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "Classique"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "Simple"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "Propre"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "Bleu"
 
@@ -2446,19 +2818,19 @@ msgstr "Se souvenir de ce choix pour les prochaines connexions"
 msgid "Certificate Details"
 msgstr "Détails du certificat"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1707
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
 msgstr "Impossible d'ouvrir l'URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1802
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
 msgstr "Sélectionner un fichier"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1874
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
 msgid "Insufficient free space to save file"
 msgstr "Espace disque insuffisant pour enregistrer le fichier"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1882
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2467,7 +2839,7 @@ msgstr ""
 "Un espace libre de %s est nécessaire pour enregistrer ce fichier mais "
 "seulement %s est disponible. Veuillez choisir un autre emplacement."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1926
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Fichier entrant de %s"
@@ -2655,25 +3027,25 @@ msgstr "Pas de message d'erreur"
 msgid "Instant Message (Empathy)"
 msgstr "Message instantané (Empathy)"
 
-#: ../src/empathy.c:308
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "Ne pas se connecter au démarrage"
 
-#: ../src/empathy.c:312
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr ""
 "Ne pas afficher la liste des contacts ou d'autres boîtes de dialogue au "
 "démarrage"
 
-#: ../src/empathy.c:320
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr "- Client de messagerie instantanée Empathy"
 
-#: ../src/empathy.c:499
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
 msgstr "Erreur de connexion au gestionnaire de compte"
 
-#: ../src/empathy.c:501
+#: ../src/empathy.c:639
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2741,7 +3113,9 @@ msgstr ""
 "Laurent Bigonville <bigon@bigon.be>\n"
 "Stéphane Raimbault <stephane.raimbault@gmail.com>\n"
 "Christophe Benz <christophe.benz@gmail.com>\n"
-"Emmanuel Sunyer <emmanuel.sunyer@dbmail.com>"
+"Emmanuel Sunyer <emmanuel.sunyer@dbmail.com>\n"
+"Alexandre Daubois <alex.daubois@gmail.com>\n"
+"Bruno Brouard <annoa.b@gmail.com>"
 
 #: ../src/empathy-account-assistant.c:167
 msgid "There was an error while importing the accounts."
@@ -2774,7 +3148,7 @@ msgstr ""
 "tard à partir du menu Édition."
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1268
+#: ../src/empathy-account-assistant.c:1271
 msgid "An error occurred"
 msgstr "Une erreur est survenue"
 
@@ -2810,7 +3184,7 @@ msgid ""
 "calls."
 msgstr ""
 "Avec Empathy, vous pouvez discuter avec des personnes connectées à proximité "
-"ou avec des amis et collègues qui utilisent Google Talk, AIM, Windows Live "
+"ou avec des amis et collègues qui utilisent Google Talk, AIM, Windows Live "
 "et bien d'autres programmes de discussion. À l'aide d'un microphone ou d'une "
 "webcam, vous pouvez également leur parler et les voir en vidéo."
 
@@ -2842,17 +3216,17 @@ msgstr ""
 msgid "Select the accounts you want to import:"
 msgstr "Sélectionnez les comptes à importer :"
 
-#: ../src/empathy-account-assistant.c:810
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-account-assistant.c:813
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "Yes"
 msgstr "Oui"
 
-#: ../src/empathy-account-assistant.c:817
+#: ../src/empathy-account-assistant.c:820
 msgid "No, that's all for now"
 msgstr "Non, c'est tout pour l'instant"
 
-#: ../src/empathy-account-assistant.c:1082
+#: ../src/empathy-account-assistant.c:1085
 msgid ""
 "Empathy can automatically discover and chat with the people connected on the "
 "same network as you. If you want to use this feature, please check that the "
@@ -2865,16 +3239,16 @@ msgstr ""
 "pourrez facilement modifier ces détails plus tard ou désactiver cette "
 "fonctionnalité en utilisant la boîte de dialogue « Comptes »"
 
-#: ../src/empathy-account-assistant.c:1088
-#: ../src/empathy-account-assistant.c:1144
+#: ../src/empathy-account-assistant.c:1091
+#: ../src/empathy-account-assistant.c:1147
 msgid "Edit->Accounts"
 msgstr "Édition -> Comptes"
 
-#: ../src/empathy-account-assistant.c:1104
+#: ../src/empathy-account-assistant.c:1107
 msgid "I do _not want to enable this feature for now"
 msgstr "Je _ne veux pas activer cette fonctionnalité pour l'instant"
 
-#: ../src/empathy-account-assistant.c:1140
+#: ../src/empathy-account-assistant.c:1143
 msgid ""
 "You won't be able to chat with people connected to your local network, as "
 "telepathy-salut is not installed. If you want to enable this feature, please "
@@ -2886,23 +3260,23 @@ msgstr ""
 "fonctionnalité, installez le paquet telepathy-salut et créez un compte "
 "« Personnes à proximité » à l'aide de la boîte de dialogue Comptes"
 
-#: ../src/empathy-account-assistant.c:1146
+#: ../src/empathy-account-assistant.c:1149
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut n'est pas installé"
 
-#: ../src/empathy-account-assistant.c:1192
+#: ../src/empathy-account-assistant.c:1195
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "Assistant des comptes de messagerie et VoIP"
 
-#: ../src/empathy-account-assistant.c:1226
+#: ../src/empathy-account-assistant.c:1229
 msgid "Welcome to Empathy"
 msgstr "Bienvenue dans Empathy"
 
-#: ../src/empathy-account-assistant.c:1235
+#: ../src/empathy-account-assistant.c:1238
 msgid "Import your existing accounts"
 msgstr "Importer vos comptes existants"
 
-#: ../src/empathy-account-assistant.c:1253
+#: ../src/empathy-account-assistant.c:1256
 msgid "Please enter personal details"
 msgstr "Saisissez vos détails personnels"
 
@@ -2919,34 +3293,35 @@ msgstr "Votre compte %s comporte des modifications non enregistrées."
 msgid "Your new account has not been saved yet."
 msgstr "Votre nouveau compte n'est pas encore enregistré."
 
-#: ../src/empathy-accounts-dialog.c:286
-#: ../src/empathy-streamed-media-window.c:809
+#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1175
 msgid "Connecting…"
 msgstr "Connexion en cours…"
 
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:386
 #, c-format
 msgid "Offline — %s"
 msgstr "Hors ligne — %s"
 
-#: ../src/empathy-accounts-dialog.c:339
+#: ../src/empathy-accounts-dialog.c:398
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Déconnecté — %s"
 
-#: ../src/empathy-accounts-dialog.c:350
+#: ../src/empathy-accounts-dialog.c:409
 msgid "Offline — No Network Connection"
 msgstr "Hors ligne — Pas de connexion réseau"
 
-#: ../src/empathy-accounts-dialog.c:357
+#: ../src/empathy-accounts-dialog.c:416
 msgid "Unknown Status"
 msgstr "Statut inconnu"
 
-#: ../src/empathy-accounts-dialog.c:369
+#: ../src/empathy-accounts-dialog.c:428
 msgid "Offline — Account Disabled"
 msgstr "Hors ligne — Compte désactivé"
 
-#: ../src/empathy-accounts-dialog.c:772
+#: ../src/empathy-accounts-dialog.c:831
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2954,16 +3329,16 @@ msgstr ""
 "Vous êtes sur le point de créer un nouveau compte, ce qui\n"
 "annulera vos modifications. Voulez-vous vraiment continuer ?"
 
-#: ../src/empathy-accounts-dialog.c:1133
+#: ../src/empathy-accounts-dialog.c:1192
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Voulez-vous supprimer %s de votre ordinateur ?"
 
-#: ../src/empathy-accounts-dialog.c:1137
+#: ../src/empathy-accounts-dialog.c:1196
 msgid "This will not remove your account on the server."
 msgstr "Cela ne supprimera pas votre compte sur le serveur."
 
-#: ../src/empathy-accounts-dialog.c:1375
+#: ../src/empathy-accounts-dialog.c:1432
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2972,15 +3347,15 @@ msgstr ""
 "annulera vos modifications. Voulez-vous vraiment continuer ?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1571
+#: ../src/empathy-accounts-dialog.c:1643
 msgid "_Enable"
 msgstr "_Activer"
 
-#: ../src/empathy-accounts-dialog.c:1572
+#: ../src/empathy-accounts-dialog.c:1644
 msgid "_Disable"
 msgstr "_Désactiver"
 
-#: ../src/empathy-accounts-dialog.c:2086
+#: ../src/empathy-accounts-dialog.c:2154
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2989,18 +3364,22 @@ msgstr ""
 "vos modifications. Voulez-vous vraiment continuer ?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Ajouter…"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
 msgid "Loading account information"
 msgstr "Chargement des informations de compte"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "No protocol installed"
 msgstr "Aucun protocole installé"
 
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Protocol:"
 msgstr "Protocole :"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3008,114 +3387,132 @@ msgstr ""
 "Pour ajouter un nouveau compte, vous devez d'abord installer le moteur "
 "correspondant à chaque protocole que vous voulez utiliser."
 
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add…"
-msgstr "A_jouter…"
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Import…"
 msgstr "_Importer…"
 
-#: ../src/empathy-auth-client.c:243
+#: ../src/empathy-auth-client.c:249
 msgid " - Empathy authentication client"
-msgstr "- Client d'authentification d'Empathy"
+msgstr "- Client d'authentification de Empathy"
 
-#: ../src/empathy-auth-client.c:259
+#: ../src/empathy-auth-client.c:265
 msgid "Empathy authentication client"
-msgstr "Client d'authentification d'Empathy"
+msgstr "Client d'authentification de Empathy"
 
 #: ../src/empathy-auto-salut-account-helper.c:83
 msgid "People nearby"
 msgstr "Personnes à proximité"
 
-#: ../src/empathy-av.c:118
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
-msgstr "- Client audio/vidéo d'Empathy"
+msgstr "- Client audio/vidéo de Empathy"
 
-#: ../src/empathy-av.c:134
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
-msgstr "Client audio/vidéo d'Empathy"
+msgstr "Client audio/vidéo de Empathy"
 
-#: ../src/empathy-streamed-media-window.c:479
+#: ../src/empathy-streamed-media-window.c:431
 msgid "Contrast"
 msgstr "Contraste"
 
-#: ../src/empathy-streamed-media-window.c:482
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Brightness"
 msgstr "Luminosité"
 
-#: ../src/empathy-streamed-media-window.c:485
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:590
+#: ../src/empathy-streamed-media-window.c:542
 msgid "Volume"
 msgstr "Volume"
 
-#: ../src/empathy-streamed-media-window.c:1166
+#: ../src/empathy-streamed-media-window.c:1110
 msgid "_Sidebar"
 msgstr "Barre _latérale"
 
-#: ../src/empathy-streamed-media-window.c:1186
+#: ../src/empathy-streamed-media-window.c:1130
 msgid "Audio input"
 msgstr "Entrée audio"
 
-#: ../src/empathy-streamed-media-window.c:1190
+#: ../src/empathy-streamed-media-window.c:1134
 msgid "Video input"
 msgstr "Entrée vidéo"
 
-#: ../src/empathy-streamed-media-window.c:1194
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Dialpad"
 msgstr "Numéroteur"
 
-#: ../src/empathy-streamed-media-window.c:1205
+#: ../src/empathy-streamed-media-window.c:1151
 msgid "Details"
 msgstr "Détails"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1274
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1782
 #, c-format
 msgid "Call with %s"
 msgstr "Conversation avec %s"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-streamed-media-window.c:1353
-msgid "Call"
-msgstr "Appel"
-
-#: ../src/empathy-streamed-media-window.c:1507
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:2026
 msgid "The IP address as seen by the machine"
 msgstr "L'adresse IP vue par la machine"
 
-#: ../src/empathy-streamed-media-window.c:1509
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:2028
 msgid "The IP address as seen by a server on the Internet"
 msgstr "L'adresse IP vue par un serveur sur Internet"
 
-#: ../src/empathy-streamed-media-window.c:1511
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:2030
 msgid "The IP address of the peer as seen by the other side"
 msgstr "L'adresse IP du client vue de l'autre côté"
 
-#: ../src/empathy-streamed-media-window.c:1513
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:2032
 msgid "The IP address of a relay server"
-msgstr "L'adresse IP d'un serveur relai"
+msgstr "L'adresse IP d'un serveur relais"
 
-#: ../src/empathy-streamed-media-window.c:1515
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:2034
 msgid "The IP address of the multicast group"
 msgstr "L'adresse IP du groupe multidiffusion"
 
+#: ../src/empathy-streamed-media-window.c:1843
+msgctxt "encoding video codec"
+msgid "Unknown"
+msgstr "Inconnu"
+
+#: ../src/empathy-streamed-media-window.c:1846
+msgctxt "encoding audio codec"
+msgid "Unknown"
+msgstr "Inconnu"
+
+#: ../src/empathy-streamed-media-window.c:1849
+msgctxt "decoding video codec"
+msgid "Unknown"
+msgstr "Inconnu"
+
+#: ../src/empathy-streamed-media-window.c:1852
+msgctxt "decoding audio codec"
+msgid "Unknown"
+msgstr "Inconnu"
+
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2266
+#: ../src/empathy-streamed-media-window.c:2144
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Connecté — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2327
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2798
 msgid "Technical Details"
 msgstr "Détails techniques"
 
-#: ../src/empathy-streamed-media-window.c:2365
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2836
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3124,7 +3521,8 @@ msgstr ""
 "Le logiciel de %s ne comprend aucun des formats audio pris en charge par "
 "votre ordinateur"
 
-#: ../src/empathy-streamed-media-window.c:2370
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2841
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3133,7 +3531,8 @@ msgstr ""
 "Le logiciel de %s ne comprend aucun des formats vidéo pris en charge par "
 "votre ordinateur"
 
-#: ../src/empathy-streamed-media-window.c:2376
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2847
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3142,25 +3541,29 @@ msgstr ""
 "Impossible d'établir une connexion avec %s. L'un d'entre vous utilise peut-"
 "être un réseau qui n'autorise pas les connexions directes."
 
-#: ../src/empathy-streamed-media-window.c:2382
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2853
 msgid "There was a failure on the network"
 msgstr "Il y a eu une panne sur le réseau"
 
-#: ../src/empathy-streamed-media-window.c:2386
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2857
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Les formats audio nécessaires pour cet appel ne sont pas installés sur votre "
 "ordinateur"
 
-#: ../src/empathy-streamed-media-window.c:2389
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2860
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Les formats vidéo nécessaires pour cet appel ne sont pas installés sur votre "
 "ordinateur"
 
-#: ../src/empathy-streamed-media-window.c:2399
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2872
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3171,147 +3574,200 @@ msgstr ""
 "\"%s\">Signalez cette anomalie</a> et joignez les journaux récupérés à "
 "l'aide de la fenêtre « débogage » dans le menu d'aide."
 
-#: ../src/empathy-streamed-media-window.c:2407
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2881
 msgid "There was a failure in the call engine"
 msgstr "Erreur dans le moteur d'appel"
 
-#: ../src/empathy-streamed-media-window.c:2410
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2884
 msgid "The end of the stream was reached"
 msgstr "La fin du flux a été atteinte"
 
-#: ../src/empathy-streamed-media-window.c:2450
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2924
 msgid "Can't establish audio stream"
 msgstr "Impossible d'établir le flux audio"
 
-#: ../src/empathy-streamed-media-window.c:2460
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2934
 msgid "Can't establish video stream"
 msgstr "Impossible d'établir le flux vidéo"
 
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "Audio"
 msgstr "Audio"
 
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Rappeler le contact"
-
 #: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "Caméra éteinte"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "Décompression :"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "Caméra en fonctionnement"
+msgid "Disable camera"
+msgstr "Désactiver la caméra"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Décompression :"
+msgid "Display the dialpad"
+msgstr "Afficher le clavier numérique"
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Désactiver la caméra et arrêter d'envoyer la vidéo"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "Compression :"
 
 #: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Activer la caméra et envoyer la vidéo"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Hang up"
+msgstr "Raccrocher"
 
 #: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Activer la caméra mais ne pas envoyer la vidéo"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Hang up current call"
+msgstr "Raccrocher l'appel en cours"
 
 #: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Compression :"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "Candidat local :"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "Raccrocher"
+msgid "Maximise me"
+msgstr "Maximiser"
 
 #: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Raccrocher l'appel en cours"
+msgid "Minimise me"
+msgstr "Minimiser"
 
 #: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Candidat local :"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "Candidat externe :"
 
 #: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "Aperçu"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Send Audio"
+msgstr "Envoyer le son"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "Rappeler"
+msgid "Send Video"
+msgstr "Envoyer la vidéo"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Candidat externe :"
+msgid "Show dialpad"
+msgstr "Afficher le clavier"
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "Envoyer le son"
+msgid "Start a video call"
+msgstr "Démarrer une conversation vidéo"
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Basculer la transmission audio"
+msgid "Start an audio call"
+msgstr "Démarrer une conversation audio"
+
+#: ../src/empathy-call-window.ui.h:18
+msgid "Swap camera"
+msgstr "Basculer la caméra"
 
 #: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_idéo"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr "Basculer la transmission audio"
 
 #: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "Vidéo"
+msgid "Toggle video transmission"
+msgstr "Basculer la transmission vidéo"
 
 #: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "Vidéo désactivée"
-
-#: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "Vidéo activée"
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:2431 ../src/empathy-call-window.c:2432
+#: ../src/empathy-call-window.c:2433 ../src/empathy-call-window.c:2434
+msgid "Unknown"
+msgstr "Inconnu"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "Aperçu de la vidéo"
+msgid "Video call"
+msgstr "Appel vidéo"
 
 #: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "_Appeler"
 
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:25
+msgid "_Camera"
+msgstr "_Caméra"
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:18
+msgid "_Contents"
+msgstr "_Sommaire"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
+msgid "_Debug"
+msgstr "_Débogage"
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:22
+msgid "_Help"
+msgstr "Aid_e"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Microphone"
+msgstr "_Microphone"
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "_Settings"
+msgstr "_Paramètres"
+
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_Affichage"
 
-#: ../src/empathy-chat-window.c:472 ../src/empathy-chat-window.c:492
+#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d non lu)"
 msgstr[1] "%s (%d non lus)"
 
-#: ../src/empathy-chat-window.c:484
+#: ../src/empathy-chat-window.c:493
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (et %u autre)"
 msgstr[1] "%s (et %u autres)"
 
-#: ../src/empathy-chat-window.c:500
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d non lu des autres)"
 msgstr[1] "%s (%d non lus des autres)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:518
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d non lu de tous)"
 msgstr[1] "%s (%d non lus de tous)"
 
-#: ../src/empathy-chat-window.c:711
+#: ../src/empathy-chat-window.c:733
+msgid "SMS:"
+msgstr "SMS :"
+
+#: ../src/empathy-chat-window.c:743
+#, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "Envoi de %d message"
+msgstr[1] "Envoi de %d messages"
+
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
 msgstr "Saisie d'un message."
 
@@ -3323,10 +3779,6 @@ msgstr "_Nettoyer"
 msgid "C_ontact"
 msgstr "C_ontact"
 
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Discuter"
-
 #: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
 msgstr "Insérer une _frimousse"
@@ -3347,10 +3799,6 @@ msgstr "Déplacer l'onglet à _droite"
 msgid "Notify for All Messages"
 msgstr "Avertir pour tous les messages"
 
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
-msgid "_Contents"
-msgstr "_Sommaire"
-
 #: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "_Conversation"
@@ -3359,18 +3807,10 @@ msgstr "_Conversation"
 msgid "_Detach Tab"
 msgstr "_Détacher l'onglet"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
-msgid "_Edit"
-msgstr "É_dition"
-
 #: ../src/empathy-chat-window.ui.h:13
 msgid "_Favorite Chat Room"
 msgstr "Salon de discussion _favori"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
-msgid "_Help"
-msgstr "Aid_e"
-
 #: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "Onglet _suivant"
@@ -3391,15 +3831,15 @@ msgstr "_Onglets"
 msgid "_Undo Close Tab"
 msgstr "_Rouvrir l'onglet fermé"
 
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
 msgstr "Salon"
 
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "Connexion automatique"
 
@@ -3407,90 +3847,96 @@ msgstr "Connexion automatique"
 msgid "Manage Favorite Rooms"
 msgstr "Gérer les salons favoris"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming video call"
 msgstr "Appel vidéo entrant"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1408
 msgid "Incoming call"
 msgstr "Appel entrant"
 
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:525
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s vous appelle en vidéo. Souhaitez-vous répondre ?"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s vous appelle. Souhaitez-vous répondre ?"
 
-#: ../src/empathy-event-manager.c:515 ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1414
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Appel entrant de %s"
 
-#: ../src/empathy-event-manager.c:540
+#: ../src/empathy-event-manager.c:554
 msgid "_Reject"
 msgstr "Re_fuser"
 
-#: ../src/empathy-event-manager.c:546
+#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
 msgid "_Answer"
 msgstr "_Répondre"
 
-#: ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:570
+msgid "_Answer with video"
+msgstr "_Répondre avec la vidéo"
+
+#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1414
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Appel vidéo entrant de %s"
 
-#: ../src/empathy-event-manager.c:737
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
 msgstr "Invitation dans un salon"
 
-#: ../src/empathy-event-manager.c:739
+#: ../src/empathy-event-manager.c:838
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Invitation à rejoindre %s"
 
-#: ../src/empathy-event-manager.c:746
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s vous invite à rejoindre %s"
 
-#: ../src/empathy-event-manager.c:754
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
 msgstr "_Refuser"
 
-#: ../src/empathy-event-manager.c:759
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Joindre"
 
-#: ../src/empathy-event-manager.c:786
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s vous a invité à rejoindre %s"
 
-#: ../src/empathy-event-manager.c:792
+#: ../src/empathy-event-manager.c:891
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Vous avez été invité à rejoindre %s"
 
-#: ../src/empathy-event-manager.c:843
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Transfert de fichiers entrant de %s"
 
-#: ../src/empathy-event-manager.c:1013 ../src/empathy-main-window.c:370
+#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
 msgid "Password required"
 msgstr "Mot de passe nécessaire"
 
-#: ../src/empathy-event-manager.c:1069
+#: ../src/empathy-event-manager.c:1190
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s aimerait être autorisé à savoir si vous êtes en ligne"
 
-#: ../src/empathy-event-manager.c:1073
+#: ../src/empathy-event-manager.c:1194
 #, c-format
 msgid ""
 "\n"
@@ -3500,105 +3946,105 @@ msgstr ""
 "Message : %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:100
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:102
+#: ../src/empathy-ft-manager.c:103
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:179
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s sur %s à %s/s"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:275
 #, c-format
 msgid "%s of %s"
 msgstr "%s sur %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:305
+#: ../src/empathy-ft-manager.c:306
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Réception de « %s » de la part de %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:309
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Envoi de « %s » à %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:338
+#: ../src/empathy-ft-manager.c:339
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Erreur lors de la réception de « %s » de la part de %s"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:342
 msgid "Error receiving a file"
 msgstr "Erreur de réception du fichier"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:347
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Erreur lors de l'envoi de « %s » à %s"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:350
 msgid "Error sending a file"
 msgstr "Erreur d'envoi du fichier"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:489
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "« %s » reçu de %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:493
+#: ../src/empathy-ft-manager.c:494
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "« %s » envoyé à %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:497
 msgid "File transfer completed"
 msgstr "Transfert de fichier terminé"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
 msgid "Waiting for the other participant's response"
 msgstr "Attente de la réponse du correspondant"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Vérification de l'intégrité de « %s »"
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Création de la somme de contrôle pour « %s »"
 
-#: ../src/empathy-ft-manager.c:1016
+#: ../src/empathy-ft-manager.c:1026
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1028
+#: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "Fichier"
 
-#: ../src/empathy-ft-manager.c:1050
+#: ../src/empathy-ft-manager.c:1060
 msgid "Remaining"
 msgstr "Restant"
 
@@ -3635,127 +4081,140 @@ msgstr "Protocole"
 msgid "Source"
 msgstr "Source"
 
-#: ../src/empathy-main-window.c:387
+#: ../src/empathy-main-window.c:392
 msgid "Provide Password"
 msgstr "Fournir un mot de passe"
 
-#: ../src/empathy-main-window.c:393
+#: ../src/empathy-main-window.c:398
 msgid "Disconnect"
 msgstr "Déconnecter"
 
-#: ../src/empathy-main-window.c:533
+#: ../src/empathy-main-window.c:622
 msgid "No match found"
 msgstr "Aucun résultat trouvé"
 
-#: ../src/empathy-main-window.c:688
+#: ../src/empathy-main-window.c:777
 msgid "Reconnect"
 msgstr "Reconnecter"
 
-#: ../src/empathy-main-window.c:694
+#: ../src/empathy-main-window.c:783
 msgid "Edit Account"
 msgstr "Modifier le compte"
 
-#: ../src/empathy-main-window.c:700
+#: ../src/empathy-main-window.c:789
 msgid "Close"
 msgstr "Fermer"
 
-#: ../src/empathy-main-window.c:1418
+#. Translators: this string will be something like:
+#. *   Top up My Account ($1.23)..."
+#: ../src/empathy-main-window.c:928
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr "Créditer %s (%s)..."
+
+#: ../src/empathy-main-window.c:975
+msgid "Top up account credit"
+msgstr "Crédite le solde du compte"
+
+#. top up button
+#: ../src/empathy-main-window.c:1046
+msgid "Top Up..."
+msgstr "Créditer..."
+
+#: ../src/empathy-main-window.c:1789
 msgid "Contact"
 msgstr "Contact"
 
-#: ../src/empathy-main-window.c:1765
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "Liste des contacts"
 
-#: ../src/empathy-main-window.c:1881
-msgid "Show and edit accounts"
-msgstr "Afficher et modifier les comptes"
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "Contacts sur une _carte"
 
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-main-window-menubar.ui.h:2
+msgid "Credit Balance"
+msgstr "Solde du compte"
+
+#: ../src/empathy-main-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "Rechercher dans la _liste des contacts"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "Joindre les _favoris"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "Gérer les favoris"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "Taille n_ormale"
 
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "Nouvel _appel…"
 
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "Taille normale avec _avatars"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "P_références"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "Afficher les p_rotocoles"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "Trié par _nom"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "Trié par é_tat"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Comptes"
 
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "Contacts _bloqués"
 
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "Taille _compacte"
 
-#: ../src/empathy-main-window.ui.h:18
-msgid "_Debug"
-msgstr "_Débogage"
-
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "Transferts de _fichiers"
 
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "_Joindre…"
 
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "_Nouvelle conversation…"
 
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "Contacts _déconnectés"
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "_Informations personnelles"
 
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "_Salon"
 
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window-menubar.ui.h:29
 msgid "_Search for Contacts…"
 msgstr "_Rechercher des contacts…"
 
@@ -3769,7 +4228,7 @@ msgstr "Membres"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:560
+#: ../src/empathy-new-chatroom-dialog.c:553
 #, c-format
 msgid ""
 "%s\n"
@@ -3782,16 +4241,16 @@ msgstr ""
 "Mot de passe nécessaire : %s\n"
 "Membres : %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "No"
 msgstr "Non"
 
-#: ../src/empathy-new-chatroom-dialog.c:591
+#: ../src/empathy-new-chatroom-dialog.c:584
 msgid "Could not start room listing"
 msgstr "Impossible de démarrer l'affichage des salons"
 
-#: ../src/empathy-new-chatroom-dialog.c:601
+#: ../src/empathy-new-chatroom-dialog.c:594
 msgid "Could not stop room listing"
 msgstr "Impossible d'arrêter l'affichage des salons"
 
@@ -3811,8 +4270,8 @@ msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
 msgstr ""
-"Saisissez le serveur qui héberge le salon ou laissez-le vide si le salon est "
-"sur le même serveur que le compte actuel"
+"Saisissez le nom du serveur qui héberge le salon, ou laissez le champ vide "
+"si le salon est sur le même serveur que le compte actuel"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid "Join Room"
@@ -3826,39 +4285,79 @@ msgstr "Liste des salons"
 msgid "_Room:"
 msgstr "Sal_on :"
 
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr "Message reçu"
 
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr "Message envoyé"
 
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
 msgstr "Nouvelle conversation"
 
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
 msgstr "Le contact est en ligne"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
 msgstr "Le contact est hors ligne"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
 msgstr "Compte connecté"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
 msgstr "Compte déconnecté"
 
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr "Langue"
 
-#: ../src/empathy-preferences.c:875
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:734
+msgid "Juliet"
+msgstr "Juliette"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:741
+msgid "Romeo"
+msgstr "Roméo"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:747
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr "Ô Roméo ! Roméo ! Pourquoi es-tu Roméo ?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:750
+msgid "Deny thy father and refuse thy name;"
+msgstr "Renie ton père et abdique ton nom ;"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:753
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr "Ou si tu ne le veux pas, jure de m'aimer"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:756
+msgid "And I'll no longer be a Capulet."
+msgstr "Et je ne serais plus une Capulet."
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:759
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr "Dois-je l'écouter encore ou lui répondre ?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:762
+msgid "Juliet has disconnected"
+msgstr "Juliette s'est déconnectée"
+
+#: ../src/empathy-preferences.c:1166
 msgid "Preferences"
 msgstr "Préférences"
 
@@ -3866,68 +4365,88 @@ msgstr "Préférences"
 msgid "Appearance"
 msgstr "Apparence"
 
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
 msgstr "Comportement"
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
 msgid "Chat Th_eme:"
 msgstr "_Thème de la fenêtre de discussion :"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
 msgid "Disable notifications when _away or busy"
 msgstr "Désactiver les notifications lorsque vous êtes _absent ou occupé"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
 msgid "Disable sounds when _away or busy"
 msgstr "Désactiver les sons lorsque vous êtes _absent ou occupé"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
-msgstr "Afficher les évènements entrants dans la zone de notification"
+msgstr "Afficher les événements entrants dans la zone de notification"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"L'annulation d'écho améliore la clarté de votre voix pour votre "
+"interlocuteur, mais peut aussi causer des problèmes sur certains "
+"ordinateurs. Si vous ou l'un de vos contacts entend certaines perturbations "
+"au niveau du son, essayez de relancer l'appel sans l'annulation d'écho."
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "Afficher des notifications quand un contact se connecte"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "Afficher des notifications quand un contact se déconnecte"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr ""
 "Afficher des notifications quand la _discussion n'est pas au premier plan"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "Activer la correction orthographique pour les langues :"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "Général"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input level:"
+msgstr "Niveau du périphérique d'entrée :"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "Volume du périphérique d'entrée :"
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "Sources de positionnement :"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "Journaliser les conversations"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "Notifications"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Jouer un son lors des événements"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "Confidentialité"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -3937,23 +4456,23 @@ msgstr ""
 "géolocalisation publiées se limitent au pays, à la région et à la ville. La "
 "précision des coordonnées GPS est limitée à un seul nombre après la virgule."
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "Convertir les frimousses en _images"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "Afficher la _liste des contacts dans les salles"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "Correction orthographique"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
@@ -3961,44 +4480,49 @@ msgstr ""
 "La liste de langues ne contient que les langues pour lesquelles vous avez un "
 "dictionnaire installé."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "Thèmes"
 
-#: ../src/empathy-preferences.ui.h:25
+# http://fr.wikipedia.org/wiki/Rel%C3%A8vement
+#: ../src/empathy-preferences.ui.h:30
+msgid "Variant:"
+msgstr "Variante :"
+
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "Se _connecter automatiquement au démarrage"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "Téléphone _mobile"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "_Activer les bulles de notification"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "_Activer les notifications sonores"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Réseau (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "_Ouvrir les nouvelles discussions dans des fenêtres séparées"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "_Publier ma position pour mes contacts"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "_Réduire la précision de la position"
 
@@ -4010,68 +4534,116 @@ msgstr "État"
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: ../src/empathy-map-view.c:442
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "Rappeler le contact"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "Caméra éteinte"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "Caméra en fonctionnement"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "Désactiver la caméra et arrêter d'envoyer la vidéo"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "Activer la caméra et envoyer la vidéo"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "Activer la caméra mais ne pas envoyer la vidéo"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "Aperçu"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "Rappeler"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "V_idéo"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "Vidéo désactivée"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "Vidéo activée"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "Aperçu de la vidéo"
+
+#: ../src/empathy-map-view.c:448
 msgid "Contact Map View"
 msgstr "Carte des contacts"
 
 # Titre de fenêtre
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
 msgid "Save"
 msgstr "Enregistrer"
 
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
 msgstr "Fenêtre de débogage"
 
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
 msgstr "Niveau "
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
 msgid "Debug"
 msgstr "Débogage"
 
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
 msgid "Info"
 msgstr "Informations"
 
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
 msgid "Message"
 msgstr "Message"
 
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
 msgid "Warning"
 msgstr "Avertissement"
 
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
 msgid "Critical"
 msgstr "Critique"
 
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
 msgid "Error"
 msgstr "Erreur"
 
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
 msgid "Time"
 msgstr "Heure"
 
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
 msgid "Domain"
 msgstr "Domaine"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
 msgstr "Catégorie"
 
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "Niveau"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4079,16 +4651,16 @@ msgstr ""
 "Le gestionnaire de connexions sélectionné ne prend pas en charge l'extension "
 "de débogage distant."
 
-#: ../src/empathy-invite-participant-dialog.c:34
-#: ../src/empathy-invite-participant-dialog.c:48
+#: ../src/empathy-invite-participant-dialog.c:179
+#: ../src/empathy-invite-participant-dialog.c:205
 msgid "Invite Participant"
 msgstr "Inviter un participant"
 
-#: ../src/empathy-invite-participant-dialog.c:35
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Choisissez un contact à inviter dans la conversation :"
 
-#: ../src/empathy-invite-participant-dialog.c:45
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "Inviter"
 
@@ -4123,43 +4695,88 @@ msgstr "- comptes Empathy"
 msgid "Empathy Accounts"
 msgstr "Comptes Empathy"
 
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr "Afficher un service particulier"
+
+#: ../src/empathy-debugger.c:75
+msgid "- Empathy Debugger"
+msgstr "- Débogueur de Empathy"
+
+#: ../src/empathy-debugger.c:114
 msgid "Empathy Debugger"
-msgstr "Débogueur Empathy"
+msgstr "Débogueur de Empathy"
 
 #: ../src/empathy-chat.c:107
 msgid "- Empathy Chat Client"
 msgstr "- Client de discussion Empathy"
 
-#: ../src/empathy-notifications-approver.c:184
+#: ../src/empathy-notifications-approver.c:203
 msgid "Respond"
 msgstr "Répondre"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1418
 msgid "Reject"
 msgstr "Rejeter"
 
-#: ../src/empathy-notifications-approver.c:194
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1419
 msgid "Answer"
 msgstr "Répondre"
 
-#: ../src/empathy-notifications-approver.c:201
-#: ../src/empathy-notifications-approver.c:211
+#: ../src/empathy-notifications-approver.c:227
+msgid "Answer with video"
+msgstr "Répondre avec la vidéo"
+
+#: ../src/empathy-notifications-approver.c:235
+#: ../src/empathy-notifications-approver.c:245
 msgid "Decline"
 msgstr "Refuser"
 
-#: ../src/empathy-notifications-approver.c:205
-#: ../src/empathy-notifications-approver.c:216
+#: ../src/empathy-notifications-approver.c:239
+#: ../src/empathy-notifications-approver.c:250
 msgid "Accept"
 msgstr "Accepter"
 
-#: ../src/empathy-call-observer.c:130
-#, c-format
-msgid "Missed call from %s"
-msgstr "Appel manqué de %s"
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:260
+msgid "Provide"
+msgstr "Fournir"
 
-#: ../src/empathy-call-observer.c:133
+#: ../src/empathy-call-observer.c:134
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr ""
 "%s vient d'essayer de vous appeler mais vous aviez déjà un autre appel."
+
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1047 ../src/empathy-call-window.c:1070
+msgid "i"
+msgstr "i"
+
+#: ../src/empathy-call-window.c:2727
+msgid "On hold"
+msgstr "En attente"
+
+#: ../src/empathy-call-window.c:2730
+msgid "Mute"
+msgstr "Muet"
+
+#: ../src/empathy-call-window.c:2732
+msgid "Duration"
+msgstr "Durée"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2735
+#, c-format
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02dm"
+
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "_Respecter la casse"
diff --git a/po/ga.po b/po/ga.po
index b472966cf..e83365d38 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -1,823 +1,1530 @@
 # Irish translations for empathy package.
 # Copyright (C) 2009 Free Software Foundation, Inc.
 # This file is distributed under the same license as the empathy package.
-# Seán de Búrca <leftmostcat@gmail.com>, 2009.
+# Seán de Búrca <leftmostcat@gmail.com>, 2009, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-07 01:56-0600\n"
-"PO-Revision-Date: 2009-08-07 02:38-0600\n"
+"POT-Creation-Date: 2011-09-25 14:21-0600\n"
+"PO-Revision-Date: 2011-09-25 15:13-0600\n"
 "Last-Translator: Seán de Búrca <leftmostcat@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
+"Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=5; plural=n==1 ? 0 : (n%10==1 || n%10==2) ? 1 : (n%"
-"10>=3 && n%10<= 6) ? 2 : ((n%10>=7 && n%10<=9) || n==10) ? 3 : 4;\n"
+"Plural-Forms: nplurals=5; plural=n==1 ? 0 : (n%10==1 || n%10==2) ? 1 : (n"
+"%10>=3 && n%10<= 6) ? 2 : ((n%10>=7 && n%10<=9) || n==10) ? 3 : 4;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Empathy IM Client"
-msgstr "Cliant IM Empathy"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr ""
 
 #: ../data/empathy.desktop.in.in.h:2
-msgid "Send and receive messages"
-msgstr "Seol agus faigh teachtaireachtaí"
+msgid "Empathy"
+msgstr "Empathy"
+
+#: ../data/empathy.desktop.in.in.h:3
+msgid "Empathy Internet Messaging"
+msgstr "Cur Teachtaireachtaí Meandaracha Empathy"
 
-#: ../data/empathy.schemas.in.h:1
+#: ../data/empathy.desktop.in.in.h:4
+msgid "IM Client"
+msgstr "Cliant IM"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:2
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Camera device"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+msgid "Chat window theme variant"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid ""
-"Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "Dlúthliosta teagmhálacha"
 
-#: ../data/empathy.schemas.in.h:6
-msgid "Contact list sort criterium"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+msgid "Connection managers should be used"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+msgid "Contact list sort criterion"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+msgid "Display incoming events in the status area"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+msgid "Echo cancellation support"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:15
-msgid "Empathy has asked about importing accounts"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+msgid "Empathy has migrated butterfly logs"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+msgid "Empathy should auto-away when idle"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "Cumasaigh litreoir"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:24
-msgid "NetworkManager should be used"
-msgstr ""
-
-#: ../data/empathy.schemas.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:27
-msgid "Path of the adium theme to use"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+msgid "Path of the Adium theme to use"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:28
-msgid "Path of the adium theme to use if the theme used for chat is adium."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:36
-msgid "Popup notifications if the chat isn't focused"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+msgid "Pop up notifications if the chat isn't focused"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:37
-msgid "Popup notifications when a contact sign in"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+msgid "Pop up notifications when a contact logs in"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:38
-msgid "Popup notifications when a contact sign out"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+msgid "Pop up notifications when a contact logs out"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:39
-msgid "Salut account is created"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#, fuzzy
+msgid "Show Balance in contact list"
+msgstr "Dlúthliosta teagmhálacha"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "Taispeáin abhatáranna"
 
-#: ../data/empathy.schemas.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "Taispeáin liosta teagmhálacha i seomraí"
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+msgid "Show protocols"
+msgstr "Taispeáin prótacail"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+msgid "The position for the chat window side pane"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:51
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:52
-msgid "Whether or not Empathy can publish the user's location to his contacts."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+msgid "Whether Empathy can use the GPS to guess the location."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:53
-msgid "Whether or not Empathy can use the GPS to guess the location."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:54
-msgid ""
-"Whether or not Empathy can use the cellular network to guess the location."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+msgid "Whether Empathy can use the network to guess the location."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:55
-msgid "Whether or not Empathy can use the network to guess the location."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+msgid "Whether Empathy has migrated butterfly logs."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:56
-msgid ""
-"Whether or not Empathy has asked about importing accounts from other "
-"programs."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
-"Whether or not Empathy should automatically log in to your accounts on "
-"startup."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
-"Whether or not Empathy should reduce the location's accuracy for privacy "
-"reasons."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether or not Empathy should use the avatar of the contact as the chat "
-"window icon."
+"Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
-"Whether or not the Salut account has been created on the first Empathy run."
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
-"Whether or not the network manager should be used to automatically "
-"disconnect/reconnect."
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
-"Whether or not to check words typed against the languages you want to check "
-"with."
+"Whether to check words typed against the languages you want to check with."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:63
-msgid ""
-"Whether or not to convert smileys into graphical images in conversations."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+msgid "Whether to convert smileys into graphical images in conversations."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:64
-msgid ""
-"Whether or not to play a sound to notify for contacts logging in the network."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
-"Whether or not to play a sound to notify for contacts logging off the "
-"network."
+"Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:66
-msgid "Whether or not to play a sound to notify for events."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+msgid "Whether to play a sound to notify of events."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:67
-msgid "Whether or not to play a sound to notify for incoming messages."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+msgid "Whether to play a sound to notify of incoming messages."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:68
-msgid "Whether or not to play a sound to notify for new conversations."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+msgid "Whether to play a sound to notify of new conversations."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:69
-msgid "Whether or not to play a sound to notify for outgoing messages."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+msgid "Whether to play a sound to notify of outgoing messages."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:70
-msgid "Whether or not to play a sound when logging in a network."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+msgid "Whether to play a sound when logging into a network."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:71
-msgid "Whether or not to play a sound when logging off a network."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+msgid "Whether to play a sound when logging out of a network."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:72
-msgid "Whether or not to play sound notifications when away or busy."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+msgid "Whether to play sound notifications when away or busy."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:73
-msgid ""
-"Whether or not to show a popup notification when a contact goes offline."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+msgid "Whether to show a popup notification when a contact goes offline."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:74
-msgid "Whether or not to show a popup notification when a contact goes online."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+msgid "Whether to show a popup notification when a contact goes online."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
-"Whether or not to show a popup notification when receiving a new message "
-"even if the chat is already opened, but not focused."
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:76
-msgid ""
-"Whether or not to show a popup notification when receiving a new message."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+msgid "Whether to show a popup notification when receiving a new message."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+msgid "Whether to show account balances in the contact list."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
-"Whether or not to show avatars for contacts in the contact list and chat "
-"windows."
+"Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:78
-msgid "Whether or not to show contacts that are offline in the contact list."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+msgid "Whether to show contacts that are offline in the contact list."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:79
-msgid "Whether or not to show popup notifications when away or busy."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+msgid "Whether to show popup notifications when away or busy."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:80
-msgid "Whether or not to show the contact list in chat rooms."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+msgid "Whether to show protocols for contacts in the contact list."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:81
-msgid ""
-"Whether or not to show the message dialog about closing the main window with "
-"the 'x' button in the title bar."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#, fuzzy
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Taispeáin liosta teagmhálacha i seomraí"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+msgid "Whether to show the contact list in compact mode."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:82
-msgid "Whether to show the contact list in compact mode or not."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:83
-msgid "Whether to use the theme for chat rooms or not."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+msgid "Whether to use the theme for chat rooms."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
-"Which criterium to use when sorting the contact list. Default is to use sort "
-"by the contact's name with the value \"name\". A value of \"state\" will "
-"sort the contact list by state."
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's name with the value \"name\". A value of \"state\" will sort "
+"the contact list by state."
 msgstr ""
 
-#: ../libempathy/empathy-ft-handler.c:838
-msgid "The hash of the received file and the sent one do not match"
+#: ../data/empathy-accounts.desktop.in.in.h:1
+msgid "Manage Messaging and VoIP accounts"
 msgstr ""
 
-#: ../libempathy/empathy-ft-handler.c:1098
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:2
+#: ../src/empathy-accounts-dialog.c:2324
+msgid "Messaging and VoIP Accounts"
+msgstr ""
+
+#: ../libempathy/empathy-ft-handler.c:825
+msgid "File transfer completed, but the file was corrupted"
+msgstr ""
+
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
 msgstr ""
 
-#: ../libempathy/empathy-ft-handler.c:1156
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is not a regular file"
 msgstr ""
 
-#: ../libempathy/empathy-ft-handler.c:1165
+#: ../libempathy/empathy-ft-handler.c:1176
 msgid "The selected file is empty"
 msgstr ""
 
-#: ../libempathy/empathy-tp-contact-list.c:843 ../src/empathy.c:289
-msgid "People nearby"
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#, c-format
+msgid "Missed call from %s"
 msgstr ""
 
-#: ../libempathy/empathy-tp-file.c:279
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, fuzzy, c-format
+msgid "Called %s"
+msgstr "Glaoch"
+
+#: ../libempathy/empathy-message.c:422
+#, c-format
+msgid "Call from %s"
+msgstr ""
+
+#: ../libempathy/empathy-tp-file.c:268
 msgid "Socket type not supported"
 msgstr ""
 
-#: ../libempathy/empathy-tp-file.c:398
+#: ../libempathy/empathy-tp-file.c:387
 msgid "No reason was specified"
 msgstr ""
 
-#: ../libempathy/empathy-tp-file.c:401
+#: ../libempathy/empathy-tp-file.c:390
 msgid "The change in state was requested"
 msgstr ""
 
-#: ../libempathy/empathy-tp-file.c:404
+#: ../libempathy/empathy-tp-file.c:393
 msgid "You canceled the file transfer"
 msgstr ""
 
-#: ../libempathy/empathy-tp-file.c:407
+#: ../libempathy/empathy-tp-file.c:396
 msgid "The other participant canceled the file transfer"
 msgstr ""
 
-#: ../libempathy/empathy-tp-file.c:410
+#: ../libempathy/empathy-tp-file.c:399
 msgid "Error while trying to transfer the file"
 msgstr ""
 
-#: ../libempathy/empathy-tp-file.c:413
+#: ../libempathy/empathy-tp-file.c:402
 msgid "The other participant is unable to transfer the file"
 msgstr ""
 
-#: ../libempathy/empathy-tp-file.c:416
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
 msgid "Unknown reason"
 msgstr "Cúis anaithnid"
 
-#: ../libempathy/empathy-utils.c:265
+#: ../libempathy/empathy-utils.c:232
 msgid "Available"
 msgstr "Ar Fáil"
 
-#: ../libempathy/empathy-utils.c:267
+#: ../libempathy/empathy-utils.c:234
 msgid "Busy"
 msgstr "Gnóthach"
 
-#: ../libempathy/empathy-utils.c:270
+#: ../libempathy/empathy-utils.c:237
 msgid "Away"
 msgstr "Amuigh"
 
-#: ../libempathy/empathy-utils.c:272
-msgid "Hidden"
-msgstr "Folaithe"
+#: ../libempathy/empathy-utils.c:239
+msgid "Invisible"
+msgstr "Dofheicthe"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:241
 msgid "Offline"
 msgstr "As Líne"
 
-#: ../libempathy/empathy-time.c:137
+#. translators: presence type is unknown
+#: ../libempathy/empathy-utils.c:244
+msgctxt "presence"
+msgid "Unknown"
+msgstr "Anaithnid"
+
+#: ../libempathy/empathy-utils.c:284
+msgid "No reason specified"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+msgid "Status is set to offline"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
+#: ../libempathy-gtk/empathy-call-utils.c:49
+msgid "Network error"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+msgid "Authentication failed"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+msgid "Encryption error"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:294
+msgid "Name in use"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+msgid "Certificate not provided"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+msgid "Certificate untrusted"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+msgid "Certificate expired"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+msgid "Certificate not activated"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+msgid "Certificate hostname mismatch"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+msgid "Certificate fingerprint mismatch"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+msgid "Certificate self-signed"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:310
+msgid "Certificate error"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:344
+msgid "Encryption is not available"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:346
+msgid "Certificate is invalid"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:348
+msgid "Connection has been refused"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:350
+msgid "Connection can't be established"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:352
+msgid "Connection has been lost"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:354
+msgid "This resource is already connected to the server"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:356
+msgid ""
+"Connection has been replaced by a new connection using the same resource"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:359
+msgid "The account already exists on the server"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:361
+msgid "Server is currently too busy to handle the connection"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:363
+msgid "Certificate has been revoked"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:365
+msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:368
+msgid ""
+"The length of the server certificate, or the depth of the server certificate "
+"chain, exceed the limits imposed by the cryptography library"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:529
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
+msgid "People Nearby"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:534
+msgid "Yahoo! Japan"
+msgstr "Yahoo! na Seapáine"
+
+#: ../libempathy/empathy-utils.c:563
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../libempathy/empathy-utils.c:564
+msgid "Facebook Chat"
+msgstr "Comhrá Facebook"
+
+#: ../libempathy/empathy-time.c:88
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:93
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libempathy/empathy-time.c:147
+#: ../libempathy/empathy-time.c:98
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libempathy/empathy-time.c:152
+#: ../libempathy/empathy-time.c:103
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libempathy/empathy-time.c:157
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:113
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libempathy/empathy-time.c:167
+#: ../libempathy/empathy-time.c:136
 msgid "in the future"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-chooser.c:426
-msgid "All"
-msgstr "Gach"
+#: ../libempathy-gtk/empathy-account-chooser.c:540
+#, fuzzy
+msgid "All accounts"
+msgstr "Cuntais"
+
+#: ../libempathy-gtk/empathy-account-widget.c:694
+#: ../src/empathy-import-widget.c:321
+msgid "Account"
+msgstr "Cuntas"
+
+#: ../libempathy-gtk/empathy-account-widget.c:695
+msgid "Password"
+msgstr "Focal faire"
+
+#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
+msgid "Server"
+msgstr "Freastalaí"
 
-#: ../libempathy-gtk/empathy-account-widget.c:302
-#: ../libempathy-gtk/empathy-account-widget.c:354
+#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
+msgid "Port"
+msgstr "Port"
+
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+#, fuzzy
+msgid "My Web Accounts"
+msgstr "Cuntais"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
+#, c-format
+msgid "The account %s is edited via %s."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget.c:1214
+#, c-format
+msgid "The account %s cannot be edited in Empathy."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget.c:1233
+msgid "Launch My Web Accounts"
+msgstr ""
+
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, fuzzy, c-format
+msgid "Edit %s"
+msgstr "_Eagar"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#, fuzzy
+msgid "Username:"
+msgstr "_Ainm úsáideora:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1909
+msgid "A_pply"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget.c:1939
+msgid "L_og in"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget.c:2013
+msgid "This account already exists on the server"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget.c:2016
+#, fuzzy
+msgid "Create a new account on the server"
+msgstr "Cr_uthaigh cuntas nua"
+
+#: ../libempathy-gtk/empathy-account-widget.c:2208
+msgid "Ca_ncel"
+msgstr ""
+
+#. To translators: The first parameter is the login id and the
+#. * second one is the network. The resulting string will be something
+#. * like: "MyUserName on freenode".
+#. * You should reverse the order of these arguments if the
+#. * server should come before the login id in your locale.
+#: ../libempathy-gtk/empathy-account-widget.c:2486
+#, c-format
+msgid "%1$s on %2$s"
+msgstr "%1$s ar %2$s"
+
+#. To translators: The parameter is the protocol name. The resulting
+#. * string will be something like: "Jabber Account"
+#: ../libempathy-gtk/empathy-account-widget.c:2512
+#, c-format
+msgid "%s Account"
+msgstr "Cuntas %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:2516
+msgid "New account"
+msgstr "Cuntas nua"
+
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+msgid "<b>Example:</b> MyScreenName"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
 msgid "Advanced"
 msgstr "Casta"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "Pass_word:"
 msgstr "_Focal faire:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#, fuzzy
+msgid "Remember Password"
+msgstr "Focal faire:"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-password-dialog.c:311
+msgid "Remember password"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 msgid "Screen _Name:"
 msgstr "_Ainm Taispeána:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
+msgid "What is your AIM password?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
+msgid "What is your AIM screen name?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
 #: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
 msgstr "Frea_stalaí:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "<b>Example:</b> username"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "Login I_D:"
 msgstr "C_A Logála Isteach:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+msgid "What is your GroupWise User ID?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+msgid "What is your GroupWise password?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+msgid "<b>Example:</b> 123456789"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#, fuzzy
+msgid "Ch_aracter set:"
+msgstr "Tacar carachtar:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
 msgid "ICQ _UIN:"
 msgstr "_UIN ICQ:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "_Charset:"
-msgstr "_Tacar carachtar:"
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+msgid "What is your ICQ UIN?"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:240
-msgid "New Network"
-msgstr "Líonra Nua"
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+msgid "What is your ICQ password?"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Charset:"
-msgstr "Tacar carachtar:"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
+msgid "Auto"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
+msgid "UDP"
+msgstr "UDP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
+msgid "TCP"
+msgstr "TCP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
+msgid "TLS"
+msgstr "TLS"
+
+#. translators: this string is very specific to SIP's internal; maybe
+#. * best to keep the English version.
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
+#, fuzzy
+msgid "Register"
+msgstr "Iartharach"
+
+#. translators: this string is very specific to SIP's internal; maybe
+#. * best to keep the English version.
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
+msgid "Options"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
+msgid "None"
+msgstr ""
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#, fuzzy
+msgid "Character set:"
+msgstr "Tacar carachtar:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Network"
 msgstr "Líonra"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Network:"
 msgstr "Líonra:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Leasainm:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "Focal faire:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "Teachtaireacht scortha:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "Fíorainm:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Servers"
 msgstr "Freastalaithe"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
+msgid "What is your IRC nickname?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "Which IRC network?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "<b>Example:</b> user@gmail.com"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
+msgid "<b>Example:</b> user@jabber.org"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+#, fuzzy
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "_Criptiú riachtanach (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+#, fuzzy
+msgid "I_gnore SSL certificate errors"
+msgstr "Déan _neamhaird ar earráidí teastas SSL"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Override server settings"
 msgstr "Sáraigh socruithe freastalaí"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "Pri_ority:"
-msgstr "_Tosaíocht:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "Priori_ty:"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 msgid "Reso_urce:"
 msgstr "Ac_mhainn:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
+#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+msgid ""
+"This is your username, not your normal Facebook login.\n"
+"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
+"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
+"Facebook username if you don't have one."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "Use old SS_L"
 msgstr "Úsáid sean-SS_L"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
-msgid "_Encryption required (TLS/SSL)"
-msgstr "_Criptiú riachtanach (TLS/SSL)"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "What is your Facebook password?"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "_Ignore SSL certificate errors"
-msgstr "Déan _neamhaird ar earráidí teastas SSL"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "What is your Facebook username?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+msgid "What is your Google ID?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+msgid "What is your Google password?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "What is your Jabber ID?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+msgid "What is your Jabber password?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+msgid "What is your desired Jabber ID?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+msgid "What is your desired Jabber password?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+msgid "<b>Example:</b> user@hotmail.com"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+msgid "What is your Windows Live ID?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+msgid "What is your Windows Live password?"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2
-msgid "_Email:"
-msgstr "_Ríomhphost:"
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "E-_mail address:"
+msgstr "Seoladh _ríomhphoist:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#, fuzzy
+msgid "Nic_kname:"
+msgstr "Leasainm:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
 msgid "_First Name:"
 msgstr "_Ainm:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "CA _Jabber:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
 msgid "_Last Name:"
 msgstr "_Sloinne:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6
-msgid "_Nickname:"
-msgstr "_Leasainm:"
-
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
 msgid "_Published Name:"
 msgstr "Ainm _Foilsithe:"
 
-#. look up the DNS SRV record at the service's domain for the host name of a STUN server.
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+msgid "<b>Example:</b> user@my.sip.server"
+msgstr ""
+
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Discover STUN"
+msgid "Authentication username:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+msgid "Discover Binding"
 msgstr ""
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+msgid "Discover the STUN server automatically"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "Ignore TLS Errors"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+msgid "Interval (seconds)"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+msgid "Keep-Alive Options"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+msgid "Loose Routing"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+msgid "Mechanism:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+msgid "Miscellaneous Options"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+msgid "NAT Traversal Options"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+msgid "Port:"
+msgstr "Port:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+msgid "Proxy Options"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "STUN Server:"
 msgstr "Freastalaí STUN:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "STUN port:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.c:347
+msgid "Server:"
+msgstr "Freastalaí:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#, fuzzy
+msgid "Transport:"
 msgstr "Port STUN:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+msgid "What is your SIP account password?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP login ID?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "_Ainm úsáideora:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
-msgid "Use _Yahoo Japan"
-msgstr "Úsáid _Yahoo Japan"
-
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-msgid "Yahoo I_D:"
-msgstr "C_A Yahoo:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "_Ignore conference and chatroom invitations"
+#, fuzzy
+msgid "I_gnore conference and chat room invitations"
 msgstr "Déan _neamhaird ar chuirí comhdhála agus seomra comhrá"
 
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+msgid "What is your Yahoo! ID?"
+msgstr ""
+
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "What is your Yahoo! password?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Yahoo! I_D:"
+msgstr "C_A Yahoo!:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "_Room List locale:"
 msgstr "Lo_gchaighdeán an Liosta Seomraí:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
-#: ../libempathy-gtk/empathy-avatar-chooser.c:525
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:450
-msgid "None of the accepted image formats is supported on your system"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
+msgid "None of the accepted image formats are supported on your system"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+msgid "Couldn't save picture to file"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "Roghnaigh d'�omhá Abhatár"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:936
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
+msgid "Take a picture..."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "Gan �omhá"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:998
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "�omhánna"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "Gach Comhad"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:324
+#: ../libempathy-gtk/empathy-avatar-image.c:322
 msgid "Click to enlarge"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:186
-msgid "Failed to reconnect this chat"
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
+msgid "There was an error starting the call"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact doesn't support calls"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:404
-msgid "Unsupported command"
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is offline"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:539
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "The specified contact is not valid"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "Emergency calls are not supported on this protocol"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:704
+msgid "Failed to open private chat"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:765
+msgid "Topic not supported on this conversation"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:771
+msgid "You are not allowed to change the topic"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:975
+#, c-format
+msgid "“%s� is not a valid contact ID"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1060
+msgid "/clear: clear all messages from the current conversation"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1063
+msgid "/topic <topic>: set the topic of the current conversation"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1066
+msgid "/join <chat room ID>: join a new chat room"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1069
+msgid "/j <chat room ID>: join a new chat room"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1073
+msgid ""
+"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
+"current one"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1077
+msgid "/query <contact ID> [<message>]: open a private chat"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1080
+msgid "/msg <contact ID> <message>: open a private chat"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1083
+msgid "/nick <nickname>: change your nickname on the current server"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1086
+msgid "/me <message>: send an ACTION message to the current conversation"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1089
+msgid ""
+"/say <message>: send <message> to the current conversation. This is used to "
+"send a message starting with a '/'. For example: \"/say /join is used to "
+"join a new chat room\""
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1094
+msgid "/whois <contact ID>: display information about a contact"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1097
+msgid ""
+"/help [<command>]: show all supported commands. If <command> is defined, "
+"show its usage."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1114
+#, c-format
+msgid "Usage: %s"
+msgstr "Úsáid: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1159
+msgid "Unknown command"
+msgstr "Ordú anaithnid"
+
+#: ../libempathy-gtk/empathy-chat.c:1285
+msgid "Unknown command; see /help for the available commands"
+msgstr ""
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1455
+msgid "insufficient balance to send message"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1457
+msgid "not capable"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1464
 msgid "offline"
 msgstr "as líne"
 
-#: ../libempathy-gtk/empathy-chat.c:542
+#: ../libempathy-gtk/empathy-chat.c:1467
 msgid "invalid contact"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:545
+#: ../libempathy-gtk/empathy-chat.c:1470
 msgid "permission denied"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:548
+#: ../libempathy-gtk/empathy-chat.c:1473
 msgid "too long message"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:551
+#: ../libempathy-gtk/empathy-chat.c:1476
 msgid "not implemented"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:554
+#: ../libempathy-gtk/empathy-chat.c:1480
 msgid "unknown"
 msgstr "anaithnid"
 
-#: ../libempathy-gtk/empathy-chat.c:558
+#: ../libempathy-gtk/empathy-chat.c:1486
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:588
+#: ../libempathy-gtk/empathy-chat.c:1490
+#, c-format
+msgid "Error sending message: %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761
+msgid "Topic:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1563
 #, c-format
 msgid "Topic set to: %s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:590
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "No topic defined"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:960
+#: ../libempathy-gtk/empathy-chat.c:2074
 msgid "(No Suggestions)"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1014
-msgid "Insert Smiley"
+#. translators: %s is the selected word
+#: ../libempathy-gtk/empathy-chat.c:2142
+#, c-format
+msgid "Add '%s' to Dictionary"
 msgstr ""
 
+#. translators: first %s is the selected word,
+#. * second %s is the language name of the target dictionary
+#: ../libempathy-gtk/empathy-chat.c:2179
+#, c-format
+msgid "Add '%s' to %s Dictionary"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:2249
+msgid "Insert Smiley"
+msgstr "Ionsáigh Straiseog"
+
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1032
-#: ../libempathy-gtk/empathy-ui-utils.c:1480
+#: ../libempathy-gtk/empathy-chat.c:2267
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "_Seol"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#. Spelling suggestions
+#: ../libempathy-gtk/empathy-chat.c:2321
 msgid "_Spelling Suggestions"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1181
+#: ../libempathy-gtk/empathy-chat.c:2410
+msgid "Failed to retrieve recent logs"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:2547
 #, c-format
 msgid "%s has disconnected"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1185
+#. translators: reverse the order of these arguments
+#. * if the kicked should come before the kicker in your locale.
+#.
+#: ../libempathy-gtk/empathy-chat.c:2554
 #, c-format
-msgid "%s was kicked by %s"
+msgid "%1$s was kicked by %2$s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1188
+#: ../libempathy-gtk/empathy-chat.c:2557
 #, c-format
 msgid "%s was kicked"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1193
+#. translators: reverse the order of these arguments
+#. * if the banned should come before the banner in your locale.
+#.
+#: ../libempathy-gtk/empathy-chat.c:2565
 #, c-format
-msgid "%s was banned by %s"
+msgid "%1$s was banned by %2$s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1196
+#: ../libempathy-gtk/empathy-chat.c:2568
 #, c-format
 msgid "%s was banned"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1200
+#: ../libempathy-gtk/empathy-chat.c:2572
 #, c-format
 msgid "%s has left the room"
 msgstr ""
@@ -827,64 +1534,185 @@ msgstr ""
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:1209
+#: ../libempathy-gtk/empathy-chat.c:2581
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:1232
+#: ../libempathy-gtk/empathy-chat.c:2606
 #, c-format
 msgid "%s has joined the room"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1365 ../src/empathy-call-window.c:1254
+#: ../libempathy-gtk/empathy-chat.c:2631
+#, c-format
+msgid "%s is now known as %s"
+msgstr ""
+
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2784
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
+#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
 msgid "Disconnected"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1800
+#. Add message
+#: ../libempathy-gtk/empathy-chat.c:3428
+msgid "Would you like to store this password?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:3434
+#, fuzzy
+msgid "Remember"
+msgstr "Baill"
+
+#: ../libempathy-gtk/empathy-chat.c:3444
+msgid "Not now"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:3488
+msgid "Retry"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:3492
+msgid "Wrong password; please try again:"
+msgstr ""
+
+#. Add message
+#: ../libempathy-gtk/empathy-chat.c:3622
+msgid "This room is protected by a password:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:3649
+#, fuzzy
+msgid "Join"
+msgstr "C_eangail"
+
+#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1850
-#: ../libempathy-gtk/empathy-log-window.c:502
+#: ../libempathy-gtk/empathy-chat.c:3906
 msgid "Conversation"
 msgstr "Comhrá"
 
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
-msgid "Topic:"
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:3911
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (SMS)"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+msgid "Unknown or invalid identifier"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+msgid "Contact blocking temporarily unavailable"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+msgid "Contact blocking unavailable"
 msgstr ""
 
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+msgid "Permission Denied"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+msgid "Could not block contact"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+msgid "Edit Blocked Contacts"
+msgstr ""
+
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Account:"
+msgstr "Cuntas:"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+#, fuzzy
+msgid "Blocked Contacts"
+msgstr "_Teagmhálacha As Líne"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+#, fuzzy
+msgid "Remove"
+msgstr "gtk-remove"
+
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:316
-#: ../libempathy-gtk/empathy-theme-adium.c:267
+#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
-msgstr ""
+msgstr "Cóipeáil _Seoladh an Naisc"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:323
-#: ../libempathy-gtk/empathy-theme-adium.c:275
+#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
-msgstr ""
+msgstr "_Oscail Nasc"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:421
+#: ../libempathy-gtk/empathy-chat-text-view.c:415
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:179
-#: ../libempathy-gtk/empathy-contact-dialogs.c:238
+#: ../libempathy-gtk/empathy-contact-dialogs.c:299
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
 msgid "Edit Contact Information"
 msgstr "Cuir Eolas Teagmhála in Eagar"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+#: ../libempathy-gtk/empathy-contact-dialogs.c:350
 msgid "Personal Information"
 msgstr "Eolas Pearsanta"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:394
+#: ../libempathy-gtk/empathy-contact-dialogs.c:459
+#: ../libempathy-gtk/empathy-individual-dialogs.c:119
 msgid "New Contact"
 msgstr "Teagmháil Nua"
 
+#: ../libempathy-gtk/empathy-contact-dialogs.c:533
+#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#, c-format
+msgid "Block %s?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:538
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#, c-format
+msgid "Are you sure you want to block '%s' from contacting you again?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:543
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+msgid "_Block"
+msgstr "_Bac"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:559
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+msgid "_Report this contact as abusive"
+msgid_plural "_Report these contacts as abusive"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
 msgstr ""
@@ -893,476 +1721,1064 @@ msgstr ""
 msgid "Subscription Request"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1412
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "_Block User"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1414
+#: ../libempathy-gtk/empathy-contact-list-view.c:1988
+#: ../libempathy-gtk/empathy-individual-view.c:2379
 msgid "Removing group"
 msgstr ""
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1461
-#: ../libempathy-gtk/empathy-contact-list-view.c:1538
+#: ../libempathy-gtk/empathy-contact-list-view.c:2037
+#: ../libempathy-gtk/empathy-contact-list-view.c:2114
+#: ../libempathy-gtk/empathy-individual-view.c:2434
+#: ../libempathy-gtk/empathy-individual-view.c:2637
 msgid "_Remove"
-msgstr ""
+msgstr "_Bain"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1491
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
+#: ../libempathy-gtk/empathy-individual-view.c:2501
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1493
+#: ../libempathy-gtk/empathy-contact-list-view.c:2069
+#: ../libempathy-gtk/empathy-individual-view.c:2522
 msgid "Removing contact"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-menu.c:195
-#: ../src/empathy-main-window.ui.h:11
-msgid "_Add Contact..."
-msgstr "_Cuir Teagmháil Leis..."
+#: ../libempathy-gtk/empathy-contact-menu.c:220
+#: ../src/empathy-main-window-menubar.ui.h:14
+msgid "_Add Contact…"
+msgstr "Cuir Teagmháil _Leis…"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:300
+msgid "_Block Contact"
+msgstr "_Bac Teagmháil"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:222
-#: ../src/empathy-main-window.ui.h:12
+#: ../libempathy-gtk/empathy-contact-menu.c:329
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "_Comhrá"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:253
+#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "Glaoch _Fuaime"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:285
+#: ../libempathy-gtk/empathy-contact-menu.c:394
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "Glaoch Fí_se"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:324
-msgid "_View Previous Conversations"
-msgstr "_Amharc ar Comhráite Roimhe Seo"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:346
-msgid "Send file"
-msgstr "Seol comhad"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:369
-msgid "Share my desktop"
-msgstr ""
+#: ../libempathy-gtk/empathy-contact-menu.c:440
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
+msgid "_Previous Conversations"
+msgstr "Comhráite _Roimhe Seo"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:397
+#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-individual-menu.c:988
+msgid "Send File"
+msgstr "Seol Comhad"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:485
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
+msgid "Share My Desktop"
+msgstr "Comhroinn Mo Dheasc"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:1886
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
+msgid "Favorite"
+msgstr "Ceanán"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:554
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "_Eolas"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:441
-#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
+#: ../libempathy-gtk/empathy-contact-menu.c:600
+#, fuzzy
+msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "_Eagar"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:501
-msgid "Inviting to this room"
+#: ../libempathy-gtk/empathy-contact-menu.c:654
+#: ../libempathy-gtk/empathy-individual-menu.c:1284
+#: ../src/empathy-chat-window.c:1011
+msgid "Inviting you to this room"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-menu.c:532
-msgid "_Invite to chatroom"
+#: ../libempathy-gtk/empathy-contact-menu.c:685
+#: ../libempathy-gtk/empathy-individual-menu.c:1330
+msgid "_Invite to Chat Room"
+msgstr "_Tabhair Cuireadh Seomra Comhrá"
+
+#. Title
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#, fuzzy
+msgid "Search contacts"
+msgstr "Roghnaigh teagmháil..."
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+msgid "Search: "
+msgstr "Cuardaigh: "
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#, fuzzy
+msgid "_Add Contact"
+msgstr "_Cuir Teagmháil Leis..."
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+msgid "No contacts found"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
 msgstr ""
 
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:447
-msgid "Save Avatar"
+#: ../libempathy-gtk/empathy-contact-widget.c:336
+#: ../libempathy-gtk/empathy-individual-widget.c:153
+#, fuzzy
+msgid "Full name:"
+msgstr "Ainm Iomlán:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:337
+#: ../libempathy-gtk/empathy-individual-widget.c:154
+msgid "Phone number:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:503
-msgid "Unable to save avatar"
+#: ../libempathy-gtk/empathy-contact-widget.c:338
+#: ../libempathy-gtk/empathy-individual-widget.c:155
+msgid "E-mail address:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1000
-msgid "Select"
+#: ../libempathy-gtk/empathy-contact-widget.c:339
+#: ../libempathy-gtk/empathy-individual-widget.c:156
+#, fuzzy
+msgid "Website:"
+msgstr "Suíomh gréasáin:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:340
+#: ../libempathy-gtk/empathy-individual-widget.c:157
+msgid "Birthday:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1009
-#: ../src/empathy-main-window.c:1023
-msgid "Group"
-msgstr "Grúpa"
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:346
+#, fuzzy
+msgid "Last seen:"
+msgstr "_Sloinne:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:348
+msgid "Connected from:"
+msgstr ""
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:353
+#, fuzzy
+msgid "Away message:"
+msgstr "Teachtaireacht scortha:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1260
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+msgid "Channels:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1262
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Country:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1264
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "State:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1266
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "City:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1268
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Area:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1270
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1272
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Street:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1274
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1276
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Floor:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1278
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Room:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1280
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Text:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1282
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Description:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1284
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1286
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1288
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1290
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1292
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1296
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Bearing:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1298
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1300
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1302
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1304
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1306
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1353
-msgid "<b>Location</b>"
-msgstr "<b>Suíomh</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:17
+msgid "Location"
+msgstr "Suíomh"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1366
-msgid "<b>Location</b>, "
-msgstr "<b>Suíomh</b>, "
+#. translators: format is "Location, $date"
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
+#, c-format
+msgid "%s, %s"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1416
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
 msgstr ""
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
+msgid "Save Avatar"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
+msgid "Unable to save avatar"
+msgstr ""
+
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1
 msgid "<b>Location</b> at (date)\t"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "Cuntas:"
-
+#. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr "Ailias:"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Birthday:"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
 msgid "Client Information"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
 msgid "Client:"
 msgstr "Cliant:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:1006
-msgid "Contact"
-msgstr "Teagmháil"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Contact Details"
 msgstr ""
 
+#. Identifier to connect to Instant Messaging network
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
+msgid "Identifier:"
+msgstr "Aitheantóir:"
+
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "Email:"
-msgstr "Ríomhphost:"
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#, fuzzy
+msgid "Information requested…"
+msgstr "_Eolas"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "Fullname:"
-msgstr "Ainm Iomlán:"
+msgid "OS:"
+msgstr "OS:"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Version:"
+msgstr "Leagan:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:333
 msgid "Groups"
 msgstr "Grúpaí"
 
-#. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
-msgid "Identifier:"
-msgstr "Aitheantóir:"
+#: ../libempathy-gtk/empathy-groups-widget.c:345
+msgid ""
+"Select the groups you want this contact to appear in.  Note that you can "
+"select more than one group or no groups."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-groups-widget.c:364
+msgid "_Add Group"
+msgstr "Cuir Grúpa _Leis"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
-msgid "Information requested..."
+#: ../libempathy-gtk/empathy-groups-widget.c:399
+msgctxt "verb in a column header displaying group names"
+msgid "Select"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
-msgid "OS:"
-msgstr "OS:"
+#: ../libempathy-gtk/empathy-groups-widget.c:409
+#: ../src/empathy-main-window.c:1807
+msgid "Group"
+msgstr "Grúpa"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+msgid "The following identity will be blocked:"
+msgid_plural "The following identities will be blocked:"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+msgid "The following identity can not be blocked:"
+msgid_plural "The following identities can not be blocked:"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#. Translators: the heading at the top of the Information dialogue
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
+#, fuzzy
+msgid "Linked Contacts"
+msgstr "_Teagmhálacha As Líne"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:370
+#, fuzzy
+msgid "Select contacts to link"
+msgstr "Roghnaigh teagmháil..."
+
+#: ../libempathy-gtk/empathy-individual-linker.c:444
+#, fuzzy
+msgid "New contact preview"
+msgstr "Teagmháil Nua"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:488
+msgid "Contacts selected in the list on the left will be linked together."
+msgstr ""
+
+#. Translators: this is used in the context menu for a contact. The first
+#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
+#. * of the user's account IDs (e.g. me@hotmail.com).
+#: ../libempathy-gtk/empathy-individual-menu.c:145
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr ""
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "Glaoch"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+msgid "Mobile"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr ""
+
+#. add an SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+msgid "_SMS"
+msgstr "_SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1142
+msgctxt "Edit individual (contextual menu)"
+msgid "_Edit"
+msgstr "_Edit"
+
+#. Translators: this is a verb meaning "to connect two contacts together
+#. * to form a meta-contact".
+#: ../libempathy-gtk/empathy-individual-menu.c:1168
+#, fuzzy
+msgctxt "Link individual (contextual menu)"
+msgid "_Link Contacts…"
+msgstr "_Teagmhálacha As Líne"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2341
+msgid "Delete and _Block"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-view.c:2510
+#, c-format
 msgid ""
-"Select the groups you want this contact to appear in.  Note that you can "
-"select more than one group or no groups."
+"Do you really want to remove the linked contact '%s'? Note that this will "
+"remove all the contacts which make up this linked contact."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
-msgid "Version:"
-msgstr "Leagan:"
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#, c-format
+msgid "Linked contact containing %u contact"
+msgid_plural "Linked contacts containing %u contacts"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
-msgid "Web site:"
-msgstr "Suíomh gréasáin:"
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
+#, fuzzy
+msgid "<b>Location</b> at (date)"
+msgstr "<b>Suíomh</b>, "
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
-msgid "_Add Group"
-msgstr "Cuir Grúpa _Leis"
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Online from a phone or mobile device"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:283
-msgid "new server"
-msgstr "freastalaí nua"
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+msgid "New Network"
+msgstr "Líonra Nua"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:510
-msgid "Server"
-msgstr "Freastalaí"
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+msgid "Choose an IRC network"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:525
-msgid "Port"
-msgstr "Port"
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+msgid "Reset _Networks List"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:538
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+msgctxt "verb displayed on a button to select an IRC network"
+msgid "Select"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
+msgid "new server"
+msgstr "freastalaí nua"
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:495
-#: ../src/empathy-import-dialog.c:285
-msgid "Account"
-msgstr "Cuntas"
+#. Translators: this is the title of the linking dialogue (reached by
+#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
+#. * is a verb.
+#: ../libempathy-gtk/empathy-linking-dialog.c:115
+#, fuzzy
+msgid "Link Contacts"
+msgstr "_Teagmhálacha As Líne"
 
-#: ../libempathy-gtk/empathy-log-window.c:512
-msgid "Date"
-msgstr "Dáta"
+#: ../libempathy-gtk/empathy-linking-dialog.c:120
+msgctxt "Unlink individual (button)"
+msgid "_Unlink…"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "Conversations"
-msgstr "Comhráite"
+#: ../libempathy-gtk/empathy-linking-dialog.c:121
+msgid ""
+"Completely split the displayed linked contacts into the separate contacts."
+msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Previous Conversations"
-msgstr "Comhráite Roimhe Seo"
+#. Add button
+#. Translators: this is an action button in the linking dialogue. "Link" is
+#. * used here as a verb meaning "to connect two contacts to form a
+#. * meta-contact".
+#: ../libempathy-gtk/empathy-linking-dialog.c:136
+msgid "_Link"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../libempathy-gtk/empathy-linking-dialog.c:183
+#, c-format
+msgid "Unlink linked contacts '%s'?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:186
+msgid ""
+"Are you sure you want to unlink these linked contacts? This will completely "
+"split the linked contacts into separate contacts."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:190
+msgctxt "Unlink individual (button)"
+msgid "_Unlink"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:634
+msgid "History"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:689
+msgid "Show"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:711
 msgid "Search"
 msgstr "Cuardaigh"
 
+#: ../libempathy-gtk/empathy-log-window.c:1159
+#, c-format
+msgid "Chat in %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:1161
+#, c-format
+msgid "Chat with %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
+#, fuzzy
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%A %d %B %Y"
+
+#. Translators: this is an emote: '* Danielle waves'
+#: ../libempathy-gtk/empathy-log-window.c:1300
+#, c-format
+msgid "<i>* %s %s</i>"
+msgstr ""
+
+#. Translators: this is a message: 'Danielle: hello'
+#. * The string in bold is the sender's name
+#: ../libempathy-gtk/empathy-log-window.c:1306
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:1382
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:1729
+msgid "Today"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:1733
+#, fuzzy
+msgid "Yesterday"
+msgstr "Iartharach"
+
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
+#, fuzzy
+msgid "%e %B %Y"
+msgstr "%A %d %B %Y"
+
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3444
+msgid "Anytime"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2372
+msgid "Anyone"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:2685
+msgid "Who"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:2889
+msgid "When"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:3005
+msgid "Anything"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:3007
+msgid "Text chats"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:3009
+#: ../src/empathy-preferences.ui.h:4
+#, fuzzy
+msgid "Calls"
+msgstr "Glaoch"
+
+#: ../libempathy-gtk/empathy-log-window.c:3014
+msgid "Incoming calls"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:3015
+msgid "Outgoing calls"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:3016
+msgid "Missed calls"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:3038
+msgid "What"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:3747
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:3751
+#, fuzzy
+msgid "Clear All"
+msgstr "G_lan"
+
+#: ../libempathy-gtk/empathy-log-window.c:3758
+msgid "Delete from:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Chat"
+msgstr "Comhrá"
+
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-msgid "_For:"
-msgstr "A_r:"
+msgid "Delete All History..."
+msgstr ""
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
-msgid "C_all"
-msgstr "_Glaoch"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+msgid "Profile"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
-msgid "C_hat"
-msgstr "C_omhrá"
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.ui.h:20
+#, fuzzy
+msgid "Video"
+msgstr "Glaoch Fí_se"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:7
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:20
+msgid "_Edit"
+msgstr "_Eagar"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "_File"
+msgstr "_Comhad"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "page 2"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
 msgid "Contact ID:"
 msgstr "CA Teagmhála:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
+#. add chat button
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
+msgid "C_hat"
+msgstr "C_omhrá"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
 msgstr "Comhrá Nua"
 
+#. add video toggle
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
+#, fuzzy
+msgid "Send _Video"
+msgstr "Seol comhad"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
+msgid "C_all"
+msgstr "_Glaoch"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+msgid "New Call"
+msgstr "Glaoch Nua"
+
+#: ../libempathy-gtk/empathy-password-dialog.c:274
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:172
-#: ../libempathy-gtk/empathy-presence-chooser.c:208
-msgid "Custom Message..."
-msgstr "Teachtaireacht Saincheaptha..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
+msgid "Custom Message…"
+msgstr "Teachtaireacht Saincheaptha…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
-#: ../libempathy-gtk/empathy-presence-chooser.c:227
-msgid "Edit Custom Messages..."
-msgstr "Cuir Teachtaireachtaí Saincheaptha in Eagar..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
+msgid "Edit Custom Messages…"
+msgstr "Cuir Teachtaireachtaí Saincheaptha in Eagar…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:326
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:335
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:369
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:782
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
 msgid "Set your presence and current status"
 msgstr ""
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1017
-msgid "Custom messages..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#, fuzzy
+msgid "Custom messages…"
 msgstr "Teachtaireachtaí saincheaptha..."
 
-#: ../libempathy-gtk/empathy-sound.c:51
+#. Create account
+#. To translator: %s is the name of the protocol, such as "Google Talk" or
+#. * "Yahoo!"
+#.
+#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#, c-format
+msgid "New %s account"
+msgstr "Cuntas %s nua"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Mat_ch case"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+msgid "Phrase not found"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "_Next"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+msgid "_Previous"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-sound.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:53
 msgid "Sent an instant message"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-sound.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:55
 msgid "Incoming chat request"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-sound.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:57
 msgid "Contact connected"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-sound.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:59
 msgid "Contact disconnected"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-sound.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:61
 msgid "Connected to server"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-sound.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:63
 msgid "Disconnected from server"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-sound.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:65
 msgid "Incoming voice call"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-sound.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:67
 msgid "Outgoing voice call"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-sound.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:69
 msgid "Voice call ended"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
-msgid "Enter Custom Message"
-msgstr "Iontráil Teachtaireacht Saincheaptha"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
 msgstr "Cuir Teachtaireachtaí Saincheaptha in Eagar"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Add _New Preset"
-msgstr "Cuir Réamhshocrú _Nua Leis"
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#, fuzzy, c-format
+msgid "Message edited at %s"
+msgstr ""
+"\n"
+"Teachtaireacht: %s"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Presets"
-msgstr "Réamhshocruithe Sábháilte"
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#, fuzzy
+msgid "Normal"
+msgstr "_Gnáthmhéid"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:3
-msgid "gtk-add"
-msgstr "gtk-add"
+#: ../libempathy-gtk/empathy-theme-manager.c:70
+msgid "Classic"
+msgstr "Clasaiceach"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4
-msgid "gtk-remove"
-msgstr "gtk-remove"
+#: ../libempathy-gtk/empathy-theme-manager.c:71
+msgid "Simple"
+msgstr "Simplí"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
-msgid "Classic"
+#: ../libempathy-gtk/empathy-theme-manager.c:72
+msgid "Clean"
+msgstr "Glan"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:73
+msgid "Blue"
+msgstr "Gorm"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:150
+msgid "The identity provided by the chat server cannot be verified."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
-msgid "Simple"
+#: ../libempathy-gtk/empathy-tls-dialog.c:157
+msgid "The certificate is not signed by a Certification Authority."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
-msgid "Clean"
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
+msgid "The certificate has expired."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
-msgid "Blue"
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
+msgid "The certificate hasn't yet been activated."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
+msgid "The certificate does not have the expected fingerprint."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:170
+msgid "The hostname verified by the certificate doesn't match the server name."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
+msgid "The certificate is self-signed."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:177
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
+msgid "The certificate is cryptographically weak."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:184
+msgid "The certificate length exceeds verifiable limits."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:188
+msgid "The certificate is malformed."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#, c-format
+msgid "Expected hostname: %s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1382
+#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#, c-format
+msgid "Certificate hostname: %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:281
+#, fuzzy
+msgid "Continue"
+msgstr "Comhthéacs"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "This connection is untrusted. Would you like to continue anyway?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:297
+msgid "Remember this choice for future connections"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:303
+msgid "Certificate Details"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1472
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1530
-msgid "Select a destination"
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
+msgid "Insufficient free space to save file"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#, c-format
+msgid ""
+"%s of free space are required to save this file, but only %s is available. "
+"Please choose another location."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#, c-format
+msgid "Incoming file from %s"
 msgstr ""
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
-msgstr ""
+msgstr "Logchaighdeán Reatha"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:161
 #: ../libempathy-gtk/totem-subtitle-encoding.c:163
@@ -1373,13 +2789,13 @@ msgstr "Arabach"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:170
 msgid "Armenian"
-msgstr ""
+msgstr "Airméanach"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:173
 #: ../libempathy-gtk/totem-subtitle-encoding.c:175
 #: ../libempathy-gtk/totem-subtitle-encoding.c:177
 msgid "Baltic"
-msgstr ""
+msgstr "Baltach"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:180
 msgid "Celtic"
@@ -1407,7 +2823,7 @@ msgstr "Síneach Traidisiúnta"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:208
 msgid "Croatian"
-msgstr ""
+msgstr "Crótach"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:211
 #: ../libempathy-gtk/totem-subtitle-encoding.c:213
@@ -1420,30 +2836,30 @@ msgstr "Coireallach"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:224
 msgid "Cyrillic/Russian"
-msgstr ""
+msgstr "Coireallach/Rúiseach"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:227
 #: ../libempathy-gtk/totem-subtitle-encoding.c:229
 msgid "Cyrillic/Ukrainian"
-msgstr ""
+msgstr "Coireallach/Úcránach"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:232
 msgid "Georgian"
-msgstr ""
+msgstr "Seoirseach"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:235
 #: ../libempathy-gtk/totem-subtitle-encoding.c:237
 #: ../libempathy-gtk/totem-subtitle-encoding.c:239
 msgid "Greek"
-msgstr ""
+msgstr "Gréagach"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:242
 msgid "Gujarati"
-msgstr ""
+msgstr "Gúisearátach"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:245
 msgid "Gurmukhi"
-msgstr ""
+msgstr "Gurmúcaíoch"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:248
 #: ../libempathy-gtk/totem-subtitle-encoding.c:250
@@ -1458,32 +2874,32 @@ msgstr "Eabhrach Infheicthe"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:260
 msgid "Hindi"
-msgstr ""
+msgstr "Hiondúch"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:263
 msgid "Icelandic"
-msgstr ""
+msgstr "�oslannach"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:266
 #: ../libempathy-gtk/totem-subtitle-encoding.c:268
 #: ../libempathy-gtk/totem-subtitle-encoding.c:270
 msgid "Japanese"
-msgstr ""
+msgstr "Seapánach"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:273
 #: ../libempathy-gtk/totem-subtitle-encoding.c:275
 #: ../libempathy-gtk/totem-subtitle-encoding.c:277
 #: ../libempathy-gtk/totem-subtitle-encoding.c:279
 msgid "Korean"
-msgstr ""
+msgstr "Cóiréach"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:282
 msgid "Nordic"
-msgstr ""
+msgstr "Nordach"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:285
 msgid "Persian"
-msgstr ""
+msgstr "Peirseach"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:288
 #: ../libempathy-gtk/totem-subtitle-encoding.c:290
@@ -1527,75 +2943,48 @@ msgstr "Iartharach"
 msgid "Vietnamese"
 msgstr "Vítneamach"
 
-#.
-#. * vim: sw=2 ts=8 cindent noai bs=2
-#.
-#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:1
-msgid ""
-"The contact to display in the applet. Empty means no contact is displayed."
-msgstr ""
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:2
-msgid "The contact's avatar token. Empty means contact has no avatar."
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
+msgid "The selected contact cannot receive files."
 msgstr ""
 
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:1
-msgid "Megaphone"
-msgstr "Meigeafón"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:519
-msgid "Talk!"
-msgstr "Caint!"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:1
-#: ../nothere/data/GNOME_NotHere_Applet.xml.h:1
-msgid "_About"
-msgstr "_Maidir Leis Seo"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:2
-msgid "_Information"
-msgstr "_Eolas"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.ui.h:23
-msgid "_Preferences"
-msgstr "_Sainroghanna"
-
-#: ../megaphone/src/megaphone-applet.c:168
-msgid "Please configure a contact."
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
+msgid "The selected contact is offline."
 msgstr ""
 
-#: ../megaphone/src/megaphone-applet.c:258
-msgid "Select contact..."
-msgstr "Roghnaigh teagmháil..."
-
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:1
-msgid "Presence"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+msgid "No error message"
 msgstr ""
 
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2
-#: ../nothere/src/nothere-applet.c:106
-msgid "Set your own presence"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+msgid "Instant Message (Empathy)"
 msgstr ""
 
-#: ../src/empathy.c:567
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr ""
 
-#: ../src/empathy.c:571
-msgid "Don't show the contact list on startup"
+#: ../src/empathy.c:435
+msgid "Don't display the contact list or any other dialogs on startup"
 msgstr ""
 
-#: ../src/empathy.c:575
-msgid "Show the accounts dialog"
-msgstr ""
-
-#: ../src/empathy.c:587
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr "- Cliant IM Empathy"
 
-#: ../src/empathy-about-dialog.c:83
+#: ../src/empathy.c:637
+msgid "Error contacting the Account Manager"
+msgstr ""
+
+#: ../src/empathy.c:639
+#, c-format
+msgid ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../src/empathy-about-dialog.c:81
 msgid ""
 "Empathy 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 "
@@ -1606,7 +2995,7 @@ msgstr ""
 "théarmaí an GNU General Public License mar foilsíodh é ag an Free Software "
 "Foundation; leagan 2 an License, nó (de do rogha) aon leagan níos déanaí."
 
-#: ../src/empathy-about-dialog.c:87
+#: ../src/empathy-about-dialog.c:85
 msgid ""
 "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1617,7 +3006,7 @@ msgstr ""
 "an baránta intuigthe IND�OLTÓIREACHTA nó OIRIÚNACHTA D'FHEIDHM �IRITHE fiú. "
 "Féach an GNU General Public License le haghaidh tuilleadh mionsonraí."
 
-#: ../src/empathy-about-dialog.c:91
+#: ../src/empathy-about-dialog.c:89
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
@@ -1627,247 +3016,732 @@ msgstr ""
 "Empathy; mura bhfuair tú é, scríobh chuig an Free Software Foundation, Inc., "
 "51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA."
 
-#: ../src/empathy-about-dialog.c:119
+#: ../src/empathy-about-dialog.c:107
 msgid "An Instant Messaging client for GNOME"
 msgstr "Cliant Cur Teachtaireachtaí Meandaracha do GNOME"
 
-#: ../src/empathy-about-dialog.c:125
+#: ../src/empathy-about-dialog.c:113
 msgid "translator-credits"
 msgstr "Seán de Búrca <leftmostcat@gmail.com>"
 
-#: ../src/empathy-accounts-dialog.c:392
-msgid "Enabled"
-msgstr "Cumasaithe"
+#: ../src/empathy-account-assistant.c:167
+msgid "There was an error while importing the accounts."
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:170
+msgid "There was an error while parsing the account details."
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:173
+msgid "There was an error while creating the account."
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:175
+msgid "There was an error."
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:179
+#, c-format
+msgid "The error message was: %s"
+msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
-msgid "Accounts"
+#: ../src/empathy-account-assistant.c:183
+msgid ""
+"You can either go back and try to enter your accounts' details again or quit "
+"this assistant and add accounts later from the Edit menu."
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:220
+#: ../src/empathy-account-assistant.c:1271
+msgid "An error occurred"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:467
+msgid "What kind of chat account do you have?"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:473
+msgid "Do you have any other chat accounts you want to set up?"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:479
+msgid "Enter your account details"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:484
+msgid "What kind of chat account do you want to create?"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:490
+msgid "Do you want to create other chat accounts?"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:497
+msgid "Enter the details for the new account"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:612
+msgid ""
+"With Empathy you can chat with people online nearby and with friends and "
+"colleagues who use Google Talk, AIM, Windows Live and many other chat "
+"programs. With a microphone or a webcam you can also have audio or video "
+"calls."
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:629
+msgid "Do you have an account you've been using with another chat program?"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:652
+msgid "Yes, import my account details from "
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:673
+msgid "Yes, I'll enter my account details now"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:695
+#, fuzzy
+msgid "No, I want a new account"
+msgstr "Cr_uthaigh cuntas nua"
+
+#: ../src/empathy-account-assistant.c:705
+msgid "No, I just want to see people online nearby for now"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:726
+msgid "Select the accounts you want to import:"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:813
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
+msgid "Yes"
+msgstr "Tá"
+
+#: ../src/empathy-account-assistant.c:820
+msgid "No, that's all for now"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:1085
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct. You can easily change these details later or "
+"disable this feature by using the 'Accounts' dialog"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:1091
+#: ../src/empathy-account-assistant.c:1147
+#, fuzzy
+msgid "Edit->Accounts"
 msgstr "Cuntais"
 
-#. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:837
+#: ../src/empathy-account-assistant.c:1107
+msgid "I do _not want to enable this feature for now"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:1143
+msgid ""
+"You won't be able to chat with people connected to your local network, as "
+"telepathy-salut is not installed. If you want to enable this feature, please "
+"install the telepathy-salut package and create a People Nearby account from "
+"the Accounts dialog"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:1149
+msgid "telepathy-salut not installed"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:1195
+msgid "Messaging and VoIP Accounts Assistant"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:1229
+msgid "Welcome to Empathy"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:1238
+#, fuzzy
+msgid "Import your existing accounts"
+msgstr "_Athúsáid cuntas atá ann"
+
+#: ../src/empathy-account-assistant.c:1256
+msgid "Please enter personal details"
+msgstr ""
+
+#. The primary text of the dialog shown to the user when he is about to lose
+#. * unsaved changes
+#: ../src/empathy-accounts-dialog.c:64
 #, c-format
-msgid "New %s account"
-msgstr "Cuntas %s nua"
+msgid "There are unsaved modifications to your %s account."
+msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:950
+#. The primary text of the dialog shown to the user when he is about to lose
+#. * an unsaved new account
+#: ../src/empathy-accounts-dialog.c:68
+msgid "Your new account has not been saved yet."
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1216
+msgid "Connecting…"
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:386
+#, fuzzy, c-format
+msgid "Offline — %s"
+msgstr "As Líne"
+
+#: ../src/empathy-accounts-dialog.c:398
 #, c-format
+msgid "Disconnected — %s"
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:409
+msgid "Offline — No Network Connection"
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:416
+#, fuzzy
+msgid "Unknown Status"
+msgstr "Cúis anaithnid"
+
+#: ../src/empathy-accounts-dialog.c:428
+msgid "Offline — Account Disabled"
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:831
 msgid ""
-"You are about to remove your %s account!\n"
-"Are you sure you want to proceed?"
+"You are about to create a new account, which will discard\n"
+"your changes. Are you sure you want to proceed?"
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:1192
+#, c-format
+msgid "Do you want to remove %s from your computer?"
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:1196
+msgid "This will not remove your account on the server."
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:956
+#: ../src/empathy-accounts-dialog.c:1432
 msgid ""
-"Any associated conversations and chat rooms will NOT be removed if you "
-"decide to proceed.\n"
-"\n"
-"Should you decide to add the account back at a later time, they will still "
-"be available."
+"You are about to select another account, which will discard\n"
+"your changes. Are you sure you want to proceed?"
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Add Account"
-msgstr "Cuir Cuntas Leis"
+#. Menu items: to enabled/disable the account
+#: ../src/empathy-accounts-dialog.c:1643
+#, fuzzy
+msgid "_Enable"
+msgstr "Cumasaithe"
 
-#: ../src/empathy-accounts-dialog.ui.h:3
-msgid "Cr_eate"
-msgstr "C_ruthaigh"
+#: ../src/empathy-accounts-dialog.c:1644
+msgid "_Disable"
+msgstr ""
 
-#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Gmail"
-msgstr "Gmail"
+#: ../src/empathy-accounts-dialog.c:2154
+msgid ""
+"You are about to close the window, which will discard\n"
+"your changes. Are you sure you want to proceed?"
+msgstr ""
 
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "Import Accounts..."
-msgstr "Iompórtáil Cuntais..."
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr ""
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:2
+#, fuzzy
+msgid "Loading account information"
+msgstr "Cuir Eolas Teagmhála in Eagar"
+
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "No protocol installed"
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "Settings"
-msgstr "Socruithe"
+#: ../src/empathy-accounts-dialog.ui.h:4
+#, fuzzy
+msgid "Protocol:"
+msgstr "Prótacal"
 
-#: ../src/empathy-accounts-dialog.ui.h:8
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.ui.h:9
-msgid "Type:"
-msgstr "Cineál:"
+#: ../src/empathy-accounts-dialog.ui.h:7
+#, fuzzy
+msgid "_Import…"
+msgstr "Iompórtáil"
 
-#: ../src/empathy-accounts-dialog.ui.h:10
-msgid "_Add..."
-msgstr "Cuir _Leis..."
+#: ../src/empathy-auth-client.c:249
+#, fuzzy
+msgid " - Empathy authentication client"
+msgstr "- Cliant IM Empathy"
 
-#: ../src/empathy-accounts-dialog.ui.h:11
-msgid "_Create a new account"
-msgstr "Cr_uthaigh cuntas nua"
+#: ../src/empathy-auth-client.c:265
+#, fuzzy
+msgid "Empathy authentication client"
+msgstr "Cliant IM Empathy"
 
-#: ../src/empathy-accounts-dialog.ui.h:12
-msgid "_Reuse an existing account"
-msgstr "_Athúsáid cuntas atá ann"
+#: ../src/empathy-auto-salut-account-helper.c:83
+msgid "People nearby"
+msgstr ""
 
-#: ../src/empathy-call-window.c:424
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#, fuzzy
+msgid "- Empathy Audio/Video Client"
+msgstr "- Cliant IM Empathy"
+
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#, fuzzy
+msgid "Empathy Audio/Video Client"
+msgstr "Cliant IM Empathy"
+
+#: ../src/empathy-streamed-media-window.c:431
 msgid "Contrast"
 msgstr "Codarsnacht"
 
-#: ../src/empathy-call-window.c:427
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Brightness"
 msgstr "Gile"
 
-#: ../src/empathy-call-window.c:430
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Gamma"
 msgstr ""
 
-#: ../src/empathy-call-window.c:535
+#: ../src/empathy-streamed-media-window.c:542
 msgid "Volume"
 msgstr ""
 
-#: ../src/empathy-call-window.c:666
-msgid "Connecting..."
+#: ../src/empathy-streamed-media-window.c:1110
+msgid "_Sidebar"
 msgstr ""
 
-#: ../src/empathy-call-window.c:772
-msgid "_Sidebar"
+#: ../src/empathy-streamed-media-window.c:1130
+msgid "Audio input"
 msgstr ""
 
-#: ../src/empathy-call-window.c:791
-msgid "Dialpad"
+#: ../src/empathy-streamed-media-window.c:1134
+msgid "Video input"
 msgstr ""
 
-#: ../src/empathy-call-window.c:797
-msgid "Audio input"
+#: ../src/empathy-streamed-media-window.c:1140
+msgid "Dialpad"
 msgstr ""
 
-#: ../src/empathy-call-window.c:801
-msgid "Video input"
+#: ../src/empathy-streamed-media-window.c:1151
+msgid "Details"
 msgstr ""
 
-#: ../src/empathy-call-window.c:860
+#. translators: Call is a noun and %s is the contact name. This string
+#. * is used in the window title
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1825
 #, c-format
 msgid "Call with %s"
 msgstr ""
 
-#: ../src/empathy-call-window.c:929
-msgid "Call"
-msgstr "Glaoch"
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:2069
+msgid "The IP address as seen by the machine"
+msgstr ""
+
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:2071
+msgid "The IP address as seen by a server on the Internet"
+msgstr ""
+
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:2073
+msgid "The IP address of the peer as seen by the other side"
+msgstr ""
+
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:2075
+msgid "The IP address of a relay server"
+msgstr ""
+
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:2077
+msgid "The IP address of the multicast group"
+msgstr ""
+
+#: ../src/empathy-streamed-media-window.c:1843
+#, fuzzy
+msgctxt "encoding video codec"
+msgid "Unknown"
+msgstr "Anaithnid"
+
+#: ../src/empathy-streamed-media-window.c:1846
+#, fuzzy
+msgctxt "encoding audio codec"
+msgid "Unknown"
+msgstr "Anaithnid"
+
+#: ../src/empathy-streamed-media-window.c:1849
+#, fuzzy
+msgctxt "decoding video codec"
+msgid "Unknown"
+msgstr "Anaithnid"
+
+#: ../src/empathy-streamed-media-window.c:1852
+#, fuzzy
+msgctxt "decoding audio codec"
+msgid "Unknown"
+msgstr "Anaithnid"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1364
+#: ../src/empathy-streamed-media-window.c:2144
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr ""
 
-#: ../src/empathy-call-window.ui.h:1
-msgid "Hang up"
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2846
+msgid "Technical Details"
 msgstr ""
 
-#: ../src/empathy-call-window.ui.h:2
-msgid "Redial"
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2884
+#, c-format
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
+msgstr ""
+
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2889
+#, c-format
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
+msgstr ""
+
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2895
+#, c-format
+msgid ""
+"Can't establish a connection to %s. One of you might be on a network that "
+"does not allow direct connections."
+msgstr ""
+
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2901
+msgid "There was a failure on the network"
+msgstr ""
+
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2905
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
+msgstr ""
+
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2908
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr ""
+
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2920
+#, c-format
+msgid ""
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+msgstr ""
+
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2929
+msgid "There was a failure in the call engine"
+msgstr ""
+
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2932
+msgid "The end of the stream was reached"
+msgstr ""
+
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2972
+msgid "Can't establish audio stream"
 msgstr ""
 
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2982
+msgid "Can't establish video stream"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:1
+#, fuzzy
+msgid "Audio"
+msgstr "Glaoch _Fuaime"
+
 #: ../src/empathy-call-window.ui.h:3
-msgid "Send Audio"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
 msgstr ""
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Send video"
+msgid "Disable camera"
 msgstr ""
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Video preview"
+msgid "Display the dialpad"
 msgstr ""
 
 #: ../src/empathy-call-window.ui.h:6
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:7
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Hang up"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:8
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Hang up current call"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:9
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Local Candidate:"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:10
+msgid "Maximise me"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:11
+msgid "Minimise me"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Send Audio"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:14
+#, fuzzy
+msgid "Send Video"
+msgstr "Seol comhad"
+
+#: ../src/empathy-call-window.ui.h:15
+msgid "Show dialpad"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:16
+msgid "Start a video call"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:17
+msgid "Start an audio call"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:18
+msgid "Swap camera"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:20
+msgid "Toggle video transmission"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
+#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
+msgid "Unknown"
+msgstr "Anaithnid"
+
+#: ../src/empathy-call-window.ui.h:23
+#, fuzzy
+msgid "Video call"
+msgstr "Glaoch Fí_se"
+
+#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "_Glaoch"
 
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-call-window.ui.h:25
+msgid "_Camera"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:18
+msgid "_Contents"
+msgstr "_Inneachar"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
+msgid "_Debug"
+msgstr "_Dífhabhtaigh"
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:22
+msgid "_Help"
+msgstr "Cab_hair"
+
+#: ../src/empathy-call-window.ui.h:30
+#, fuzzy
+msgid "_Microphone"
+msgstr "Meigeafón"
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "_Settings"
+msgstr "_Socruithe"
+
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_Amharc"
 
-#: ../src/empathy-chat-window.c:344
+#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
 #, c-format
-msgid "Conversations (%d)"
-msgstr "Comhráite (%d)"
+msgid "%s (%d unread)"
+msgid_plural "%s (%d unread)"
+msgstr[0] "%s (%d gan léamh)"
+msgstr[1] "%s (%d gan léamh)"
+msgstr[2] "%s (%d gan léamh)"
+msgstr[3] "%s (%d gan léamh)"
+msgstr[4] "%s (%d gan léamh)"
+
+#: ../src/empathy-chat-window.c:493
+#, c-format
+msgid "%s (and %u other)"
+msgid_plural "%s (and %u others)"
+msgstr[0] "%s (agus %u duine eile)"
+msgstr[1] "%s (agus %u dhuine eile)"
+msgstr[2] "%s (agus %u dhuine eile)"
+msgstr[3] "%s (agus %u duine eile)"
+msgstr[4] "%s (agus %u duine eile)"
+
+#: ../src/empathy-chat-window.c:509
+#, c-format
+msgid "%s (%d unread from others)"
+msgid_plural "%s (%d unread from others)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
 
-#: ../src/empathy-chat-window.c:476
+#: ../src/empathy-chat-window.c:518
+#, c-format
+msgid "%s (%d unread from all)"
+msgid_plural "%s (%d unread from all)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: ../src/empathy-chat-window.c:733
+msgid "SMS:"
+msgstr "SMS:"
+
+#: ../src/empathy-chat-window.c:743
+#, fuzzy, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "Seol agus faigh teachtaireachtaí"
+msgstr[1] "Seol agus faigh teachtaireachtaí"
+msgstr[2] "Seol agus faigh teachtaireachtaí"
+msgstr[3] "Seol agus faigh teachtaireachtaí"
+msgstr[4] "Seol agus faigh teachtaireachtaí"
+
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
-msgstr ""
+msgstr "Teachtaireacht á scríobh."
 
 #: ../src/empathy-chat-window.ui.h:1
 msgid "C_lear"
 msgstr "G_lan"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "Chat"
-msgstr "Comhrá"
-
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Insert _Smiley"
-msgstr ""
+msgid "C_ontact"
+msgstr "_Teagmháil"
 
 #: ../src/empathy-chat-window.ui.h:4
-msgid "Move Tab _Left"
-msgstr ""
+msgid "Insert _Smiley"
+msgstr "Ionsáigh _Straiseog"
 
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Move Tab _Right"
-msgstr ""
+msgid "Invite _Participant…"
+msgstr "Tabhair Cuireadh do _Rannpháirtí…"
 
 #: ../src/empathy-chat-window.ui.h:6
-msgid "_Contact"
-msgstr "_Teagmháil"
+msgid "Move Tab _Left"
+msgstr "Bog Cluaisín ar _Chlé"
 
-#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
-msgid "_Contents"
-msgstr "_Inneachar"
+#: ../src/empathy-chat-window.ui.h:7
+msgid "Move Tab _Right"
+msgstr "Bog Cluaisín ar _Dheis"
 
 #: ../src/empathy-chat-window.ui.h:8
+msgid "Notify for All Messages"
+msgstr ""
+
+#: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "_Comhrá"
 
-#: ../src/empathy-chat-window.ui.h:9
-msgid "_Detach Tab"
-msgstr ""
-
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Favorite Chatroom"
-msgstr ""
-
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
-msgid "_Help"
-msgstr "Cab_hair"
+msgid "_Detach Tab"
+msgstr "Díchean_gail Cluaisín"
 
 #: ../src/empathy-chat-window.ui.h:13
+#, fuzzy
+msgid "_Favorite Chat Room"
+msgstr "Seomra Comhrá"
+
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
-msgstr ""
+msgstr "An Chéad Chluaisín _Eile"
 
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:16
 msgid "_Previous Tab"
-msgstr ""
+msgstr "An Cluaisín _Roimhe Seo"
 
-#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
 msgid "_Show Contact List"
 msgstr "_Taispeáin Liosta Teagmhálacha"
 
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:18
 msgid "_Tabs"
 msgstr "C_luaisíní"
 
-#: ../src/empathy-chatrooms-window.c:258
+#: ../src/empathy-chat-window.ui.h:19
+msgid "_Undo Close Tab"
+msgstr "Cea_laigh Dúnadh Cluaisín"
+
+#: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "Ainm"
 
-#: ../src/empathy-chatrooms-window.c:276
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
 msgstr "Seomra"
 
-#: ../src/empathy-chatrooms-window.c:285
+#: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr ""
 
@@ -1875,75 +3749,97 @@ msgstr ""
 msgid "Manage Favorite Rooms"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:321
-msgid "Incoming call"
+#: ../src/empathy-event-manager.c:521
+msgid "Incoming video call"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:324
-#, c-format
-msgid "%s is calling you, do you want to answer?"
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
+msgid "Incoming call"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:331
-msgid "_Reject"
+#: ../src/empathy-event-manager.c:525
+#, c-format
+msgid "%s is video calling you. Do you want to answer?"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:337
-msgid "_Answer"
+#: ../src/empathy-event-manager.c:526
+#, c-format
+msgid "%s is calling you. Do you want to answer?"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:452
+#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming call from %s"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:496
-#, c-format
-msgid "%s is offering you an invitation"
+#: ../src/empathy-event-manager.c:554
+msgid "_Reject"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:502
-msgid "An external application will be started to handle it."
+#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+msgid "_Answer"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:570
+msgid "_Answer with video"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:507
-msgid "You don't have the needed external application to handle it."
+#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1455
+#, c-format
+msgid "Incoming video call from %s"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:634
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:637
+#: ../src/empathy-event-manager.c:838
+#, c-format
+msgid "Invitation to join %s"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:645
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "C_eangail"
 
-#: ../src/empathy-event-manager.c:689
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:715
+#: ../src/empathy-event-manager.c:891
+#, c-format
+msgid "You have been invited to join %s"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:895
+#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#, fuzzy
+msgid "Password required"
+msgstr "Focal faire:"
+
+#: ../src/empathy-event-manager.c:1190
 #, c-format
-msgid "Subscription requested by %s"
+msgid "%s would like permission to see when you are online"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:899
+#: ../src/empathy-event-manager.c:1194
 #, c-format
 msgid ""
 "\n"
@@ -1952,118 +3848,106 @@ msgstr ""
 "\n"
 "Teachtaireacht: %s"
 
-#. someone is logging off
-#: ../src/empathy-event-manager.c:935
-#, c-format
-msgid "%s is now offline."
-msgstr ""
-
-#. someone is logging in
-#: ../src/empathy-event-manager.c:951
-#, c-format
-msgid "%s is now online."
-msgstr ""
-
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:101
+#: ../src/empathy-ft-manager.c:100
 #, c-format
 msgid "%u:%02u.%02u"
-msgstr ""
+msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:104
+#: ../src/empathy-ft-manager.c:103
 #, c-format
 msgid "%02u.%02u"
-msgstr ""
+msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:180
+#: ../src/empathy-ft-manager.c:179
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Anaithnid"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr ""
 
-#: ../src/empathy-ft-manager.c:276
+#: ../src/empathy-ft-manager.c:275
 #, c-format
 msgid "%s of %s"
 msgstr ""
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:307
+#: ../src/empathy-ft-manager.c:306
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr ""
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:310
+#: ../src/empathy-ft-manager.c:309
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr ""
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:340
+#: ../src/empathy-ft-manager.c:339
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr ""
 
-#: ../src/empathy-ft-manager.c:343
+#: ../src/empathy-ft-manager.c:342
 msgid "Error receiving a file"
 msgstr ""
 
-#: ../src/empathy-ft-manager.c:348
+#: ../src/empathy-ft-manager.c:347
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr ""
 
-#: ../src/empathy-ft-manager.c:351
+#: ../src/empathy-ft-manager.c:350
 msgid "Error sending a file"
 msgstr ""
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:490
+#: ../src/empathy-ft-manager.c:489
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr ""
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:495
+#: ../src/empathy-ft-manager.c:494
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr ""
 
-#: ../src/empathy-ft-manager.c:498
+#: ../src/empathy-ft-manager.c:497
 msgid "File transfer completed"
 msgstr ""
 
-#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
 msgid "Waiting for the other participant's response"
 msgstr ""
 
-#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr ""
 
-#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
 #, c-format
 msgid "Hashing \"%s\""
 msgstr ""
 
-#: ../src/empathy-ft-manager.c:1024
+#: ../src/empathy-ft-manager.c:1026
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1036
+#: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "Comhad"
 
-#: ../src/empathy-ft-manager.c:1058
+#: ../src/empathy-ft-manager.c:1060
 msgid "Remaining"
 msgstr "Fágtha"
 
@@ -2075,204 +3959,197 @@ msgstr "Aistrithe Comhad"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr ""
 
-#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:263
-msgid "Import"
-msgstr "Iompórtáil"
-
-#: ../src/empathy-import-dialog.c:272
-msgid "Protocol"
-msgstr "Prótacal"
-
-#: ../src/empathy-import-dialog.c:298
-msgid "Source"
-msgstr "Foinse"
-
-#: ../src/empathy-import-dialog.c:392
+#: ../src/empathy-import-dialog.c:84
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr ""
 
-#: ../src/empathy-import-dialog.ui.h:1
+#: ../src/empathy-import-dialog.c:199
 msgid "Import Accounts"
 msgstr "Iompórtáil Cuntais"
 
-#: ../src/empathy-main-window.c:402
-msgid "_Edit account"
-msgstr ""
-
-#: ../src/empathy-main-window.c:505
-msgid "No error specified"
-msgstr ""
-
-#: ../src/empathy-main-window.c:508
-msgid "Network error"
-msgstr ""
+#. Translators: this is the header of a treeview column
+#: ../src/empathy-import-widget.c:301
+msgid "Import"
+msgstr "Iompórtáil"
 
-#: ../src/empathy-main-window.c:511
-msgid "Authentication failed"
-msgstr ""
+#: ../src/empathy-import-widget.c:310
+msgid "Protocol"
+msgstr "Prótacal"
 
-#: ../src/empathy-main-window.c:514
-msgid "Encryption error"
-msgstr ""
+#: ../src/empathy-import-widget.c:334
+msgid "Source"
+msgstr "Foinse"
 
-#: ../src/empathy-main-window.c:517
-msgid "Name in use"
-msgstr ""
+#: ../src/empathy-main-window.c:392
+#, fuzzy
+msgid "Provide Password"
+msgstr "Focal faire:"
 
-#: ../src/empathy-main-window.c:520
-msgid "Certificate not provided"
+#: ../src/empathy-main-window.c:398
+msgid "Disconnect"
 msgstr ""
 
-#: ../src/empathy-main-window.c:523
-msgid "Certificate untrusted"
+#: ../src/empathy-main-window.c:622
+msgid "No match found"
 msgstr ""
 
-#: ../src/empathy-main-window.c:526
-msgid "Certificate expired"
+#: ../src/empathy-main-window.c:777
+msgid "Reconnect"
 msgstr ""
 
-#: ../src/empathy-main-window.c:529
-msgid "Certificate not activated"
-msgstr ""
+#: ../src/empathy-main-window.c:783
+#, fuzzy
+msgid "Edit Account"
+msgstr "Cuir Cuntas Leis"
 
-#: ../src/empathy-main-window.c:532
-msgid "Certificate hostname mismatch"
+#: ../src/empathy-main-window.c:789
+msgid "Close"
 msgstr ""
 
-#: ../src/empathy-main-window.c:535
-msgid "Certificate fingerprint mismatch"
+#. Translators: this string will be something like:
+#. *   Top up My Account ($1.23)..."
+#: ../src/empathy-main-window.c:928
+#, c-format
+msgid "Top up %s (%s)..."
 msgstr ""
 
-#: ../src/empathy-main-window.c:538
-msgid "Certificate self-signed"
+#: ../src/empathy-main-window.c:975
+msgid "Top up account credit"
 msgstr ""
 
-#: ../src/empathy-main-window.c:541
-msgid "Certificate error"
+#. top up button
+#: ../src/empathy-main-window.c:1046
+msgid "Top Up..."
 msgstr ""
 
-#: ../src/empathy-main-window.c:544
-msgid "Unknown error"
-msgstr "Earráid anaithnid"
-
-#: ../src/empathy-main-window.c:1293
-msgid "Show and edit accounts"
-msgstr ""
+#: ../src/empathy-main-window.c:1789
+msgid "Contact"
+msgstr "Teagmháil"
 
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "Liosta Teagmhálacha"
 
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr ""
 
-#: ../src/empathy-main-window.ui.h:3
-msgid "Context"
-msgstr "Comhthéacs"
+#: ../src/empathy-main-window-menubar.ui.h:2
+msgid "Credit Balance"
+msgstr ""
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:3
+msgid "Find in Contact _List"
+msgstr "Aimsigh sa _Liosta Teagmhálacha"
+
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "Ceangail le C_eanáin"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "Bainistigh Ceanáin"
 
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "_Gnáthmhéid"
 
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
+msgid "New _Call…"
+msgstr "_Glaoch Nua…"
+
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
-msgstr "Gnáthmhéid le A_bhatáir"
+msgstr "Gnáthmhéid le hA_bhatáir"
+
+#: ../src/empathy-main-window-menubar.ui.h:9
+msgid "P_references"
+msgstr "_Sainroghanna"
+
+#: ../src/empathy-main-window-menubar.ui.h:10
+msgid "Show P_rotocols"
+msgstr "Taispeáin _Prótacail"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
-msgstr "Sórtáil De Réir _Ainm"
+msgstr "Sórtáil de Réir _Ainm"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
-msgstr "Sórtáil De Réir _Stádas"
+msgstr "Sórtáil de Réir _Stádas"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Cuntais"
 
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window-menubar.ui.h:15
+msgid "_Blocked Contacts"
+msgstr "Teagmhálacha _Bactha"
+
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "_Dlúthmhéid"
 
-#: ../src/empathy-main-window.ui.h:15
-msgid "_Debug"
-msgstr "_Dífhabhtaigh"
-
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "Aistrithe _Comhad"
 
-#: ../src/empathy-main-window.ui.h:19
-msgid "_Join..."
-msgstr "_Ceangail..."
+#: ../src/empathy-main-window-menubar.ui.h:23
+msgid "_Join…"
+msgstr "_Ceangail…"
 
-#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation..."
-msgstr "Comhrá _Nua..."
+#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
+msgid "_New Conversation…"
+msgstr "_Comhrá Nua…"
 
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
-msgstr "_Teagmhálacha As Líne"
+msgstr "_Teagmhálacha as Líne"
 
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "Eolas _Pearsanta"
 
-#: ../src/empathy-main-window.ui.h:24
-msgid "_Previous Conversations"
-msgstr "Comhráite _Roimhe Seo"
-
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "_Seomra"
 
-#: ../src/empathy-new-chatroom-dialog.c:331
+#: ../src/empathy-main-window-menubar.ui.h:29
+msgid "_Search for Contacts…"
+msgstr "Cuar_daigh ar Theagmhálacha…"
+
+#: ../src/empathy-new-chatroom-dialog.c:337
 msgid "Chat Room"
 msgstr "Seomra Comhrá"
 
-#: ../src/empathy-new-chatroom-dialog.c:347
+#: ../src/empathy-new-chatroom-dialog.c:353
 msgid "Members"
 msgstr "Baill"
 
-#: ../src/empathy-new-chatroom-dialog.c:496
+#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
+#. yes/no, yes/no and a number.
+#: ../src/empathy-new-chatroom-dialog.c:553
 #, c-format
-msgctxt ""
-"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
-"and a number."
 msgid ""
-"<b>%s</b>\n"
+"%s\n"
 "Invite required: %s\n"
 "Password required: %s\n"
 "Members: %s"
 msgstr ""
 
-#: ../src/empathy-new-chatroom-dialog.c:498
-#: ../src/empathy-new-chatroom-dialog.c:499
-msgid "Yes"
-msgstr "Tá"
-
-#: ../src/empathy-new-chatroom-dialog.c:498
-#: ../src/empathy-new-chatroom-dialog.c:499
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "No"
 msgstr "Níl"
 
-#: ../src/empathy-new-chatroom-dialog.c:526
+#: ../src/empathy-new-chatroom-dialog.c:584
 msgid "Could not start room listing"
 msgstr ""
 
-#: ../src/empathy-new-chatroom-dialog.c:536
+#: ../src/empathy-new-chatroom-dialog.c:594
 msgid "Could not stop room listing"
 msgstr ""
 
@@ -2303,72 +4180,112 @@ msgstr "Liosta Seomraí"
 msgid "_Room:"
 msgstr "_Seomra:"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr ""
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr ""
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
 msgstr ""
 
-#: ../src/empathy-preferences.c:150
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
 msgstr ""
 
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
 msgstr ""
 
-#: ../src/empathy-preferences.c:152
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
 msgstr ""
 
-#: ../src/empathy-preferences.c:153
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
 msgstr ""
 
-#: ../src/empathy-preferences.c:393
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:1
-msgid "Allow _GPS usage"
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:734
+msgid "Juliet"
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:2
-msgid "Allow _cellphone usage"
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:741
+msgid "Romeo"
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Allow _network usage"
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:747
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:4
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:750
+msgid "Deny thy father and refuse thy name;"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:753
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:756
+msgid "And I'll no longer be a Capulet."
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:759
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:762
+msgid "Juliet has disconnected"
+msgstr ""
+
+#: ../src/empathy-preferences.c:1166
+msgid "Preferences"
+msgstr "Sainroghanna"
+
+#: ../src/empathy-preferences.ui.h:1
 msgid "Appearance"
 msgstr "Cuma"
 
+#: ../src/empathy-preferences.ui.h:3
+msgid "Behavior"
+msgstr "Oibriú"
+
 #: ../src/empathy-preferences.ui.h:5
-msgid "Automatically _connect on startup "
-msgstr "_Nasc go huathoibríoch ag am tosaithe "
+msgid "Chat Th_eme:"
+msgstr ""
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Behavior"
-msgstr "Oibriú"
+msgid "Disable notifications when _away or busy"
+msgstr ""
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Chat Th_eme:"
+msgid "Disable sounds when _away or busy"
 msgstr ""
 
 #: ../src/empathy-preferences.ui.h:8
-msgid "Disable notifications when _away or busy"
+msgid "Display incoming events in the notification area"
 msgstr ""
 
 #: ../src/empathy-preferences.ui.h:9
-msgid "Disable sounds when _away or busy"
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
 
 #: ../src/empathy-preferences.ui.h:10
@@ -2392,169 +4309,359 @@ msgid "General"
 msgstr "Ginearálta"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Geoclue Settings"
-msgstr "Socruithe Geoclue"
+msgid "Input level:"
+msgstr ""
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Location"
+msgid "Input volume:"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:18
+#, fuzzy
+msgid "Location sources:"
 msgstr "Suíomh"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:19
+#, fuzzy
+msgid "Log conversations"
+msgstr "Comhráite"
+
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "Fógairtí"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Seinn fuaim do theagmhais"
 
-#: ../src/empathy-preferences.ui.h:19
-msgid "Preferences"
-msgstr "Sainroghanna"
-
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "Príobháideachas"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
 "decimal place."
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "Taispeáin _straoiseoga mar íomhánna"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "Taispeáin _liosta teagmhálacha i seomraí"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "Fuaimeanna"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "Litriú"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "Téamaí"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:30
+msgid "Variant:"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:31
+#, fuzzy
+msgid "_Automatically connect on startup"
+msgstr "_Nasc go huathoibríoch ag am tosaithe "
+
+#: ../src/empathy-preferences.ui.h:32
+#, fuzzy
+msgid "_Cellphone"
+msgstr "Meigeafón"
+
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:35
+msgid "_GPS"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:36
+msgid "_Network (IP, Wi-Fi)"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "_Oscail comhráite nua i bhfuinneoga faoi leith"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:32
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr ""
 
-#: ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "Stádas"
 
-#: ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-status-icon.ui.h:4
 msgid "_Quit"
 msgstr "_Scoir"
 
-#: ../src/empathy-tube-dispatch.c:375
-#, c-format
-msgid "Unable to start application for service %s: %s"
+#: ../src/empathy-streamed-media-window.ui.h:2
+#, fuzzy
+msgid "Call the contact again"
+msgstr "Dlúthliosta teagmhálacha"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
 msgstr ""
 
-#: ../src/empathy-tube-dispatch.c:446
-#, c-format
-msgid ""
-"An invitation was offered for service %s, but you don't have the needed "
-"application to handle it"
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
 msgstr ""
 
-#: ../src/empathy-call-window-fullscreen.ui.h:1
-msgid "gtk-leave-fullscreen"
-msgstr "gtk-leave-fullscreen"
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr ""
 
-#: ../src/empathy-map-view.ui.h:1
-msgid "Contact Map View"
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
 msgstr ""
 
-#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
-msgid "Error"
-msgstr "Earráid"
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr ""
 
-#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
-msgid "Critical"
-msgstr "Criticiúil"
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr ""
 
-#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
-msgid "Warning"
-msgstr "Rabhadh"
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr ""
 
-#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
-#: ../src/empathy-debug-dialog.c:1113
-msgid "Message"
-msgstr "Teachtaireacht"
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr ""
 
-#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
-msgid "Info"
-msgstr "Eolas"
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr ""
 
-#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
-msgid "Debug"
-msgstr "Dífhabhtú"
+#: ../src/empathy-streamed-media-window.ui.h:22
+#, fuzzy
+msgid "Video On"
+msgstr "Glaoch Fí_se"
 
-#: ../src/empathy-debug-dialog.c:845
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr ""
+
+#: ../src/empathy-map-view.c:448
+msgid "Contact Map View"
+msgstr ""
+
+#: ../src/empathy-debug-window.c:1228
 msgid "Save"
 msgstr "Sábháil"
 
-#: ../src/empathy-debug-dialog.c:948
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
 msgstr "Fuinneog Dífhabhtaithe"
 
-#: ../src/empathy-debug-dialog.c:1021
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
 msgstr "Sos"
 
-#: ../src/empathy-debug-dialog.c:1033
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
 msgstr "Leibhéal"
 
-#: ../src/empathy-debug-dialog.c:1102
+#: ../src/empathy-debug-window.c:1549
+msgid "Debug"
+msgstr "Dífhabhtú"
+
+#: ../src/empathy-debug-window.c:1555
+msgid "Info"
+msgstr "Eolas"
+
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+msgid "Message"
+msgstr "Teachtaireacht"
+
+#: ../src/empathy-debug-window.c:1567
+msgid "Warning"
+msgstr "Rabhadh"
+
+#: ../src/empathy-debug-window.c:1573
+msgid "Critical"
+msgstr "Criticiúil"
+
+#: ../src/empathy-debug-window.c:1579
+msgid "Error"
+msgstr "Earráid"
+
+#: ../src/empathy-debug-window.c:1598
 msgid "Time"
 msgstr "Am"
 
-#: ../src/empathy-debug-dialog.c:1104
+#: ../src/empathy-debug-window.c:1601
 msgid "Domain"
 msgstr "Fearann"
 
-#: ../src/empathy-debug-dialog.c:1106
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
 msgstr "Catagóir"
 
-#: ../src/empathy-debug-dialog.c:1108
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "Leibhéal"
 
-#: ../src/empathy-debug-dialog.c:1140
+#: ../src/empathy-debug-window.c:1642
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr ""
+
+#: ../src/empathy-invite-participant-dialog.c:179
+#: ../src/empathy-invite-participant-dialog.c:205
+msgid "Invite Participant"
+msgstr ""
+
+#: ../src/empathy-invite-participant-dialog.c:180
+msgid "Choose a contact to invite into the conversation:"
+msgstr ""
+
+#: ../src/empathy-invite-participant-dialog.c:201
+msgid "Invite"
+msgstr ""
+
+#: ../src/empathy-accounts.c:183
+msgid "Don't display any dialogs; do any work (eg, importing) and exit"
+msgstr ""
+
+#: ../src/empathy-accounts.c:187
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr ""
+
+#: ../src/empathy-accounts.c:191
+msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
+msgstr ""
+
+#: ../src/empathy-accounts.c:193
+#, fuzzy
+msgid "<account-id>"
+msgstr "Cuntas"
+
+#: ../src/empathy-accounts.c:198
+#, fuzzy
+msgid "- Empathy Accounts"
+msgstr "Iompórtáil Cuntais"
+
+#: ../src/empathy-accounts.c:237
+#, fuzzy
+msgid "Empathy Accounts"
+msgstr "Iompórtáil Cuntais"
+
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr ""
+
+#: ../src/empathy-debugger.c:75
+msgid "- Empathy Debugger"
+msgstr ""
+
+#: ../src/empathy-debugger.c:114
+msgid "Empathy Debugger"
+msgstr ""
+
+#: ../src/empathy-chat.c:107
+#, fuzzy
+msgid "- Empathy Chat Client"
+msgstr "- Cliant IM Empathy"
+
+#: ../src/empathy-notifications-approver.c:203
+msgid "Respond"
+msgstr ""
+
+#: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1459
+msgid "Reject"
+msgstr ""
+
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1460
+msgid "Answer"
+msgstr ""
+
+#: ../src/empathy-notifications-approver.c:227
+msgid "Answer with video"
+msgstr ""
+
+#: ../src/empathy-notifications-approver.c:235
+#: ../src/empathy-notifications-approver.c:245
+msgid "Decline"
+msgstr ""
+
+#: ../src/empathy-notifications-approver.c:239
+#: ../src/empathy-notifications-approver.c:250
+msgid "Accept"
+msgstr ""
+
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:260
+msgid "Provide"
+msgstr ""
+
+#: ../src/empathy-call-observer.c:134
+#, c-format
+msgid "%s just tried to call you, but you were in another call."
+msgstr ""
+
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+msgid "i"
+msgstr ""
+
+#: ../src/empathy-call-window.c:2775
+msgid "On hold"
+msgstr ""
+
+#: ../src/empathy-call-window.c:2778
+msgid "Mute"
+msgstr ""
+
+#: ../src/empathy-call-window.c:2780
+#, fuzzy
+msgid "Duration"
+msgstr "Suíomh"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2783
+#, c-format
+msgid "%s — %d:%02dm"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 08ad8fe9f..6b4d29e7f 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,22 +6,22 @@
 # Antón Méixome <meixome@mancomun.org>, 2009.
 # Antón Méixome <meixome@certima.net>, 2010.
 # Francisco Diéguez <frandieguez@ubuntu.com>, 2010.
-# Fran Dieguez <frandieguez@ubuntu.com>, 2009, 2010.
 # Fran Diéguez <frandieguez@gnome.org>,2009, 2010, 2011.
+# Fran Dieguez <frandieguez@gnome.org>, 2009, 2010, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy-master-po-gl-57278_.merged\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-28 17:51+0200\n"
-"PO-Revision-Date: 2011-08-28 17:52+0200\n"
-"Last-Translator: Fran Diéguez <frandieguez@gnome.org>\n"
+"POT-Creation-Date: 2011-09-15 21:00+0200\n"
+"PO-Revision-Date: 2011-09-15 21:01+0200\n"
+"Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
 "Language-Team: Galician <gnome-l10n-gl@gnome.org>\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #: ../data/empathy.desktop.in.in.h:1
@@ -58,8 +58,12 @@ msgstr "Volume da chamada, como porcentaxe."
 msgid "Camera device"
 msgstr "Dispositivo da cámara"
 
-# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "Posición da cámara"
+
+# rever
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -68,17 +72,17 @@ msgstr ""
 "alcume (tabulador) nunha conversa de grupo."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "Tema da xanela de conversa"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Chat window theme variant"
 msgstr "Variante do tema da xanela de charla"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
@@ -86,46 +90,46 @@ msgstr ""
 "ex., «gl, pt, en»)."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "Lista de contactos compacta"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "Se se deberían usar xestores de conexión"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "Criterio de ordenación da lista de contactos"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr ""
 "Dispositivo de cámara predeterminado para usar nas chamadas de vídeo, p.ex. /"
 "dev/video0."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
 msgstr "O cartafol predeterminado desde o que seleccionar unha imaxe de avatar"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr "Desactivar as notificacións emerxentes cando se está ausente"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr "Desactivar os sons cando se está ausente"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
 msgstr "Mostrar os eventos de entrada na área de estado"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -133,272 +137,277 @@ msgstr ""
 "Mostrar os eventos entrantes na área de estado. Se é falso mostrarllos "
 "directamente ao usuario."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Echo cancellation support"
 msgstr "Compatibilidade de cancelación de eco"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr "Empathy pode publicar a localización dos usuarios"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy pode usar o GPS para seguir a localización"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy pode usar a rede de móbiles para seguir a localización"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy pode usar a rede para adiviñar a localización"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr "Cartafol de descargas predeterminado do Empathy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
 msgstr "Empathy migrou os seus rexistros de butterfly"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr "O Empathy debería pórse automaticamente en ausente ao estar inactivo"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "O Empathy debería conectarse automaticamente ao inicio"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "O Empathy debería reducir a precisión da localización"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
 "O Empathy debería usar o avatar do contacto como a icona da xanela de "
 "conversa"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr "Activar as ferramentas de desenvolvedor WebKit"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "Activar as notificacións emerxentes para as mensaxes novas"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "Activar a verificación ortográfica"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "Agochar a xanela principal"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "Agochar a xanela principal."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "Carácter de completado de alcume"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "Abrir as novas conversas en xanelas separadas"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "Ruta do tema de Adium para usar"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
 "Ruta do tema de Adium para usar se o tema usado para o chat é de Adium."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Reproducir un son para as mensaxes entrantes"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "Reproducir un son para as conversas novas"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Reproducir un son para as mensaxes saíntes"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "Reproducir un son cando un contacto inicia unha sesión"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "Reproducir un son cando un contacto saia da sesión"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "Reproducir un son cando iniciamos a sesión"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "Reproducir un son cando saímos da sesión"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Facer emerxer unha notificación cando a conversa non está enfocada"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "Facer emerxer unha notificación cando un contacto entra"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "Facer emerxer unha notificación cando un contacto sae"
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr ""
+"Posición onde debe estar a vista previa da cámara durante unha chamada."
+
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Show Balance in contact list"
 msgstr "Mostrar o balance na lista de contactos"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "Mostrar os avatares"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "Mostrar a lista de contactos nas salas"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr "Mostrar unha indicación sobre pechar a xanela principal"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr "Mostrar os contactos desconectados"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
 msgstr "Mostrar os protocolos"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "Idiomas para a corrección ortográfica"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr ""
 "O cartafol predeterminado en que gardar as transferencias de ficheiros."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
 msgstr "O último cartafol desde onde foi escollida unha imaxe de avatar."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
 msgstr "A posición do panel lateral da xanela de conversa"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr ""
 "A posición almacenada (en píxeles) do panel lateral da xanela de conversa."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "O tema usado para mostrar as conversa nas xanelas de conversa."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr ""
 "A variante do tema que se usará para mostrar a conversa nas xanelas de chat."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Usar emoticonas gráficas"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "Usar sons de notificación"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "Usar un tema para as salas de conversa"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr ""
 "Indica se o Empathy pode ou non publicar a localización do usuario aos seus "
 "contactos."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr ""
 "Indica se o Empathy pode usar ou non o GPS para adiviñar a localización."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
 "Indica se o Empathy pode ou non usar a rede de telefonía móbil para adiviñar "
 "a localización."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
 msgstr ""
 "Indica se o Empathy pode ou non usar a rede para adiviñar a localización."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "Indica se Empathy migrou os seus rexistros de butterfly."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr ""
 "Indica se o Empathy debería iniciar a sesión nas súas contas automaticamente "
 "ao inicio ou non."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
@@ -406,7 +415,7 @@ msgstr ""
 "inactivo."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
@@ -414,14 +423,14 @@ msgstr ""
 "motivos de privacidade."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 "Indica se o Empathy debería usar o avatar dos contactos como a icona da "
 "xanela da conversa ou non."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
@@ -429,7 +438,7 @@ msgstr ""
 "deberían ser activadas."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
@@ -438,7 +447,7 @@ msgstr ""
 "desconectarse automaticamente ou non."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr ""
@@ -446,84 +455,84 @@ msgstr ""
 "as quere verificar."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr ""
 "Indica se converter ou non as emoticonas en imaxes gráficas nas conversas."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr "Indica se activar o filtro de cancelación de eco de Pulseaudio."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr ""
 "Indica se reproducir ou non un son para notificar que os contactos inician "
 "unha sesión na rede."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
 "Indica se reproducir ou non un son para notificar que os contactos terminan "
 "unha sesión na rede."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "Indica se reproducir ou non un son para notificar os eventos."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr ""
 "Indica se reproducir ou non un son para notificar as mensaxes entrantes."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Indica se reproducir ou non un son para notificar as conversas novas."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Indica se reproducir ou non un son para notificar as mensaxes saíntes."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr ""
 "Indica se reproducir ou non un son cando se inicia unha sesión na rede."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Indica se reproducir ou non un son cando se sae da sesión na rede."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr ""
 "Indica se reproducir ou non un son para notificar cando se está ocupado ou "
 "ausente."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr ""
 "Indica se mostrar ou non unha notificación emerxente cando un contacto está "
 "desconectado."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr ""
 "Indica se mostrar ou non unha notificación emerxente cando un contacto está "
 "conectado."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -532,19 +541,19 @@ msgstr ""
 "mensaxe nova, aínda cando a conversa xa estea aberta mais non estea enfocada."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr ""
 "Indica se mostrar ou non unha notificación emerxente cando se reciba unha "
 "mensaxe nova."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show account balances in the contact list."
 msgstr "Indica se mostrar ou non os balances na lista de contactos."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
@@ -552,38 +561,38 @@ msgstr ""
 "das xanelas de conversa."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr ""
 "Indica se mostrar ou non os contactos que están desconectados na lista de "
 "contactos."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
 msgstr ""
 "Indica se mostrar ou non as notificacións emerxentes cando se está ausente "
 "ou ocupado."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr ""
 "Indica se mostrar ou non os protocolos para os contacto na lista de "
 "contactos."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Indica se mostrar ou non a lista de contactos nas salas de conversa."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "Indica se mostrar ou non a lista de contactos no modo compacto."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -592,12 +601,12 @@ msgstr ""
 "principal co botón 'x' da barra de título."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "Indica se usar ou non o tema para as salas de conversa."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -910,72 +919,83 @@ msgstr[1] "Hai %d meses"
 msgid "in the future"
 msgstr "no futuro"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:539
+#: ../libempathy-gtk/empathy-account-chooser.c:540
 msgid "All accounts"
 msgstr "Tódalas contas"
 
-#: ../libempathy-gtk/empathy-account-widget.c:693
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "Conta"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "Contrasinal"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Porto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:768
-#: ../libempathy-gtk/empathy-account-widget.c:825
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1166
+# rever
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "As miñas contas web"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "A conta %s edítase mediante My Web Accounts."
+msgid "The account %s is edited via %s."
+msgstr "A conta %s edítase mediante %s."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1172
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "Non é posíbel editar a conta %s en Empathy."
 
 # rever
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
 msgstr "Iniciar My Web Accounts"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1532
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "Editar %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Nome de _usuario:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1850
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "A_plicar"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1880
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
 msgstr "Iniciar sesi_ón"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1954
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "Esta conta xa existe no servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1957
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "Crear unha nova conta no servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2149
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "Ca_ncelar"
 
@@ -985,20 +1005,20 @@ msgstr "Ca_ncelar"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2427
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s sobre %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2453
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "Conta %s"
 
 # rever
-#: ../libempathy-gtk/empathy-account-widget.c:2457
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "Conta nova"
 
@@ -1509,23 +1529,23 @@ msgstr "Non se lle permite cambiar o asunto"
 msgid "“%s� is not a valid contact ID"
 msgstr "«%s» non é un ID de contacto válido"
 
-#: ../libempathy-gtk/empathy-chat.c:1030
+#: ../libempathy-gtk/empathy-chat.c:1058
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear, limpa todas as mensaxes da conversa actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1033
+#: ../libempathy-gtk/empathy-chat.c:1061
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topic>, estabelece o asunto da conversa actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1064
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <chatroom id>, unirse a unha nova sala de conversa"
 
-#: ../libempathy-gtk/empathy-chat.c:1039
+#: ../libempathy-gtk/empathy-chat.c:1067
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <chatroom id>, unirse a unha nova sala de conversa"
 
-#: ../libempathy-gtk/empathy-chat.c:1043
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1533,23 +1553,23 @@ msgstr ""
 "/part [<chat room ID>] [<reason>]: abandonar a sala de char, por omisión a "
 "actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1047
+#: ../libempathy-gtk/empathy-chat.c:1075
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <contact id> [<message>], abre unha conversa privada"
 
-#: ../libempathy-gtk/empathy-chat.c:1050
+#: ../libempathy-gtk/empathy-chat.c:1078
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <contact id> <message>, abre unha conversa privada"
 
-#: ../libempathy-gtk/empathy-chat.c:1053
+#: ../libempathy-gtk/empathy-chat.c:1081
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nickname>, cambia o seu nome de usuario no servidor actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1056
+#: ../libempathy-gtk/empathy-chat.c:1084
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <message>, envía unha mensaxe ACTION á conversa actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1059
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1559,11 +1579,11 @@ msgstr ""
 "unha mensaxe que comeza cunha '/'. Por exemplo: \"/say /join úsase para "
 "unirse a unha nova sala de conversa\""
 
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ID do contacto>: mostra información sobre un contacto"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1571,119 +1591,119 @@ msgstr ""
 "/help [<command>], mostra todas as ordes admitidas. Se <command> está "
 "definida, mostra o seu uso."
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1112
 #, c-format
 msgid "Usage: %s"
 msgstr "Uso: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1116
+#: ../libempathy-gtk/empathy-chat.c:1157
 msgid "Unknown command"
 msgstr "Orde descoñecida"
 
-#: ../libempathy-gtk/empathy-chat.c:1242
+#: ../libempathy-gtk/empathy-chat.c:1283
 msgid "Unknown command; see /help for the available commands"
 msgstr "Orde descoñecida, vexa /help para obter as ordes dispoñíbeis"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1412
+#: ../libempathy-gtk/empathy-chat.c:1453
 msgid "insufficient balance to send message"
 msgstr "non ten balance suficiente para enviar a mensaxe"
 
-#: ../libempathy-gtk/empathy-chat.c:1414
+#: ../libempathy-gtk/empathy-chat.c:1455
 msgid "not capable"
 msgstr "non é posíbel"
 
-#: ../libempathy-gtk/empathy-chat.c:1421
+#: ../libempathy-gtk/empathy-chat.c:1462
 msgid "offline"
 msgstr "desconectado"
 
-#: ../libempathy-gtk/empathy-chat.c:1424
+#: ../libempathy-gtk/empathy-chat.c:1465
 msgid "invalid contact"
 msgstr "contacto incorrecto"
 
-#: ../libempathy-gtk/empathy-chat.c:1427
+#: ../libempathy-gtk/empathy-chat.c:1468
 msgid "permission denied"
 msgstr "permiso denegado"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1430
+#: ../libempathy-gtk/empathy-chat.c:1471
 msgid "too long message"
 msgstr "a mensaxe é demasiado longa"
 
-#: ../libempathy-gtk/empathy-chat.c:1433
+#: ../libempathy-gtk/empathy-chat.c:1474
 msgid "not implemented"
 msgstr "non implementado"
 
-#: ../libempathy-gtk/empathy-chat.c:1437
+#: ../libempathy-gtk/empathy-chat.c:1478
 msgid "unknown"
 msgstr "descoñecido"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1443
+#: ../libempathy-gtk/empathy-chat.c:1484
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Produciuse un erro ao enviar a mensaxe '%s': %s"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1447
+#: ../libempathy-gtk/empathy-chat.c:1488
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Produciuse un erro ao enviar a mensaxe: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1508 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1549 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Asunto:"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1520
+#: ../libempathy-gtk/empathy-chat.c:1561
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Cambiouse o asunto a: %s"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1563
 msgid "No topic defined"
 msgstr "Non se definiu un asunto"
 
-#: ../libempathy-gtk/empathy-chat.c:2031
+#: ../libempathy-gtk/empathy-chat.c:2072
 msgid "(No Suggestions)"
 msgstr "(Sen suxestións)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2099
+#: ../libempathy-gtk/empathy-chat.c:2140
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Engadir «%s» ao dicionario"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2136
+#: ../libempathy-gtk/empathy-chat.c:2177
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Engadir «%s» ao dicionario de %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2206
+#: ../libempathy-gtk/empathy-chat.c:2247
 msgid "Insert Smiley"
 msgstr "Inserir unha emoticona"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2224
+#: ../libempathy-gtk/empathy-chat.c:2265
 #: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "_Enviar"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2278
+#: ../libempathy-gtk/empathy-chat.c:2319
 msgid "_Spelling Suggestions"
 msgstr "Suxestións de _ortografía"
 
-#: ../libempathy-gtk/empathy-chat.c:2367
+#: ../libempathy-gtk/empathy-chat.c:2408
 msgid "Failed to retrieve recent logs"
 msgstr "Produciuse un fallo ao obter os rexistros recentes"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:2504
+#: ../libempathy-gtk/empathy-chat.c:2545
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s desconectou"
@@ -1691,12 +1711,12 @@ msgstr "%s desconectou"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2511
+#: ../libempathy-gtk/empathy-chat.c:2552
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s foi expulsado por %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2514
+#: ../libempathy-gtk/empathy-chat.c:2555
 #, c-format
 msgid "%s was kicked"
 msgstr "%s foi expulsado"
@@ -1704,17 +1724,17 @@ msgstr "%s foi expulsado"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2522
+#: ../libempathy-gtk/empathy-chat.c:2563
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s foi vetado por %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2525
+#: ../libempathy-gtk/empathy-chat.c:2566
 #, c-format
 msgid "%s was banned"
 msgstr "%s foi excluído"
 
-#: ../libempathy-gtk/empathy-chat.c:2529
+#: ../libempathy-gtk/empathy-chat.c:2570
 #, c-format
 msgid "%s has left the room"
 msgstr "%s deixou a sala"
@@ -1724,69 +1744,73 @@ msgstr "%s deixou a sala"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2538
+#: ../libempathy-gtk/empathy-chat.c:2579
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2604
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s uniuse á sala"
 
-#: ../libempathy-gtk/empathy-chat.c:2588
+#: ../libempathy-gtk/empathy-chat.c:2629
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s agora é coñecido como %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2727
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2768
 #: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:2328
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1391
+#: ../src/empathy-call-window.c:1441 ../src/empathy-call-window.c:2479
 msgid "Disconnected"
 msgstr "Desconectado"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3374
+#: ../libempathy-gtk/empathy-chat.c:3415
 msgid "Would you like to store this password?"
 msgstr "Desexa gardar este contrasinal?"
 
-#: ../libempathy-gtk/empathy-chat.c:3380
+#: ../libempathy-gtk/empathy-chat.c:3421
 msgid "Remember"
 msgstr "Lembrar"
 
-#: ../libempathy-gtk/empathy-chat.c:3390
+#: ../libempathy-gtk/empathy-chat.c:3431
 msgid "Not now"
 msgstr "Agora non"
 
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3475
 msgid "Retry"
 msgstr "Reintentar"
 
-#: ../libempathy-gtk/empathy-chat.c:3438
+#: ../libempathy-gtk/empathy-chat.c:3479
 msgid "Wrong password; please try again:"
 msgstr "O contrasinal é incorrecto, ténteo de novo:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3568
+#: ../libempathy-gtk/empathy-chat.c:3609
 msgid "This room is protected by a password:"
 msgstr "Esta sala está protexida por un contrasinal:"
 
-#: ../libempathy-gtk/empathy-chat.c:3595
+#: ../libempathy-gtk/empathy-chat.c:3636
 msgid "Join"
 msgstr "Unirse"
 
-#: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:3838 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../libempathy-gtk/empathy-chat.c:3852
+#: ../libempathy-gtk/empathy-chat.c:3893
 msgid "Conversation"
 msgstr "Conversa"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3857
+#: ../libempathy-gtk/empathy-chat.c:3898
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1820,7 +1844,7 @@ msgstr "Editar os contactos bloqueados"
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:512
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1485
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
@@ -1964,50 +1988,50 @@ msgid "_Block Contact"
 msgstr "_Bloquear contacto"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:551
+#: ../libempathy-gtk/empathy-individual-menu.c:758
 #: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "_Conversa"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:642
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Audiochamada"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:687
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Videochamada"
 
 # rever
 #: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:740
+#: ../libempathy-gtk/empathy-individual-menu.c:947
 #: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "Conversas _previas"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:781
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "Enviar ficheiro"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:823
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
 msgstr "Compartir o meu escritorio"
 
 # rever
 #: ../libempathy-gtk/empathy-contact-menu.c:525
 #: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:858
-#: ../libempathy-gtk/empathy-individual-widget.c:1373
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "Favorito"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:886
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "Infor_mación"
 
@@ -2018,14 +2042,14 @@ msgstr "_Editar"
 
 # rever
 #: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1076
+#: ../libempathy-gtk/empathy-individual-menu.c:1283
 #: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "Invítao a vostede a esta sala"
 
 # rever
 #: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1122
+#: ../libempathy-gtk/empathy-individual-menu.c:1329
 msgid "_Invite to Chat Room"
 msgstr "Conv_idar a sala de conversa"
 
@@ -2236,7 +2260,7 @@ msgstr "Altitude:"
 #: ../libempathy-gtk/empathy-contact-widget.c:1011
 #: ../libempathy-gtk/empathy-individual-widget.c:607
 #: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "Localización"
 
@@ -2292,7 +2316,7 @@ msgstr "Detalles do contacto"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1515
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "Identificador:"
 
@@ -2370,18 +2394,43 @@ msgstr "Ligaranse entre si os contactos seleccionados na lista da esquerda"
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:141
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "Seleccione a conta a usar para realizar a chamada"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "Chamar"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+msgid "Mobile"
+msgstr "Móbil"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "Traballo"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "Casa"
+
 #. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:597
+#: ../libempathy-gtk/empathy-individual-menu.c:804
 #: ../libempathy-gtk/empathy-new-message-dialog.c:215
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:934
+#: ../libempathy-gtk/empathy-individual-menu.c:1141
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Editar"
@@ -2389,7 +2438,7 @@ msgstr "_Editar"
 # rever
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:960
+#: ../libempathy-gtk/empathy-individual-menu.c:1167
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "_Ligar contactos…"
@@ -2407,7 +2456,7 @@ msgstr ""
 "Desexa eliminar o contacto ligado %s? Teña en conta que eliminaranse tamén "
 "todos os contactos que forman este contacto ligado."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1662
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2492,130 +2541,137 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "_Desligar"
 
-#: ../libempathy-gtk/empathy-log-window.c:633
+#: ../libempathy-gtk/empathy-log-window.c:634
 msgid "History"
 msgstr "Historial"
 
-#: ../libempathy-gtk/empathy-log-window.c:685
+#: ../libempathy-gtk/empathy-log-window.c:689
 msgid "Show"
 msgstr "Mostrar"
 
-#: ../libempathy-gtk/empathy-log-window.c:707
+#: ../libempathy-gtk/empathy-log-window.c:711
 msgid "Search"
 msgstr "Buscar"
 
-#: ../libempathy-gtk/empathy-log-window.c:1155
+#: ../libempathy-gtk/empathy-log-window.c:1159
 #, c-format
 msgid "Chat in %s"
 msgstr "Conversar en %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1157
+#: ../libempathy-gtk/empathy-log-window.c:1161
 #, c-format
 msgid "Chat with %s"
 msgstr "Conversa con %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1207
-#: ../libempathy-gtk/empathy-log-window.c:1354
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e de %B de %Y ás %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1296
+#: ../libempathy-gtk/empathy-log-window.c:1300
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1302
+#: ../libempathy-gtk/empathy-log-window.c:1306
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
-#: ../libempathy-gtk/empathy-log-window.c:1375
-#: ../src/empathy-ft-manager.c:1026
-msgid "%"
-msgstr "%"
-
 #: ../libempathy-gtk/empathy-log-window.c:1382
 #, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s segundo"
+msgstr[1] "%s segundos"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s minuto"
+msgstr[1] "%s minutos"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
+#, c-format
 msgid "Call took %s, ended at %s"
 msgstr "A chamada levou %s, rematou ás %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1714
+#: ../libempathy-gtk/empathy-log-window.c:1729
 msgid "Today"
 msgstr "Hoxe"
 
-#: ../libempathy-gtk/empathy-log-window.c:1718
+#: ../libempathy-gtk/empathy-log-window.c:1733
 msgid "Yesterday"
 msgstr "Mañá"
 
-#: ../libempathy-gtk/empathy-log-window.c:1734
-msgctxt ""
-"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
 msgid "%e %B %Y"
 msgstr "%e de %B de %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1815
-#: ../libempathy-gtk/empathy-log-window.c:3396
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3425
 msgid "Anytime"
 msgstr "Calquera momento"
 
-#: ../libempathy-gtk/empathy-log-window.c:1895
-#: ../libempathy-gtk/empathy-log-window.c:2325
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2353
 msgid "Anyone"
 msgstr "Calquera persoa"
 
-#: ../libempathy-gtk/empathy-log-window.c:2637
+#: ../libempathy-gtk/empathy-log-window.c:2666
 msgid "Who"
 msgstr "Quen"
 
-#: ../libempathy-gtk/empathy-log-window.c:2841
+#: ../libempathy-gtk/empathy-log-window.c:2870
 msgid "When"
 msgstr "Cando"
 
-#: ../libempathy-gtk/empathy-log-window.c:2957
+#: ../libempathy-gtk/empathy-log-window.c:2986
 msgid "Anything"
 msgstr "Calquera cousa"
 
-#: ../libempathy-gtk/empathy-log-window.c:2959
+#: ../libempathy-gtk/empathy-log-window.c:2988
 msgid "Text chats"
 msgstr "Conversas de texto"
 
-#: ../libempathy-gtk/empathy-log-window.c:2961
+#: ../libempathy-gtk/empathy-log-window.c:2990
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "Chamadas"
 
 # rever
-#: ../libempathy-gtk/empathy-log-window.c:2966
+#: ../libempathy-gtk/empathy-log-window.c:2995
 msgid "Incoming calls"
 msgstr "Chamadas entrantes"
 
 # rever
-#: ../libempathy-gtk/empathy-log-window.c:2967
+#: ../libempathy-gtk/empathy-log-window.c:2996
 msgid "Outgoing calls"
 msgstr "Chamadas de voz saíntes"
 
-#: ../libempathy-gtk/empathy-log-window.c:2968
+#: ../libempathy-gtk/empathy-log-window.c:2997
 msgid "Missed calls"
 msgstr "Chamadas perdidas de %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:2990
+#: ../libempathy-gtk/empathy-log-window.c:3019
 msgid "What"
 msgstr "Que"
 
-#: ../libempathy-gtk/empathy-log-window.c:3699
+#: ../libempathy-gtk/empathy-log-window.c:3728
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Ten certeza de eliminar tódolos rexistros das conversas anteriores?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3703
+#: ../libempathy-gtk/empathy-log-window.c:3732
 msgid "Clear All"
 msgstr "Limpar todo"
 
-#: ../libempathy-gtk/empathy-log-window.c:3710
+#: ../libempathy-gtk/empathy-log-window.c:3739
 msgid "Delete from:"
 msgstr "Eliminar desde:"
 
@@ -2623,14 +2679,6 @@ msgstr "Eliminar desde:"
 msgid "<span size=\"x-large\">Loading...</span>"
 msgstr "<span size=\"x-large\">Cargando…</span>"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call"
-msgstr "Chamar"
-
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
 #: ../src/empathy-chat-window.ui.h:3
 msgid "Chat"
@@ -2825,12 +2873,12 @@ msgstr "Chamada de voz finalizada"
 msgid "Edit Custom Messages"
 msgstr "Editar mensaxes personalizadas"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1030
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
 #, c-format
 msgid "Message edited at %s"
 msgstr "Mensaxe editado ás %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1720
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
 msgid "Normal"
 msgstr "Normal"
 
@@ -3142,25 +3190,25 @@ msgid "Instant Message (Empathy)"
 msgstr "Mensaxe instantáneo (Empathy)"
 
 # rever
-#: ../src/empathy.c:354
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "Non conectarse ao inicio"
 
 # rever
-#: ../src/empathy.c:358
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Non mostrar a lista de contactos nin outros diálogos no inicio"
 
 # rever
-#: ../src/empathy.c:373
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr " - Cliente de mensaxaría instantánea Empathy"
 
-#: ../src/empathy.c:560
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
 msgstr "Produciuse un erro ao contactar co Xestor de contas"
 
-#: ../src/empathy.c:562
+#: ../src/empathy.c:639
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3402,7 +3450,7 @@ msgstr "A súa nova conta aínda non foi gardada."
 
 #: ../src/empathy-accounts-dialog.c:345
 #: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1152
+#: ../src/empathy-call-window.c:1175
 msgid "Connecting…"
 msgstr "Conectando…"
 
@@ -3520,11 +3568,11 @@ msgid "People nearby"
 msgstr "Persoas próximas"
 
 # rever
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:127
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr "- Cliente de son/vídeo Empathy"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:152
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "Cliente de son/vídeo Empathy"
 
@@ -3570,33 +3618,33 @@ msgstr "Detalles do contacto"
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1660
+#: ../src/empathy-call-window.c:1782
 #, c-format
 msgid "Call with %s"
 msgstr "Chamar con %s"
 
 #: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:1904
+#: ../src/empathy-call-window.c:2026
 msgid "The IP address as seen by the machine"
 msgstr "O enderezo IP como é visto polo computador"
 
 #: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:1906
+#: ../src/empathy-call-window.c:2028
 msgid "The IP address as seen by a server on the Internet"
 msgstr "O enderezo IP como é visto por un servidor na Internet"
 
 #: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:1908
+#: ../src/empathy-call-window.c:2030
 msgid "The IP address of the peer as seen by the other side"
 msgstr "O enderezo IP do par como é visto pola outra parte"
 
 #: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:1910
+#: ../src/empathy-call-window.c:2032
 msgid "The IP address of a relay server"
 msgstr "O enderezo IP dun servidor de desvío"
 
 #: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:1912
+#: ../src/empathy-call-window.c:2034
 msgid "The IP address of the multicast group"
 msgstr "O enderezo IP do grupo multicast"
 
@@ -3629,12 +3677,12 @@ msgstr "Conectado — %d:%02dm"
 
 # rever
 #: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2647
+#: ../src/empathy-call-window.c:2798
 msgid "Technical Details"
 msgstr "Detalles técnicos"
 
 #: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2685
+#: ../src/empathy-call-window.c:2836
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3644,7 +3692,7 @@ msgstr ""
 "computador"
 
 #: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2690
+#: ../src/empathy-call-window.c:2841
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3654,7 +3702,7 @@ msgstr ""
 "computador"
 
 #: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2696
+#: ../src/empathy-call-window.c:2847
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3664,24 +3712,24 @@ msgstr ""
 "que non permite conexións directas."
 
 #: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2702
+#: ../src/empathy-call-window.c:2853
 msgid "There was a failure on the network"
 msgstr "Produciuse un fallo na rede"
 
 #: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2706
+#: ../src/empathy-call-window.c:2857
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "Non ten instalados os formatos de audio necesarios neste computador"
 
 #: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2709
+#: ../src/empathy-call-window.c:2860
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "Non ten instalados os formatos de vídeo necesarios neste computador"
 
 #: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2721
+#: ../src/empathy-call-window.c:2872
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3693,22 +3741,22 @@ msgstr ""
 "xanela «Depurar» no menú Axuda."
 
 #: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2730
+#: ../src/empathy-call-window.c:2881
 msgid "There was a failure in the call engine"
 msgstr "Produciuse un fallo ao chamar ao motor"
 
 #: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2733
+#: ../src/empathy-call-window.c:2884
 msgid "The end of the stream was reached"
 msgstr "Chegouse ao final do fluxo"
 
 #: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2773
+#: ../src/empathy-call-window.c:2924
 msgid "Can't establish audio stream"
 msgstr "Non é posíbel estabelecer un fluxo de audio"
 
 #: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2783
+#: ../src/empathy-call-window.c:2934
 msgid "Can't establish video stream"
 msgstr "Non é posíbel estabelecer un fluxo de vídeo"
 
@@ -3801,8 +3849,8 @@ msgstr "Activar/desactivar transmisión de vídeo"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2280 ../src/empathy-call-window.c:2281
-#: ../src/empathy-call-window.c:2282 ../src/empathy-call-window.c:2283
+#: ../src/empathy-call-window.c:2431 ../src/empathy-call-window.c:2432
+#: ../src/empathy-call-window.c:2433 ../src/empathy-call-window.c:2434
 msgid "Unknown"
 msgstr "Descoñecido"
 
@@ -3981,7 +4029,7 @@ msgid "Incoming video call"
 msgstr "Chamada de vídeo entrante"
 
 # rever
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1408
 msgid "Incoming call"
 msgstr "Chamada entrante"
 
@@ -3998,7 +4046,7 @@ msgid "%s is calling you. Do you want to answer?"
 msgstr "%s estao chamando. Quérelle responder?"
 
 #: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1414
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Chamada entrante de %s"
@@ -4017,6 +4065,7 @@ msgid "_Answer with video"
 msgstr "_Responder con vídeo"
 
 #: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1414
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Videochamada entrante de %s"
@@ -4184,6 +4233,10 @@ msgstr "Verificando a integridade de «%s»"
 msgid "Hashing \"%s\""
 msgstr "Aplicando o hash «%s»"
 
+#: ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "%"
+
 #: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "Ficheiro"
@@ -4275,7 +4328,7 @@ msgstr "Recargar…"
 msgid "Contact"
 msgstr "Contacto"
 
-#: ../src/empathy-main-window.c:2119
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "Lista de contactos"
 
@@ -4553,60 +4606,72 @@ msgstr "Desactivar os sons cando se estea _ausente ou ocupado"
 msgid "Display incoming events in the notification area"
 msgstr "Mostrar os eventos de entrada na área de notificación"
 
-# rever
 #: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"A cancelación de eco axúdalle a facer o son da súa voz máis claro ás outras "
+"persoas pero pode causar problemas nalgúns computadores. Se vostede ou outra "
+"persoa escoita ruidos estranos ou ten problemas técnicos durante as chamadas "
+"tente desactivando a cancelación do eco e reiniciando a chamada."
+
+# rever
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "Activar as notificacións cando un contacto está conectado"
 
 # rever
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "Activar as notificacións cando un contacto está desconectado"
 
 # rever
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Activar as notificacións cando a _conversa non está enfocada"
 
 # rever
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "Activar a verificación ortográfica para os idiomas:"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "Xeral"
 
-#: ../src/empathy-preferences.ui.h:14
-msgid "Input level"
-msgstr "Nivel de entrada"
-
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input volume"
-msgstr "Volume de entrada"
+msgid "Input level:"
+msgstr "Nivel de entrada:"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "Volume de entrada:"
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "Fontes de localización:"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "Rexistrar conversas"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "Notificacións"
 
 # rever
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Reproducir un son para os eventos"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -4617,25 +4682,25 @@ msgstr ""
 "aproximadas a 1 valor decimal."
 
 # rever
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "Mostrar as _emoticonas como imaxes"
 
 # rever
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "Mostrar a _lista de contactos nas salas"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "Verificación ortográfica"
 
 # rever
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
@@ -4643,53 +4708,53 @@ msgstr ""
 "A lista de idiomas reflicte só naqueles idiomas para os que ten un "
 "dicionario instalado."
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "Temas"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "Variante:"
 
 # rever
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "_Conectar automaticamente ao iniciar"
 
 # rever
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Teléfono móbil"
 
 # rever
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "_Activar as burbullas de notificación"
 
 # rever
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "_Activar as notificacións de son"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Rede (IP, Wifi)"
 
 # rever
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "A_brir as conversas novas en xanelas separadas"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "_Publicar a miña localización aos meus contactos"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "_Reducir a precisión de localización"
 
@@ -4820,16 +4885,16 @@ msgstr ""
 "O xestor de conexión seleccionado non é compatíbel coa extensión de "
 "depuración remota."
 
+#: ../src/empathy-invite-participant-dialog.c:179
 #: ../src/empathy-invite-participant-dialog.c:205
-#: ../src/empathy-invite-participant-dialog.c:231
 msgid "Invite Participant"
 msgstr "Invitar participante"
 
-#: ../src/empathy-invite-participant-dialog.c:206
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Seleccione o contacto que quere invitar á conversa:"
 
-#: ../src/empathy-invite-participant-dialog.c:227
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "Invitar"
 
@@ -4885,12 +4950,14 @@ msgid "Respond"
 msgstr "Responder"
 
 #: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1418
 msgid "Reject"
 msgstr "Rexeitar"
 
 # rever
 #: ../src/empathy-notifications-approver.c:222
 #: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1419
 msgid "Answer"
 msgstr "Responder"
 
@@ -4908,6 +4975,9 @@ msgstr "Declinar"
 msgid "Accept"
 msgstr "Aceptar"
 
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
 #: ../src/empathy-notifications-approver.c:260
 msgid "Provide"
 msgstr "Fornecer"
@@ -4919,25 +4989,25 @@ msgstr "%s tentou chamarlle, pero vostede estaba noutra chamada."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1026 ../src/empathy-call-window.c:1049
+#: ../src/empathy-call-window.c:1047 ../src/empathy-call-window.c:1070
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2576
+#: ../src/empathy-call-window.c:2727
 msgid "On hold"
 msgstr "En espera"
 
-#: ../src/empathy-call-window.c:2579
+#: ../src/empathy-call-window.c:2730
 msgid "Mute"
 msgstr "Silenciar"
 
-#: ../src/empathy-call-window.c:2581
+#: ../src/empathy-call-window.c:2732
 msgid "Duration"
 msgstr "Duración"
 
 # rever
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2584
+#: ../src/empathy-call-window.c:2735
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
diff --git a/po/he.po b/po/he.po
index 2ba58d7b4..a9d657499 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-24 12:11+0300\n"
-"PO-Revision-Date: 2011-08-24 12:12+0200\n"
+"POT-Creation-Date: 2011-09-23 07:57+0300\n"
+"PO-Revision-Date: 2011-09-23 07:58+0200\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
 "Language-Team: \n"
 "Language: \n"
@@ -50,6 +50,10 @@ msgid "Camera device"
 msgstr "Camera device"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "מיקו� המצלמה"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -57,53 +61,53 @@ msgstr ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "Chat window theme"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Chat window theme variant"
 msgstr "Chat window theme variant"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "Compact contact list"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "Connection managers should be used"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "Contact list sort criterion"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr "Default camera device to use in video calls, e.g. /dev/video0."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
 msgstr "Default directory to select an avatar image from"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr "Disable popup notifications when away"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr "Disable sounds when away"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
 msgstr "Display incoming events in the status area"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -111,242 +115,246 @@ msgstr ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Echo cancellation support"
 msgstr "Echo cancellation support"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr "Empathy can publish the user's location"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy can use the GPS to guess the location"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy can use the cellular network to guess the location"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy can use the network to guess the location"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr "Empathy default download folder"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
 msgstr "Empathy has migrated butterfly logs"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy should auto-away when idle"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy should auto-connect on startup"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy should reduce the location's accuracy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy should use the avatar of the contact as the chat window icon"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr "Enable WebKit Developer Tools"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "Enable popup notifications for new messages"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "Enable spell checker"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "Hide main window"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "Hide the main window."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "Nick completed character"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "Open new chats in separate windows"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "Path of the Adium theme to use"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "Path of the Adium theme to use if the theme used for chat is Adium."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Play a sound for incoming messages"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "Play a sound for new conversations"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Play a sound for outgoing messages"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "Play a sound when a contact logs in"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "Play a sound when a contact logs out"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "Play a sound when we log in"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "Play a sound when we log out"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Pop up notifications if the chat isn't focused"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "Pop up notifications when a contact logs in"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "Pop up notifications when a contact logs out"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr "Position the camera preview should be during a call."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Show Balance in contact list"
 msgstr "Show Balance in contact list"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "Show avatars"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "Show contact list in rooms"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr "Show hint about closing the main window"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr "Show offline contacts"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
 msgstr "Show protocols"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "Spell checking languages"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr "The default folder to save file transfers in."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
 msgstr "The last directory that an avatar image was chosen from."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
 msgstr "The position for the chat window side pane"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "The stored position (in pixels) of the chat window side pane."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "The theme that is used to display the conversation in chat windows."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr ""
 "The theme variant that is used to display the conversation in chat windows."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Use graphical smileys"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "Use notification sounds"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "Use theme for chat rooms"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Whether Empathy can publish the user's location to their contacts."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Whether Empathy can use the GPS to guess the location."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Whether Empathy can use the cellular network to guess the location."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Whether Empathy can use the network to guess the location."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "Whether Empathy has migrated butterfly logs."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr ""
 "Whether Empathy should automatically log into your accounts on startup."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
@@ -354,68 +362,68 @@ msgstr ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr ""
 "Whether to check words typed against the languages you want to check with."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "Whether to convert smileys into graphical images in conversations."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr "Whether to enable Pulseaudio's echo cancellation filter."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr ""
 "Whether to play a sound to notify of contacts logging into the network."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
 "Whether to play a sound to notify of contacts logging out of the network."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "Whether to play a sound to notify of events."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Whether to play a sound to notify of incoming messages."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Whether to play a sound to notify of new conversations."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Whether to play a sound to notify of outgoing messages."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "Whether to play a sound when logging into a network."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Whether to play a sound when logging out of a network."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr "Whether to play sound notifications when away or busy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "Whether to show a popup notification when a contact goes offline."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "Whether to show a popup notification when a contact goes online."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -423,41 +431,41 @@ msgstr ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "Whether to show a popup notification when receiving a new message."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show account balances in the contact list."
 msgstr "Whether to show account balances in the contact list."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "Whether to show contacts that are offline in the contact list."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
 msgstr "Whether to show popup notifications when away or busy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "Whether to show protocols for contacts in the contact list."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Whether to show the contact list in chat rooms."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "Whether to show the contact list in compact mode."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -465,11 +473,11 @@ msgstr ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "Whether to use the theme for chat rooms."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -549,141 +557,141 @@ msgstr "התרחשה שגי�ה בזמן ניסיון העברת הקובץ"
 msgid "The other participant is unable to transfer the file"
 msgstr "המשתתף ה�חר ל� יכול להעביר �ת הקובץ"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
 msgid "Unknown reason"
 msgstr "סיבה ל� ידועה"
 
-#: ../libempathy/empathy-utils.c:222
+#: ../libempathy/empathy-utils.c:232
 msgid "Available"
 msgstr "זמין"
 
-#: ../libempathy/empathy-utils.c:224
+#: ../libempathy/empathy-utils.c:234
 msgid "Busy"
 msgstr "עסוק"
 
-#: ../libempathy/empathy-utils.c:227
+#: ../libempathy/empathy-utils.c:237
 msgid "Away"
 msgstr "מרוחק"
 
-#: ../libempathy/empathy-utils.c:229
+#: ../libempathy/empathy-utils.c:239
 msgid "Invisible"
 msgstr "בלתי נר�ה"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:241
 msgid "Offline"
 msgstr "ל� מחובר"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:244
 msgctxt "presence"
 msgid "Unknown"
 msgstr "ל� ידוע"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:284
 msgid "No reason specified"
 msgstr "ל� צויינה סיבה"
 
-#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
 msgid "Status is set to offline"
 msgstr "המצב מוגדר כמנותק"
 
-#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
 #: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "שגי�ת רשת"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
 msgid "Authentication failed"
 msgstr "ה�ימות נכשל"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
 msgid "Encryption error"
 msgstr "שגי�ת הצפנה"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:294
 msgid "Name in use"
 msgstr "הש� בשימוש"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate not provided"
 msgstr "ל� סופקה תעודה"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate untrusted"
 msgstr "התעודה �ינה מ�ובטחת"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
 msgid "Certificate expired"
 msgstr "התעודה ל� תקפה"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
 msgid "Certificate not activated"
 msgstr "התעודה �ינה פעילה"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
 msgid "Certificate hostname mismatch"
 msgstr "ש� המ�רח בתעודה ל� תו��"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
 msgid "Certificate fingerprint mismatch"
 msgstr "טביעת ה�צבע של התעודה �ינה תו�מת"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
 msgid "Certificate self-signed"
 msgstr "תעודה בחתימה עצמית"
 
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate error"
 msgstr "שגי�ת תעודה"
 
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:344
 msgid "Encryption is not available"
 msgstr "�ין הצפנה זמינה"
 
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:346
 msgid "Certificate is invalid"
 msgstr "התעודה שגויה"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:348
 msgid "Connection has been refused"
 msgstr "החיבור נתקל בסירוב"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:350
 msgid "Connection can't be established"
 msgstr "ל� ניתן לקיי� �ת החיבור"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:352
 msgid "Connection has been lost"
 msgstr "החיבור נקטע"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:354
 msgid "This resource is already connected to the server"
 msgstr "המש�ב כבר מחובר לשרת"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:356
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "החיבור הוחלף בחיבור חדש ב�מצעות �ותו המש�ב"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:359
 msgid "The account already exists on the server"
 msgstr "החשבון כבר קיי� בשרת"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:361
 msgid "Server is currently too busy to handle the connection"
 msgstr "השרת עסוק מכדי לטפל בחיבור"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:363
 msgid "Certificate has been revoked"
 msgstr "התעודה נשללה"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:365
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "התעודה משתמשת ב�לגורית� הצפנה בלתי מ�ובטח �ו שהו� חלש מבחינה קריפטוגרפית"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:368
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -691,20 +699,20 @@ msgstr ""
 "�ורך �ישור ה�בטחה של השרת �ו עומק מחרוזת �ישור ה�בטחה של השרת חורגי� "
 "מהמגבלות שהוצבו על ידי ספריית ההצפנה"
 
-#: ../libempathy/empathy-utils.c:519
+#: ../libempathy/empathy-utils.c:529
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "�נשי� בקרבתי"
 
-#: ../libempathy/empathy-utils.c:524
+#: ../libempathy/empathy-utils.c:534
 msgid "Yahoo! Japan"
 msgstr "�Yahoo! יפן"
 
-#: ../libempathy/empathy-utils.c:553
+#: ../libempathy/empathy-utils.c:563
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:554
+#: ../libempathy/empathy-utils.c:564
 msgid "Facebook Chat"
 msgstr "צ׳�ט Facebook"
 
@@ -754,71 +762,81 @@ msgstr[1] "לפני %d חודשי�"
 msgid "in the future"
 msgstr "בעתיד"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:539
+#: ../libempathy-gtk/empathy-account-chooser.c:540
 msgid "All accounts"
 msgstr "כל החשבונות"
 
-#: ../libempathy-gtk/empathy-account-widget.c:693
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "חשבון"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "ססמה"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "שרת"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "פתחה"
 
-#: ../libempathy-gtk/empathy-account-widget.c:768
-#: ../libempathy-gtk/empathy-account-widget.c:825
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1166
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "החשבונות המקווני� שלי"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "החשבון %s נערך דרך החשבונות המקווני� שלי."
+msgid "The account %s is edited via %s."
+msgstr "החשבון %s נערך דרך %s."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1172
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "ל� ניתן לערוך �ת החשבון %s ב־Empathy."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
 msgstr "טעינת החשבונות המקווני� שלי"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1532
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "עריכת %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "ש_� משתמש:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1850
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "ה_חלה"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1880
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
 msgstr "_כניסה"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1954
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "חשבון זה כבר קיי� על השרת"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1957
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "יצירת חשבון חדש על השרת"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2149
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "_ביטול"
 
@@ -827,19 +845,19 @@ msgstr "_ביטול"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2427
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "�%1$s על גבי %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2453
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "חשבון %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2457
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "חשבון חדש"
 
@@ -961,36 +979,36 @@ msgstr "מספר מנוי ה־ICQ שלך?"
 msgid "What is your ICQ password?"
 msgstr "ססמת ה־ICQ שלך?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:184
-#: ../libempathy-gtk/empathy-account-widget-sip.c:217
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "�וטומטי"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:187
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:193
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:222
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "הרשמה"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:227
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "�פשרויות"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "לל�"
 
@@ -1219,14 +1237,18 @@ msgid "Transport:"
 msgstr "תעבורה:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "יש להשתמש בחשבון זה על מנת להתקשר לטלפוני� ניי_חי� וניידי�"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "מהי ססמת חשבון ה־SIP שלך?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "מהו מזהה ההתחברות של חשבון ה־SIP שלך?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "ש_� משתמש:"
 
@@ -1250,36 +1272,36 @@ msgstr "מז_הה Yahoo!:"
 msgid "_Room List locale:"
 msgstr "שפת רשימת ה_חדרי�:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:470
-#: ../libempathy-gtk/empathy-avatar-chooser.c:555
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "ל� ניתן להמיר תמונה"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "�ף �חד מסוגי התמונות המקובלי� �ינ� נתמכי� על ידי המערכת שלך"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:818
-msgid "Couldn't save pixbuf to png"
-msgstr "ל� ניתן לשמור �ת ה־pixbuf ל־png"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+msgid "Couldn't save picture to file"
+msgstr "ל� ניתן לשמור �ת התמונה לקובץ"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:934
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "נ� לבחור �ת התמונה ה�ישית שלך"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
 msgstr "צילו� תמונה..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:941
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "לל� תמונה"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "תמונות"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "כל הקבצי�"
 
@@ -1308,62 +1330,62 @@ msgstr "�יש הקשר המסוי� הזה �ינו תקני"
 msgid "Emergency calls are not supported on this protocol"
 msgstr "�ין תמיכה בשיחות חירו� בפרוטוקול זה"
 
-#: ../libempathy-gtk/empathy-chat.c:702
+#: ../libempathy-gtk/empathy-chat.c:704
 msgid "Failed to open private chat"
 msgstr "�רע כשל בפתיחת שיחה פרטית"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:765
 msgid "Topic not supported on this conversation"
 msgstr "�ין תמיכה בשימוש בנוש� בדיון זה"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:771
 msgid "You are not allowed to change the topic"
 msgstr "�ין לך הרש�ה לשנות �ת הנוש�"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:975
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "\"%s\" �ינו מזהה �יש קשר ל� תקין"
 
-#: ../libempathy-gtk/empathy-chat.c:1030
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: פינוי כל ההודעות מהדיון הנוכחי"
 
-#: ../libempathy-gtk/empathy-chat.c:1033
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <נוש�>:‎ הגדרת נוש� השיחה הנוכחית"
 
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <זיהוי החדר>:‎ הצטרפות לחדר שיחה חדש"
 
-#: ../libempathy-gtk/empathy-chat.c:1039
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <זיהוי החדר>:‎ הצטרפות לחדר שיחה חדש"
 
-#: ../libempathy-gtk/empathy-chat.c:1043
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr "/part [<זיהוי החדר>]‎ [<סיבה>]:‎ עזיבת ערוץ השיחה, הנוכחי הו� בררת המחדל"
 
-#: ../libempathy-gtk/empathy-chat.c:1047
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <זיהוי �יש הקשר> ‎[<הודעה>]:‎ פתיחת צ׳�ט �ישי"
 
-#: ../libempathy-gtk/empathy-chat.c:1050
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <זיהוי �יש הקשר>‎ <הודעה>:‎ פתיחת צ׳�ט פרטי"
 
-#: ../libempathy-gtk/empathy-chat.c:1053
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <כינוי>:‎ שינוי הכינוי שלך בשרת הנוכחי"
 
-#: ../libempathy-gtk/empathy-chat.c:1056
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <הודעה>:‎ שליחת הודעת ACTION לדיון הנוכחי"
 
-#: ../libempathy-gtk/empathy-chat.c:1059
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1372,11 +1394,11 @@ msgstr ""
 "/say <הודעה>:‎ שליחת <הודעה> לדיון הנוכחי. פקודה זו משמשת לשליחת הודעות "
 "המתחילות ב־'/'. לדוגמה: \"/say /join משמשת לצורך התחברות לחדר שיחה חדש\""
 
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <מזהה המשתמש>:‎ הצגת פרטי� על �יש הקשר"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1384,113 +1406,113 @@ msgstr ""
 "/help [<פקודה>]:‎ הצגת כל הפקודות הנתמכות. �� יש הגדרה ל־<פקודה> יוצג �ופן "
 "הפעלתה."
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1114
 #, c-format
 msgid "Usage: %s"
 msgstr "שימוש: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1116
+#: ../libempathy-gtk/empathy-chat.c:1159
 msgid "Unknown command"
 msgstr "פקודה ל� ידועה"
 
-#: ../libempathy-gtk/empathy-chat.c:1242
+#: ../libempathy-gtk/empathy-chat.c:1285
 msgid "Unknown command; see /help for the available commands"
 msgstr "פקודה בלתי מוכרת; יש לעיין ב־‎/help לצפייה בפקודות הזמינות"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1412
+#: ../libempathy-gtk/empathy-chat.c:1455
 msgid "insufficient balance to send message"
 msgstr "המ�זן �ינו מ�פשר לשלוח הודעה"
 
-#: ../libempathy-gtk/empathy-chat.c:1414
+#: ../libempathy-gtk/empathy-chat.c:1457
 msgid "not capable"
 msgstr "לל� יכולת"
 
-#: ../libempathy-gtk/empathy-chat.c:1421
+#: ../libempathy-gtk/empathy-chat.c:1464
 msgid "offline"
 msgstr "ל� מחובר"
 
-#: ../libempathy-gtk/empathy-chat.c:1424
+#: ../libempathy-gtk/empathy-chat.c:1467
 msgid "invalid contact"
 msgstr "�יש קשר ל� תקין"
 
-#: ../libempathy-gtk/empathy-chat.c:1427
+#: ../libempathy-gtk/empathy-chat.c:1470
 msgid "permission denied"
 msgstr "�יש קשר ל� תקין"
 
-#: ../libempathy-gtk/empathy-chat.c:1430
+#: ../libempathy-gtk/empathy-chat.c:1473
 msgid "too long message"
 msgstr "הודעה �רוכה מדי"
 
-#: ../libempathy-gtk/empathy-chat.c:1433
+#: ../libempathy-gtk/empathy-chat.c:1476
 msgid "not implemented"
 msgstr "ל� ממומש"
 
-#: ../libempathy-gtk/empathy-chat.c:1437
+#: ../libempathy-gtk/empathy-chat.c:1480
 msgid "unknown"
 msgstr "ל� ידוע"
 
-#: ../libempathy-gtk/empathy-chat.c:1443
+#: ../libempathy-gtk/empathy-chat.c:1486
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "שגי�ה בשליחת ההודעה '%s': �%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1447
+#: ../libempathy-gtk/empathy-chat.c:1490
 #, c-format
 msgid "Error sending message: %s"
 msgstr "שגי�ה בשליחת ההודעה: �%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1508 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "נוש�:"
 
-#: ../libempathy-gtk/empathy-chat.c:1520
+#: ../libempathy-gtk/empathy-chat.c:1563
 #, c-format
 msgid "Topic set to: %s"
 msgstr "הנוש� הוגדר ל־: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "No topic defined"
 msgstr "ל� נקבע נוש�"
 
-#: ../libempathy-gtk/empathy-chat.c:2031
+#: ../libempathy-gtk/empathy-chat.c:2074
 msgid "(No Suggestions)"
 msgstr "(�ין הצעות)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2099
+#: ../libempathy-gtk/empathy-chat.c:2142
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "הוספת '%s' למילון"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2136
+#: ../libempathy-gtk/empathy-chat.c:2179
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "הוספת '%s' למילון %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2206
+#: ../libempathy-gtk/empathy-chat.c:2249
 msgid "Insert Smiley"
 msgstr "הכנס סמיילי"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2224
+#: ../libempathy-gtk/empathy-chat.c:2267
 #: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "_שלח"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2278
+#: ../libempathy-gtk/empathy-chat.c:2321
 msgid "_Spelling Suggestions"
 msgstr "הצעות _�יות"
 
-#: ../libempathy-gtk/empathy-chat.c:2367
+#: ../libempathy-gtk/empathy-chat.c:2410
 msgid "Failed to retrieve recent logs"
 msgstr "�רע כשל בקבלת הדוחות ה�חרוני�"
 
-#: ../libempathy-gtk/empathy-chat.c:2504
+#: ../libempathy-gtk/empathy-chat.c:2547
 #, c-format
 msgid "%s has disconnected"
 msgstr "�%s התנתק"
@@ -1498,12 +1520,12 @@ msgstr "�%s התנתק"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2511
+#: ../libempathy-gtk/empathy-chat.c:2554
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "�%1$s סולק על ידי %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2514
+#: ../libempathy-gtk/empathy-chat.c:2557
 #, c-format
 msgid "%s was kicked"
 msgstr "�%s סולק"
@@ -1511,17 +1533,17 @@ msgstr "�%s סולק"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2522
+#: ../libempathy-gtk/empathy-chat.c:2565
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "�%1$s נחס� על ידי %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2525
+#: ../libempathy-gtk/empathy-chat.c:2568
 #, c-format
 msgid "%s was banned"
 msgstr "�%s נחס�"
 
-#: ../libempathy-gtk/empathy-chat.c:2529
+#: ../libempathy-gtk/empathy-chat.c:2572
 #, c-format
 msgid "%s has left the room"
 msgstr "�%s עזב �ת החדר"
@@ -1531,68 +1553,72 @@ msgstr "�%s עזב �ת החדר"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2538
+#: ../libempathy-gtk/empathy-chat.c:2581
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2606
 #, c-format
 msgid "%s has joined the room"
 msgstr "�%s הצטרף לחדר"
 
-#: ../libempathy-gtk/empathy-chat.c:2588
+#: ../libempathy-gtk/empathy-chat.c:2631
 #, c-format
 msgid "%s is now known as %s"
 msgstr "�%s נודע כעת בכינוי %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2727
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2784
 #: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:2328
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
+#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
 msgid "Disconnected"
 msgstr "מנותק"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3374
+#: ../libempathy-gtk/empathy-chat.c:3428
 msgid "Would you like to store this password?"
 msgstr "ה�� ברצונך ל�חסן ססמה זו?"
 
-#: ../libempathy-gtk/empathy-chat.c:3380
+#: ../libempathy-gtk/empathy-chat.c:3434
 msgid "Remember"
 msgstr "שמירה"
 
-#: ../libempathy-gtk/empathy-chat.c:3390
+#: ../libempathy-gtk/empathy-chat.c:3444
 msgid "Not now"
 msgstr "ל� כעת"
 
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3488
 msgid "Retry"
 msgstr "ניסיון חוזר"
 
-#: ../libempathy-gtk/empathy-chat.c:3438
+#: ../libempathy-gtk/empathy-chat.c:3492
 msgid "Wrong password; please try again:"
 msgstr "ססמה שגויה; נ� לנסות שוב:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3568
+#: ../libempathy-gtk/empathy-chat.c:3622
 msgid "This room is protected by a password:"
 msgstr "חדר זה מוגן בססמה:"
 
-#: ../libempathy-gtk/empathy-chat.c:3595
+#: ../libempathy-gtk/empathy-chat.c:3649
 msgid "Join"
 msgstr "הצטרפות"
 
-#: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "מחובר"
 
-#: ../libempathy-gtk/empathy-chat.c:3852
+#: ../libempathy-gtk/empathy-chat.c:3906
 msgid "Conversation"
 msgstr "שיחה"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3857
+#: ../libempathy-gtk/empathy-chat.c:3911
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1625,7 +1651,7 @@ msgstr "עריכת �נשי הקשר החסומי�"
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:512
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1485
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
@@ -1759,48 +1785,48 @@ msgid "_Block Contact"
 msgstr "ח_סימת �יש קשר"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:551
+#: ../libempathy-gtk/empathy-individual-menu.c:758
 #: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "_שיחה"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:642
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "שיחה _קולית"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:687
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "שיחת _ויד�ו"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:740
+#: ../libempathy-gtk/empathy-individual-menu.c:947
 #: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "שיחות _קודמות"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:781
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "שליחת קובץ"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:823
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
 msgstr "שיתוף שולחן העבודה שלי"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:525
 #: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:858
-#: ../libempathy-gtk/empathy-individual-widget.c:1373
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "מועדף"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:886
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "_מידע"
 
@@ -1810,13 +1836,13 @@ msgid "_Edit"
 msgstr "ע_ריכה"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1076
+#: ../libempathy-gtk/empathy-individual-menu.c:1284
 #: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "מזמין/ה �ותך לחדר זה"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1122
+#: ../libempathy-gtk/empathy-individual-menu.c:1330
 msgid "_Invite to Chat Room"
 msgstr "ה_זמנה לחדר שיחה"
 
@@ -2021,7 +2047,7 @@ msgstr "גובה:"
 #: ../libempathy-gtk/empathy-contact-widget.c:1011
 #: ../libempathy-gtk/empathy-individual-widget.c:607
 #: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "מיקו�"
 
@@ -2073,7 +2099,7 @@ msgstr "פרטי �יש קשר"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1515
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "מזהה:"
 
@@ -2148,25 +2174,50 @@ msgstr "�נשי הקשר שנבחרו ברשימה שמימין יקושרו ז
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:141
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "נ� לבחור �ת החשבון לשימוש לצורך ההתקשרות"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "התקשרות"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+msgid "Mobile"
+msgstr "סלולרי"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "עבודה"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "בית"
+
 #. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:597
+#: ../libempathy-gtk/empathy-individual-menu.c:804
 #: ../libempathy-gtk/empathy-new-message-dialog.c:215
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:934
+#: ../libempathy-gtk/empathy-individual-menu.c:1142
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "ע_ריכה"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:960
+#: ../libempathy-gtk/empathy-individual-menu.c:1168
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "_קישור �נשי קשר…"
@@ -2184,7 +2235,7 @@ msgstr ""
 "ה�� �כן ברצונך להסיר �ת �יש הקשר המקושר '%s'? נ� לשי� לב שפעולה זו תסיר �ת "
 "כל �נשי הקשר המת�גדי� ל�יש קשר מקושר זה."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1662
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2267,128 +2318,135 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "_ניתוק"
 
-#: ../libempathy-gtk/empathy-log-window.c:633
+#: ../libempathy-gtk/empathy-log-window.c:634
 msgid "History"
 msgstr "היסטוריה"
 
-#: ../libempathy-gtk/empathy-log-window.c:685
+#: ../libempathy-gtk/empathy-log-window.c:689
 msgid "Show"
 msgstr "הצגה"
 
-#: ../libempathy-gtk/empathy-log-window.c:707
+#: ../libempathy-gtk/empathy-log-window.c:711
 msgid "Search"
 msgstr "חיפוש"
 
-#: ../libempathy-gtk/empathy-log-window.c:1155
+#: ../libempathy-gtk/empathy-log-window.c:1159
 #, c-format
 msgid "Chat in %s"
 msgstr "שיחה תחת %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1157
+#: ../libempathy-gtk/empathy-log-window.c:1161
 #, c-format
 msgid "Chat with %s"
 msgstr "שיחה ע� %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1207
-#: ../libempathy-gtk/empathy-log-window.c:1354
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A %d ב%B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1296
+#: ../libempathy-gtk/empathy-log-window.c:1300
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "* %s %s"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1302
+#: ../libempathy-gtk/empathy-log-window.c:1306
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
-#: ../libempathy-gtk/empathy-log-window.c:1375
-#: ../src/empathy-ft-manager.c:1026
-msgid "%"
-msgstr "%"
-
 #: ../libempathy-gtk/empathy-log-window.c:1382
 #, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "שנייה �חת"
+msgstr[1] "%s שניות"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "דקה �חת"
+msgstr[1] "%s דקות"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
+#, c-format
 msgid "Call took %s, ended at %s"
 msgstr "השיחה �רכה %s, הסתיימה ב־%s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1714
+#: ../libempathy-gtk/empathy-log-window.c:1729
 msgid "Today"
 msgstr "היו�"
 
-#: ../libempathy-gtk/empathy-log-window.c:1718
+#: ../libempathy-gtk/empathy-log-window.c:1733
 msgid "Yesterday"
 msgstr "�תמול"
 
-#: ../libempathy-gtk/empathy-log-window.c:1734
-msgctxt ""
-"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
 msgid "%e %B %Y"
 msgstr "ה־%e ב%B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1815
-#: ../libempathy-gtk/empathy-log-window.c:3396
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3444
 msgid "Anytime"
 msgstr "כל זמן שהו�"
 
-#: ../libempathy-gtk/empathy-log-window.c:1895
-#: ../libempathy-gtk/empathy-log-window.c:2325
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2372
 msgid "Anyone"
 msgstr "כל �חד"
 
-#: ../libempathy-gtk/empathy-log-window.c:2637
+#: ../libempathy-gtk/empathy-log-window.c:2685
 msgid "Who"
 msgstr "מי"
 
-#: ../libempathy-gtk/empathy-log-window.c:2841
+#: ../libempathy-gtk/empathy-log-window.c:2889
 msgid "When"
 msgstr "מתי"
 
-#: ../libempathy-gtk/empathy-log-window.c:2957
+#: ../libempathy-gtk/empathy-log-window.c:3005
 msgid "Anything"
 msgstr "כל דבר"
 
-#: ../libempathy-gtk/empathy-log-window.c:2959
+#: ../libempathy-gtk/empathy-log-window.c:3007
 msgid "Text chats"
 msgstr "מלל הצ׳�טי�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2961
+#: ../libempathy-gtk/empathy-log-window.c:3009
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "שיחות"
 
-#: ../libempathy-gtk/empathy-log-window.c:2966
+#: ../libempathy-gtk/empathy-log-window.c:3014
 msgid "Incoming calls"
 msgstr "שיחות נכנסות"
 
-#: ../libempathy-gtk/empathy-log-window.c:2967
+#: ../libempathy-gtk/empathy-log-window.c:3015
 msgid "Outgoing calls"
 msgstr "שיחות יוצ�ות"
 
-#: ../libempathy-gtk/empathy-log-window.c:2968
+#: ../libempathy-gtk/empathy-log-window.c:3016
 msgid "Missed calls"
 msgstr "שיחות של� נענו"
 
-#: ../libempathy-gtk/empathy-log-window.c:2990
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "What"
 msgstr "מה"
 
-#: ../libempathy-gtk/empathy-log-window.c:3699
+#: ../libempathy-gtk/empathy-log-window.c:3747
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "ה�� �כן ברצונך למחוק �ת כל היומני� של הדיוני� ה�חרוני� שלך?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3703
+#: ../libempathy-gtk/empathy-log-window.c:3751
 msgid "Clear All"
 msgstr "מחיקת הכול"
 
-#: ../libempathy-gtk/empathy-log-window.c:3710
+#: ../libempathy-gtk/empathy-log-window.c:3758
 msgid "Delete from:"
 msgstr "מחיקה עד מ־:"
 
@@ -2396,14 +2454,6 @@ msgstr "מחיקה עד מ־:"
 msgid "<span size=\"x-large\">Loading...</span>"
 msgstr "<span size=\"x-large\">בטעינה...</span>"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call"
-msgstr "התקשרות"
-
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
 #: ../src/empathy-chat-window.ui.h:3
 msgid "Chat"
@@ -2585,12 +2635,12 @@ msgstr "שיחה קולית הסתיימה"
 msgid "Edit Custom Messages"
 msgstr "עריכת הודעה מות�מת"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1030
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
 #, c-format
 msgid "Message edited at %s"
 msgstr "ההודעה נערכה ב־%s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1720
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
 msgid "Normal"
 msgstr "רגיל"
 
@@ -2890,23 +2940,23 @@ msgstr "�ין הודעת שגי�ה"
 msgid "Instant Message (Empathy)"
 msgstr "הודעה מיידית (Empathy)"
 
-#: ../src/empathy.c:354
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "ל� להתחבר בהפעלה"
 
-#: ../src/empathy.c:358
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "�ין להציג �ת רשימת �נשי הקשר �ו כל דו־שיח �חר בהפעלה"
 
-#: ../src/empathy.c:373
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr "- לקוח המסרי� המידיי� Empathy"
 
-#: ../src/empathy.c:560
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
 msgstr "שגי�ה ביצירת קשר ע� מנהל החשבונות"
 
-#: ../src/empathy.c:562
+#: ../src/empathy.c:639
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3134,7 +3184,7 @@ msgstr "החשבון החדש שלך ל� נשמר עדיין."
 
 #: ../src/empathy-accounts-dialog.c:345
 #: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1152
+#: ../src/empathy-call-window.c:1216
 msgid "Connecting…"
 msgstr "בהתחברות…"
 
@@ -3241,11 +3291,11 @@ msgstr "לקוח ה�ימות של Empathy"
 msgid "People nearby"
 msgstr "�נשי� בקרבתי"
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:127
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr "- לקוח השמע/הוויד�ו Empathy"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:152
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "לקוח השמע/הוויד�ו Empathy"
 
@@ -3288,33 +3338,33 @@ msgstr "פרטי�"
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1660
+#: ../src/empathy-call-window.c:1825
 #, c-format
 msgid "Call with %s"
 msgstr "שיחה ע� %s"
 
 #: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:1904
+#: ../src/empathy-call-window.c:2069
 msgid "The IP address as seen by the machine"
 msgstr "כתובת ה־IP כפי שנר�ית על ידי המחשב"
 
 #: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:1906
+#: ../src/empathy-call-window.c:2071
 msgid "The IP address as seen by a server on the Internet"
 msgstr "כתובת ה־IP כפי שנר�ית על ידי שרת ב�ינטרנט"
 
 #: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:1908
+#: ../src/empathy-call-window.c:2073
 msgid "The IP address of the peer as seen by the other side"
 msgstr "כתובת ה־IP כדי שנר�ית על ידי עמית מהצד השני"
 
 #: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:1910
+#: ../src/empathy-call-window.c:2075
 msgid "The IP address of a relay server"
 msgstr "כתובת ה־IP של שרת הממסר"
 
 #: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:1912
+#: ../src/empathy-call-window.c:2077
 msgid "The IP address of the multicast group"
 msgstr "כתובת ה־IP של קבוצת התשדורת"
 
@@ -3345,12 +3395,12 @@ msgid "Connected — %d:%02dm"
 msgstr "מחובר — %d:%02d דק׳"
 
 #: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2647
+#: ../src/empathy-call-window.c:2846
 msgid "Technical Details"
 msgstr "פרטי� טכניי�"
 
 #: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2685
+#: ../src/empathy-call-window.c:2884
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3358,7 +3408,7 @@ msgid ""
 msgstr "התכנה של %s �ינה מבינה �ת מבני השמע הנתמכי� על ידי המחשב שלך"
 
 #: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2690
+#: ../src/empathy-call-window.c:2889
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3366,7 +3416,7 @@ msgid ""
 msgstr "התכנה של %s �ינה מבינה �ת מבני הוויד�ו הנתמכי� על ידי המחשב שלך"
 
 #: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2696
+#: ../src/empathy-call-window.c:2895
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3376,24 +3426,24 @@ msgstr ""
 "מ�פשרת חיבורי� ישירי�."
 
 #: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2702
+#: ../src/empathy-call-window.c:2901
 msgid "There was a failure on the network"
 msgstr "�ירעה שגי�ה ברשת"
 
 #: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2706
+#: ../src/empathy-call-window.c:2905
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "מבני השמע הדרושי� לקיו� שיחה זו �ינ� מותקני� במחשבך"
 
 #: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2709
+#: ../src/empathy-call-window.c:2908
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "מבני הוויד�ו הדרושי� לקיו� שיחה זו �ינ� מותקני� במחשבך"
 
 #: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2721
+#: ../src/empathy-call-window.c:2920
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3404,22 +3454,22 @@ msgstr ""
 "ולהוסיף דוחות שנ�ספו מחלון 'ניפוי השגי�ות' שבתפריט העזרה."
 
 #: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2730
+#: ../src/empathy-call-window.c:2929
 msgid "There was a failure in the call engine"
 msgstr "�ירעה שגי�ה במנוע הקרי�ה"
 
 #: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2733
+#: ../src/empathy-call-window.c:2932
 msgid "The end of the stream was reached"
 msgstr "התזרי� הגיע לסיומו"
 
 #: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2773
+#: ../src/empathy-call-window.c:2972
 msgid "Can't establish audio stream"
 msgstr "ל� ניתן לקיי� תזרי� שמע"
 
 #: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2783
+#: ../src/empathy-call-window.c:2982
 msgid "Can't establish video stream"
 msgstr "ל� ניתן לקיי� תזרי� ויד�ו"
 
@@ -3510,8 +3560,8 @@ msgstr "החלפת מצב העברת ויד�ו"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2280 ../src/empathy-call-window.c:2281
-#: ../src/empathy-call-window.c:2282 ../src/empathy-call-window.c:2283
+#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
+#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
 msgid "Unknown"
 msgstr "ל� ידוע"
 
@@ -3680,7 +3730,7 @@ msgstr "ניהול חדרי שיחה מועדפי�"
 msgid "Incoming video call"
 msgstr "שיחה קולית נכנסת"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
 msgid "Incoming call"
 msgstr "שיחה נכנסת"
 
@@ -3695,7 +3745,7 @@ msgid "%s is calling you. Do you want to answer?"
 msgstr "�%s מתקשר �ליך, ה�� ברצונך לענות?"
 
 #: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming call from %s"
 msgstr "שיחה נכנסת מ־%s"
@@ -3713,6 +3763,7 @@ msgid "_Answer with video"
 msgstr "מ_ענה ע� ויד�ו"
 
 #: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "שיחת ויד�ו נכנסת מ־%s"
@@ -3864,6 +3915,10 @@ msgstr "נבדקת השלמות של \"%s\""
 msgid "Hashing \"%s\""
 msgstr "מתבצע גיבוב ל־\"%s\""
 
+#: ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "%"
+
 #: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "קובץ"
@@ -3948,7 +4003,7 @@ msgstr "Top Up..."
 msgid "Contact"
 msgstr "�יש קשר"
 
-#: ../src/empathy-main-window.c:2119
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "רשימת �נשי קשר"
 
@@ -4208,54 +4263,65 @@ msgid "Display incoming events in the notification area"
 msgstr "הצגת �ירועי� נכנסי� ב�זור הדיווחי�"
 
 #: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"ביטול ההד הופך �ת השיחות הקוליות שלך לצלולות יותר עבור הצד השני �ך עלולות "
+"לגרו� לתקלות במספר מחשבי�. �� בצד שלך �ו בצד השני נשמעי� רעשי� מוזרי� �ו "
+"קטיעות במהלך השיחה כד�י לנסות לכבות �ת ביטול ההד ולהתחיל בשיחה מחדש."
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "הפעלת התרעות כ�שר �יש קשר מתחבר"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "הפעלת התרעות כ�שר �יש קשר מתנתק"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "�יפשור התרעות כ�שר חלון ה_שיחה �ינו ממוקד"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "הפעלת בדיקת �יות עבור השפות:"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "כללי"
 
-#: ../src/empathy-preferences.ui.h:14
-msgid "Input level"
-msgstr "רמת הקלט"
-
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input volume"
-msgstr "עצמת הקלט"
+msgid "Input level:"
+msgstr "רמת הקלט:"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "עצמת הקלט:"
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "מקורות המיקומי�:"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "רישו� השיחות"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "התרעות"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "השמעת צליל עבור �ירועי�"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "פרטיות"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -4264,70 +4330,70 @@ msgstr ""
 "הפחתת רמת הדיוק של המיקו� �ומרת שהמידע המדויק ביותר שיפורס� הו� העיר, המדינה "
 "וה�רץ שלך. הדיוק של נקודות ציון מ־GPS יהיו ע� מספר עשרוני 1."
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "הצגת _סמיילי� כתמונות"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "הצגת _רשימת �נשי קשר בחדרי�"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "צלילי�"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "בדיקת �יות"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "ברשימת השפות מוצגות שפות שעבורן מותקני� �צלך מילוני�."
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "ערכות נוש�"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "הגוון:"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "התחברות _�וטומטית ע� ההפעלה"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "טלפון _סלולרי"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "ה_פעלת התרעות בתוך בועה"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "ה_פעלת התרעות קוליות"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_רשת (IP, �לחוטית)"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "_פתיחת שיחות חדשות בחלונות נפרדי�"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "_פרסו� המיקו� שלי ל�נשי הקשר שלי"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "ה_פחתת דיוק המיקו�"
 
@@ -4453,16 +4519,16 @@ msgid ""
 "extension."
 msgstr "מנהל החיבורי� שנבחר �ינו תומך בהרחבת ניפוי שגי�ות מרחוק."
 
+#: ../src/empathy-invite-participant-dialog.c:179
 #: ../src/empathy-invite-participant-dialog.c:205
-#: ../src/empathy-invite-participant-dialog.c:231
 msgid "Invite Participant"
 msgstr "הזמנת משתתפי�"
 
-#: ../src/empathy-invite-participant-dialog.c:206
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "נ� לבחור �נשי קשר להזמנה לדיון:"
 
-#: ../src/empathy-invite-participant-dialog.c:227
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "הזמנה"
 
@@ -4514,11 +4580,13 @@ msgid "Respond"
 msgstr "תגובה"
 
 #: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1459
 msgid "Reject"
 msgstr "דחייה"
 
 #: ../src/empathy-notifications-approver.c:222
 #: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1460
 msgid "Answer"
 msgstr "מענה"
 
@@ -4536,6 +4604,9 @@ msgstr "סירוב"
 msgid "Accept"
 msgstr "�ישור"
 
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
 #: ../src/empathy-notifications-approver.c:260
 msgid "Provide"
 msgstr "×”×–× ×”"
@@ -4547,24 +4618,24 @@ msgstr "התקבלה בקשת שיחה מ×�ת %s, ×�ך ב×�ותו הזמן כב×
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1026 ../src/empathy-call-window.c:1049
+#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2576
+#: ../src/empathy-call-window.c:2775
 msgid "On hold"
 msgstr "בהמתנה"
 
-#: ../src/empathy-call-window.c:2579
+#: ../src/empathy-call-window.c:2778
 msgid "Mute"
 msgstr "השתק"
 
-#: ../src/empathy-call-window.c:2581
+#: ../src/empathy-call-window.c:2780
 msgid "Duration"
 msgstr "משך"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2584
+#: ../src/empathy-call-window.c:2783
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02d דק׳"
diff --git a/po/hi.po b/po/hi.po
index 0d1ee97f8..96be62775 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -2,20 +2,21 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Rajesh Ranjan <rranjan@redhat.com>, 2008, 2009.
+# Rajesh Ranjan <rranjan@redhat.com>, 2008, 2009, 2011.
 # Rajesh Ranjan <rajesh672@gmail.com>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy.master.hi\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-03-14 13:26+0000\n"
-"PO-Revision-Date: 2011-03-28 13:44+0530\n"
-"Last-Translator: Rajesh Ranjan\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2011-09-08 12:16+0000\n"
+"PO-Revision-Date: 2011-09-14 13:24+0530\n"
+"Last-Translator: Rajesh <rranjan>\n"
 "Language-Team: Hindi <Indlinux>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.2\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "\n"
 "\n"
@@ -23,6 +24,7 @@ msgstr ""
 "\n"
 "\n"
 "\n"
+"Language: hi\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
@@ -30,420 +32,471 @@ msgstr ""
 
 #: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
-msgstr ""
+msgstr "Empathy"
 
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
-msgstr ""
+msgstr "�ंपैथी इंटरनेट मैसेजिंग"
 
 #: ../data/empathy.desktop.in.in.h:4
-#, fuzzy
 #| msgid "Client:"
 msgid "IM Client"
-msgstr "क�ला�ंट:"
+msgstr "IM क�ला�ंट"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
 msgstr "नई गपशप के लि� हमेशा अलग गपशप विंडो खोलता है"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr "काल मात�रा"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr "काल मात�रा बतौर प�रतिशत"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Camera device"
+msgstr "कैमरा य�क�ति"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "कैमरा स�थिति"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
-msgstr "उपनाम के बाद जोड़ने के लि� वर�ण जब उपनाम समाप�ति (टैब) में समूह गपशप में प�रयोग करता है."
+msgstr ""
+"उपनाम के बाद जोड़ने के लि� वर�ण जब उपनाम समाप�ति (टैब) में समूह गपशप में "
+"प�रयोग करता है."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "चैट विंडो थीम"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#| msgid "Chat window theme"
+msgid "Chat window theme variant"
+msgstr "चैट विंडो थीम चर"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 #| msgid ""
 #| "Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
-msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr "वर�ण जा�चकर�ता भाषा की कौमा से अलग की ह�ई सूची (उदा. en, fr, nl)."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr ""
+"वर�तनी जा�चकर�ता भाषा की कौमा से अलग की ह�ई सूची (उदा. \"en, fr, nl\")."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "संक�चित संपर�क सूची"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 #| msgid "NetworkManager should be used"
 msgid "Connection managers should be used"
-msgstr "NetworkManager प�रयोग करना चाहि�"
+msgstr "कनेक�शन मैनेजर का प�रयोग करना चाहि�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 #| msgid "Contact list sort criterium"
 msgid "Contact list sort criterion"
-msgstr "सूची छा�ट मापदंड से संपर�क करें"
+msgstr "संपर�क सूची छा�ट मापदंड"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
 msgstr "कोई अवतार छवि इससे च�नने के लि� तयश�दा निर�देशिका"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr "दूर रहने पर पॉपअप अधिसूचना निष�क�रिय करें"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr "दूर रहने पर ध�वनि निष�क�रिय करें"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+msgid "Echo cancellation support"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr "Empathy तयश�दा डाउनलोड फ़ोल�डर"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 #, fuzzy
 #| msgid "Empathy should auto-connect on startup"
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy आरंभ में स�वतः ज�ड़ जाना चाहि�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy आरंभ में स�वतः ज�ड़ जाना चाहि�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy संपर�क को अवतार का प�रयोग बतौर गपशप विंडो प�रतीक करना चाहि�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "नये संदेश के लि� पॉपअप अधिसूचना सक�रिय करें"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "वर�तनी जा�च सक�रिय करें"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "म�ख�य विंडो छिपा��"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "म�ख�य विंडो छिपा��"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "उपनाम पूर�ण ह�आ वर�ण"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "अलग विंडो में नया गपशप विंडो खोलें"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 #, fuzzy
 #| msgid "Whether to use the theme for chat rooms or not."
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "गपशप कक�ष से प�रसंग का प�रयोग करना है."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "आने वाले संदेश के लि� कोई ध�वनि बजा��"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "नई वार�तालाप के लि� कोई ध�वनि बजा��"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "बाहर जाने वाले संदेश के लि� कोई ध�वनि बजा��"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "किसी संपर�क के लॉगिन होने पर कोई ध�वनि बजा��"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "किसी संपर�क के लॉगआउट होने पर कोई ध�वनि बजा��"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "हमारे लॉगिन होने पर कोई ध�वनि बजा��"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "हमारे लॉगआउट होने पर कोई ध�वनि बजा��"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 #, fuzzy
 #| msgid "Popup notifications if the chat isn't focused"
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "गपशप के केंद�रित नहीं रहने पर पॉपअप अधिसूचना"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 #, fuzzy
 #| msgid "Play a sound when a contact logs in"
 msgid "Pop up notifications when a contact logs in"
 msgstr "किसी संपर�क के लॉगिन होने पर कोई ध�वनि बजा��"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 #, fuzzy
 #| msgid "Play a sound when a contact logs out"
 msgid "Pop up notifications when a contact logs out"
 msgstr "किसी संपर�क के लॉगआउट होने पर कोई ध�वनि बजा��"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#, fuzzy
+#| msgid "Show offline contacts"
+msgid "Show Balance in contact list"
+msgstr "ऑफलाइन संपर�क दिखा��"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "अवतार दिखा��"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 #, fuzzy
 #| msgid "_Show Contact List"
 msgid "Show contact list in rooms"
 msgstr "संपर�क सूची दिखा�� (_S)"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr "म�ख�य विंडो बंद करने के बारे में संकेत दिखा��"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr "ऑफलाइन संपर�क दिखा��"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 #| msgid "Protocol"
 msgid "Show protocols"
-msgstr "प�रोटोकाल"
+msgstr "प�रोटोकाल दिखा��"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "वर�तनीजांच भाषा"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr "तयश�दा फ़ोल�डर जिसमें फ़ाइल हस�तांतरण अंदर सहेजना है."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
 msgstr "अंतिम निर�देशिका जिससे अवतार छवि च�ना गया."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "प�रसंग जो गपशप विंडो में वार�तालाप दिखाने के लि� प�रय�क�त है"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#, fuzzy
+#| msgid "The theme that is used to display the conversation in chat windows."
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "प�रसंग जो गपशप विंडो में वार�तालाप दिखाने के लि� प�रय�क�त है"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "आलेखीय स�माइली का प�रयोग करें"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "अधिसूचना ध�वनि का प�रयोग करें"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "गपशप कक�ष के लि� प�रसंग का प�रयोग करें"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 #| msgid ""
 #| "Whether or not Empathy should use the avatar of the contact as the chat "
 #| "window icon."
 msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "क�या �ंपेथी को बतौर गपशप विंडो प�रतीक संपर�क के अवतार का प�रयोग करना चाहि�."
+msgstr "क�या �ंपेथी को स�थान के अन�मान के लि� जीपी�स का प�रयोग करना चाहि�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 #| msgid ""
 #| "Whether or not Empathy should use the avatar of the contact as the chat "
 #| "window icon."
 msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "क�या �ंपेथी को बतौर गपशप विंडो प�रतीक संपर�क के अवतार का प�रयोग करना चाहि�."
+msgstr "क�या �ंपेथी को स�थान के अन�मान के लि� सेल संजाल का प�रयोग करना चाहि�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 #| msgid ""
 #| "Whether or not Empathy should use the avatar of the contact as the chat "
 #| "window icon."
 msgid "Whether Empathy can use the network to guess the location."
-msgstr "क�या �ंपेथी को बतौर गपशप विंडो प�रतीक संपर�क के अवतार का प�रयोग करना चाहि�."
+msgstr "क�या �ंपेथी को स�थान के अन�मान के लि� संजाल का प�रयोग करना चाहि�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 #| msgid ""
 #| "Whether or not Empathy should automatically log in to your accounts on "
 #| "startup."
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "क�या �ंपेथी को आरंभ में ही आपके खाता में स�वतः लॉग कर लेना चाहि�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 #, fuzzy
 #| msgid ""
 #| "Whether or not Empathy should automatically log in to your accounts on "
 #| "startup."
-msgid "Whether Empathy should go into away mode automatically if the user is idle."
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr "क�या �ंपेथी को आरंभ में ही आपके खाता में स�वतः लॉग कर लेना चाहि�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+msgid ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 #, fuzzy
 #| msgid ""
 #| "Whether or not Empathy should use the avatar of the contact as the chat "
 #| "window icon."
-msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "क�या �ंपेथी को बतौर गपशप विंडो प�रतीक संपर�क के अवतार का प�रयोग करना चाहि�."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr ""
+"क�या �ंपेथी को बतौर गपशप विंडो प�रतीक संपर�क के अवतार का प�रयोग करना चाहि�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 #, fuzzy
 #| msgid ""
 #| "Whether or not to check words typed against the languages you want to "
 #| "check with."
-msgid "Whether to check words typed against the languages you want to check with."
-msgstr "क�या उन भाषाओं के लि� टाइप कि� शब�दों को जा�चना चाहि� जिसके लि� आप जा�चना चाहते हैं"
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr ""
+"क�या उन भाषाओं के लि� टाइप कि� शब�दों को जा�चना चाहि� जिसके लि� आप जा�चना "
+"चाहते हैं"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 #, fuzzy
 #| msgid ""
 #| "Whether or not to convert smileys into graphical images in conversations."
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "क�या वार�तालाप में आलेखीय छवि में स�माइली को बदलना है."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 #, fuzzy
 #| msgid ""
 #| "Whether or not to play a sound to notify for contacts logging in the "
 #| "network."
 msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "क�या संपर�कों के लि� ध�वनि बजायी जानी चाहि� जो संजाल में लॉगिंग हो रहे हों."
+msgstr ""
+"क�या संपर�कों के लि� ध�वनि बजायी जानी चाहि� जो संजाल में लॉगिंग हो रहे हों."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 #, fuzzy
 #| msgid ""
 #| "Whether or not to play a sound to notify for contacts logging off the "
 #| "network."
-msgid "Whether to play a sound to notify of contacts logging out of the network."
-msgstr "क�या संपर�कों के लि� ध�वनि बजायी जानी चाहि� जो संजाल में लॉग ऑफ़ हो रहे हों."
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr ""
+"क�या संपर�कों के लि� ध�वनि बजायी जानी चाहि� जो संजाल में लॉग ऑफ़ हो रहे हों."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 #, fuzzy
 #| msgid "Whether or not to play a sound to notify for events."
 msgid "Whether to play a sound to notify of events."
 msgstr "क�या घटनाओं के लि� ध�वनि अधिसूचित करने के लि� बजानी है."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 #, fuzzy
 #| msgid "Whether or not to play a sound to notify for incoming messages."
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "क�या आने वाली संदेशों के लि� ध�वनि अधिसूचित करने के लि� बजानी है."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 #, fuzzy
 #| msgid "Whether or not to play a sound to notify for new conversations."
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "क�या नये वार�तालाप के लि� ध�वनि अधिसूचित करने के लि� बजानी है."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 #, fuzzy
 #| msgid "Whether or not to play a sound to notify for outgoing messages."
 msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "क�या बाहर जाने वाले संदेशों के लि� ध�वनि अधिसूचित करने के लि� बजानी है."
+msgstr ""
+"क�या बाहर जाने वाले संदेशों के लि� ध�वनि अधिसूचित करने के लि� बजानी है."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 #| msgid "Whether or not to play a sound when logging in a network."
 msgid "Whether to play a sound when logging into a network."
 msgstr "क�या संजाल में लॉगिंग के दौरान ध�वनि बजानी है."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 #| msgid "Whether or not to play a sound when logging off a network."
 msgid "Whether to play a sound when logging out of a network."
-msgstr "क�या संजाल में लॉग ऑफ के दौरान ध�वनि बजानी है."
+msgstr "क�या संजाल में लॉग आउट के दौरान ध�वनि बजानी है."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 #| msgid "Whether or not to play sound notifications when away or busy."
 msgid "Whether to play sound notifications when away or busy."
 msgstr "दूर या व�यस�त होने पर क�या ध�वनि अधिसूचना बजानी है."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 #| msgid "Whether or not to show popup notifications when away or busy."
 msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "क�या पॉप अप अधिसूचना दिखानी है जब दूर या व�यस�त है."
+msgstr "क�या पॉप अप अधिसूचना दिखानी है जब संपर�क ऑफलाइन होता है."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 #| msgid "Whether or not to show popup notifications when away or busy."
 msgid "Whether to show a popup notification when a contact goes online."
-msgstr "क�या पॉप अप अधिसूचना दिखानी है जब दूर या व�यस�त है."
+msgstr "क�या पॉप अप अधिसूचना दिखानी है जब संपर�क ऑनलाइन होता है."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 #| msgid ""
 #| "Whether or not to show a popup notification when receiving a new message "
 #| "even if the chat is already opened, but not focused."
@@ -451,38 +504,47 @@ msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
 msgstr ""
-"क�या नये संदेश पाने पर पॉपअप अधिसूचना दिखानी है बावजूद कि गपशप पहले से ख�ला है लेकिन "
+"क�या नये संदेश पाने पर पॉपअप अधिसूचना दिखानी है बावजूद कि गपशप पहले से ख�ला "
+"है लेकिन "
 "केंद�रित नहीं है."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 #| msgid ""
 #| "Whether or not to show a popup notification when receiving a new message."
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "क�या नये संदेश पाने पर पॉपअप अधिसूचना दिखानी है."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 #, fuzzy
 #| msgid ""
 #| "Whether or not to show avatars for contacts in the contact list and chat "
 #| "windows."
-msgid "Whether to show avatars for contacts in the contact list and chat windows."
+msgid "Whether to show account balances in the contact list."
 msgstr "संपर�क सूची और गपशप विंजो में क�या अवतार दिखानी है"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#, fuzzy
+#| msgid ""
+#| "Whether or not to show avatars for contacts in the contact list and chat "
+#| "windows."
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "संपर�क सूची और गपशप विंजो में क�या अवतार दिखानी है"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 #, fuzzy
 #| msgid ""
 #| "Whether or not to show contacts that are offline in the contact list."
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "क�या संपर�कों को दिखाना है जो संपर�क सूची में ऑफ़लाइन हैं."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 #, fuzzy
 #| msgid "Whether or not to show popup notifications when away or busy."
 msgid "Whether to show popup notifications when away or busy."
 msgstr "क�या पॉप अप अधिसूचना दिखानी है जब दूर या व�यस�त है."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 #, fuzzy
 #| msgid ""
 #| "Whether or not to show avatars for contacts in the contact list and chat "
@@ -490,19 +552,19 @@ msgstr "कà¥�या पॉप अप अधिसूचना दिखानà¥
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "संपर�क सूची और गपशप विंजो में क�या अवतार दिखानी है"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 #, fuzzy
 #| msgid "Whether to show the contact list in compact mode or not."
 msgid "Whether to show the contact list in chat rooms."
 msgstr "क�या संपर�क सूची संहत सूची में दिखानी है."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 #, fuzzy
 #| msgid "Whether to show the contact list in compact mode or not."
 msgid "Whether to show the contact list in compact mode."
 msgstr "क�या संपर�क सूची संहत सूची में दिखानी है."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 #, fuzzy
 #| msgid ""
 #| "Whether or not to show the message dialog about closing the main window "
@@ -510,16 +572,16 @@ msgstr "कà¥�या संपरà¥�क सूची संहत सूची à
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
-msgstr "क�या संदेश संवाद दिखानी है 'x' बटन के साथ शीर�षक पट�टी में म�ख�य विंडो बंद करने के बारे में."
+msgstr ""
+"क�या संदेश संवाद दिखानी है 'x' बटन के साथ शीर�षक पट�टी में म�ख�य विंडो बंद "
+"करने के बारे में."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 #| msgid "Whether to use the theme for chat rooms or not."
 msgid "Whether to use the theme for chat rooms."
 msgstr "गपशप कक�ष से प�रसंग का प�रयोग करना है."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 #| msgid ""
 #| "Which criterium to use when sorting the contact list. Default is to use "
 #| "sort by the contact's name with the value \"name\". A value of \"state\" "
@@ -529,8 +591,10 @@ msgid ""
 "the contact's name with the value \"name\". A value of \"state\" will sort "
 "the contact list by state."
 msgstr ""
-"संपर�क सूची छांटने के दौरान किस मापदंड को प�रयोग करना है. संपर�क नाम के द�वारा तयश�दा का "
-"प�रयोग करना है \"name\" मान के साथ. \"state\" का मान स�थिति के अन�सार संपर�क सूची को "
+"संपर�क सूची छांटने के दौरान किस मापदंड को प�रयोग करना है. संपर�क नाम के "
+"द�वारा तयश�दा का "
+"प�रयोग करना है \"name\" मान के साथ. \"state\" का मान स�थिति के अन�सार संपर�क "
+"सूची को "
 "छा�टेगा."
 
 #: ../data/empathy-accounts.desktop.in.in.h:1
@@ -539,31 +603,49 @@ msgstr ""
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2242
+#: ../src/empathy-accounts-dialog.c:2324
 msgid "Messaging and VoIP Accounts"
-msgstr ""
+msgstr "मैसेजिंग और  VoIP खाता"
 
 #: ../libempathy/empathy-ft-handler.c:825
-#, fuzzy
 #| msgid "File transfer completed"
 msgid "File transfer completed, but the file was corrupted"
-msgstr "फ़ाइल हस�तांतरण संपन�न"
+msgstr "फ़ाइल हस�तांतरण संपन�न लेकिन फाइल भ�रष�ट था"
 
-#: ../libempathy/empathy-ft-handler.c:1116
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
-msgstr ""
+msgstr "फाइल हस�तांतरण दूरस�थ संपर�क द�वारा समर�थित नहीं"
 
-#: ../libempathy/empathy-ft-handler.c:1172
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is not a regular file"
 msgstr ""
 
-#: ../libempathy/empathy-ft-handler.c:1181
+#: ../libempathy/empathy-ft-handler.c:1176
 msgid "The selected file is empty"
-msgstr ""
+msgstr "चयनित फाइल खाली है"
+
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#, c-format
+#| msgid "Incoming call from %s"
+msgid "Missed call from %s"
+msgstr "%s से मिस काल"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, c-format
+#| msgid "_Call"
+msgid "Called %s"
+msgstr "%s को काल किया"
+
+#: ../libempathy/empathy-message.c:422
+#, c-format
+#| msgid "Incoming call from %s"
+msgid "Call from %s"
+msgstr "%s से काल"
 
 #: ../libempathy/empathy-tp-file.c:268
 msgid "Socket type not supported"
-msgstr ""
+msgstr "साकेट प�रकार समर�थित नहीं है"
 
 #: ../libempathy/empathy-tp-file.c:387
 msgid "No reason was specified"
@@ -589,367 +671,349 @@ msgstr "फ़ाइल हसà¥�तांतरण को कोशिश मà¥
 msgid "The other participant is unable to transfer the file"
 msgstr "दूसरे सहभागी फ़ाइल हस�तांतरण में असमर�थ हैं"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:383
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
 msgid "Unknown reason"
 msgstr "अज�ञात कारण"
 
-#: ../libempathy/empathy-utils.c:305
+#: ../libempathy/empathy-utils.c:222
 msgid "Available"
 msgstr "उपलब�ध"
 
-#: ../libempathy/empathy-utils.c:307
+#: ../libempathy/empathy-utils.c:224
 msgid "Busy"
 msgstr "व�यस�त"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:227
 msgid "Away"
 msgstr "दूर"
 
-#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:229
 msgid "Invisible"
 msgstr "अदृश�य"
 
-#: ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:231
 msgid "Offline"
 msgstr "ऑफ़लाइन"
 
-#: ../libempathy/empathy-utils.c:316
-#: ../src/empathy-streamed-media-window.c:1897
-#: ../src/empathy-streamed-media-window.c:1898
-#: ../src/empathy-streamed-media-window.c:1899
-#: ../src/empathy-streamed-media-window.c:1900
-#: ../src/empathy-call-window.ui.h:18
-#, fuzzy
+#. translators: presence type is unknown
+#: ../libempathy/empathy-utils.c:234
 #| msgctxt "file transfer percent"
 #| msgid "Unknown"
+msgctxt "presence"
 msgid "Unknown"
 msgstr "अज�ञात"
 
-#: ../libempathy/empathy-utils.c:355
-#, fuzzy
+#: ../libempathy/empathy-utils.c:274
 #| msgid "No reason was specified"
 msgid "No reason specified"
 msgstr "कोई कारण निर�दिष�ट नहीं"
 
-#: ../libempathy/empathy-utils.c:357 ../libempathy/empathy-utils.c:413
+#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
 msgid "Status is set to offline"
-msgstr ""
+msgstr "प�रस�थिति ऑफ़लाइन सेट है"
 
-#: ../libempathy/empathy-utils.c:359 ../libempathy/empathy-utils.c:393
+#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "नेटवर�क त�र�टि"
 
-#: ../libempathy/empathy-utils.c:361 ../libempathy/empathy-utils.c:395
+#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
 msgid "Authentication failed"
 msgstr "सत�यापन असफल"
 
-#: ../libempathy/empathy-utils.c:363 ../libempathy/empathy-utils.c:397
+#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
 msgid "Encryption error"
 msgstr "गोपन त�र�टि"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:284
 msgid "Name in use"
 msgstr "प�रयोग में नाम"
 
-#: ../libempathy/empathy-utils.c:367 ../libempathy/empathy-utils.c:399
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
 msgid "Certificate not provided"
 msgstr "प�रमाणपत�र नहीं दिया"
 
-#: ../libempathy/empathy-utils.c:369 ../libempathy/empathy-utils.c:401
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
 msgid "Certificate untrusted"
 msgstr "प�रमाणपत�र गैर विश�वसनीय"
 
-#: ../libempathy/empathy-utils.c:371 ../libempathy/empathy-utils.c:403
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
 msgid "Certificate expired"
 msgstr "प�रमाणपत�र समाप�त"
 
-#: ../libempathy/empathy-utils.c:373 ../libempathy/empathy-utils.c:405
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
 msgid "Certificate not activated"
 msgstr "प�रमाणपत�र सक�रिय नहीं"
 
-#: ../libempathy/empathy-utils.c:375 ../libempathy/empathy-utils.c:407
+#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
 msgid "Certificate hostname mismatch"
 msgstr "प�रमाणपत�र होस�टनेम बेमेल"
 
-#: ../libempathy/empathy-utils.c:377 ../libempathy/empathy-utils.c:409
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate fingerprint mismatch"
 msgstr "प�रमाणपत�र फिंगरप�रिंट बेमेल"
 
-#: ../libempathy/empathy-utils.c:379 ../libempathy/empathy-utils.c:411
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate self-signed"
 msgstr "प�रमाणपत�र स�वहस�ताक�षरित"
 
-#: ../libempathy/empathy-utils.c:381
+#: ../libempathy/empathy-utils.c:300
 msgid "Certificate error"
 msgstr "प�रमाणपत�र त�र�टि"
 
-#: ../libempathy/empathy-utils.c:415
+#: ../libempathy/empathy-utils.c:334
 msgid "Encryption is not available"
-msgstr ""
+msgstr "गोपन उपलब�ध नहीं है"
 
-#: ../libempathy/empathy-utils.c:417
-#, fuzzy
+#: ../libempathy/empathy-utils.c:336
 #| msgid "Certificate not activated"
 msgid "Certificate is invalid"
-msgstr "प�रमाणपत�र सक�रिय नहीं"
+msgstr "प�रमाणपत�र अवैध है"
 
-#: ../libempathy/empathy-utils.c:419
-#, fuzzy
+#: ../libempathy/empathy-utils.c:338
 #| msgid "NetworkManager should be used"
 msgid "Connection has been refused"
-msgstr "NetworkManager प�रयोग करना चाहि�"
+msgstr "कनेक�शन अस�वीकृत किया गया है"
 
-#: ../libempathy/empathy-utils.c:421
-#, fuzzy
+#: ../libempathy/empathy-utils.c:340
 #| msgid "NetworkManager should be used"
 msgid "Connection can't be established"
-msgstr "NetworkManager प�रयोग करना चाहि�"
+msgstr "कनेक�शन स�थापित नहीं किया जा सकता है"
 
-#: ../libempathy/empathy-utils.c:423
-#, fuzzy
+#: ../libempathy/empathy-utils.c:342
 #| msgid "NetworkManager should be used"
 msgid "Connection has been lost"
-msgstr "NetworkManager प�रयोग करना चाहि�"
+msgstr "कनेक�शन ग�म हो गया है"
 
-#: ../libempathy/empathy-utils.c:425
+#: ../libempathy/empathy-utils.c:344
 msgid "This resource is already connected to the server"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:427
-msgid "Connection has been replaced by a new connection using the same resource"
+#: ../libempathy/empathy-utils.c:346
+msgid ""
+"Connection has been replaced by a new connection using the same resource"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:430
+#: ../libempathy/empathy-utils.c:349
 msgid "The account already exists on the server"
-msgstr ""
+msgstr "खाता पहले से सर�वर पर मौजूद है"
 
-#: ../libempathy/empathy-utils.c:432
+#: ../libempathy/empathy-utils.c:351
 msgid "Server is currently too busy to handle the connection"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:434
-#, fuzzy
+#: ../libempathy/empathy-utils.c:353
 #| msgid "Certificate not provided"
 msgid "Certificate has been revoked"
-msgstr "प�रमाणपत�र नहीं दिया"
+msgstr "प�रमाणपत�र वापस किया गया"
 
-#: ../libempathy/empathy-utils.c:436
-msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
+#: ../libempathy/empathy-utils.c:355
+msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:439
+#: ../libempathy/empathy-utils.c:358
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:602
+#: ../libempathy/empathy-utils.c:519
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
-#, fuzzy
 #| msgid "People nearby"
 msgid "People Nearby"
 msgstr "निकटस�थ लोग"
 
-#: ../libempathy/empathy-utils.c:607
-#, fuzzy
+#: ../libempathy/empathy-utils.c:524
 #| msgid "Use _Yahoo Japan"
 msgid "Yahoo! Japan"
-msgstr "_Yahoo जापान का प�रयोग करें"
+msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:636
+#: ../libempathy/empathy-utils.c:553
 msgid "Google Talk"
-msgstr ""
+msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:637
+#: ../libempathy/empathy-utils.c:554
 msgid "Facebook Chat"
-msgstr ""
+msgstr "Facebook Chat"
 
-#: ../libempathy/empathy-time.c:137
+#: ../libempathy/empathy-time.c:88
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d सेकेंड पहले"
+msgstr[1] "%d सेकेंड पहले"
 
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:93
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d मिनट पहले"
 msgstr[1] "%d मिनट पहले"
 
-#: ../libempathy/empathy-time.c:147
+#: ../libempathy/empathy-time.c:98
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d घंटा पहले"
 msgstr[1] "%d घंटा पहले"
 
-#: ../libempathy/empathy-time.c:152
+#: ../libempathy/empathy-time.c:103
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d दिन पहले"
+msgstr[1] "%d दिन पहले"
 
-#: ../libempathy/empathy-time.c:157
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d सप�ताह पहले"
+msgstr[1] "%d सप�ताह पहले"
 
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:113
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d महीने पहले"
+msgstr[1] "%d महीने पहले"
 
-#: ../libempathy/empathy-time.c:167
+#: ../libempathy/empathy-time.c:136
 msgid "in the future"
 msgstr "भविष�य में"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:501
-msgid "All"
-msgstr "सभी"
+#: ../libempathy-gtk/empathy-account-chooser.c:539
+#| msgid "_Accounts"
+msgid "All accounts"
+msgstr "सभी खाता"
 
-#: ../libempathy-gtk/empathy-account-widget.c:679
-#: ../libempathy-gtk/empathy-log-window.c:647
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "खाता"
 
-#: ../libempathy-gtk/empathy-account-widget.c:680
-#, fuzzy
+#: ../libempathy-gtk/empathy-account-widget.c:695
 #| msgid "Password:"
 msgid "Password"
-msgstr "पासवर�ड"
+msgstr "कूटशब�द"
 
-#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "सर�वर"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "पोर�ट"
 
-#: ../libempathy-gtk/empathy-account-widget.c:754
-#: ../libempathy-gtk/empathy-account-widget.c:811
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1163
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+#| msgid "_Accounts"
+msgid "My Web Accounts"
+msgstr "मेरा वेब खाता"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
+msgid "The account %s is edited via %s."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget.c:1169
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget.c:1189
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
-msgstr ""
+msgstr "मेरा वेब खाता लांच करें"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1527
-#, fuzzy
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+#| msgid "_Edit"
+msgid "Edit %s"
+msgstr "संपादन  %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 #| msgid "_Username:"
 msgid "Username:"
 msgstr "उपयोक�ता नाम:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1894
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
-msgstr ""
+msgstr "लागू करें (_p)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1924
-#, fuzzy
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 #| msgid "_Join"
 msgid "L_og in"
-msgstr "शामिल हो�ं (_J)"
-
-#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1990
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:515
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1479
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "खाता:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2001
-#, fuzzy
-#| msgid "Enabled"
-msgid "_Enabled"
-msgstr "सक�षम"
+msgstr "लाग इन (_o)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2066
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
-msgstr ""
+msgstr "यह खाता पहले से सर�वर पर मौजूद है"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2069
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
-msgstr ""
+msgstr "सर�वर पर नया खाता बना��"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2261
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
-msgstr ""
+msgstr "रद�द करें (_n)"
 
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2558
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s %2$s पर"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2584
-#, fuzzy, c-format
+#: ../libempathy-gtk/empathy-account-widget.c:2512
+#, c-format
 #| msgid "Account"
 msgid "%s Account"
-msgstr "खाता"
+msgstr "%s खाता"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2588
-#, fuzzy
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 #| msgid "New %s account"
 msgid "New account"
-msgstr "नया %s खाता"
+msgstr "नया खाता"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
 msgid "<b>Example:</b> MyScreenName"
-msgstr ""
+msgstr "<b>उदाहरण:</b> MyScreenName"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-#, fuzzy
 #| msgid "<b>Advanced</b>"
 msgid "Advanced"
-msgstr "विस�तृत"
+msgstr "उन�नत"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "Pass_word:"
 msgstr "कूटशब�द (_w):"
@@ -959,11 +1023,10 @@ msgstr "कूटशब�द (_w):"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-#, fuzzy
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
 #| msgid "Password:"
 msgid "Remember Password"
-msgstr "कूटशब�द: "
+msgstr "कूटशब�द याद करें"
 
 #. remember password ticky box
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
@@ -971,11 +1034,11 @@ msgstr "कूटशब�द: "
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 #: ../libempathy-gtk/empathy-password-dialog.c:311
 msgid "Remember password"
-msgstr "पासवर�ड याद रखें"
+msgstr "कूटशब�द याद करें"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 msgid "Screen _Name:"
@@ -983,11 +1046,11 @@ msgstr "स�क�रीननाम (_N):"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
 msgid "What is your AIM password?"
-msgstr ""
+msgstr "आपका AIM कूटशब�द क�या है?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
-msgstr ""
+msgstr "आपका AIM स�क�रीन नाम क�या है?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
@@ -1010,7 +1073,7 @@ msgstr "सर�वर (_S):"
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
 msgid "<b>Example:</b> username"
-msgstr ""
+msgstr "<b>उदाहरण:</b> उपयोक�तानाम"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
@@ -1020,22 +1083,21 @@ msgstr "लॉगिन I_D:"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
 msgid "What is your GroupWise User ID?"
-msgstr ""
+msgstr "आपका GroupWise उपयोक�ता आईडी क�या है?"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise password?"
-msgstr ""
+msgstr "आपका GroupWise कूटशब�द क�या है?"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
 msgid "<b>Example:</b> 123456789"
-msgstr ""
+msgstr "<b>उदाहरण:</b> 123456789"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
-#, fuzzy
 #| msgid "Charset:"
 msgid "Ch_aracter set:"
-msgstr "Charset:"
+msgstr "Ch_aracter set:"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
 msgid "ICQ _UIN:"
@@ -1043,124 +1105,122 @@ msgstr "ICQ _UIN:"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
 msgid "What is your ICQ UIN?"
-msgstr ""
+msgstr "आपका ICQ UIN क�या है?"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ password?"
-msgstr ""
+msgstr "आपका ICQ कूटशब�द क�या है?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:183
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
-#, fuzzy
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 #| msgid "_About"
 msgid "Auto"
 msgstr "स�वतः"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "यूडीपी"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "टीसीपी"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "टी�ल�स"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:221
-#, fuzzy
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 #| msgid "Western"
 msgid "Register"
 msgstr "पंजीकृत करें"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:226
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "विकल�प"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:229
-#, fuzzy
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 #| msgid "No"
 msgid "None"
 msgstr "क�छ नहीं"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#, fuzzy
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 #| msgid "Charset:"
 msgid "Character set:"
 msgstr "संप�रतीक सेट:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Network"
 msgstr "नेटवर�क"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Network:"
 msgstr "नेटवर�क:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "उपनामः"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "कूटशब�द: "
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "संदेश छोड़ें"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "वास�तविक नामः"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-#, fuzzy
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 #| msgid "Server"
 msgid "Servers"
 msgstr "सर�वर"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "What is your IRC nickname?"
-msgstr ""
+msgstr "आपका IRC उपनाम क�या है?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
-msgstr ""
+msgstr "कौन सा IRC संजाल?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
 msgid "<b>Example:</b> user@gmail.com"
-msgstr ""
+msgstr "<b>उदाहरण:</b> user@gmail.com"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
 msgid "<b>Example:</b> user@jabber.org"
-msgstr ""
+msgstr "<b>उदाहरण:</b> user@jabber.org"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-#, fuzzy
 #| msgid "_Encryption required (TLS/SSL)"
 msgid "Encr_yption required (TLS/SSL)"
-msgstr "गोपन जरूरी (_E) (TLS/SSL)"
+msgstr "गोपन जरूरी (_y) (TLS/SSL)"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-#, fuzzy
 #| msgid "_Ignore SSL certificate errors"
 msgid "I_gnore SSL certificate errors"
 msgstr "SSL प�रमाणपत�र त�र�टि अनदेखा करें (_I)"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Override server settings"
-msgstr ""
+msgstr "सर�वर जमावट अधिरोहित करें"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-#, fuzzy
 #| msgid "Pri_ority:"
 msgid "Priori_ty:"
-msgstr "प�राथमिकता (_o):"
+msgstr "प�राथमिकता (_t):"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 msgid "Reso_urce:"
@@ -1181,57 +1241,56 @@ msgstr "प�राना SS_L प�रयोग करें"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
 msgid "What is your Facebook password?"
-msgstr ""
+msgstr "आपका Facebook कूटशब�द क�या है?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
 msgid "What is your Facebook username?"
-msgstr ""
+msgstr "आपका Facebook उपयोक�तानाम क�या है?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 msgid "What is your Google ID?"
-msgstr ""
+msgstr "आपका Google आईडी क�या है?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 msgid "What is your Google password?"
-msgstr ""
+msgstr "आपका Google कूटशब�द क�या है?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
 msgid "What is your Jabber ID?"
-msgstr ""
+msgstr "आपका Jabber आईडी क�या है?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
 msgid "What is your Jabber password?"
-msgstr ""
+msgstr "आपका Jabber कूटशब�द क�या है?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your desired Jabber ID?"
-msgstr ""
+msgstr "आपका वांछित Jabber आईडी क�या है?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber password?"
-msgstr ""
+msgstr "आपका वांछित Jabber कूटशब�द क�या है?"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
 msgid "<b>Example:</b> user@hotmail.com"
-msgstr ""
+msgstr "<b>उदाहरण:</b> user@hotmail.com"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
 msgid "What is your Windows Live ID?"
-msgstr ""
+msgstr "आपका Windows Live आईडी क�या है?"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live password?"
-msgstr ""
+msgstr "आपका Windows Live कूटशब�द क�या है?"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
 msgid "E-_mail address:"
 msgstr "ई-मेल पता (_m):"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
-#, fuzzy
 #| msgid "Nickname:"
 msgid "Nic_kname:"
-msgstr "उपनाम (_k)"
+msgstr "उपनाम (_k):"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
 msgid "_First Name:"
@@ -1251,126 +1310,138 @@ msgstr "प�रकाशित नाम (_P):"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
 msgid "<b>Example:</b> user@my.sip.server"
-msgstr ""
+msgstr "<b>उदाहरण:</b> user@my.sip.server"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-#, fuzzy
 #| msgid "Authentication failed"
 msgid "Authentication username:"
-msgstr "सत�यापन असफल"
+msgstr "सत�यापन उपयोक�तानाम:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-#, fuzzy
 #| msgid "Discover STUN"
 msgid "Discover Binding"
-msgstr "Discover STUN"
+msgstr "बाइंडिंग खोजें"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "Discover the STUN server automatically"
 msgstr ""
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Interval (seconds)"
+msgid "Ignore TLS Errors"
 msgstr ""
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Keep-Alive Options"
+msgid "Interval (seconds)"
 msgstr ""
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Loose Routing"
-msgstr ""
+msgid "Keep-Alive Options"
+msgstr "Keep-Alive विकल�प"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Mechanism:"
+msgid "Loose Routing"
 msgstr ""
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+msgid "Mechanism:"
+msgstr "यांत�रिकी"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
 msgid "Miscellaneous Options"
 msgstr "विविध विकल�प"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 msgid "NAT Traversal Options"
-msgstr ""
+msgstr "NAT Traversal विकल�प"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#, fuzzy
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 #| msgid "_Port:"
 msgid "Port:"
 msgstr "पोर�टः"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 msgid "Proxy Options"
 msgstr "प�रॉक�सी विकल�प"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "STUN Server:"
 msgstr "STUN सर�वर:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-#, fuzzy
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.c:347
 #| msgid "_Server:"
 msgid "Server:"
 msgstr "सर�वरः"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#, fuzzy
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 #| msgid "STUN port:"
 msgid "Transport:"
 msgstr "ट�रांसपोर�ट:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "What is your SIP account password?"
-msgstr ""
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "What is your SIP login ID?"
+msgid "Use this account to call _landlines and mobile phones"
 msgstr ""
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+msgid "What is your SIP account password?"
+msgstr "आपका SIP खाता कूटशब�द क�या है?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP login ID?"
+msgstr "आपका सिप लॉगिन आईडी क�या है?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "प�रयोक�ता नाम (_U):"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-#, fuzzy
 #| msgid "_Ignore conference and chatroom invitations"
 msgid "I_gnore conference and chat room invitations"
-msgstr "सम�मेलन व गपशप कक�ष आमंत�रण अनदेखा करें (_I)"
+msgstr "सम�मेलन व गपशप कक�ष आमंत�रण अनदेखा करें (_g)"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "What is your Yahoo! ID?"
-msgstr ""
+msgstr "आपका Yahoo! आईडी क�या है?"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "What is your Yahoo! password?"
-msgstr ""
+msgstr "आपकाYahoo! कूटशब�द क�या है?"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-#, fuzzy
 #| msgid "Yahoo I_D:"
 msgid "Yahoo! I_D:"
-msgstr "Yahoo I_D:"
+msgstr "Yahoo! I_D:"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "_Room List locale:"
 msgstr "कक�ष सूची लोकेल (_R):"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:448
-#: ../libempathy-gtk/empathy-avatar-chooser.c:524
+#: ../libempathy-gtk/empathy-avatar-chooser.c:470
+#: ../libempathy-gtk/empathy-avatar-chooser.c:555
 msgid "Couldn't convert image"
 msgstr "छवि बदल नहीं सका"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #, fuzzy
 #| msgid "None of the accepted image formats is supported on your system"
 msgid "None of the accepted image formats are supported on your system"
 msgstr "आपके तंत�र पर कोई स�वीकार�य छवि प�रारूप समर�थित नहीं है"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:936
+#: ../libempathy-gtk/empathy-avatar-chooser.c:818
+#, fuzzy
+#| msgid "Couldn't convert image"
+msgid "Couldn't save picture to file"
+msgstr "छवि बदल नहीं सका"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:934
 msgid "Select Your Avatar Image"
 msgstr "अवतार चित�र च�नें"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:939
+#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+msgid "Take a picture..."
+msgstr "तस�वीर लें ..."
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:941
 msgid "No Image"
 msgstr "कोई बिंब नहीं"
 
@@ -1386,180 +1457,230 @@ msgstr "सभी फ़ाइलें"
 msgid "Click to enlarge"
 msgstr "बड़ा करने के लि� क�लिक करें"
 
-#: ../libempathy-gtk/empathy-chat.c:655
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
+#, fuzzy
+#| msgid "Empathy has asked about importing accounts"
+msgid "There was an error starting the call"
+msgstr "Empathy ने खाता आयात करने के बारे में पूछा है"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact doesn't support calls"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+#| msgid "Contact goes offline"
+msgid "The specified contact is offline"
+msgstr "निर�दिष�ट संपर�क ऑफ़लाइन हो गया"
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+#| msgid "Contact goes offline"
+msgid "The specified contact is not valid"
+msgstr "निर�दिष�ट संपर�क वैध नहीं है"
+
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "Emergency calls are not supported on this protocol"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:702
 msgid "Failed to open private chat"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:720
+#: ../libempathy-gtk/empathy-chat.c:763
 msgid "Topic not supported on this conversation"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:726
+#: ../libempathy-gtk/empathy-chat.c:769
 msgid "You are not allowed to change the topic"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:909
+#: ../libempathy-gtk/empathy-chat.c:973
+#, fuzzy, c-format
+#| msgid "invalid contact"
+msgid "“%s� is not a valid contact ID"
+msgstr "अवैध संपर�क"
+
+#: ../libempathy-gtk/empathy-chat.c:1030
 msgid "/clear: clear all messages from the current conversation"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:912
+#: ../libempathy-gtk/empathy-chat.c:1033
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:915
+#: ../libempathy-gtk/empathy-chat.c:1036
 msgid "/join <chat room ID>: join a new chat room"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:918
+#: ../libempathy-gtk/empathy-chat.c:1039
 msgid "/j <chat room ID>: join a new chat room"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:923
+#: ../libempathy-gtk/empathy-chat.c:1043
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:928
+#: ../libempathy-gtk/empathy-chat.c:1047
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:931
+#: ../libempathy-gtk/empathy-chat.c:1050
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:934
+#: ../libempathy-gtk/empathy-chat.c:1053
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:937
+#: ../libempathy-gtk/empathy-chat.c:1056
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:940
+#: ../libempathy-gtk/empathy-chat.c:1059
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:945
+#: ../libempathy-gtk/empathy-chat.c:1064
+msgid "/whois <contact ID>: display information about a contact"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1067
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:955
-#, fuzzy, c-format
+#: ../libempathy-gtk/empathy-chat.c:1077
+#, c-format
 #| msgid ""
 #| "\n"
 #| "Message: %s"
 msgid "Usage: %s"
 msgstr "प�रयोग: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:997
-#, fuzzy
+#: ../libempathy-gtk/empathy-chat.c:1116
 #| msgid "Unknown reason"
 msgid "Unknown command"
 msgstr "अनजान कमांड"
 
-#: ../libempathy-gtk/empathy-chat.c:1123
+#: ../libempathy-gtk/empathy-chat.c:1242
 msgid "Unknown command; see /help for the available commands"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1263
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1412
+msgid "insufficient balance to send message"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1414
+msgid "not capable"
+msgstr "सक�षम नहीं"
+
+#: ../libempathy-gtk/empathy-chat.c:1421
 msgid "offline"
 msgstr "ऑफ़लाइन"
 
-#: ../libempathy-gtk/empathy-chat.c:1266
+#: ../libempathy-gtk/empathy-chat.c:1424
 msgid "invalid contact"
 msgstr "अवैध संपर�क"
 
-#: ../libempathy-gtk/empathy-chat.c:1269
+#: ../libempathy-gtk/empathy-chat.c:1427
 msgid "permission denied"
 msgstr "अन�मति मनाही"
 
-#: ../libempathy-gtk/empathy-chat.c:1272
+#: ../libempathy-gtk/empathy-chat.c:1430
 msgid "too long message"
 msgstr "बह�त लंबा संदेश"
 
-#: ../libempathy-gtk/empathy-chat.c:1275
+#: ../libempathy-gtk/empathy-chat.c:1433
 msgid "not implemented"
 msgstr "लागू नहीं"
 
-#: ../libempathy-gtk/empathy-chat.c:1279
+#: ../libempathy-gtk/empathy-chat.c:1437
 msgid "unknown"
 msgstr "अज�ञात"
 
-#: ../libempathy-gtk/empathy-chat.c:1283
+#: ../libempathy-gtk/empathy-chat.c:1443
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Error sending message '%s': %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1344 ../src/empathy-chat-window.c:707
+#: ../libempathy-gtk/empathy-chat.c:1447
+#, c-format
+#| msgid "Error sending message '%s': %s"
+msgid "Error sending message: %s"
+msgstr "संदेश भेजने में त�र�टि: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1508 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "विषय:"
 
-#: ../libempathy-gtk/empathy-chat.c:1356
+#: ../libempathy-gtk/empathy-chat.c:1520
 #, c-format
 msgid "Topic set to: %s"
 msgstr "यहां टापिक सेट: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1358
+#: ../libempathy-gtk/empathy-chat.c:1522
 msgid "No topic defined"
 msgstr "कोई टापिक नहीं"
 
-#: ../libempathy-gtk/empathy-chat.c:1857
+#: ../libempathy-gtk/empathy-chat.c:2031
 msgid "(No Suggestions)"
 msgstr ""
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1925
+#: ../libempathy-gtk/empathy-chat.c:2099
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr ""
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1962
+#: ../libempathy-gtk/empathy-chat.c:2136
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2021
+#: ../libempathy-gtk/empathy-chat.c:2206
 msgid "Insert Smiley"
 msgstr "स�माइली दें"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2039
-#: ../libempathy-gtk/empathy-ui-utils.c:1810
+#: ../libempathy-gtk/empathy-chat.c:2224
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "भेजें (_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2278
 msgid "_Spelling Suggestions"
-msgstr ""
+msgstr "वर�तनी स��ाव (_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2163
+#: ../libempathy-gtk/empathy-chat.c:2367
 msgid "Failed to retrieve recent logs"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2274
-#, fuzzy, c-format
+#: ../libempathy-gtk/empathy-chat.c:2504
+#, c-format
 #| msgid "Contact disconnected"
 msgid "%s has disconnected"
-msgstr "संपर�क डिसकनेक�टेड"
+msgstr "%s डिसकनेक�टेड"
 
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2281
+#: ../libempathy-gtk/empathy-chat.c:2511
 #, c-format
 msgid "%1$s was kicked by %2$s"
-msgstr ""
+msgstr "%1$s को %2$s द�वारा किक किया गया"
 
-#: ../libempathy-gtk/empathy-chat.c:2284
+#: ../libempathy-gtk/empathy-chat.c:2514
 #, c-format
 msgid "%s was kicked"
 msgstr ""
@@ -1567,17 +1688,17 @@ msgstr ""
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2292
+#: ../libempathy-gtk/empathy-chat.c:2522
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2295
+#: ../libempathy-gtk/empathy-chat.c:2525
 #, c-format
 msgid "%s was banned"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2299
+#: ../libempathy-gtk/empathy-chat.c:2529
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ने कक�ष छोड़ दिया है"
@@ -1587,111 +1708,139 @@ msgstr "%s ने कक�ष छोड़ दिया है"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2308
+#: ../libempathy-gtk/empathy-chat.c:2538
 #, c-format
 msgid " (%s)"
-msgstr ""
+msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2333
+#: ../libempathy-gtk/empathy-chat.c:2563
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s कक�ष में शामिल ह�आ है"
 
-#: ../libempathy-gtk/empathy-chat.c:2358
+#: ../libempathy-gtk/empathy-chat.c:2588
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s अब %s रूप में जाने जाते हैं"
 
-#: ../libempathy-gtk/empathy-chat.c:2497
-#: ../src/empathy-streamed-media-window.c:1942
-#: ../src/empathy-event-manager.c:1122
+#: ../libempathy-gtk/empathy-chat.c:2727
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:2355
 msgid "Disconnected"
 msgstr "डिस�कनेक�टेड"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3127
+#: ../libempathy-gtk/empathy-chat.c:3374
 msgid "Would you like to store this password?"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:3133
-#, fuzzy
+#: ../libempathy-gtk/empathy-chat.c:3380
 #| msgid "Themes"
 msgid "Remember"
 msgstr "याद रखें"
 
-#: ../libempathy-gtk/empathy-chat.c:3143
+#: ../libempathy-gtk/empathy-chat.c:3390
 msgid "Not now"
-msgstr ""
+msgstr "अभी नहीं"
 
-#: ../libempathy-gtk/empathy-chat.c:3187
+#: ../libempathy-gtk/empathy-chat.c:3434
 msgid "Retry"
 msgstr "फिर कोशिश करें"
 
-#: ../libempathy-gtk/empathy-chat.c:3191
+#: ../libempathy-gtk/empathy-chat.c:3438
 msgid "Wrong password; please try again:"
 msgstr ""
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3308
+#: ../libempathy-gtk/empathy-chat.c:3568
 msgid "This room is protected by a password:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:3335
-#, fuzzy
+#: ../libempathy-gtk/empathy-chat.c:3595
 #| msgid "_Join"
 msgid "Join"
 msgstr "शामिल हों"
 
-#: ../libempathy-gtk/empathy-chat.c:3505 ../src/empathy-event-manager.c:1144
+#: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "ज�ड़ा ह�आ"
 
-#: ../libempathy-gtk/empathy-chat.c:3558
-#: ../libempathy-gtk/empathy-log-window.c:654
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "Conversation"
 msgstr "वार�तालाप"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:422
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:3857
+#, c-format
+#| msgid "%s of %s"
+msgid "%s (SMS)"
+msgstr "%s (SMS)"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
 msgid "Unknown or invalid identifier"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
 msgid "Contact blocking temporarily unavailable"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
 msgid "Contact blocking unavailable"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
-#, fuzzy
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
 #| msgid "permission denied"
 msgid "Permission Denied"
 msgstr "अन�मति मनाही"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
 msgid "Could not block contact"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:701
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
 msgid "Edit Blocked Contacts"
 msgstr ""
 
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1485
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Account:"
+msgstr "खाता:"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+#| msgid "Show offline contacts"
+msgid "Blocked Contacts"
+msgstr "अवरोधित संपर�क"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+#| msgid "_Remove"
+msgid "Remove"
+msgstr "हटा�ं"
+
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:794
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "लिंक पता कॉपी करें (_C)"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:801
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "लिंक खोलें (_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:420
+#: ../libempathy-gtk/empathy-chat-text-view.c:415
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
@@ -1709,25 +1858,25 @@ msgstr "व�यक�तिगत जानकारी"
 msgid "New Contact"
 msgstr "नया संपर�क"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:532
-#: ../libempathy-gtk/empathy-individual-dialogs.c:198
+#: ../libempathy-gtk/empathy-contact-dialogs.c:533
+#: ../libempathy-gtk/empathy-individual-dialogs.c:200
 #, c-format
 msgid "Block %s?"
 msgstr "%s को रोकें?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:537
-#: ../libempathy-gtk/empathy-individual-dialogs.c:239
+#: ../libempathy-gtk/empathy-contact-dialogs.c:538
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:542
-#: ../libempathy-gtk/empathy-individual-dialogs.c:261
+#: ../libempathy-gtk/empathy-contact-dialogs.c:543
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
 msgid "_Block"
 msgstr "रोकें (_B)"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:552
-#: ../libempathy-gtk/empathy-individual-dialogs.c:270
+#: ../libempathy-gtk/empathy-contact-dialogs.c:559
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] ""
@@ -1743,384 +1892,391 @@ msgstr "सदस�यता आग�रह"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
 msgid "_Block User"
-msgstr ""
+msgstr "उपयोक�ता रोकें (_B)"
 
 #: ../libempathy-gtk/empathy-contact-list-store.h:71
 msgid "Ungrouped"
 msgstr "असमूहीकृत"
 
 #: ../libempathy-gtk/empathy-contact-list-store.h:72
-#, fuzzy
 #| msgid "_Favorite Chatroom"
 msgid "Favorite People"
-msgstr "पसंदीदा चैटरूम (_F)"
+msgstr "पसंदीदा लोग"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2012
-#: ../libempathy-gtk/empathy-individual-view.c:2327
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "क�या आप वाकई '%s' समूह हटाना चाहते हैं?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2014
-#: ../libempathy-gtk/empathy-individual-view.c:2330
+#: ../libempathy-gtk/empathy-contact-list-view.c:1988
+#: ../libempathy-gtk/empathy-individual-view.c:2379
 msgid "Removing group"
 msgstr "समूह हटा रहा है"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2063
-#: ../libempathy-gtk/empathy-contact-list-view.c:2140
-#: ../libempathy-gtk/empathy-individual-view.c:2385
-#: ../libempathy-gtk/empathy-individual-view.c:2552
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../libempathy-gtk/empathy-contact-list-view.c:2037
+#: ../libempathy-gtk/empathy-contact-list-view.c:2114
+#: ../libempathy-gtk/empathy-individual-view.c:2434
+#: ../libempathy-gtk/empathy-individual-view.c:2637
 msgid "_Remove"
 msgstr "हटा�ं (_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2093
-#: ../libempathy-gtk/empathy-individual-view.c:2438
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
+#: ../libempathy-gtk/empathy-individual-view.c:2501
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "क�या आप वाकई '%s' संपर�क हटाना चाहते हैं?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2095
-#: ../libempathy-gtk/empathy-individual-view.c:2457
+#: ../libempathy-gtk/empathy-contact-list-view.c:2069
+#: ../libempathy-gtk/empathy-individual-view.c:2522
 msgid "Removing contact"
 msgstr "संपर�क हटा रहा है"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:219
-#: ../src/empathy-main-window.ui.h:13
-#, fuzzy
+#: ../libempathy-gtk/empathy-contact-menu.c:220
+#: ../src/empathy-main-window-menubar.ui.h:14
 #| msgid "_Add Contact..."
 msgid "_Add Contact…"
 msgstr "संपर�क जोड़ें (_A)..."
 
-#: ../libempathy-gtk/empathy-contact-menu.c:296
-#, fuzzy
+#: ../libempathy-gtk/empathy-contact-menu.c:300
 #| msgid "_Contact"
 msgid "_Block Contact"
-msgstr "संपर�क (_C)"
+msgstr "संपर�क रोकें (_B)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:325
-#: ../libempathy-gtk/empathy-individual-menu.c:517
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:329
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "चैट (_C)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:356
-#: ../libempathy-gtk/empathy-individual-menu.c:560
-#, fuzzy
+#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 #| msgid "_Call"
 msgctxt "menu item"
 msgid "_Audio Call"
-msgstr "कॉल (_a)"
+msgstr "ऑडियो कॉल (_A)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:387
-#: ../libempathy-gtk/empathy-individual-menu.c:602
-#, fuzzy
+#: ../libempathy-gtk/empathy-contact-menu.c:394
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 #| msgid "_Call"
 msgctxt "menu item"
 msgid "_Video Call"
-msgstr "कॉल (_a)"
+msgstr "वीडियो कॉल (_V)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:433
-#: ../libempathy-gtk/empathy-individual-menu.c:645
-#: ../src/empathy-main-window.ui.h:26
-#, fuzzy
+#: ../libempathy-gtk/empathy-contact-menu.c:440
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
 #| msgid "Previous Conversations"
 msgid "_Previous Conversations"
-msgstr "पिछली बातचीत"
+msgstr "पिछली बातचीत (_P)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:455
-#: ../libempathy-gtk/empathy-individual-menu.c:686
-#, fuzzy
+#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 #| msgid "Send file"
 msgid "Send File"
 msgstr "फाइल भेजें"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:478
-#: ../libempathy-gtk/empathy-individual-menu.c:728
+#: ../libempathy-gtk/empathy-contact-menu.c:485
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
-msgstr ""
+msgstr "मेरा डेस�कटॉप सा�ा करें"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:518
-#: ../libempathy-gtk/empathy-contact-widget.c:1762
-#: ../libempathy-gtk/empathy-individual-menu.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:1370
-#, fuzzy
+#: ../libempathy-gtk/empathy-contact-menu.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:1886
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:1373
 #| msgid "Join _Favorites"
 msgid "Favorite"
 msgstr "पसंदीदा"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:547
-#: ../libempathy-gtk/empathy-individual-menu.c:789
+#: ../libempathy-gtk/empathy-contact-menu.c:554
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "सूचना (_m)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:593
-#, fuzzy
+#: ../libempathy-gtk/empathy-contact-menu.c:600
 #| msgid "_Edit"
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "संपादन (_E)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:647
-#: ../libempathy-gtk/empathy-individual-menu.c:970
-#: ../src/empathy-chat-window.c:919
-#, fuzzy
+#: ../libempathy-gtk/empathy-contact-menu.c:654
+#: ../libempathy-gtk/empathy-individual-menu.c:1283
+#: ../src/empathy-chat-window.c:1011
 #| msgid "Inviting to this room"
 msgid "Inviting you to this room"
 msgstr "इस कक�ष में आमंत�रित कर रहा है"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:678
-#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-contact-menu.c:685
+#: ../libempathy-gtk/empathy-individual-menu.c:1329
 #, fuzzy
 #| msgid "_Invite to chatroom"
 msgid "_Invite to Chat Room"
 msgstr "पसंदीदा में ब�ला��"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:508
-#, fuzzy
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
 #| msgid "Select a contact"
 msgid "Search contacts"
 msgstr "संपर�क खोजें"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:538
-#, fuzzy
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
 #| msgid "Search"
 msgid "Search: "
-msgstr "ढूंढें:"
+msgstr "खोजें:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:596
-#, fuzzy
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
 #| msgid "_Add Contact..."
 msgid "_Add Contact"
 msgstr "संपर�क जोड़ें (_A)..."
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:614
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
 msgid "No contacts found"
+msgstr "कोई संपर�क नहीं मिला"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
 msgstr ""
 
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "कोई संपर�क च�नें"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:295
+#: ../libempathy-gtk/empathy-contact-widget.c:336
 #: ../libempathy-gtk/empathy-individual-widget.c:153
-#, fuzzy
 #| msgid "Fullname:"
 msgid "Full name:"
 msgstr "पूरा नामः"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:296
+#: ../libempathy-gtk/empathy-contact-widget.c:337
 #: ../libempathy-gtk/empathy-individual-widget.c:154
 msgid "Phone number:"
 msgstr "दूरभाष क�रमांकः"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:297
+#: ../libempathy-gtk/empathy-contact-widget.c:338
 #: ../libempathy-gtk/empathy-individual-widget.c:155
 msgid "E-mail address:"
 msgstr "ई-मेल पता:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:298
+#: ../libempathy-gtk/empathy-contact-widget.c:339
 #: ../libempathy-gtk/empathy-individual-widget.c:156
-#, fuzzy
 #| msgid "Web site:"
 msgid "Website:"
 msgstr "वेबसाइट:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:299
+#: ../libempathy-gtk/empathy-contact-widget.c:340
 #: ../libempathy-gtk/empathy-individual-widget.c:157
 msgid "Birthday:"
 msgstr "जन�म दिन:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:346
+#| msgid "_Last Name:"
+msgid "Last seen:"
+msgstr "अंतिम बार देखा गया:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:348
+#| msgid "Connected"
+msgid "Connected from:"
+msgstr "इससे कनेक�टेड:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:353
+#| msgid "Quit message:"
+msgid "Away message:"
+msgstr "दूर संदेश:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+msgid "Channels:"
+msgstr "चैनल:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
-msgstr ""
+msgstr "देश आई�सओ कोड:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:489
-#, fuzzy
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 #| msgid "Account:"
 msgid "Country:"
 msgstr "देश:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:491
-#, fuzzy
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 #| msgid "Status:"
 msgid "State:"
-msgstr "स�थिति:"
+msgstr "राज�य:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:768
-#: ../libempathy-gtk/empathy-individual-widget.c:493
-#, fuzzy
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 #| msgid "Client:"
 msgid "City:"
 msgstr "शहर:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:770
-#: ../libempathy-gtk/empathy-individual-widget.c:495
-#, fuzzy
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 #| msgid "Armenian"
 msgid "Area:"
 msgstr "क�षेत�र:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:772
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
-msgstr ""
+msgstr "डाक कोड:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:774
-#: ../libempathy-gtk/empathy-individual-widget.c:499
-#, fuzzy
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 #| msgid "Select"
 msgid "Street:"
 msgstr "सड़कः"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:776
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
-msgstr ""
+msgstr "बिल�डिंग:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:778
-#: ../libempathy-gtk/empathy-individual-widget.c:503
-#, fuzzy
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 #| msgid "_For:"
 msgid "Floor:"
-msgstr "के लि� (_F):"
+msgstr "तल:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:780
-#: ../libempathy-gtk/empathy-individual-widget.c:505
-#, fuzzy
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 #| msgid "_Room:"
 msgid "Room:"
 msgstr "कमराः"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:782
-#: ../libempathy-gtk/empathy-individual-widget.c:507
-#, fuzzy
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 #| msgid "Type:"
 msgid "Text:"
 msgstr "पाठः"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:784
-#: ../libempathy-gtk/empathy-individual-widget.c:509
-#, fuzzy
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 #| msgid "Version:"
 msgid "Description:"
 msgstr "वर�णनः"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:786
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
-msgstr ""
+msgstr "सटीकता स�तर:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:790
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr "त�र�टि:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:792
-#: ../libempathy-gtk/empathy-individual-widget.c:517
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
-msgstr ""
+msgstr "लंबबत त�र�टि (मीटर):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:794
-#: ../libempathy-gtk/empathy-individual-widget.c:519
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
-msgstr ""
+msgstr "क�षैतिज त�र�टि (मीटर):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:521
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr "गतिः"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:523
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 #, fuzzy
 #| msgid "Version:"
 msgid "Bearing:"
 msgstr "संस�करण:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:800
-#: ../libempathy-gtk/empathy-individual-widget.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
-msgstr ""
+msgstr "चढ़ाव गति:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:802
-#: ../libempathy-gtk/empathy-individual-widget.c:527
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
-msgstr ""
+msgstr "अंतिम बार अद�यतन:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:804
-#: ../libempathy-gtk/empathy-individual-widget.c:529
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
 msgstr "देशान�तरः"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:806
-#: ../libempathy-gtk/empathy-individual-widget.c:531
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
 msgstr "अक�षांशः"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:808
-#: ../libempathy-gtk/empathy-individual-widget.c:533
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
 msgstr "उन�नतांशः"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:871
-#: ../libempathy-gtk/empathy-contact-widget.c:888
-#: ../libempathy-gtk/empathy-individual-widget.c:615
-#: ../libempathy-gtk/empathy-individual-widget.c:632
-#: ../src/empathy-preferences.ui.h:12
-#, fuzzy
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:17
 #| msgid "Notifications"
 msgid "Location"
 msgstr "स�थान"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:890
-#: ../libempathy-gtk/empathy-individual-widget.c:634
-#, fuzzy, c-format
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
+#, c-format
 #| msgid "%s of %s"
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:942
-#: ../libempathy-gtk/empathy-individual-widget.c:683
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
-msgstr ""
+msgstr "%R UTC पर %B %e, %Y"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1024
-#: ../libempathy-gtk/empathy-individual-widget.c:918
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
 msgid "Save Avatar"
 msgstr "अवतार सहेजें"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1080
-#: ../libempathy-gtk/empathy-individual-widget.c:976
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
 msgid "Unable to save avatar"
 msgstr "अवतार सहेजने में असमर�थ"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1
 msgid "<b>Location</b> at (date)\t"
-msgstr ""
+msgstr "<b>स�थान</b> (तिथि) पर\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1305
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr "उपनाम:"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-#, fuzzy
 #| msgid "<b>Client Information</b>"
 msgid "Client Information"
-msgstr "<b>क�लाइंट सूचना</b>"
+msgstr "क�लाइंट सूचना"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:5
 msgid "Client:"
@@ -2128,21 +2284,19 @@ msgstr "क�ला�ंट:"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-#, fuzzy
 #| msgid "<b>Contact Details</b>"
 msgid "Contact Details"
-msgstr "<b>संपर�क विवरण</b>"
+msgstr "संपर�क विवरण"
 
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1509
+#: ../libempathy-gtk/empathy-individual-widget.c:1515
 msgid "Identifier:"
 msgstr "पहचानकर�ताः"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-#, fuzzy
 #| msgid "Information requested..."
 msgid "Information requested…"
 msgstr "सूचना आग�रहित..."
@@ -2155,82 +2309,110 @@ msgstr "ओ�स:"
 msgid "Version:"
 msgstr "संस�करण:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:332
-#, fuzzy
+#: ../libempathy-gtk/empathy-groups-widget.c:333
 #| msgid "Group"
 msgid "Groups"
 msgstr "समूह"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:344
+#: ../libempathy-gtk/empathy-groups-widget.c:345
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr ""
-"उन समूहों को च�नें जिसमें आप इस संपर�क को प�रकट होते देखना चाहते हैं. नोट करें कि आप �क से "
+"उन समूहों को च�नें जिसमें आप इस संपर�क को प�रकट होते देखना चाहते हैं. नोट "
+"करें कि आप �क से "
 "अधिक या कोई समूह नहीं भी च�न सकते हैं."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:363
+#: ../libempathy-gtk/empathy-groups-widget.c:364
 msgid "_Add Group"
 msgstr "समूह जोड़ें (_A)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:398
-#, fuzzy
+#: ../libempathy-gtk/empathy-groups-widget.c:399
 #| msgid "Select"
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "च�नें"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1436
+#: ../libempathy-gtk/empathy-groups-widget.c:409
+#: ../src/empathy-main-window.c:1807
 msgid "Group"
 msgstr "समूह"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:244
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:251
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] ""
 msgstr[1] ""
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
-#, fuzzy
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 #| msgid "Show offline contacts"
 msgid "Linked Contacts"
-msgstr "ऑफलाइन संपर�क दिखा��"
+msgstr "कड़ीबद�ध संपर�क"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:354
-#, fuzzy
+#: ../libempathy-gtk/empathy-individual-linker.c:370
 #| msgid "Select a contact"
 msgid "Select contacts to link"
-msgstr "कोई संपर�क च�नें"
+msgstr "कड़ी में संपर�क च�नें"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:428
-#, fuzzy
+#: ../libempathy-gtk/empathy-individual-linker.c:444
 #| msgid "New Contact"
 msgid "New contact preview"
-msgstr "नया संपर�क"
+msgstr "नया संपर�क पूर�वावलोकन"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:472
+#: ../libempathy-gtk/empathy-individual-linker.c:488
 msgid "Contacts selected in the list on the left will be linked together."
 msgstr ""
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:131
-#, fuzzy, c-format
+#: ../libempathy-gtk/empathy-individual-menu.c:145
+#, c-format
 #| msgid "%s of %s"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:837
-#, fuzzy
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr ""
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+#| msgid "_Call"
+msgid "Call"
+msgstr "कॉल करें"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+#| msgid "File"
+msgid "Mobile"
+msgstr "मोबाइल"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "काम"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "घर"
+
+#. add an SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+msgid "_SMS"
+msgstr "_SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1141
 #| msgid "_Edit"
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
@@ -2238,25 +2420,24 @@ msgstr "संपादन (_E)"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:863
-#, fuzzy
+#: ../libempathy-gtk/empathy-individual-menu.c:1167
 #| msgid "Show offline contacts"
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
-msgstr "ऑफलाइन संपर�क दिखा��"
+msgstr "संपर�क कड़ीबद�ध करें (_L)..."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2292
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 msgid "Delete and _Block"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-individual-view.c:2446
+#: ../libempathy-gtk/empathy-individual-view.c:2510
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
 "remove all the contacts which make up this linked contact."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1650
+#: ../libempathy-gtk/empathy-individual-widget.c:1662
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2264,10 +2445,9 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:1
-#, fuzzy
 #| msgid "<b>Contact</b>"
 msgid "<b>Location</b> at (date)"
-msgstr "<b>संपर�क</b>"
+msgstr "<b>स�थान</b> (तिथि) पर\t"
 
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Online from a phone or mobile device"
@@ -2279,14 +2459,13 @@ msgstr "नया नेटवर�क"
 
 #: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
 msgid "Choose an IRC network"
-msgstr ""
+msgstr "च�नें IRC संजाल"
 
 #: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
 msgid "Reset _Networks List"
 msgstr ""
 
 #: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
-#, fuzzy
 #| msgid "Select"
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
@@ -2304,10 +2483,9 @@ msgstr "SSL"
 #. * right-clicking on a contact and selecting "Link…"). "Link" in this title
 #. * is a verb.
 #: ../libempathy-gtk/empathy-linking-dialog.c:115
-#, fuzzy
 #| msgid "Show offline contacts"
 msgid "Link Contacts"
-msgstr "ऑफलाइन संपर�क दिखा��"
+msgstr "संपर�क कड़ीबद�ध करें"
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:120
 msgctxt "Unlink individual (button)"
@@ -2315,7 +2493,8 @@ msgid "_Unlink…"
 msgstr ""
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid "Completely split the displayed linked contacts into the separate contacts."
+msgid ""
+"Completely split the displayed linked contacts into the separate contacts."
 msgstr ""
 
 #. Add button
@@ -2323,7 +2502,6 @@ msgstr ""
 #. * used here as a verb meaning "to connect two contacts to form a
 #. * meta-contact".
 #: ../libempathy-gtk/empathy-linking-dialog.c:136
-#, fuzzy
 #| msgid "_Open Link"
 msgid "_Link"
 msgstr "कड़ी (_L)"
@@ -2345,73 +2523,212 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:664
-msgid "Date"
-msgstr "दिनांक"
+#: ../libempathy-gtk/empathy-log-window.c:634
+msgid "History"
+msgstr "इतिहास "
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
-msgstr "बातचीत"
+#: ../libempathy-gtk/empathy-log-window.c:689
+msgid "Show"
+msgstr "दिखा��"
+
+#: ../libempathy-gtk/empathy-log-window.c:711
+msgid "Search"
+msgstr "ढूंढें"
+
+#: ../libempathy-gtk/empathy-log-window.c:1159
+#, c-format
+msgid "Chat in %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:1161
+#, fuzzy, c-format
+#| msgid "Chat window theme"
+msgid "Chat with %s"
+msgstr "चैट विंडो थीम"
+
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
+#| msgid "%A %B %d %Y"
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%A, %e %B %Y %X"
+
+#. Translators: this is an emote: '* Danielle waves'
+#: ../libempathy-gtk/empathy-log-window.c:1300
+#, c-format
+msgid "<i>* %s %s</i>"
+msgstr "<i>* %s %s</i>"
+
+#. Translators: this is a message: 'Danielle: hello'
+#. * The string in bold is the sender's name
+#: ../libempathy-gtk/empathy-log-window.c:1306
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1377
+#: ../libempathy-gtk/empathy-log-window.c:1379
+#: ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "%"
+
+#: ../libempathy-gtk/empathy-log-window.c:1386
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:1718
+msgid "Today"
+msgstr "आज"
+
+#: ../libempathy-gtk/empathy-log-window.c:1722
+#| msgid "Western"
+msgid "Yesterday"
+msgstr "कल"
+
+#: ../libempathy-gtk/empathy-log-window.c:1738
+#| msgid "%A %B %d %Y"
+msgctxt ""
+"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+msgid "%e %B %Y"
+msgstr "%e %B %Y"
+
+#: ../libempathy-gtk/empathy-log-window.c:1819
+#: ../libempathy-gtk/empathy-log-window.c:3415
+msgid "Anytime"
+msgstr "किसी समय"
+
+#: ../libempathy-gtk/empathy-log-window.c:1906
+#: ../libempathy-gtk/empathy-log-window.c:2343
+#| msgid "No"
+msgid "Anyone"
+msgstr "कोई"
+
+#: ../libempathy-gtk/empathy-log-window.c:2656
+msgid "Who"
+msgstr "कौन"
+
+#: ../libempathy-gtk/empathy-log-window.c:2860
+msgid "When"
+msgstr "कब"
+
+#: ../libempathy-gtk/empathy-log-window.c:2976
+msgid "Anything"
+msgstr "कोई चीज"
+
+#: ../libempathy-gtk/empathy-log-window.c:2978
+#| msgid "Status"
+msgid "Text chats"
+msgstr "पाठ चैट"
+
+#: ../libempathy-gtk/empathy-log-window.c:2980
+#: ../src/empathy-preferences.ui.h:4
+#| msgid "_Call"
+msgid "Calls"
+msgstr "कॉल"
+
+#: ../libempathy-gtk/empathy-log-window.c:2985
+#| msgid "Incoming call"
+msgid "Incoming calls"
+msgstr "इनकमिंग काल"
+
+#: ../libempathy-gtk/empathy-log-window.c:2986
+#| msgid "Outgoing voice call"
+msgid "Outgoing calls"
+msgstr "आउटगोइंग काल"
+
+#: ../libempathy-gtk/empathy-log-window.c:2987
+#| msgid "Incoming call from %s"
+msgid "Missed calls"
+msgstr "मिस काल"
+
+#: ../libempathy-gtk/empathy-log-window.c:3009
+#| msgid "Chat"
+msgid "What"
+msgstr "क�या"
+
+#: ../libempathy-gtk/empathy-log-window.c:3718
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:3722
+#| msgid "C_lear"
+msgid "Clear All"
+msgstr "सभी साफ करें"
+
+#: ../libempathy-gtk/empathy-log-window.c:3729
+msgid "Delete from:"
+msgstr "इससे मिटा��:"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Loading...</span>"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "अगला ढूंढें"
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Chat"
+msgstr "बात-चीत"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-#, fuzzy
-#| msgid "_Previous Tab"
-msgid "Find Previous"
-msgstr "पिछला ढूंढें"
+msgid "Delete All History..."
+msgstr "सभी इतिहास को मिटा�ं ..."
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr "पिछली बातचीत"
+msgid "Profile"
+msgstr "प�रोफाइल"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.ui.h:20
+#| msgid "Video input"
+msgid "Video"
+msgstr "वीडियो"
 
-#. Tab Label
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "ढूंढें"
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:20
+msgid "_Edit"
+msgstr "संपादन (_E)"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+#| msgid "File"
+msgid "_File"
+msgstr "फ़ाइल"
 
-#. Searching *for* something
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "के लि� (_F):"
+msgid "page 2"
+msgstr "पृष�ठ 2"
 
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
 msgid "Contact ID:"
 msgstr "संपर�क ID:"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:171
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
 msgid "C_hat"
 msgstr "चैट (_h)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:181
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
 msgstr "नयी बातचीत"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:252
-#, fuzzy
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
 #| msgid "Send video"
 msgid "Send _Video"
 msgstr "वीडियो भेजें"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:260
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
 msgid "C_all"
 msgstr "कॉल (_a)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:270
-#, fuzzy
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 #| msgid "_Call"
 msgid "New Call"
-msgstr "कॉल"
+msgstr "नया कॉल"
 
 #: ../libempathy-gtk/empathy-password-dialog.c:274
 #, c-format
@@ -2426,41 +2743,37 @@ msgstr ""
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
-#, fuzzy
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 #| msgid "Custom messages..."
 msgid "Custom Message…"
 msgstr "पसंदीदा संदेश..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
-#, fuzzy
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 #| msgid "Custom message"
 msgid "Edit Custom Messages…"
-msgstr "पसंदीदा संदेश"
+msgstr "पसंदीदा संदेश संपादित करें..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
-#, fuzzy
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 #| msgid "Status"
 msgid "Set status"
-msgstr "स�थिति"
+msgstr "स�थिति सेट करें"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:948
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
 msgid "Set your presence and current status"
 msgstr ""
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1136
-#, fuzzy
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
 #| msgid "Custom messages..."
 msgid "Custom messages…"
 msgstr "पसंदीदा संदेश..."
@@ -2474,20 +2787,30 @@ msgstr "पसंदीदा संदेश..."
 msgid "New %s account"
 msgstr "नया %s खाता"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
-#, fuzzy
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
 #| msgid "Hindi"
 msgid "Find:"
 msgstr "ढूंढें:"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "केस मिलायें"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+#| msgid "Match case"
+msgid "Mat_ch case"
+msgstr "स�थिति मिला�� (_c)"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
 msgid "Phrase not found"
 msgstr "म�हावरा नहीं मिला"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+#| msgid "_Next Tab"
+msgid "_Next"
+msgstr "अगला (_N)"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+#| msgid "_Previous Tab"
+msgid "_Previous"
+msgstr "पिछला (_P)"
+
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
 msgstr "�क फौरी संदेश पाया"
@@ -2528,41 +2851,34 @@ msgstr "आउटगोइंग व�याइस काल"
 msgid "Voice call ended"
 msgstr "आवाज कॉल समाप�त"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-#, fuzzy
-#| msgid "Custom message"
-msgid "Enter Custom Message"
-msgstr "पसंदीदा संदेश"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
-#, fuzzy
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 #| msgid "Custom message"
 msgid "Edit Custom Messages"
-msgstr "पसंदीदा संदेश"
+msgstr "पसंदीदा संदेश संपादित करें"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr ""
+#: ../libempathy-gtk/empathy-theme-adium.c:1030
+#, fuzzy, c-format
+#| msgid "Message received"
+msgid "Message edited at %s"
+msgstr "प�राप�त सन�देश"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-#, fuzzy
-#| msgid "Custom message"
-msgid "Saved Status Messages"
-msgstr "पसंदीदा संदेश"
+#: ../libempathy-gtk/empathy-theme-adium.c:1720
+msgid "Normal"
+msgstr "सामान�य"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "क�लासिक"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "सरल"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "साफ"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "नीला"
 
@@ -2575,7 +2891,6 @@ msgid "The certificate is not signed by a Certification Authority."
 msgstr ""
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:161
-#, fuzzy
 #| msgid "Certificate expired"
 msgid "The certificate has expired."
 msgstr "प�रमाणपत�र की मियाद ख़त�म हो च�की है."
@@ -2595,13 +2910,13 @@ msgid "The hostname verified by the certificate doesn't match the server name."
 msgstr ""
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:174
-#, fuzzy
 #| msgid "Certificate self-signed"
 msgid "The certificate is self-signed."
 msgstr "प�रमाणपत�र स�व-हस�ताक�षरित है."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:177
-msgid "The certificate has been revoked by the issuing Certification Authority."
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
 msgstr ""
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:181
@@ -2613,25 +2928,23 @@ msgid "The certificate length exceeds verifiable limits."
 msgstr ""
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:188
-#, fuzzy
 #| msgid "Certificate expired"
 msgid "The certificate is malformed."
-msgstr "प�रमाणपत�र समाप�त"
+msgstr "प�रमाणपत�र विरूपित है."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:206
-#, fuzzy, c-format
+#, c-format
 #| msgid "Certificate hostname mismatch"
 msgid "Expected hostname: %s"
-msgstr "प�रमाणपत�र होस�टनेम बेमेल"
+msgstr "प�रत�याशित मेजबाननाम: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:209
-#, fuzzy, c-format
+#, c-format
 #| msgid "Certificate hostname mismatch"
 msgid "Certificate hostname: %s"
-msgstr "प�रमाणपत�र होस�टनेम बेमेल"
+msgstr "प�रमाणपत�र मेजबाननाम : %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-#, fuzzy
 #| msgid "Context"
 msgid "Continue"
 msgstr "जारी रखें"
@@ -2645,31 +2958,30 @@ msgid "Remember this choice for future connections"
 msgstr ""
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:303
-#, fuzzy
 #| msgid "Certificate expired"
 msgid "Certificate Details"
-msgstr "प�रमाणपत�र समाप�त"
+msgstr "प�रमाणपत�र विवरण"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1707
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
 msgstr "URI खोलने में असमर�थ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1802
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
 msgstr "�क फाइल च�नें"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1874
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
 msgid "Insufficient free space to save file"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1882
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1926
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, fuzzy, c-format
 #| msgid "Incoming call from %s"
 msgid "Incoming file from %s"
@@ -2847,40 +3159,38 @@ msgid "The selected contact cannot receive files."
 msgstr ""
 
 #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-#, fuzzy
 #| msgid "Contact goes offline"
 msgid "The selected contact is offline."
-msgstr "संपर�क ऑफ़लाइन हो गया"
+msgstr "चयनित संपर�क ऑफ़लाइन हो गया"
 
 #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
-#, fuzzy
 #| msgid "too long message"
 msgid "No error message"
 msgstr "कोई त�र�टि संदेश नहीं"
 
 #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
 msgid "Instant Message (Empathy)"
-msgstr ""
+msgstr "इंस�टेंट संदेश (�ंपेथी)"
 
-#: ../src/empathy.c:308
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "आरंभ में मत कनेक�ट हों."
 
-#: ../src/empathy.c:312
+#: ../src/empathy.c:435
 #, fuzzy
 #| msgid "Don't show the contact list on startup"
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "आरंभ पर संपर�क सूची मत दिखा��"
 
-#: ../src/empathy.c:320
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
-msgstr ""
+msgstr "- Empathy IM Client"
 
-#: ../src/empathy.c:499
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
 msgstr ""
 
-#: ../src/empathy.c:501
+#: ../src/empathy.c:639
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2962,7 +3272,7 @@ msgid ""
 msgstr ""
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1268
+#: ../src/empathy-account-assistant.c:1271
 msgid "An error occurred"
 msgstr "�क त�र�टि ह�ई"
 
@@ -3024,17 +3334,17 @@ msgstr ""
 msgid "Select the accounts you want to import:"
 msgstr ""
 
-#: ../src/empathy-account-assistant.c:810
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-account-assistant.c:813
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "Yes"
 msgstr "हा�"
 
-#: ../src/empathy-account-assistant.c:817
+#: ../src/empathy-account-assistant.c:820
 msgid "No, that's all for now"
 msgstr ""
 
-#: ../src/empathy-account-assistant.c:1082
+#: ../src/empathy-account-assistant.c:1085
 msgid ""
 "Empathy can automatically discover and chat with the people connected on the "
 "same network as you. If you want to use this feature, please check that the "
@@ -3042,18 +3352,18 @@ msgid ""
 "disable this feature by using the 'Accounts' dialog"
 msgstr ""
 
-#: ../src/empathy-account-assistant.c:1088
-#: ../src/empathy-account-assistant.c:1144
+#: ../src/empathy-account-assistant.c:1091
+#: ../src/empathy-account-assistant.c:1147
 #, fuzzy
 #| msgid "_Edit account"
 msgid "Edit->Accounts"
 msgstr "खाता संपादित करें (_E)"
 
-#: ../src/empathy-account-assistant.c:1104
+#: ../src/empathy-account-assistant.c:1107
 msgid "I do _not want to enable this feature for now"
 msgstr ""
 
-#: ../src/empathy-account-assistant.c:1140
+#: ../src/empathy-account-assistant.c:1143
 msgid ""
 "You won't be able to chat with people connected to your local network, as "
 "telepathy-salut is not installed. If you want to enable this feature, please "
@@ -3061,25 +3371,25 @@ msgid ""
 "the Accounts dialog"
 msgstr ""
 
-#: ../src/empathy-account-assistant.c:1146
+#: ../src/empathy-account-assistant.c:1149
 msgid "telepathy-salut not installed"
 msgstr ""
 
-#: ../src/empathy-account-assistant.c:1192
+#: ../src/empathy-account-assistant.c:1195
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr ""
 
-#: ../src/empathy-account-assistant.c:1226
+#: ../src/empathy-account-assistant.c:1229
 msgid "Welcome to Empathy"
-msgstr ""
+msgstr "�ंपेथी में स�वागत है"
 
-#: ../src/empathy-account-assistant.c:1235
+#: ../src/empathy-account-assistant.c:1238
 #, fuzzy
 #| msgid "Import Accounts"
 msgid "Import your existing accounts"
 msgstr "खाता आयात करें"
 
-#: ../src/empathy-account-assistant.c:1253
+#: ../src/empathy-account-assistant.c:1256
 msgid "Please enter personal details"
 msgstr ""
 
@@ -3096,256 +3406,285 @@ msgstr ""
 msgid "Your new account has not been saved yet."
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:286
-#: ../src/empathy-streamed-media-window.c:809
-#, fuzzy
+#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1164
 #| msgid "Connecting..."
 msgid "Connecting…"
 msgstr "ज�ड़ रहा है..."
 
-#: ../src/empathy-accounts-dialog.c:327
-#, fuzzy, c-format
+#: ../src/empathy-accounts-dialog.c:386
+#, c-format
 #| msgid "Offline"
 msgid "Offline — %s"
-msgstr "ऑफ़लाइन"
+msgstr "ऑफ़लाइन — %s"
 
-#: ../src/empathy-accounts-dialog.c:339
-#, fuzzy, c-format
+#: ../src/empathy-accounts-dialog.c:398
+#, c-format
 #| msgid "Disconnected"
 msgid "Disconnected — %s"
-msgstr "डिस�कनेक�टेड"
+msgstr "डिस�कनेक�टेड — %s"
 
-#: ../src/empathy-accounts-dialog.c:350
+#: ../src/empathy-accounts-dialog.c:409
 msgid "Offline — No Network Connection"
-msgstr ""
+msgstr "ऑफ़लाइन — कोई नेटवर�क कनेक�शन नहीं"
 
-#: ../src/empathy-accounts-dialog.c:357
-#, fuzzy
+#: ../src/empathy-accounts-dialog.c:416
 #| msgid "Unknown reason"
 msgid "Unknown Status"
-msgstr "अज�ञात कारण"
+msgstr "अज�ञात स�थिति"
 
-#: ../src/empathy-accounts-dialog.c:369
+#: ../src/empathy-accounts-dialog.c:428
 msgid "Offline — Account Disabled"
-msgstr ""
+msgstr "ऑफ़लाइन — खाता निष�क�रिय"
 
-#: ../src/empathy-accounts-dialog.c:772
+#: ../src/empathy-accounts-dialog.c:831
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:1133
+#: ../src/empathy-accounts-dialog.c:1192
 #, fuzzy, c-format
 #| msgid "Do you really want to remove the group '%s'?"
 msgid "Do you want to remove %s from your computer?"
 msgstr "क�या आप वाकई '%s' समूह हटाना चाहते हैं?"
 
-#: ../src/empathy-accounts-dialog.c:1137
+#: ../src/empathy-accounts-dialog.c:1196
 msgid "This will not remove your account on the server."
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:1375
+#: ../src/empathy-accounts-dialog.c:1432
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgstr ""
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1571
-#, fuzzy
+#: ../src/empathy-accounts-dialog.c:1643
 #| msgid "Enabled"
 msgid "_Enable"
 msgstr "समर�थ करें (_E)"
 
-#: ../src/empathy-accounts-dialog.c:1572
+#: ../src/empathy-accounts-dialog.c:1644
 msgid "_Disable"
 msgstr "असमर�थ करें (_D)"
 
-#: ../src/empathy-accounts-dialog.c:2086
+#: ../src/empathy-accounts-dialog.c:2154
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgstr ""
 
 #: ../src/empathy-accounts-dialog.ui.h:1
-#, fuzzy
+msgid "Add…"
+msgstr "जोड़ें…"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
 #| msgid "Edit Contact Information"
 msgid "Loading account information"
-msgstr "संपर�क सूचना संपादित करें"
+msgstr "खाता सूचना लोड करें"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "No protocol installed"
-msgstr ""
+msgstr "कोई प�रोटोकॉल संस�थापित नहीं"
 
-#: ../src/empathy-accounts-dialog.ui.h:3
-#, fuzzy
+#: ../src/empathy-accounts-dialog.ui.h:4
 #| msgid "Protocol"
 msgid "Protocol:"
 msgstr "प�रोटोकॉल:"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr ""
-"नया खाता जोड़ने के लि�, आपको पहले �क बैकेंज संस�थापित करना होगा हर प�रोटोकॉल के लि� जिसे "
+"नया खाता जोड़ने के लि�, आपको पहले �क बैकेंज संस�थापित करना होगा हर प�रोटोकॉल "
+"के लि� जिसे "
 "आप प�रयोग करना चाहते हैं"
 
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add…"
-msgstr ""
-
-#: ../src/empathy-accounts-dialog.ui.h:6
-#, fuzzy
+#: ../src/empathy-accounts-dialog.ui.h:7
 #| msgid "Import"
 msgid "_Import…"
 msgstr "आयात"
 
-#: ../src/empathy-auth-client.c:243
+#: ../src/empathy-auth-client.c:249
 #, fuzzy
 #| msgid "Authentication failed"
 msgid " - Empathy authentication client"
 msgstr "सत�यापन असफल"
 
-#: ../src/empathy-auth-client.c:259
-#, fuzzy
+#: ../src/empathy-auth-client.c:265
 #| msgid "Authentication failed"
 msgid "Empathy authentication client"
-msgstr "सत�यापन असफल"
+msgstr "�ंपेथी सत�यापन असफल"
 
 #: ../src/empathy-auto-salut-account-helper.c:83
 msgid "People nearby"
 msgstr "निकटस�थ लोग"
 
-#: ../src/empathy-av.c:118
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:127
 msgid "- Empathy Audio/Video Client"
 msgstr ""
 
-#: ../src/empathy-av.c:134
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:152
 msgid "Empathy Audio/Video Client"
-msgstr ""
+msgstr "�ंपेथी ऑडियो/वीडियो क�लाइंट"
 
-#: ../src/empathy-streamed-media-window.c:479
+#: ../src/empathy-streamed-media-window.c:431
 msgid "Contrast"
 msgstr "विरोधी"
 
-#: ../src/empathy-streamed-media-window.c:482
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Brightness"
 msgstr "चमकीलापन"
 
-#: ../src/empathy-streamed-media-window.c:485
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Gamma"
 msgstr "गामा"
 
-#: ../src/empathy-streamed-media-window.c:590
+#: ../src/empathy-streamed-media-window.c:542
 msgid "Volume"
 msgstr "आवाज़"
 
-#: ../src/empathy-streamed-media-window.c:1165
+#: ../src/empathy-streamed-media-window.c:1110
 msgid "_Sidebar"
 msgstr "किनारे की पट�टी (_S)"
 
-#: ../src/empathy-streamed-media-window.c:1185
+#: ../src/empathy-streamed-media-window.c:1130
 msgid "Audio input"
 msgstr "ऑडियो इनप�ट"
 
-#: ../src/empathy-streamed-media-window.c:1189
+#: ../src/empathy-streamed-media-window.c:1134
 msgid "Video input"
 msgstr "वीडियो इनप�ट"
 
-#: ../src/empathy-streamed-media-window.c:1193
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Dialpad"
 msgstr "डॉयलपैड"
 
-#: ../src/empathy-streamed-media-window.c:1198
-#, fuzzy
+#: ../src/empathy-streamed-media-window.c:1151
 #| msgid "<b>Contact Details</b>"
 msgid "Details"
 msgstr "विवरण"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1267
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1672
 #, c-format
 msgid "Call with %s"
 msgstr ""
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-streamed-media-window.c:1346
-#, fuzzy
-#| msgid "_Call"
-msgid "Call"
-msgstr "कॉल"
-
-#: ../src/empathy-streamed-media-window.c:1500
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:1916
 msgid "The IP address as seen by the machine"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:1502
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:1918
 msgid "The IP address as seen by a server on the Internet"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:1504
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:1920
 msgid "The IP address of the peer as seen by the other side"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:1506
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:1922
 msgid "The IP address of a relay server"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:1508
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:1924
 msgid "The IP address of the multicast group"
 msgstr ""
 
+#: ../src/empathy-streamed-media-window.c:1843
+#| msgctxt "file transfer percent"
+#| msgid "Unknown"
+msgctxt "encoding video codec"
+msgid "Unknown"
+msgstr "अज�ञात"
+
+#: ../src/empathy-streamed-media-window.c:1846
+#| msgctxt "file transfer percent"
+#| msgid "Unknown"
+msgctxt "encoding audio codec"
+msgid "Unknown"
+msgstr "अज�ञात"
+
+#: ../src/empathy-streamed-media-window.c:1849
+#| msgctxt "file transfer percent"
+#| msgid "Unknown"
+msgctxt "decoding video codec"
+msgid "Unknown"
+msgstr "अज�ञात"
+
+#: ../src/empathy-streamed-media-window.c:1852
+#| msgctxt "file transfer percent"
+#| msgid "Unknown"
+msgctxt "decoding audio codec"
+msgid "Unknown"
+msgstr "अज�ञात"
+
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2259
-#, fuzzy, c-format
+#: ../src/empathy-streamed-media-window.c:2144
+#, c-format
 #| msgid "Connected -- %d:%02dm"
 msgid "Connected — %d:%02dm"
-msgstr "Connected -- %d:%02dm"
+msgstr "कनेक�टेड — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2320
-#, fuzzy
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2674
 #| msgid "<b>Contact Details</b>"
 msgid "Technical Details"
 msgstr "तकनीकी विवरण"
 
-#: ../src/empathy-streamed-media-window.c:2358
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2712
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:2363
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2717
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:2369
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2723
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
 "does not allow direct connections."
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:2375
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2729
 msgid "There was a failure on the network"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:2379
-msgid "The audio formats necessary for this call are not installed on your computer"
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2733
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:2382
-msgid "The video formats necessary for this call are not installed on your computer"
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2736
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:2392
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2748
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3353,161 +3692,208 @@ msgid ""
 "the Help menu."
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:2400
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2757
 msgid "There was a failure in the call engine"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:2403
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2760
 msgid "The end of the stream was reached"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:2443
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2800
 msgid "Can't establish audio stream"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:2453
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2810
 msgid "Can't establish video stream"
 msgstr ""
 
-#: ../src/empathy-call-window.ui.h:1
-#, fuzzy
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:1
 #| msgid "Send Audio"
 msgid "Audio"
 msgstr "ऑडियो"
 
-#: ../src/empathy-call-window.ui.h:2
-#, fuzzy
-#| msgid "Compact contact list"
-msgid "Call the contact again"
-msgstr "संक�चित संपर�क सूची"
-
 #: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
 msgstr ""
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr ""
+#| msgid "_Disable"
+msgid "Disable camera"
+msgstr "कैमरा असमर�थ करें"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
+msgid "Display the dialpad"
 msgstr ""
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Encoding Codec:"
 msgstr ""
 
 #: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr ""
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Hang up"
+msgstr "हैंग अप"
 
 #: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Hang up current call"
 msgstr ""
 
 #: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr ""
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "स�थानीय कंडीडेट:"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "हैंग अप"
+msgid "Maximise me"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
+msgid "Minimise me"
 msgstr ""
 
 #: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Remote Candidate:"
 msgstr ""
 
 #: ../src/empathy-call-window.ui.h:13
-#, fuzzy
-#| msgid "Video preview"
-msgid "Preview"
-msgstr "पूर�वावलोकन"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Send Audio"
+msgstr "आडियो भेजें"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr ""
+#| msgid "Send video"
+msgid "Send Video"
+msgstr "वीडियो भेजें"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr ""
+#| msgid "Dialpad"
+msgid "Show dialpad"
+msgstr "डॉयलपैड दिखा��"
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "आडियो भेजें"
+msgid "Start a video call"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
+msgid "Start an audio call"
 msgstr ""
 
+#: ../src/empathy-call-window.ui.h:18
+msgid "Swap camera"
+msgstr "कैमरा स�वैप करें"
+
 #: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr ""
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr "ऑडियो प�रेषण टॉगल करें"
 
 #: ../src/empathy-call-window.ui.h:20
-#, fuzzy
-#| msgid "Video input"
-msgid "Video"
-msgstr "वीडियो"
+msgid "Toggle video transmission"
+msgstr "वीडियो प�रेषण टॉगल करें"
 
 #: ../src/empathy-call-window.ui.h:21
-#, fuzzy
-#| msgid "Video input"
-msgid "Video Off"
-msgstr "वीडियो इनप�ट"
-
-#: ../src/empathy-call-window.ui.h:22
-#, fuzzy
-#| msgid "Video input"
-msgid "Video On"
-msgstr "वीडियो इनप�ट"
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:2307 ../src/empathy-call-window.c:2308
+#: ../src/empathy-call-window.c:2309 ../src/empathy-call-window.c:2310
+#| msgctxt "file transfer percent"
+#| msgid "Unknown"
+msgid "Unknown"
+msgstr "अज�ञात"
 
 #: ../src/empathy-call-window.ui.h:23
-#, fuzzy
-#| msgid "Video preview"
-msgid "Video Preview"
-msgstr "वीडियो पूर�वावलोकन"
+#| msgid "_Call"
+msgid "Video call"
+msgstr "वीडियो कॉल"
 
 #: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "कॉल (_a)"
 
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:25
+msgid "_Camera"
+msgstr "कैमरा (_C)"
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:18
+msgid "_Contents"
+msgstr "विषय सूची (_C)"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
+msgid "_Debug"
+msgstr "डिबग करें (_D)"
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:22
+msgid "_Help"
+msgstr "मदद (_H)"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Microphone"
+msgstr "माइक�रोफोन (_M)"
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "_Settings"
+msgstr "सेटिंग�स (_S)"
+
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "देखें (_V)"
 
-#: ../src/empathy-chat-window.c:472 ../src/empathy-chat-window.c:492
+#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s (%d unread)"
+msgstr[1] "%s (%d unread)"
 
-#: ../src/empathy-chat-window.c:484
+#: ../src/empathy-chat-window.c:493
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s (and %u other)"
+msgstr[1] "%s (and %u others)"
 
-#: ../src/empathy-chat-window.c:500
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s (%d unread from others)"
+msgstr[1] "%s (%d unread from others)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:518
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s (%d unread from all)"
+msgstr[1] "%s (%d unread from all)"
+
+#: ../src/empathy-chat-window.c:733
+msgid "SMS:"
+msgstr "SMS:"
+
+#: ../src/empathy-chat-window.c:743
+#, fuzzy, c-format
+#| msgid "Typing a message."
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "संदेश टाइप कर रहा है"
+msgstr[1] "संदेश टाइप कर रहा है"
 
-#: ../src/empathy-chat-window.c:711
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
 msgstr "संदेश टाइप कर रहा है"
 
@@ -3516,22 +3902,17 @@ msgid "C_lear"
 msgstr "साफ करें (_l)"
 
 #: ../src/empathy-chat-window.ui.h:2
-#, fuzzy
 #| msgid "Contact"
 msgid "C_ontact"
 msgstr "संपर�क (_o)"
 
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "बात-चीत"
-
 #: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
 msgstr "स�माइली घ�सा�� (_S)"
 
 #: ../src/empathy-chat-window.ui.h:5
 msgid "Invite _Participant…"
-msgstr ""
+msgstr "सहभागी आमंत�रित करें…"
 
 #: ../src/empathy-chat-window.ui.h:6
 msgid "Move Tab _Left"
@@ -3545,10 +3926,6 @@ msgstr "टैब दा�� ले जा�� (_R)"
 msgid "Notify for All Messages"
 msgstr ""
 
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
-msgid "_Contents"
-msgstr "विषय सूची (_C)"
-
 #: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "वार�तालाप (_C)"
@@ -3557,20 +3934,11 @@ msgstr "वार�तालाप (_C)"
 msgid "_Detach Tab"
 msgstr "टैब अलग करें (_D)"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
-msgid "_Edit"
-msgstr "संपादन (_E)"
-
 #: ../src/empathy-chat-window.ui.h:13
-#, fuzzy
 #| msgid "_Favorite Chatroom"
 msgid "_Favorite Chat Room"
 msgstr "पसंदीदा चैटरूम (_F)"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
-msgid "_Help"
-msgstr "मदद (_H)"
-
 #: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "अगला टैब  (_N)"
@@ -3591,15 +3959,15 @@ msgstr "टैब (_T)"
 msgid "_Undo Close Tab"
 msgstr ""
 
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "नाम"
 
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
 msgstr "कमरा"
 
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "स�वतः ज�ड़ाव"
 
@@ -3607,99 +3975,102 @@ msgstr "स�वतः ज�ड़ाव"
 msgid "Manage Favorite Rooms"
 msgstr "प�रिय कक�षों को प�रबंधित करें"
 
-#: ../src/empathy-event-manager.c:507
-#, fuzzy
+#: ../src/empathy-event-manager.c:521
 #| msgid "Incoming voice call"
 msgid "Incoming video call"
-msgstr "इनकमिंग व�याइस काल"
+msgstr "इनकमिंग वीडियो काल"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming call"
 msgstr "इनकमिंग काल"
 
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:525
 #, fuzzy, c-format
 #| msgid "%s is calling you, do you want to answer?"
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s आपको ब�ला कर रहा है, क�या आप जवाब देना चाहते हैं?"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:526
 #, fuzzy, c-format
 #| msgid "%s is calling you, do you want to answer?"
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s आपको ब�ला कर रहा है, क�या आप जवाब देना चाहते हैं?"
 
-#: ../src/empathy-event-manager.c:515 ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s से आगत कॉल"
 
-#: ../src/empathy-event-manager.c:540
+#: ../src/empathy-event-manager.c:554
 msgid "_Reject"
 msgstr "अस�वीकार करें (_R)"
 
-#: ../src/empathy-event-manager.c:546
+#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
 msgid "_Answer"
 msgstr "जवाब (_A)"
 
-#: ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:570
+msgid "_Answer with video"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
 #, fuzzy, c-format
 #| msgid "Incoming call from %s"
 msgid "Incoming video call from %s"
 msgstr "%s से आगत कॉल"
 
-#: ../src/empathy-event-manager.c:737
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
 msgstr "कक�ष आमंत�रण"
 
-#: ../src/empathy-event-manager.c:739
+#: ../src/empathy-event-manager.c:838
 #, fuzzy, c-format
 #| msgid "%s invited you to join %s"
 msgid "Invitation to join %s"
 msgstr "%s ने आपको %s में शामिल होने के लि� आमंत�रण भेजा है"
 
-#: ../src/empathy-event-manager.c:746
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s आपको %s में शामिल होने के लि� आमंत�रित कर रहा है"
 
-#: ../src/empathy-event-manager.c:754
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
 msgstr "मना करें (_D)"
 
-#: ../src/empathy-event-manager.c:759
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "शामिल हो�ं (_J)"
 
-#: ../src/empathy-event-manager.c:786
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s ने आपको %s में शामिल होने के लि� आमंत�रण भेजा है"
 
-#: ../src/empathy-event-manager.c:792
+#: ../src/empathy-event-manager.c:891
 #, fuzzy, c-format
 #| msgid "%s invited you to join %s"
 msgid "You have been invited to join %s"
 msgstr "%s ने आपको %s में शामिल होने के लि� आमंत�रण भेजा है"
 
-#: ../src/empathy-event-manager.c:843
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "%s से आगल फ़ाइल हस�तांतरण"
 
-#: ../src/empathy-event-manager.c:1013 ../src/empathy-main-window.c:370
-#, fuzzy
+#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
 #| msgid "Password:"
 msgid "Password required"
 msgstr "कूटशब�द जरूरी"
 
-#: ../src/empathy-event-manager.c:1069
+#: ../src/empathy-event-manager.c:1190
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:1073
+#: ../src/empathy-event-manager.c:1194
 #, c-format
 msgid ""
 "\n"
@@ -3709,62 +4080,62 @@ msgstr ""
 "संदेश: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:100
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:102
+#: ../src/empathy-ft-manager.c:103
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:179
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "अज�ञात"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr ""
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:275
 #, c-format
 msgid "%s of %s"
 msgstr "%s, %s का"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:305
+#: ../src/empathy-ft-manager.c:306
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "\"%s\" को %s से पा रहा है"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:309
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "\"%s\" को %s में भेज रहा है"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:338
+#: ../src/empathy-ft-manager.c:339
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr ""
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:342
 msgid "Error receiving a file"
 msgstr ""
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:347
 #, fuzzy, c-format
 #| msgid "Error sending message '%s': %s"
 msgid "Error sending \"%s\" to %s"
 msgstr "Error sending message '%s': %s"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:350
 #, fuzzy
 #| msgid "Error sending message '%s': %s"
 msgid "Error sending a file"
@@ -3772,51 +4143,46 @@ msgstr "Error sending message '%s': %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:489
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" पाया %s से"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:493
+#: ../src/empathy-ft-manager.c:494
 #, fuzzy, c-format
 #| msgid "Topic set to: %s"
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" को %s में प�रेषित"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:497
 msgid "File transfer completed"
 msgstr "फ़ाइल हस�तांतरण संपन�न"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
 msgid "Waiting for the other participant's response"
 msgstr ""
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr ""
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
 #, c-format
 msgid "Hashing \"%s\""
-msgstr ""
-
-#: ../src/empathy-ft-manager.c:1016
-msgid "%"
-msgstr "%"
+msgstr "हैशिंग \"%s\""
 
-#: ../src/empathy-ft-manager.c:1028
+#: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "फ़ाइल"
 
-#: ../src/empathy-ft-manager.c:1050
+#: ../src/empathy-ft-manager.c:1060
 msgid "Remaining"
 msgstr "शेष"
 
 #: ../src/empathy-ft-manager.ui.h:1
-#, fuzzy
 #| msgid "File transfers"
 msgid "File Transfers"
 msgstr "फाइल हस�तांतरण"
@@ -3830,7 +4196,8 @@ msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr ""
-"आयात करने के लि� कोई खाता नहीं मिला. �ंपेथी केवल पिजिन से खाता आयात के लि� समर�थन देता "
+"आयात करने के लि� कोई खाता नहीं मिला. �ंपेथी केवल पिजिन से खाता आयात के लि� "
+"समर�थन देता "
 "है."
 
 #: ../src/empathy-import-dialog.c:199
@@ -3850,179 +4217,175 @@ msgstr "प�रोटोकाल"
 msgid "Source"
 msgstr "स�रोत"
 
-#: ../src/empathy-main-window.c:387
-#, fuzzy
+#: ../src/empathy-main-window.c:392
 #| msgid "Password:"
 msgid "Provide Password"
-msgstr "कूटशब�द: "
+msgstr "कूटशब�द दें: "
 
-#: ../src/empathy-main-window.c:393
-#, fuzzy
+#: ../src/empathy-main-window.c:398
 #| msgid "Disconnected"
 msgid "Disconnect"
 msgstr "डिस�कनेक�ट"
 
-#: ../src/empathy-main-window.c:533
-#, fuzzy
+#: ../src/empathy-main-window.c:622
 #| msgid "No topic defined"
 msgid "No match found"
-msgstr "कोई टापिक नहीं"
+msgstr "कोई मेल नहीं मिला"
 
-#: ../src/empathy-main-window.c:688
-#, fuzzy
+#: ../src/empathy-main-window.c:777
 #| msgid "Disconnected"
 msgid "Reconnect"
-msgstr "फिर से ज�ड़ें"
+msgstr "फिर से कनेक�ट करें"
 
-#: ../src/empathy-main-window.c:694
-#, fuzzy
+#: ../src/empathy-main-window.c:783
 #| msgid "_Edit account"
 msgid "Edit Account"
-msgstr "खाता का संपादन करें"
+msgstr "खाता संपादन करें"
 
-#: ../src/empathy-main-window.c:700
-#, fuzzy
+#: ../src/empathy-main-window.c:789
 #| msgid "Clean"
 msgid "Close"
 msgstr "बंद करें"
 
-#: ../src/empathy-main-window.c:1418
+#. Translators: this string will be something like:
+#. *   Top up My Account ($1.23)..."
+#: ../src/empathy-main-window.c:928
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr ""
+
+#: ../src/empathy-main-window.c:975
+msgid "Top up account credit"
+msgstr ""
+
+#. top up button
+#: ../src/empathy-main-window.c:1046
+msgid "Top Up..."
+msgstr ""
+
+#: ../src/empathy-main-window.c:1789
 msgid "Contact"
 msgstr "संपर�क"
 
-#: ../src/empathy-main-window.c:1765
+#: ../src/empathy-main-window.c:2119
 msgid "Contact List"
 msgstr "सम�पर�क सूची"
 
-#: ../src/empathy-main-window.c:1881
-msgid "Show and edit accounts"
-msgstr "खाता दिखा�� व संपादित करें"
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr ""
 
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-main-window-menubar.ui.h:2
+msgid "Credit Balance"
+msgstr ""
+
+#: ../src/empathy-main-window-menubar.ui.h:3
 #, fuzzy
 #| msgid "Contact List"
 msgid "Find in Contact _List"
 msgstr "सम�पर�क सूची"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "पसंदीदा शामिल हों (_F)"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "पसंदीदा प�रबंधित करें"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
-msgstr ""
+msgstr "सामान�य आकार (_o)"
 
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr ""
 
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr ""
 
-#: ../src/empathy-main-window.ui.h:8
-#, fuzzy
+#: ../src/empathy-main-window-menubar.ui.h:9
 #| msgid "Preferences"
 msgid "P_references"
 msgstr "वरीयता�� (_r)"
 
-#: ../src/empathy-main-window.ui.h:9
-#, fuzzy
+#: ../src/empathy-main-window-menubar.ui.h:10
 #| msgid "Protocol"
 msgid "Show P_rotocols"
-msgstr "प�रोटोकाल"
+msgstr "प�रोटोकाल दिखा�� (_r)"
 
-#: ../src/empathy-main-window.ui.h:10
-#, fuzzy
+#: ../src/empathy-main-window-menubar.ui.h:11
 #| msgid "Sort by _name"
 msgid "Sort by _Name"
 msgstr "नाम के अन�सार छांटें (_N)"
 
-#: ../src/empathy-main-window.ui.h:11
-#, fuzzy
+#: ../src/empathy-main-window-menubar.ui.h:12
 #| msgid "Sort by s_tate"
 msgid "Sort by _Status"
-msgstr "स�थिति से छांटें (_t)"
+msgstr "स�थिति से छांटें (_S)"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "खाता (_A)"
 
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:15
 #, fuzzy
 #| msgid "Show offline contacts"
 msgid "_Blocked Contacts"
 msgstr "ऑफलाइन संपर�क दिखा��"
 
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr ""
 
-#: ../src/empathy-main-window.ui.h:18
-msgid "_Debug"
-msgstr "डिबग करें (_D)"
-
-#: ../src/empathy-main-window.ui.h:20
-#, fuzzy
+#: ../src/empathy-main-window-menubar.ui.h:21
 #| msgid "File transfers"
 msgid "_File Transfers"
-msgstr "फाइल स�थानांतरण"
+msgstr "फाइल स�थानांतरण (_F)"
 
-#: ../src/empathy-main-window.ui.h:22
-#, fuzzy
+#: ../src/empathy-main-window-menubar.ui.h:23
 #| msgid "_Join"
 msgid "_Join…"
 msgstr "शामिल हो�ं (_J)"
 
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
-#, fuzzy
+#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
 #| msgid "New Conversation"
 msgid "_New Conversation…"
-msgstr "नयी बातचीत"
+msgstr "नयी बातचीत (_N)..."
 
-#: ../src/empathy-main-window.ui.h:24
-#, fuzzy
+#: ../src/empathy-main-window-menubar.ui.h:25
 #| msgid "Show offline contacts"
 msgid "_Offline Contacts"
-msgstr "ऑफलाइन संपर�क दिखा��"
+msgstr "ऑफलाइन संपर�क (_O)"
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "निजी सूचना (_P)"
 
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "कक�ष (_R)"
 
-#: ../src/empathy-main-window.ui.h:28
-#, fuzzy
+#: ../src/empathy-main-window-menubar.ui.h:29
 #| msgid "_Show Contact List"
 msgid "_Search for Contacts…"
-msgstr "संपर�क सूची दिखा�� (_S)"
+msgstr "संपर�क के लि� खोजें (_S)"
 
 #: ../src/empathy-new-chatroom-dialog.c:337
-#, fuzzy
 #| msgid "Chat Rooms"
 msgid "Chat Room"
 msgstr "चैट कक�ष"
 
 #: ../src/empathy-new-chatroom-dialog.c:353
-#, fuzzy
 #| msgid "Themes"
 msgid "Members"
 msgstr "सदस�य"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:560
+#: ../src/empathy-new-chatroom-dialog.c:553
 #, c-format
 msgid ""
 "%s\n"
@@ -4031,16 +4394,16 @@ msgid ""
 "Members: %s"
 msgstr ""
 
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "No"
 msgstr "नहीं"
 
-#: ../src/empathy-new-chatroom-dialog.c:591
+#: ../src/empathy-new-chatroom-dialog.c:584
 msgid "Could not start room listing"
 msgstr ""
 
-#: ../src/empathy-new-chatroom-dialog.c:601
+#: ../src/empathy-new-chatroom-dialog.c:594
 msgid "Could not stop room listing"
 msgstr ""
 
@@ -4049,25 +4412,27 @@ msgid "Couldn't load room list"
 msgstr ""
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
-msgid "Enter the room name to join here or click on one or more rooms in the list."
-msgstr "यहा� शामिल होने के लि� कक�ष नाम दाखिल करें या सूची में �क या अधिक कक�ष शामिल करें."
+msgid ""
+"Enter the room name to join here or click on one or more rooms in the list."
+msgstr ""
+"यहा� शामिल होने के लि� कक�ष नाम दाखिल करें या सूची में �क या अधिक कक�ष शामिल "
+"करें."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
 msgstr ""
-"सर�वर दाखिल करें जो कक�ष मेजबानित करता है या इसे रिक�त छोड़े यदि कक�ष मौजूदा खाता सर�वर "
+"सर�वर दाखिल करें जो कक�ष मेजबानित करता है या इसे रिक�त छोड़े यदि कक�ष मौजूदा "
+"खाता सर�वर "
 "पर है"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:5
-#, fuzzy
 #| msgid "Room"
 msgid "Join Room"
-msgstr "कमरा"
+msgstr "कक�ष में शामिल हों"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
-#, fuzzy
 #| msgid "Room"
 msgid "Room List"
 msgstr "कमरा सूची"
@@ -4076,191 +4441,250 @@ msgstr "कमरा सूची"
 msgid "_Room:"
 msgstr "कक�ष (_R):"
 
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr "प�राप�त सन�देश"
 
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr "सन�देश भेजा गया"
 
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
 msgstr "नयी बातचीत"
 
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
 msgstr "संपर�क ऑनलाइन हो गया"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
 msgstr "संपर�क ऑफ़लाइन हो गया"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
 msgstr "खाता क�कनेक�टेड"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
 msgstr "खाता डिस�कनेक�टेड"
 
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr "भाषा"
 
-#: ../src/empathy-preferences.c:875
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:734
+#| msgid "Client:"
+msgid "Juliet"
+msgstr "ज�लियट"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:741
+#| msgid "Room"
+msgid "Romeo"
+msgstr "रोमियो"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:747
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:750
+msgid "Deny thy father and refuse thy name;"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:753
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:756
+msgid "And I'll no longer be a Capulet."
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:759
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:762
+#| msgid "Contact disconnected"
+msgid "Juliet has disconnected"
+msgstr "ज�लियट डिसकनेक�टेड"
+
+#: ../src/empathy-preferences.c:1166
 msgid "Preferences"
 msgstr "वरीयता�ं"
 
 #: ../src/empathy-preferences.ui.h:1
-#, fuzzy
 #| msgid "<b>Appearance</b>"
 msgid "Appearance"
 msgstr "रूप"
 
-#: ../src/empathy-preferences.ui.h:2
-#, fuzzy
+#: ../src/empathy-preferences.ui.h:3
 #| msgid "<b>Behavior</b>"
 msgid "Behavior"
 msgstr "व�यवहार"
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
 msgid "Chat Th_eme:"
 msgstr "चैट प�रसंग (_e):"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
 msgid "Disable notifications when _away or busy"
 msgstr "दूर या व�यस�त रहने पर अधिसूचना निष�क�रिय करें (_a)"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
 msgid "Disable sounds when _away or busy"
 msgstr "दूर या व�यस�त होने पर ध�वनि निष�क�रिय करें (_a)"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "अधिसूचना सक�रिय करें जब गपशप केंद�रित नहीं है (_c)"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:13
 #, fuzzy
 #| msgid "Spell checking languages"
 msgid "Enable spell checking for languages:"
 msgstr "वर�तनीजांच भाषा"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "सामान�य"
 
-#: ../src/empathy-preferences.ui.h:13
-#, fuzzy
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input level:"
+msgstr "इनप�ट स�तर:"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "इनप�ट आवाज़:"
+
+#: ../src/empathy-preferences.ui.h:18
 #| msgid "Notifications"
 msgid "Location sources:"
-msgstr "स�थान"
+msgstr "स�थान स�रोत:"
 
-#: ../src/empathy-preferences.ui.h:14
-#, fuzzy
+#: ../src/empathy-preferences.ui.h:19
 #| msgid "Conversations"
 msgid "Log conversations"
-msgstr "बातचीत"
+msgstr "बातचीत लाग"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "सूचना��"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "गोपनीयता"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
 "decimal place."
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "बतौर छवि स�माइली दिखा�� (_s)"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:25
 #, fuzzy
 #| msgid "_Show Contact List"
 msgid "Show contact _list in rooms"
 msgstr "संपर�क सूची दिखा�� (_S)"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "ध�वनि"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "वर�तनी की जांच "
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "प�रसंग"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:30
+#| msgid "Version:"
+msgid "Variant:"
+msgstr "चर:"
+
+#: ../src/empathy-preferences.ui.h:31
 #, fuzzy
 #| msgid "Automatically _connect on startup "
 msgid "_Automatically connect on startup"
 msgstr "आरंभ पर स�वतः कनेक�ट करें (_c) "
 
-#: ../src/empathy-preferences.ui.h:26
-#, fuzzy
+#: ../src/empathy-preferences.ui.h:32
 #| msgid "Megaphone"
 msgid "_Cellphone"
-msgstr "मेगाफोन"
+msgstr "सेलफोन (_C)"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "बबल अधिसूचना सक�रिय करें (_E)"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:34
 #, fuzzy
 #| msgid "Notifications"
 msgid "_Enable sound notifications"
 msgstr "ध�वनि अधिसूचना सक�रिय करें (_E)"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
-msgstr ""
+msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
-msgstr ""
+msgstr "संजाल (_N) (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "अलग विंडो में नया गपशप खोलें (_O)"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr ""
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr ""
 
@@ -4272,96 +4696,143 @@ msgstr "स�थिति"
 msgid "_Quit"
 msgstr "बाहर (_Q)"
 
-#: ../src/empathy-map-view.c:442
+#: ../src/empathy-streamed-media-window.ui.h:2
 #, fuzzy
+#| msgid "Compact contact list"
+msgid "Call the contact again"
+msgstr "संक�चित संपर�क सूची"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "कैमरा बंद"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "कैमरा चालू"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr ""
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr ""
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr ""
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+#| msgid "Video preview"
+msgid "Preview"
+msgstr "पूर�वावलोकन"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr ""
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "वीडियो"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+#| msgid "Video input"
+msgid "Video Off"
+msgstr "वीडियो बंद"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+#| msgid "Video input"
+msgid "Video On"
+msgstr "वीडियो चालू"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+#| msgid "Video preview"
+msgid "Video Preview"
+msgstr "वीडियो पूर�वावलोकन"
+
+#: ../src/empathy-map-view.c:448
 #| msgid "Contact List"
 msgid "Contact Map View"
-msgstr "सम�पर�क सूची"
+msgstr "सम�पर�क सूची दृश�य"
 
-#: ../src/empathy-debug-window.c:1218
-#, fuzzy
+#: ../src/empathy-debug-window.c:1228
 #| msgid "Server"
 msgid "Save"
 msgstr "सहेजें"
 
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
 msgstr "डिबग विन�डो"
 
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
 msgstr "ठहरें"
 
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
 msgstr "स�तर "
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
 msgid "Debug"
 msgstr "डिबग"
 
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
 msgid "Info"
 msgstr "सूचना"
 
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
-#, fuzzy
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
 #| msgid "Message:"
 msgid "Message"
 msgstr "संदेश"
 
-#: ../src/empathy-debug-window.c:1526
-#, fuzzy
+#: ../src/empathy-debug-window.c:1567
 #| msgid "Remaining"
 msgid "Warning"
 msgstr "चेतावनी"
 
-#: ../src/empathy-debug-window.c:1532
-#, fuzzy
+#: ../src/empathy-debug-window.c:1573
 #| msgid "Croatian"
 msgid "Critical"
 msgstr "गंभीर"
 
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
 msgid "Error"
 msgstr "त�र�टि"
 
-#: ../src/empathy-debug-window.c:1557
-#, fuzzy
+#: ../src/empathy-debug-window.c:1598
 #| msgid "Simple"
 msgid "Time"
 msgstr "समय"
 
-#: ../src/empathy-debug-window.c:1560
-#, fuzzy
+#: ../src/empathy-debug-window.c:1601
 #| msgid "Romanian"
 msgid "Domain"
 msgstr "डोमेन"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
 msgstr "श�रेणी"
 
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "स�तर"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr ""
 
-#: ../src/empathy-invite-participant-dialog.c:34
-#: ../src/empathy-invite-participant-dialog.c:48
+#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:231
 msgid "Invite Participant"
-msgstr ""
+msgstr "सहभागी आमंत�रित करें"
 
-#: ../src/empathy-invite-participant-dialog.c:35
+#: ../src/empathy-invite-participant-dialog.c:206
 msgid "Choose a contact to invite into the conversation:"
 msgstr ""
 
-#: ../src/empathy-invite-participant-dialog.c:45
+#: ../src/empathy-invite-participant-dialog.c:227
 msgid "Invite"
 msgstr "निमंत�रित करें"
 
@@ -4370,7 +4841,8 @@ msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 
 #: ../src/empathy-accounts.c:187
-msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 
 #: ../src/empathy-accounts.c:191
@@ -4378,10 +4850,9 @@ msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 
 #: ../src/empathy-accounts.c:193
-#, fuzzy
 #| msgid "Account"
 msgid "<account-id>"
-msgstr "खाता"
+msgstr "<account-id>"
 
 #: ../src/empathy-accounts.c:198
 #, fuzzy
@@ -4390,57 +4861,137 @@ msgid "- Empathy Accounts"
 msgstr "खाता आयात करें"
 
 #: ../src/empathy-accounts.c:237
-#, fuzzy
 #| msgid "Import Accounts"
 msgid "Empathy Accounts"
-msgstr "खाता आयात करें"
+msgstr "�ंपेथी खाता"
 
-#: ../src/empathy-debugger.c:66
-msgid "Empathy Debugger"
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
 msgstr ""
 
+#: ../src/empathy-debugger.c:75
+#| msgid "Import Accounts"
+msgid "- Empathy Debugger"
+msgstr "- �ंपेथी डिबगर"
+
+#: ../src/empathy-debugger.c:114
+msgid "Empathy Debugger"
+msgstr "�ंपेथी डिबगर"
+
 #: ../src/empathy-chat.c:107
 msgid "- Empathy Chat Client"
 msgstr ""
 
-#: ../src/empathy-notifications-approver.c:184
+#: ../src/empathy-notifications-approver.c:203
 msgid "Respond"
 msgstr ""
 
-#: ../src/empathy-notifications-approver.c:190
-#, fuzzy
+#: ../src/empathy-notifications-approver.c:217
 #| msgid "_Reject"
 msgid "Reject"
-msgstr "अस�वीकृत"
+msgstr "अस�वीकार करें"
 
-#: ../src/empathy-notifications-approver.c:194
-#, fuzzy
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:227
 #| msgid "_Answer"
 msgid "Answer"
 msgstr "उत�तर"
 
-#: ../src/empathy-notifications-approver.c:201
-#: ../src/empathy-notifications-approver.c:211
-#, fuzzy
+#: ../src/empathy-notifications-approver.c:227
+msgid "Answer with video"
+msgstr ""
+
+#: ../src/empathy-notifications-approver.c:235
+#: ../src/empathy-notifications-approver.c:245
 #| msgid "_Decline"
 msgid "Decline"
-msgstr "अस�वीकार"
+msgstr "अस�वीकारें"
 
-#: ../src/empathy-notifications-approver.c:205
-#: ../src/empathy-notifications-approver.c:216
-#, fuzzy
+#: ../src/empathy-notifications-approver.c:239
+#: ../src/empathy-notifications-approver.c:250
 #| msgid "Account"
 msgid "Accept"
 msgstr "स�वीकारें"
 
-#: ../src/empathy-call-observer.c:130
-#, fuzzy, c-format
-#| msgid "Incoming call from %s"
-msgid "Missed call from %s"
-msgstr "%s से मिस काल"
+#: ../src/empathy-notifications-approver.c:260
+#| msgid "Video preview"
+msgid "Provide"
+msgstr "प�रदान करें"
 
-#: ../src/empathy-call-observer.c:133
+#: ../src/empathy-call-observer.c:134
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr ""
 
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1036 ../src/empathy-call-window.c:1059
+msgid "i"
+msgstr "i"
+
+#: ../src/empathy-call-window.c:2603
+msgid "On hold"
+msgstr ""
+
+#: ../src/empathy-call-window.c:2606
+msgid "Mute"
+msgstr "मूक"
+
+#: ../src/empathy-call-window.c:2608
+#| msgid "Notifications"
+msgid "Duration"
+msgstr "अवधि"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2611
+#, c-format
+#| msgid "Connected -- %d:%02dm"
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02dm"
+
+#: ../libempathy-gtk/empathy-search-bar.c:243
+#, fuzzy
+#| msgid "Match case"
+msgid "_Match case"
+msgstr "केस मिलायें"
+
+#~ msgid "All"
+#~ msgstr "सभी"
+
+#, fuzzy
+#~| msgid "Enabled"
+#~ msgid "_Enabled"
+#~ msgstr "सक�षम"
+
+#~ msgid "Date"
+#~ msgstr "दिनांक"
+
+#~ msgid "Conversations"
+#~ msgstr "बातचीत"
+
+#~ msgid "Find Next"
+#~ msgstr "अगला ढूंढें"
+
+#, fuzzy
+#~| msgid "_Previous Tab"
+#~ msgid "Find Previous"
+#~ msgstr "पिछला ढूंढें"
+
+#~ msgid "Previous Conversations"
+#~ msgstr "पिछली बातचीत"
+
+#~ msgid "_For:"
+#~ msgstr "के लि� (_F):"
+
+#, fuzzy
+#~| msgid "Custom message"
+#~ msgid "Enter Custom Message"
+#~ msgstr "पसंदीदा संदेश"
+
+#, fuzzy
+#~| msgid "Custom message"
+#~ msgid "Saved Status Messages"
+#~ msgstr "पसंदीदा संदेश"
+
+#~ msgid "Show and edit accounts"
+#~ msgstr "खाता दिखा�� व संपादित करें"
diff --git a/po/hu.po b/po/hu.po
index b1e5965bf..ec0cfe300 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-02 01:15+0200\n"
-"PO-Revision-Date: 2011-08-02 01:17+0200\n"
+"POT-Creation-Date: 2011-09-19 23:45+0200\n"
+"PO-Revision-Date: 2011-09-19 23:45+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
 "Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
 "Language: \n"
@@ -48,6 +48,14 @@ msgid "Call volume, as a percentage."
 msgstr "Hívás hangereje százalékban."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Camera device"
+msgstr "Kameraeszköz"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "Kamerapozíció"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -55,49 +63,56 @@ msgstr ""
 "Becenévhez fűzendő karakter becenév-kiegészítés (tab) használatakor "
 "csoportos csevegésben."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "Csevegőablak témája"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Chat window theme variant"
 msgstr "Csevegőablak témájának változata"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "A helyesírás-ellenőrző által használandó nyelvek vesszővel elválasztott "
 "listája (például: „en, fr, hu�)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "Tömör partnerlista"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "Használandó kapcsolatkezelők"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "Partnerlista rendezési feltétele"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr ""
+"A videohívásokban használandó alapértelmezett kameraeszköz, például /dev/"
+"video0."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
 msgstr "Alapértelmezett könyvtár avatar kép kiválasztásához"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr "Felugró értesítések tiltása ha nincs itt"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr "Hangok tiltása ha nincs itt"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
 msgstr "Bejövő események megjelenítése az állapotterületen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -105,289 +120,314 @@ msgstr ""
 "Bejövő események megjelenítése az állapotterületen. Ha hamis, akkor azonnal "
 "megjeleníti ezeket a felhasználónak."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+msgid "Echo cancellation support"
+msgstr "Visszhang-csillapítás támogatása"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr "Az Empathy közzéteheti a felhasználó helyét"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Az Empathy használhatja a GPS-t a hely meghatározására"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Az Empathy használhatja mobilhálózatot a hely meghatározására"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr "Az Empathy használhatja a hálózatot a hely meghatározására"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr "Az Empathy alapértelmezett letöltési mappája"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
 msgstr "Az Empathy átköltöztette az MSN-naplókat"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr "Az Empathy automatikusan távol módba váltson-e üresjáratban?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "Az Empathy automatikusan csatlakozzon-e induláskor?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Az Empathy csökkentse-e a hely pontosságát?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Az Empathy a partner avatarját használja-e a csevegésablak ikonjaként"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr "WebKit fejlesztőeszközök engedélyezése"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "Felugró értesítések értesítések engedélyezése új üzenetekre"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "Helyesírás-ellenőrző engedélyezése"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "Főablak elrejtése"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "A főablak elrejtése."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "Kiegészített becenevet jelző karakter"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "Új csevegések megnyitása külön ablakokban"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "A használandó Adium téma útvonala"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "A használandó Adium téma útvonala, ha a csevegéshez használ téma Adium."
+msgstr ""
+"A használandó Adium téma útvonala, ha a csevegéshez használ téma Adium."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Hang lejátszása érkező üzenetekhez"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "Hang lejátszása új társalgásokhoz"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Hang lejátszása kimenő üzenetekhez"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "Hang lejátszása partner bejelentkezésekor"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "Hang lejátszása partner kijelentkezésekor"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "Hang lejátszása bejelentkezéskor"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "Hang lejátszása kijelentkezéskor"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Felugró értesítések megjelenítése, ha a csevegés nincs fókuszban"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "Felugró értesítések megjelenítése, ha egy partner bejelentkezik"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "Felugró értesítések megjelenítése, ha egy partner kijelentkezik"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr "A kamera-előnézet helye a hívás során."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Show Balance in contact list"
 msgstr "Egyenleg megjelenítése a partnerlistában"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "Avatarok megjelenítése"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "Partnerlista megjelenítése szobákban"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr "Tanács megjelenítése a főablak bezárásakor"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr "Kilépett partnerek megjelenítése"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
 msgstr "Protokollok megjelenítése"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "Helyesírás-ellenőrző nyelvei"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr "Alapértelmezett mappa átvitt fájlok mentéséhez."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Az utolsó könyvtár, amelyből egy avatar kép kiválasztásra került."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
 msgstr "A csevegőablak oldalsávjának pozíciója"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "A csevegőablak oldalsávjának tárolt pozíciója képpontban."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "A társalgás megjelenítésére használt téma a csevegőablakokban."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The theme variant that is used to display the conversation in chat windows."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
 msgstr "A társalgás megjelenítésére használt témaváltozat a csevegőablakokban."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Grafikus hangulatjelek használata"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "Értesítő hangok használata"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "Téma használata a csevegőszobákhoz"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Az Empathy közzéteheti-e a felhasználó helyét a partnereinek."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Az Empathy használhatja-e a GPS-t a hely meghatározására."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Az Empathy használhatja-e a mobilhálózatot a hely meghatározására."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Az Empathy használhatja-e a hálózatot a hely meghatározására."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "Az Empathy átköltöztette-e az MSN naplókat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Az Empathy automatikusan bejelentkezzen-e a fiókjaiba induláskor."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "Az Empathy automatikusan távol módba váltson-e, ha a felhasználó tétlen."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr ""
+"Az Empathy automatikusan távol módba váltson-e, ha a felhasználó tétlen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+msgid ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "Az Empathy csökkentse-e adatvédelmi okokból a hely pontosságát."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "Az Empathy a partner avatarját használja-e a csevegésablak ikonjaként."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "A WebKit fejlesztői eszközök, például a Web Inspector engedélyezve legyen-e."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr ""
+"A WebKit fejlesztői eszközök, például a Web Inspector engedélyezve legyen-e."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
-msgstr "Használandók-e kapcsolatkezelők az automatikus bontáshoz/újracsatlakozáshoz."
+msgstr ""
+"Használandók-e kapcsolatkezelők az automatikus bontáshoz/újracsatlakozáshoz."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid "Whether to check words typed against the languages you want to check with."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+msgid ""
+"Whether to check words typed against the languages you want to check with."
 msgstr "Ellenőrzendők-e a beírt szavak az ellenőrizni kívánt nyelveken."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "Hangulatjelek képekké alakítása társalgások közben."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Engedélyezendő-e a Pulseaudio visszhang-csillapítási szűrője."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Lejátsszon-e hangos értesítéseket, ha a partnerek bejelentkeznek a hálózatra."
+msgstr ""
+"Lejátsszon-e hangos értesítéseket, ha a partnerek bejelentkeznek a hálózatra."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid "Whether to play a sound to notify of contacts logging out of the network."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
 "Lejátsszon-e hangos értesítéseket, ha a partnerek kijelentkeznek a "
 "hálózatból?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "Lejátsszon-e hangot az eseményekre figyelmeztetésként."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Lejátsszon-e hangot bejövő üzenetekre figyelmeztetésként."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Lejátsszon-e hangot új társalgásokra figyelmeztetésként."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Lejátsszon-e hangot kimenő üzenetekre figyelmeztetésként."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "Lejátsszon-e hangot a hálózatba bejelentkezéskor."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Lejátsszon-e hangot a hálózatból kijelentkezéskor."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr "Lejátsszon-e hangos értesítéseket, ha Ön távol van vagy elfoglalt."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Megjelenjenek-e felugró értesítések, ha egy partner távol állapotúvá válik."
+msgstr ""
+"Megjelenjenek-e felugró értesítések, ha egy partner távol állapotúvá válik."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr ""
 "Megjelenjenek-e felugró értesítések, ha egy partner elérhető állapotúvá "
 "válik."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -395,53 +435,55 @@ msgstr ""
 "Megjelenjenek-e felugró értesítések új üzenet érkezésekor akkor is, ha a "
 "csevegés meg van nyitva, de nincs fókuszban."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "Megjelenjenek-e felugró értesítések új üzenet érkezésekor."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show account balances in the contact list."
 msgstr "Megjelenjenek-e a fiókegyenlegek a partnerlistában."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to show avatars for contacts in the contact list and chat windows."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 "Megjelenjenek-e az avatarok a partnerekhez a partnerlistában és "
 "csevegőablakokban."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "Kilépett partnerek megjelenítése a partnerlistában."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
 msgstr "Megjelenjenek-e felugró értesítések, ha Ön távol van vagy elfoglalt."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr ""
 "Megjelenjenek-e az avatarok a partnerekhez a partnerlistában és "
 "csevegőablakokban."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Megjelenjen-e a partnerlista csevegőszobákban."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "Megjelenjen-e a partnerlista tömör módban."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
-msgstr "Megjelenjen-e párbeszédablak a főablak bezárásakor a címsor X gombjával."
+msgstr ""
+"Megjelenjen-e párbeszédablak a főablak bezárásakor a címsor X gombjával."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "Használandó-e téma a csevegőszobákhoz."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -464,30 +506,30 @@ msgstr "Üzenetküldő- és VoIP-fiókok"
 msgid "File transfer completed, but the file was corrupted"
 msgstr "A fájlátvitel befejeződött, de a fájl megsérült"
 
-#: ../libempathy/empathy-ft-handler.c:1113
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
 msgstr "A távoli partner nem támogatja a fájlátvitelt"
 
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is not a regular file"
 msgstr "A kiválasztott fájl nem szabályos fájl"
 
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1176
 msgid "The selected file is empty"
 msgstr "A kiválasztott fájl üres"
 
-#: ../libempathy/empathy-message.c:413 ../src/empathy-call-observer.c:132
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
 #, c-format
 msgid "Missed call from %s"
 msgstr "Nem fogadott hívás ettől: %s"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:417
+#: ../libempathy/empathy-message.c:419
 #, c-format
 msgid "Called %s"
 msgstr "Felhívva: %s"
 
-#: ../libempathy/empathy-message.c:420
+#: ../libempathy/empathy-message.c:422
 #, c-format
 msgid "Call from %s"
 msgstr "Hívás tőle: %s"
@@ -520,140 +562,143 @@ msgstr "Hiba a fájl átvitelekor"
 msgid "The other participant is unable to transfer the file"
 msgstr "A partner nem képes a fájl átvitelére"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
 msgid "Unknown reason"
 msgstr "Ismeretlen ok"
 
-#: ../libempathy/empathy-utils.c:212
+#: ../libempathy/empathy-utils.c:222
 msgid "Available"
 msgstr "Elérhető"
 
-#: ../libempathy/empathy-utils.c:214
+#: ../libempathy/empathy-utils.c:224
 msgid "Busy"
 msgstr "Elfoglalt"
 
-#: ../libempathy/empathy-utils.c:217
+#: ../libempathy/empathy-utils.c:227
 msgid "Away"
 msgstr "Távol"
 
-#: ../libempathy/empathy-utils.c:219
+#: ../libempathy/empathy-utils.c:229
 msgid "Invisible"
 msgstr "Láthatatlan"
 
-#: ../libempathy/empathy-utils.c:221
+#: ../libempathy/empathy-utils.c:231
 msgid "Offline"
 msgstr "Kilépett"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:224
+#: ../libempathy/empathy-utils.c:234
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: ../libempathy/empathy-utils.c:264
+#: ../libempathy/empathy-utils.c:274
 msgid "No reason specified"
 msgstr "Nincs megadva ok"
 
-#: ../libempathy/empathy-utils.c:266 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
 msgid "Status is set to offline"
 msgstr "Az állapot beállítva kilépettre"
 
-#: ../libempathy/empathy-utils.c:268 ../libempathy/empathy-utils.c:302
-#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "Hálózati hiba"
 
-#: ../libempathy/empathy-utils.c:270 ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
 msgid "Authentication failed"
 msgstr "A hitelesítés meghiúsult"
 
-#: ../libempathy/empathy-utils.c:272 ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
 msgid "Encryption error"
 msgstr "Titkosítási hiba"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:284
 msgid "Name in use"
 msgstr "A név használatban"
 
-#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:308
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
 msgid "Certificate not provided"
 msgstr "Nincs megadva tanúsítvány"
 
-#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
 msgid "Certificate untrusted"
 msgstr "A tanúsítvány nem megbízható"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
 msgid "Certificate expired"
 msgstr "A tanúsítvány lejárt"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
 msgid "Certificate not activated"
 msgstr "A tanúsítvány nincs aktiválva"
 
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
 msgid "Certificate hostname mismatch"
 msgstr "A tanúsítvány gépneve eltér"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate fingerprint mismatch"
 msgstr "A tanúsítvány ujjlenyomata eltér"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate self-signed"
 msgstr "A tanúsítvány önaláírt"
 
-#: ../libempathy/empathy-utils.c:290
+#: ../libempathy/empathy-utils.c:300
 msgid "Certificate error"
 msgstr "Tanúsítványhiba"
 
-#: ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:334
 msgid "Encryption is not available"
 msgstr "A titkosítás nem érhető el"
 
-#: ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:336
 msgid "Certificate is invalid"
 msgstr "A tanúsítvány érvénytelen"
 
-#: ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:338
 msgid "Connection has been refused"
 msgstr "A kapcsolat visszautasítva"
 
-#: ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:340
 msgid "Connection can't be established"
 msgstr "A kapcsolat nem hozható létre"
 
-#: ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:342
 msgid "Connection has been lost"
 msgstr "A kapcsolat elveszett"
 
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:344
 msgid "This resource is already connected to the server"
 msgstr "Ez az erőforrás már kapcsolódik a kiszolgálóhoz"
 
-#: ../libempathy/empathy-utils.c:336
-msgid "Connection has been replaced by a new connection using the same resource"
-msgstr "A kapcsolatot leváltotta egy új, ugyanazt az erőforrást használó kapcsolat"
+#: ../libempathy/empathy-utils.c:346
+msgid ""
+"Connection has been replaced by a new connection using the same resource"
+msgstr ""
+"A kapcsolatot leváltotta egy új, ugyanazt az erőforrást használó kapcsolat"
 
-#: ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:349
 msgid "The account already exists on the server"
 msgstr "A fiók már létezik a kiszolgálón"
 
-#: ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:351
 msgid "Server is currently too busy to handle the connection"
 msgstr "A kiszolgáló pillanatnyilag túl elfoglalt a kapcsolat kezeléséhez"
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:353
 msgid "Certificate has been revoked"
 msgstr "A tanúsítvány visszavonva"
 
-#: ../libempathy/empathy-utils.c:345
-msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
+#: ../libempathy/empathy-utils.c:355
+msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "A tanúsítvány nem biztonságos titkosító algoritmust használ, vagy "
 "titkosításilag gyenge"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:358
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -661,20 +706,20 @@ msgstr ""
 "A kiszolgáló tanúsítványának hossza, vagy a kiszolgáló tanúsítványláncának "
 "mélysége túllépi a titkosítási programkönyvtár korlátozásait"
 
-#: ../libempathy/empathy-utils.c:509
+#: ../libempathy/empathy-utils.c:519
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "Közeli emberek"
 
-#: ../libempathy/empathy-utils.c:514
+#: ../libempathy/empathy-utils.c:524
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:543
+#: ../libempathy/empathy-utils.c:553
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:544
+#: ../libempathy/empathy-utils.c:554
 msgid "Facebook Chat"
 msgstr "Facebook csevegés"
 
@@ -724,71 +769,81 @@ msgstr[1] "%d hónapja"
 msgid "in the future"
 msgstr "a jövőben"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:539
+#: ../libempathy-gtk/empathy-account-chooser.c:540
 msgid "All accounts"
 msgstr "Minden fiók"
 
-#: ../libempathy-gtk/empathy-account-widget.c:691
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "Fiók"
 
-#: ../libempathy-gtk/empathy-account-widget.c:692
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "Jelszó"
 
-#: ../libempathy-gtk/empathy-account-widget.c:693
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Kiszolgáló"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:766
-#: ../libempathy-gtk/empathy-account-widget.c:823
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1164
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "Webes fiókjaim"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "A(z) %s fiók szerkesztésre került a webes fiókjaimmal."
+msgid "The account %s is edited via %s."
+msgstr "A(z) %s fiók szerkesztésre kerül a(z) %s használatával."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1170
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "A(z) %s fiókot nem lehet szerkeszteni az Empathyban."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1190
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
 msgstr "A webes fiókjaim elindítása"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1530
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "%s szerkesztése"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Felhasználónév:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1848
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "_Alkalmazás"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1878
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
 msgstr "Bejele_ntkezés"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1952
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "Ez a fiók már létezik a kiszolgálón"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1955
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "Új fiók létrehozása a kiszolgálón"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2147
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "Mé_gse"
 
@@ -797,19 +852,19 @@ msgstr "Mé_gse"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2425
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s ezen: %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2451
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "%s fiók"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2455
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "Új fiók"
 
@@ -931,36 +986,36 @@ msgstr "Mi az Ön ICQ UIN-ja?"
 msgid "What is your ICQ password?"
 msgstr "Mi az Ön ICQ jelszava?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:184
-#: ../libempathy-gtk/empathy-account-widget-sip.c:217
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "Auto"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:187
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:193
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:222
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "Regisztrálás"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:227
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "Beállítások"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "Nincs"
 
@@ -1192,14 +1247,18 @@ msgid "Transport:"
 msgstr "Szállítás:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Ezen fiók használata _vezetékes és mobil telefonok hívására"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "Mi az Ön SIP fiókjának jelszava?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Mi az Ön SIP felhasználói azonosítója?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "_Felhasználónév:"
 
@@ -1223,36 +1282,36 @@ msgstr "Yahoo! a_zonosító:"
 msgid "_Room List locale:"
 msgstr "Sz_obalista területi beállítása:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:474
-#: ../libempathy-gtk/empathy-avatar-chooser.c:559
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "A kép nem alakítható át"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:475
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "Az elfogadott képformátumok egyikét sem támogatja a rendszere"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:822
-msgid "Couldn't save pixbuf to png"
-msgstr "A kép nem menthető PNG-vé"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+msgid "Couldn't save picture to file"
+msgstr "A kép nem menthető fájlba"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "Válassza ki az avatarját"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:942
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
 msgstr "Kép készítése…"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:945
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "Nincs kép"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "Képek"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1009
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "Minden fájl"
 
@@ -1260,24 +1319,24 @@ msgstr "Minden fájl"
 msgid "Click to enlarge"
 msgstr "Kattintson ide a nagyításhoz"
 
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:58
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Hiba történt a hívás indításakor"
 
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact doesn't support calls"
 msgstr "A megadott partner nem támogatja a hívásokat"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is offline"
 msgstr "A kiválasztott partner kilépett"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "The specified contact is not valid"
 msgstr "A kiválasztott partner nem érvényes"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:57
 msgid "Emergency calls are not supported on this protocol"
 msgstr "A vészhívások nem támogatottak ezzel a protokollal"
 
@@ -1298,23 +1357,23 @@ msgstr "A téma megváltoztatása nem engedélyezett"
 msgid "“%s� is not a valid contact ID"
 msgstr "A(z) „%s� nem érvényes partnerazonosító"
 
-#: ../libempathy-gtk/empathy-chat.c:1030
+#: ../libempathy-gtk/empathy-chat.c:1058
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: az aktuális társalgás összes üzenetének törlése"
 
-#: ../libempathy-gtk/empathy-chat.c:1033
+#: ../libempathy-gtk/empathy-chat.c:1061
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <téma>: az aktuális társalgás témájának beállítása"
 
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1064
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <szobaazonosító>: csatlakozás új csevegőszobához"
 
-#: ../libempathy-gtk/empathy-chat.c:1039
+#: ../libempathy-gtk/empathy-chat.c:1067
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <szobaazonosító>: csatlakozás új csevegőszobához"
 
-#: ../libempathy-gtk/empathy-chat.c:1043
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1322,23 +1381,23 @@ msgstr ""
 "/part [<csevegőszoba-azonosító>] [<ok>]: csevegőszoba elhagyása, "
 "alapértelmezés a jelenlegi"
 
-#: ../libempathy-gtk/empathy-chat.c:1047
+#: ../libempathy-gtk/empathy-chat.c:1075
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <partnerazonosító> [<üzenet>]: privát csevegés megnyitása"
 
-#: ../libempathy-gtk/empathy-chat.c:1050
+#: ../libempathy-gtk/empathy-chat.c:1078
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <partnerazonosító> <üzenet>: privát csevegés megnyitása"
 
-#: ../libempathy-gtk/empathy-chat.c:1053
+#: ../libempathy-gtk/empathy-chat.c:1081
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <becenév>: becenév módosítása a jelenlegi kiszolgálón"
 
-#: ../libempathy-gtk/empathy-chat.c:1056
+#: ../libempathy-gtk/empathy-chat.c:1084
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <üzenet>: tevékenység üzenet küldése az aktuális társalgásba"
 
-#: ../libempathy-gtk/empathy-chat.c:1059
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1348,11 +1407,11 @@ msgstr ""
 "jellel kezdődő üzenetek küldésére használatos. Például: „/say /join "
 "#csevegőszoba, így léphet be új csevegőszobába�"
 
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <partnerazonosító>: információk megjelenítése egy partnerről"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1360,113 +1419,113 @@ msgstr ""
 "/help [<parancs>]: minden támogatott parancs megjelenítése. Ha a <parancs> "
 "meg van adva, akkor annak használatát jeleníti meg."
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1112
 #, c-format
 msgid "Usage: %s"
 msgstr "Használat: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1116
+#: ../libempathy-gtk/empathy-chat.c:1157
 msgid "Unknown command"
 msgstr "Ismeretlen parancs"
 
-#: ../libempathy-gtk/empathy-chat.c:1242
+#: ../libempathy-gtk/empathy-chat.c:1283
 msgid "Unknown command; see /help for the available commands"
 msgstr "Ismeretlen parancs, lásd a /help kimenetét az elérhető parancsokért"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1412
+#: ../libempathy-gtk/empathy-chat.c:1453
 msgid "insufficient balance to send message"
 msgstr "Az egyenleg nem elég az üzenet elküldéséhez"
 
-#: ../libempathy-gtk/empathy-chat.c:1414
+#: ../libempathy-gtk/empathy-chat.c:1455
 msgid "not capable"
 msgstr "nem lehetséges"
 
-#: ../libempathy-gtk/empathy-chat.c:1421
+#: ../libempathy-gtk/empathy-chat.c:1462
 msgid "offline"
 msgstr "kilépett"
 
-#: ../libempathy-gtk/empathy-chat.c:1424
+#: ../libempathy-gtk/empathy-chat.c:1465
 msgid "invalid contact"
 msgstr "érvénytelen partner"
 
-#: ../libempathy-gtk/empathy-chat.c:1427
+#: ../libempathy-gtk/empathy-chat.c:1468
 msgid "permission denied"
 msgstr "hozzáférés megtagadva"
 
-#: ../libempathy-gtk/empathy-chat.c:1430
+#: ../libempathy-gtk/empathy-chat.c:1471
 msgid "too long message"
 msgstr "túl hosszú üzenet"
 
-#: ../libempathy-gtk/empathy-chat.c:1433
+#: ../libempathy-gtk/empathy-chat.c:1474
 msgid "not implemented"
 msgstr "nincs megvalósítva"
 
-#: ../libempathy-gtk/empathy-chat.c:1437
+#: ../libempathy-gtk/empathy-chat.c:1478
 msgid "unknown"
 msgstr "ismeretlen"
 
-#: ../libempathy-gtk/empathy-chat.c:1443
+#: ../libempathy-gtk/empathy-chat.c:1484
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "hiba a(z) „%s� üzenet elküldésekor: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1447
+#: ../libempathy-gtk/empathy-chat.c:1488
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Hiba az üzenet elküldésekor: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1508 ../src/empathy-chat-window.c:760
+#: ../libempathy-gtk/empathy-chat.c:1549 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Téma:"
 
-#: ../libempathy-gtk/empathy-chat.c:1520
+#: ../libempathy-gtk/empathy-chat.c:1561
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Téma beállítva: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1563
 msgid "No topic defined"
 msgstr "Nincs megadva témakör"
 
-#: ../libempathy-gtk/empathy-chat.c:2031
+#: ../libempathy-gtk/empathy-chat.c:2072
 msgid "(No Suggestions)"
 msgstr "(Nincs javaslat)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2099
+#: ../libempathy-gtk/empathy-chat.c:2140
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "„%s� hozzáadása a szótárhoz"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2136
+#: ../libempathy-gtk/empathy-chat.c:2177
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "„%s� hozzáadása a(z) %s szótárhoz"
 
-#: ../libempathy-gtk/empathy-chat.c:2206
+#: ../libempathy-gtk/empathy-chat.c:2247
 msgid "Insert Smiley"
 msgstr "Hangulatjel beszúrása"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2224
-#: ../libempathy-gtk/empathy-ui-utils.c:1756
+#: ../libempathy-gtk/empathy-chat.c:2265
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "_Küldés"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2278
+#: ../libempathy-gtk/empathy-chat.c:2319
 msgid "_Spelling Suggestions"
 msgstr "_Helyesírási javaslatok"
 
-#: ../libempathy-gtk/empathy-chat.c:2367
+#: ../libempathy-gtk/empathy-chat.c:2408
 msgid "Failed to retrieve recent logs"
 msgstr "Nem sikerült lekérni a legutóbbi naplókat"
 
-#: ../libempathy-gtk/empathy-chat.c:2504
+#: ../libempathy-gtk/empathy-chat.c:2545
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s kilépett"
@@ -1474,12 +1533,12 @@ msgstr "%s kilépett"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2511
+#: ../libempathy-gtk/empathy-chat.c:2552
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s kirúgta a következőt: %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2514
+#: ../libempathy-gtk/empathy-chat.c:2555
 #, c-format
 msgid "%s was kicked"
 msgstr "%s kirúgva"
@@ -1487,17 +1546,17 @@ msgstr "%s kirúgva"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2522
+#: ../libempathy-gtk/empathy-chat.c:2563
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s kitiltotta a következőt: %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2525
+#: ../libempathy-gtk/empathy-chat.c:2566
 #, c-format
 msgid "%s was banned"
 msgstr "%s kitiltva"
 
-#: ../libempathy-gtk/empathy-chat.c:2529
+#: ../libempathy-gtk/empathy-chat.c:2570
 #, c-format
 msgid "%s has left the room"
 msgstr "%s elhagyta a szobát"
@@ -1507,69 +1566,72 @@ msgstr "%s elhagyta a szobát"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2538
+#: ../libempathy-gtk/empathy-chat.c:2579
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2604
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s belépett a szobába"
 
-#: ../libempathy-gtk/empathy-chat.c:2588
+#: ../libempathy-gtk/empathy-chat.c:2629
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s mostantól %s néven ismert"
 
-#: ../libempathy-gtk/empathy-chat.c:2727
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2768
 #: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1241 ../src/empathy-call-window.c:1666
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
+#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
 msgid "Disconnected"
 msgstr "Kapcsolat bontva"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3374
+#: ../libempathy-gtk/empathy-chat.c:3415
 msgid "Would you like to store this password?"
 msgstr "Szeretné tárolni ezt a jelszót?"
 
-#: ../libempathy-gtk/empathy-chat.c:3380
+#: ../libempathy-gtk/empathy-chat.c:3421
 msgid "Remember"
 msgstr "Megjegyzés"
 
-#: ../libempathy-gtk/empathy-chat.c:3390
+#: ../libempathy-gtk/empathy-chat.c:3431
 msgid "Not now"
 msgstr "Most nem"
 
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3475
 msgid "Retry"
 msgstr "Újra"
 
-#: ../libempathy-gtk/empathy-chat.c:3438
+#: ../libempathy-gtk/empathy-chat.c:3479
 msgid "Wrong password; please try again:"
 msgstr "Hibás jelszó, próbálja újra:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3568
+#: ../libempathy-gtk/empathy-chat.c:3609
 msgid "This room is protected by a password:"
 msgstr "Ezt a szobát jelszó védi:"
 
-#: ../libempathy-gtk/empathy-chat.c:3595
+#: ../libempathy-gtk/empathy-chat.c:3636
 msgid "Join"
 msgstr "Csatlakozás"
 
-#: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1262
-#: ../src/empathy-call-window.c:1914
+#: ../libempathy-gtk/empathy-chat.c:3838 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "Kapcsolódva"
 
-#: ../libempathy-gtk/empathy-chat.c:3852
+#: ../libempathy-gtk/empathy-chat.c:3893
 msgid "Conversation"
 msgstr "Társalgás"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3857
+#: ../libempathy-gtk/empathy-chat.c:3898
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1594,15 +1656,15 @@ msgstr "Hozzáférés megtagadva"
 msgid "Could not block contact"
 msgstr "A partner nem blokkolható"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:772
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
 msgid "Edit Blocked Contacts"
 msgstr "Blokkolt partnerek szerkesztése"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:521
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1495
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
@@ -1613,15 +1675,22 @@ msgstr "Felhasználói fiók:"
 msgid "Blocked Contacts"
 msgstr "Blokkolt partnerek"
 
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Eltávolítás"
+
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:1417
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "Hivatkozás cí_mének másolása"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:1424
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Hivatkozás megnyitása"
 
@@ -1652,18 +1721,18 @@ msgid "Block %s?"
 msgstr "Blokkolja Å‘t: %s?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Biztosan nem szeretné, hogy „%s� újra felvegye Önnel a kapcsolatot?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:274
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
 msgid "_Block"
 msgstr "_Blokkolás"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:283
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Partner jelentése visszaélőként"
@@ -1689,38 +1758,38 @@ msgstr "Csoportosítatlan"
 msgid "Favorite People"
 msgstr "Kedvenc partnerek"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1983
-#: ../libempathy-gtk/empathy-individual-view.c:2375
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Valóban el kívánja távolítani a(z) „%s� csoportot?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1985
-#: ../libempathy-gtk/empathy-individual-view.c:2378
+#: ../libempathy-gtk/empathy-contact-list-view.c:1988
+#: ../libempathy-gtk/empathy-individual-view.c:2379
 msgid "Removing group"
 msgstr "Csoport eltávolítása"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2034
-#: ../libempathy-gtk/empathy-contact-list-view.c:2111
-#: ../libempathy-gtk/empathy-individual-view.c:2433
-#: ../libempathy-gtk/empathy-individual-view.c:2636
+#: ../libempathy-gtk/empathy-contact-list-view.c:2037
+#: ../libempathy-gtk/empathy-contact-list-view.c:2114
+#: ../libempathy-gtk/empathy-individual-view.c:2434
+#: ../libempathy-gtk/empathy-individual-view.c:2637
 msgid "_Remove"
 msgstr "_Eltávolítás"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2064
-#: ../libempathy-gtk/empathy-individual-view.c:2500
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
+#: ../libempathy-gtk/empathy-individual-view.c:2501
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Valóban el kívánja távolítani „%s� partnert?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2066
-#: ../libempathy-gtk/empathy-individual-view.c:2521
+#: ../libempathy-gtk/empathy-contact-list-view.c:2069
+#: ../libempathy-gtk/empathy-individual-view.c:2522
 msgid "Removing contact"
 msgstr "Partner eltávolítása"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "Partner _felvétele…"
 
@@ -1729,48 +1798,48 @@ msgid "_Block Contact"
 msgstr "Partner _blokkolása"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:548
-#: ../src/empathy-main-window.ui.h:16
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "_Csevegés"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:639
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Hanghívás"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:684
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Videohívás"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:737
-#: ../src/empathy-main-window.ui.h:27
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "K_orábbi társalgások"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:778
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "Fájl küldése"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:820
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
 msgstr "Az asztalom megosztása"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1890
-#: ../libempathy-gtk/empathy-individual-menu.c:855
-#: ../libempathy-gtk/empathy-individual-widget.c:1386
+#: ../libempathy-gtk/empathy-contact-widget.c:1886
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "Kedvenc"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:883
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "_Információk"
 
@@ -1780,33 +1849,41 @@ msgid "_Edit"
 msgstr "S_zerkesztés"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1070
-#: ../src/empathy-chat-window.c:1010
+#: ../libempathy-gtk/empathy-individual-menu.c:1283
+#: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "Meghívás ebbe a szobába"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1116
+#: ../libempathy-gtk/empathy-individual-menu.c:1329
 msgid "_Invite to Chat Room"
 msgstr "Meg_hívás csevegőszobába"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:514
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
 msgid "Search contacts"
 msgstr "Partnerek keresése"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:544
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
 msgid "Search: "
 msgstr "Keresés: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:602
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
 msgid "_Add Contact"
 msgstr "Partner _felvétele"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:620
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
 msgid "No contacts found"
 msgstr "Nem található partner"
 
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr "A bemutatkozó üzenete:"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
+msgstr "Kérem engedélyezze, hogy láthassam az állapotát. Köszönöm!"
+
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "Válasszon partnert"
@@ -1859,153 +1936,153 @@ msgstr "Távol üzenet:"
 msgid "Channels:"
 msgstr "Csatornák:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
 msgstr "Ország ISO kódja:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Country:"
 msgstr "Ország:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "State:"
 msgstr "�llapot:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "City:"
 msgstr "Város:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Area:"
 msgstr "Terület:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
 msgstr "Irányítószám:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Street:"
 msgstr "Utca:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
 msgstr "Épület:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Floor:"
 msgstr "Emelet:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Room:"
 msgstr "Szoba:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Text:"
 msgstr "Szöveg:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:517
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Description:"
 msgstr "Leírás:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:519
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:521
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
 msgstr "Pontossági szint:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:523
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr "Hiba:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
 msgstr "Függőleges hiba (méter):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:527
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
 msgstr "Vízszintes hiba (méter):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:529
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr "Sebesség:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:531
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Bearing:"
 msgstr "Irány:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:533
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
 msgstr "Emelkedési sebesség:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:535
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
 msgstr "Utolsó frissítés:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:537
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
 msgstr "Hosszúság:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:945
-#: ../libempathy-gtk/empathy-individual-widget.c:539
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
 msgstr "Szélesség:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:947
-#: ../libempathy-gtk/empathy-individual-widget.c:541
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
 msgstr "Magasság:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1000
-#: ../libempathy-gtk/empathy-contact-widget.c:1015
-#: ../libempathy-gtk/empathy-individual-widget.c:629
-#: ../libempathy-gtk/empathy-individual-widget.c:644
-#: ../src/empathy-preferences.ui.h:16
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "Hely"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1017
-#: ../libempathy-gtk/empathy-individual-widget.c:646
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1069
-#: ../libempathy-gtk/empathy-individual-widget.c:695
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
 msgstr "%Y. %B %e, %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1151
-#: ../libempathy-gtk/empathy-individual-widget.c:931
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
 msgid "Save Avatar"
 msgstr "Avatar mentése"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1207
-#: ../libempathy-gtk/empathy-individual-widget.c:989
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
 msgid "Unable to save avatar"
 msgstr "Az avatar nem menthető"
 
@@ -2015,7 +2092,7 @@ msgstr "<b>Hely</b> az időpontban\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1321
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr "�lnév:"
 
@@ -2035,7 +2112,7 @@ msgstr "Partner részletei"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1525
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "Azonosító:"
 
@@ -2074,17 +2151,17 @@ msgid "Select"
 msgstr "Kijelölés"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1835
+#: ../src/empathy-main-window.c:1807
 msgid "Group"
 msgstr "Csoport"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:257
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "A következő azonosító blokkolva lesz:"
 msgstr[1] "A következő azonosítók blokkolva lesznek:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:264
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "A következő azonosító nem blokkolható:"
@@ -2110,34 +2187,59 @@ msgstr "A bal oldali listában kiválasztott partnerek össze lesznek kapcsolva.
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:138
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "Válassza ki a fiókot a hívás indításához"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "Hívás"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+msgid "Mobile"
+msgstr "Mobil"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "Munkahelyi"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "OTTHONI"
+
 #. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:594
-#: ../libempathy-gtk/empathy-new-message-dialog.c:248
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:931
+#: ../libempathy-gtk/empathy-individual-menu.c:1141
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "S_zerkesztés"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:957
+#: ../libempathy-gtk/empathy-individual-menu.c:1167
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "_Partnerek összekapcsolása…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2340
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 msgid "Delete and _Block"
 msgstr "_Törlés és blokkolás"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2509
+#: ../libempathy-gtk/empathy-individual-view.c:2510
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2146,7 +2248,7 @@ msgstr ""
 "Valóban el akarja távolítani a(z) %s gyűjtőpartnert? Ne feledje, hogy ez "
 "minden partnert eltávolít, amelyek ezt a gyűjtőpartnert alkotják."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1672
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2199,7 +2301,8 @@ msgid "_Unlink…"
 msgstr "S_zétválasztás…"
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid "Completely split the displayed linked contacts into the separate contacts."
+msgid ""
+"Completely split the displayed linked contacts into the separate contacts."
 msgstr "A megjelenített gyűjtőpartner szétvágása az azt alkotó partnerekké."
 
 #. Add button
@@ -2228,127 +2331,135 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "S_zétválasztás"
 
-#: ../libempathy-gtk/empathy-log-window.c:458
+#: ../libempathy-gtk/empathy-log-window.c:634
 msgid "History"
 msgstr "Előzmények"
 
-#: ../libempathy-gtk/empathy-log-window.c:510
+#: ../libempathy-gtk/empathy-log-window.c:689
 msgid "Show"
 msgstr "Megjelenítés"
 
-#: ../libempathy-gtk/empathy-log-window.c:532
+#: ../libempathy-gtk/empathy-log-window.c:711
 msgid "Search"
 msgstr "Keresés"
 
-#: ../libempathy-gtk/empathy-log-window.c:946
+#: ../libempathy-gtk/empathy-log-window.c:1159
 #, c-format
 msgid "Chat in %s"
 msgstr "Csevegés itt: %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:948
+#: ../libempathy-gtk/empathy-log-window.c:1161
 #, c-format
 msgid "Chat with %s"
 msgstr "Csevegés vele: %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:998
-#: ../libempathy-gtk/empathy-log-window.c:1176
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%Y. %B %e %A, %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1118
+#: ../libempathy-gtk/empathy-log-window.c:1300
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1124
+#: ../libempathy-gtk/empathy-log-window.c:1306
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1195
-#: ../libempathy-gtk/empathy-log-window.c:1197
-#: ../src/empathy-ft-manager.c:1026
-msgid "%"
-msgstr "%"
+#: ../libempathy-gtk/empathy-log-window.c:1382
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s másodperc"
+msgstr[1] "%s másodperc"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s perc"
+msgstr[1] "%s perc"
 
-#: ../libempathy-gtk/empathy-log-window.c:1204
+#: ../libempathy-gtk/empathy-log-window.c:1397
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Hívás hossza: %s, befejezve: %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1536
+#: ../libempathy-gtk/empathy-log-window.c:1729
 msgid "Today"
 msgstr "Ma"
 
-#: ../libempathy-gtk/empathy-log-window.c:1540
+#: ../libempathy-gtk/empathy-log-window.c:1733
 msgid "Yesterday"
 msgstr "Tegnap"
 
-#: ../libempathy-gtk/empathy-log-window.c:1556
-msgctxt "A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
 msgid "%e %B %Y"
 msgstr "%Y. %B %e"
 
-#: ../libempathy-gtk/empathy-log-window.c:1637
-#: ../libempathy-gtk/empathy-log-window.c:3203
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3425
 msgid "Anytime"
 msgstr "Bármikor"
 
-#: ../libempathy-gtk/empathy-log-window.c:1717
-#: ../libempathy-gtk/empathy-log-window.c:2154
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2353
 msgid "Anyone"
 msgstr "Bárki"
 
-#: ../libempathy-gtk/empathy-log-window.c:2451
+#: ../libempathy-gtk/empathy-log-window.c:2666
 msgid "Who"
 msgstr "Ki"
 
-#: ../libempathy-gtk/empathy-log-window.c:2655
+#: ../libempathy-gtk/empathy-log-window.c:2870
 msgid "When"
 msgstr "Mikor"
 
-#: ../libempathy-gtk/empathy-log-window.c:2771
+#: ../libempathy-gtk/empathy-log-window.c:2986
 msgid "Anything"
 msgstr "Bármi"
 
-#: ../libempathy-gtk/empathy-log-window.c:2773
+#: ../libempathy-gtk/empathy-log-window.c:2988
 msgid "Text chats"
 msgstr "Szöveges csevegések"
 
-#: ../libempathy-gtk/empathy-log-window.c:2775
+#: ../libempathy-gtk/empathy-log-window.c:2990
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "Hívások"
 
-#: ../libempathy-gtk/empathy-log-window.c:2780
+#: ../libempathy-gtk/empathy-log-window.c:2995
 msgid "Incoming calls"
 msgstr "Bejövő hívások"
 
-#: ../libempathy-gtk/empathy-log-window.c:2781
+#: ../libempathy-gtk/empathy-log-window.c:2996
 msgid "Outgoing calls"
 msgstr "Kimenő hívások"
 
-#: ../libempathy-gtk/empathy-log-window.c:2782
+#: ../libempathy-gtk/empathy-log-window.c:2997
 msgid "Missed calls"
 msgstr "Nem fogadott hívások"
 
-#: ../libempathy-gtk/empathy-log-window.c:2804
+#: ../libempathy-gtk/empathy-log-window.c:3019
 msgid "What"
 msgstr "Mi"
 
-#: ../libempathy-gtk/empathy-log-window.c:3506
+#: ../libempathy-gtk/empathy-log-window.c:3728
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Biztosan törölni szeretné a korábbi társalgások minden naplóját?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3510
+#: ../libempathy-gtk/empathy-log-window.c:3732
 msgid "Clear All"
 msgstr "Összes törlése"
 
-#: ../libempathy-gtk/empathy-log-window.c:3517
+#: ../libempathy-gtk/empathy-log-window.c:3739
 msgid "Delete from:"
 msgstr "Törlés innen:"
 
@@ -2356,14 +2467,6 @@ msgstr "Törlés innen:"
 msgid "<span size=\"x-large\">Loading...</span>"
 msgstr "<span size=\"x-large\">Betöltés…</span>"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call"
-msgstr "Hívás"
-
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
 #: ../src/empathy-chat-window.ui.h:3
 msgid "Chat"
@@ -2378,14 +2481,14 @@ msgid "Profile"
 msgstr "Profil"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:22
 #: ../src/empathy-streamed-media-window.ui.h:20
 msgid "Video"
 msgstr "Videó"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:24 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:20
 msgid "_Edit"
 msgstr "S_zerkesztés"
 
@@ -2402,27 +2505,27 @@ msgid "Contact ID:"
 msgstr "Partnerazonosító:"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:258
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
 msgid "C_hat"
 msgstr "Cse_vegés"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:277
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
 msgstr "Új társalgás"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:231
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
 msgid "Send _Video"
 msgstr "_Videó küldése"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
 msgid "C_all"
 msgstr "_Hívás"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:252
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "New Call"
 msgstr "Új hívás"
 
@@ -2482,24 +2585,24 @@ msgid "New %s account"
 msgstr "Új %s fiók"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "Következő találat"
+msgid "Find:"
+msgstr "Keresés:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "Előző találat"
+msgid "Mat_ch case"
+msgstr "Kis- és _nagybetűk"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Find:"
-msgstr "Keresés:"
+msgid "Phrase not found"
+msgstr "A kifejezés nem található"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "Nagybetűérzékeny"
+msgid "_Next"
+msgstr "_Következő"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "Phrase not found"
-msgstr "A kifejezés nem található"
+msgid "_Previous"
+msgstr "_Előző"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2545,34 +2648,28 @@ msgstr "A hanghívás befejeződött"
 msgid "Edit Custom Messages"
 msgstr "Egyéni üzenetek szerkesztése"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
-#: ../src/empathy-chatrooms-window.ui.h:3
-msgid "Remove"
-msgstr "Eltávolítás"
-
-#: ../libempathy-gtk/empathy-theme-adium.c:1121
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
 #, c-format
 msgid "Message edited at %s"
 msgstr "Ãœzenet szerkesztve ekkor: %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1943
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
 msgid "Normal"
 msgstr "Normál"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:75
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "Klasszikus"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:76
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "Egyszerű"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:77
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "Tiszta"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:78
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "Kék"
 
@@ -2598,14 +2695,16 @@ msgstr "A tanúsítvány nem rendelkezik a várt ujjlenyomattal."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:170
 msgid "The hostname verified by the certificate doesn't match the server name."
-msgstr "A tanúsítvány által ellenőrzött gépnév nem egyezik a kiszolgáló nevével."
+msgstr ""
+"A tanúsítvány által ellenőrzött gépnév nem egyezik a kiszolgáló nevével."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:174
 msgid "The certificate is self-signed."
 msgstr "A tanúsítvány önaláírt."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:177
-msgid "The certificate has been revoked by the issuing Certification Authority."
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
 msgstr "A tanúsítványt visszavonta a kibocsátó hitelesítésszolgáltató."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:181
@@ -2646,19 +2745,19 @@ msgstr "Emlékezzen a válaszra a jövőbeli kapcsolatokhoz"
 msgid "Certificate Details"
 msgstr "Tanúsítvány részletei"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1653
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
 msgstr "Az URI nem nyitható meg"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1748
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
 msgstr "Válasszon ki egy fájlt"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1820
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
 msgid "Insufficient free space to save file"
 msgstr "Nincs elég szabad hely a fájl mentéséhez"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1828
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2667,7 +2766,7 @@ msgstr ""
 "%s szabad hely szükséges a fájl mentéséhez, de csak %s érhető el. Válasszon "
 "másik helyet."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Bejövő fájl %s partnertől"
@@ -2855,23 +2954,23 @@ msgstr "Nincs hibaüzenet"
 msgid "Instant Message (Empathy)"
 msgstr "Azonnali üzenet (Empathy)"
 
-#: ../src/empathy.c:309
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "Ne kapcsolódjon indításkor"
 
-#: ../src/empathy.c:313
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Ne jelenjen meg a partnerlista vagy más ablak indításkor"
 
-#: ../src/empathy.c:321
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr "– Empathy üzenetküldő-kliens"
 
-#: ../src/empathy.c:500
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
 msgstr "Hiba a fiókkezelő elérésekor"
 
-#: ../src/empathy.c:502
+#: ../src/empathy.c:639
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3100,7 +3199,8 @@ msgid "Your new account has not been saved yet."
 msgstr "Új fiókja még nincs elmentve."
 
 #: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754 ../src/empathy-call-window.c:651
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1216
 msgid "Connecting…"
 msgstr "Kapcsolódás…"
 
@@ -3208,11 +3308,11 @@ msgstr "Empathy hitelesítési kliens"
 msgid "People nearby"
 msgstr "Közeli emberek"
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:124
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr "– Empathy hang/videó kliens"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:145
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy hang/videó kliens"
 
@@ -3255,33 +3355,33 @@ msgstr "Részletek"
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1005
+#: ../src/empathy-call-window.c:1825
 #, c-format
 msgid "Call with %s"
 msgstr "%s hívása"
 
 #: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:1249
+#: ../src/empathy-call-window.c:2069
 msgid "The IP address as seen by the machine"
 msgstr "A gép által látott IP-cím"
 
 #: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:1251
+#: ../src/empathy-call-window.c:2071
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Az interneten lévő kiszolgáló által látott IP-cím"
 
 #: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:1253
+#: ../src/empathy-call-window.c:2073
 msgid "The IP address of the peer as seen by the other side"
 msgstr "A partner másik oldal által látott IP-címe"
 
 #: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:1255
+#: ../src/empathy-call-window.c:2075
 msgid "The IP address of a relay server"
 msgstr "Közvetítő kiszolgáló IP-címe"
 
 #: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:1257
+#: ../src/empathy-call-window.c:2077
 msgid "The IP address of the multicast group"
 msgstr "Üzenetszórási csoport IP-címe"
 
@@ -3312,12 +3412,12 @@ msgid "Connected — %d:%02dm"
 msgstr "Kapcsolódva – %d.%02dp"
 
 #: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:1976
+#: ../src/empathy-call-window.c:2846
 msgid "Technical Details"
 msgstr "Technikai részletek"
 
 #: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2014
+#: ../src/empathy-call-window.c:2884
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3327,7 +3427,7 @@ msgstr ""
 "hangformátumot sem"
 
 #: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2019
+#: ../src/empathy-call-window.c:2889
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3337,7 +3437,7 @@ msgstr ""
 "videoformátumot sem"
 
 #: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2025
+#: ../src/empathy-call-window.c:2895
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3347,22 +3447,25 @@ msgstr ""
 "kapcsolatot nem engedélyező hálózatot használ."
 
 #: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2031
+#: ../src/empathy-call-window.c:2901
 msgid "There was a failure on the network"
 msgstr "Hálózati hiba történt"
 
 #: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2035
-msgid "The audio formats necessary for this call are not installed on your computer"
+#: ../src/empathy-call-window.c:2905
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
 msgstr "A híváshoz szükséges hangformátumok nincsenek telepítve a számítógépre"
 
 #: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2038
-msgid "The video formats necessary for this call are not installed on your computer"
-msgstr "A híváshoz szükséges videoformátumok nincsenek telepítve a számítógépre"
+#: ../src/empathy-call-window.c:2908
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr ""
+"A híváshoz szükséges videoformátumok nincsenek telepítve a számítógépre"
 
 #: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2050
+#: ../src/empathy-call-window.c:2920
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3374,22 +3477,22 @@ msgstr ""
 "naplókat."
 
 #: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2059
+#: ../src/empathy-call-window.c:2929
 msgid "There was a failure in the call engine"
 msgstr "Hiba történt a hívási alrendszerben"
 
 #: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2062
+#: ../src/empathy-call-window.c:2932
 msgid "The end of the stream was reached"
 msgstr "A folyam vége elérve"
 
 #: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2102
+#: ../src/empathy-call-window.c:2972
 msgid "Can't establish audio stream"
 msgstr "Nem hozható létre a hangfolyam"
 
 #: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2112
+#: ../src/empathy-call-window.c:2982
 msgid "Can't establish video stream"
 msgstr "Nem hozható létre a videofolyam"
 
@@ -3466,79 +3569,107 @@ msgid "Start an audio call"
 msgstr "Hanghívás indítása"
 
 #: ../src/empathy-call-window.ui.h:18
+msgid "Swap camera"
+msgstr "Kamera cseréje"
+
+#: ../src/empathy-call-window.ui.h:19
 #: ../src/empathy-streamed-media-window.ui.h:17
 msgid "Toggle audio transmission"
 msgstr "Hangátvitel be/ki"
 
-#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:20
 msgid "Toggle video transmission"
 msgstr "Videoátvitel be/ki"
 
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:1621 ../src/empathy-call-window.c:1622
-#: ../src/empathy-call-window.c:1623 ../src/empathy-call-window.c:1624
+#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
+#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-call-window.ui.h:23
 msgid "Video call"
 msgstr "Videohívás"
 
-#: ../src/empathy-call-window.ui.h:23
+#: ../src/empathy-call-window.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "_Hívás"
 
 #: ../src/empathy-call-window.ui.h:25
+msgid "_Camera"
+msgstr "_Kamera"
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:18
+msgid "_Contents"
+msgstr "_Tartalom"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
+msgid "_Debug"
+msgstr "_Hibakeresés"
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:22
+msgid "_Help"
+msgstr "_Súgó"
+
+#: ../src/empathy-call-window.ui.h:30
 msgid "_Microphone"
 msgstr "_Mikrofon"
 
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-main-window.ui.h:30
+#: ../src/empathy-call-window.ui.h:31
+msgid "_Settings"
+msgstr "_Beállítások"
+
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_Nézet"
 
-#: ../src/empathy-chat-window.c:480 ../src/empathy-chat-window.c:500
+#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d olvasatlan)"
 msgstr[1] "%s (%d olvasatlan)"
 
-#: ../src/empathy-chat-window.c:492
+#: ../src/empathy-chat-window.c:493
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (és %u egyéb)"
 msgstr[1] "%s (és %u egyéb)"
 
-#: ../src/empathy-chat-window.c:508
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d olvasatlan másoktól)"
 msgstr[1] "%s (%d olvasatlan másoktól)"
 
-#: ../src/empathy-chat-window.c:517
+#: ../src/empathy-chat-window.c:518
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d olvasatlan mindenkitől)"
 msgstr[1] "%s (%d olvasatlan mindenkitől)"
 
-#: ../src/empathy-chat-window.c:732
+#: ../src/empathy-chat-window.c:733
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:742
+#: ../src/empathy-chat-window.c:743
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "%d üzenet küldése"
 msgstr[1] "%d üzenet küldése"
 
-#: ../src/empathy-chat-window.c:764
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
 msgstr "Üzenet írása."
 
@@ -3570,10 +3701,6 @@ msgstr "Lap j_obbra"
 msgid "Notify for All Messages"
 msgstr "Értesítés az összes hibaüzenetről"
 
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:18
-msgid "_Contents"
-msgstr "_Tartalom"
-
 #: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "_Társalgás"
@@ -3586,10 +3713,6 @@ msgstr "_Lap leválasztása"
 msgid "_Favorite Chat Room"
 msgstr "_Kedvenc csevegőszoba"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:22
-msgid "_Help"
-msgstr "_Súgó"
-
 #: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "_Következő lap"
@@ -3626,95 +3749,96 @@ msgstr "Automatikus kapcsolódás"
 msgid "Manage Favorite Rooms"
 msgstr "Kedvenc szobák kezelése"
 
-#: ../src/empathy-event-manager.c:522
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming video call"
 msgstr "Bejövő videohívás"
 
-#: ../src/empathy-event-manager.c:522
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
 msgid "Incoming call"
 msgstr "Bejövő hívás"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:525
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s videón hívja, válaszol?"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s hívja, válaszol?"
 
-#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
-#: ../src/empathy-event-manager.c:764
+#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Bejövő hívás %s partnertől"
 
-#: ../src/empathy-event-manager.c:555
+#: ../src/empathy-event-manager.c:554
 msgid "_Reject"
 msgstr "_Elutasítás"
 
-#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
 msgid "_Answer"
 msgstr "_Válasz"
 
-#: ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:570
 msgid "_Answer with video"
 msgstr "_Válasz videóval"
 
-#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
+#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Bejövő videohívás %s partnertől"
 
-#: ../src/empathy-event-manager.c:837
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
 msgstr "Szobameghívás"
 
-#: ../src/empathy-event-manager.c:839
+#: ../src/empathy-event-manager.c:838
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Meghívás a csatlakozásra ehhez: %s"
 
-#: ../src/empathy-event-manager.c:846
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s kéri, hogy csatlakozzon ehhez: %s"
 
-#: ../src/empathy-event-manager.c:854
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
 msgstr "_Elutasítás"
 
-#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Csatlakozás"
 
-#: ../src/empathy-event-manager.c:886
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s megkérte, hogy csatlakozzon ehhez: %s"
 
-#: ../src/empathy-event-manager.c:892
+#: ../src/empathy-event-manager.c:891
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Megkérték, hogy csatlakozzon ehhez: %s"
 
-#: ../src/empathy-event-manager.c:943
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Bejövő fájlátvitel %s partnertől"
 
-#: ../src/empathy-event-manager.c:1135 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
 msgid "Password required"
 msgstr "Jelszó szükséges"
 
-#: ../src/empathy-event-manager.c:1191
+#: ../src/empathy-event-manager.c:1190
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s engedélyt kér, hogy láthassa az Ön elérhető állapotát"
 
-#: ../src/empathy-event-manager.c:1195
+#: ../src/empathy-event-manager.c:1194
 #, c-format
 msgid ""
 "\n"
@@ -3814,6 +3938,10 @@ msgstr "„%s� integritásának ellenőrzése"
 msgid "Hashing \"%s\""
 msgstr "„%s� ellenőrzése"
 
+#: ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "%"
+
 #: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "Fájl"
@@ -3828,7 +3956,8 @@ msgstr "Fájlátvitelek"
 
 #: ../src/empathy-ft-manager.ui.h:2
 msgid "Remove completed, canceled and failed file transfers from the list"
-msgstr "Befejezett, megszakított és meghiúsult átvitelek eltávolítása a listából"
+msgstr ""
+"Befejezett, megszakított és meghiúsult átvitelek eltávolítása a listából"
 
 #: ../src/empathy-import-dialog.c:84
 msgid ""
@@ -3891,111 +4020,104 @@ msgid "Top up account credit"
 msgstr "Fiókegyenleg feltöltése"
 
 #. top up button
-#: ../src/empathy-main-window.c:1050
+#: ../src/empathy-main-window.c:1046
 msgid "Top Up..."
 msgstr "Feltöltés…"
 
-#: ../src/empathy-main-window.c:1817
+#: ../src/empathy-main-window.c:1789
 msgid "Contact"
 msgstr "Partner"
 
-#: ../src/empathy-main-window.c:2169
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "Partnerlista"
 
-#: ../src/empathy-main-window.c:2287
-msgid "Show and edit accounts"
-msgstr "Fiókok megjelenítése és szerkesztése"
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "_Partnerek térképen"
 
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-main-window-menubar.ui.h:2
 msgid "Credit Balance"
 msgstr "Egyenleg"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "_Keresés a partnerlistában"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "_Csatlakozás a kedvencekhez"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "Kedvencek kezelése"
 
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "N_ormál méret"
 
-#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "Új _hívás…"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "Normál méret _avatarokkal"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "B_eállítások"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "_Protokollok megjelenítése"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "Rendezés _név szerint"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "Rendezés álla_pot szerint"
 
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Fiókok"
 
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "Bl_okkolt partnerek"
 
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "_Tömör méret"
 
-#: ../src/empathy-main-window.ui.h:19
-msgid "_Debug"
-msgstr "_Hibakeresés"
-
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "_Fájlátvitelek"
 
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "_Csatlakozás…"
 
-#: ../src/empathy-main-window.ui.h:24 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "Új _társalgás…"
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "Kilé_pett partnerek"
 
-#: ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "S_zemélyes információk"
 
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "Sz_oba"
 
-#: ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-main-window-menubar.ui.h:29
 msgid "_Search for Contacts…"
 msgstr "Partnerek _keresése…"
 
@@ -4040,7 +4162,8 @@ msgid "Couldn't load room list"
 msgstr "Nem tölthető be a szobalista"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
-msgid "Enter the room name to join here or click on one or more rooms in the list."
+msgid ""
+"Enter the room name to join here or click on one or more rooms in the list."
 msgstr ""
 "Itt adja meg a szoba nevét a csatlakozáshoz, vagy kattintson néhány, a "
 "listán látható szobára."
@@ -4065,80 +4188,80 @@ msgstr "Szobalista"
 msgid "_Room:"
 msgstr "Sz_oba:"
 
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr "Üzenet érkezett"
 
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr "Üzenet elküldve"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
 msgstr "Új társalgás"
 
-#: ../src/empathy-preferences.c:163
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
 msgstr "Partner belép"
 
-#: ../src/empathy-preferences.c:164
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
 msgstr "Partner kilép"
 
-#: ../src/empathy-preferences.c:165
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
 msgstr "Fiók kapcsolódott"
 
-#: ../src/empathy-preferences.c:166
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
 msgstr "Fiók kapcsolata bontva"
 
-#: ../src/empathy-preferences.c:469
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr "Nyelv"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:719
+#: ../src/empathy-preferences.c:734
 msgid "Juliet"
 msgstr "Júlia"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:726
+#: ../src/empathy-preferences.c:741
 msgid "Romeo"
 msgstr "Romeo"
 
 # http://mek.oszk.hu/00400/00492/00492.htm
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:747
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Ó, Romeo, mért vagy te Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:735
+#: ../src/empathy-preferences.c:750
 msgid "Deny thy father and refuse thy name;"
 msgstr "Tagadd meg az atyád, neved hajítsd el,"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:753
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "S ha nem teszed meg, esküdj édesemmé"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:756
 msgid "And I'll no longer be a Capulet."
 msgstr "És nem leszek Capulet én se többé."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:759
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Hallgassak-e vagy szóljak-e neki?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:762
 msgid "Juliet has disconnected"
 msgstr "Júlia kilépett"
 
-#: ../src/empathy-preferences.c:1153
+#: ../src/empathy-preferences.c:1166
 msgid "Preferences"
 msgstr "Beállítások"
 
@@ -4167,54 +4290,66 @@ msgid "Display incoming events in the notification area"
 msgstr "Bejövő események megjelenítése az értesítési területen"
 
 #: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"A visszhang-csillapítás segítsével hangja tisztábban fog hallatszani a másik "
+"félnél, de egyes számítógépeken problémákat okozhat. Ha Ön vagy a hívott "
+"partner fura zajokat vagy hanghibákat hall a hívás során, akkor próbálja meg "
+"kikapcsolni a visszhang-csillapítást, és újraindítani a hívást."
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "Értesítések engedélyezése, ha a partnerek elérhetővé válnak"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "Értesítések engedélyezése, ha a partnerek elérhetetlenné válnak"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Értesítések engedélyezése, ha a cse_vegés nincs fókuszban"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "Helyesírás-ellenőrzés ezen nyelveken:"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "�ltalános"
 
-#: ../src/empathy-preferences.ui.h:14
-msgid "Input level"
-msgstr "Bemeneti szint"
-
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input volume"
-msgstr "Bemeneti hangerő"
+msgid "Input level:"
+msgstr "Bemeneti szint:"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "Bemeneti hangerő:"
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "Helyforrások:"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "Társalgások naplózása"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "Értesítések"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Hang lejátszása eseményekhez"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "Adatvédelem"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -4224,23 +4359,23 @@ msgstr ""
 "csak a város, megye és ország lesz közzétéve. A GPS koordináták 1 decimális "
 "hely pontosságúak lesznek."
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "_Hangulatjelek képekké alakítása"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "Partnerlista m_utatása szobákban"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "Hangok"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "Helyesírás-ellenőrzés"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
@@ -4248,48 +4383,48 @@ msgstr ""
 "Ezen az oldalon csak azok a nyelvek vannak felsorolva, amelyekhez telepítve "
 "van szótár."
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "Témák"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "Változat:"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "A_utomatikus kapcsolódás indításkor"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Mobiltelefon"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "B_uborékértesítések engedélyezése"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "H_angos értesítések engedélyezése"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Hálózat (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "Új csevegések megnyitása _külön ablakokban"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "_Hely közzététele a partnereimnek"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "Hely pontosságának _csökkentése"
 
@@ -4353,63 +4488,63 @@ msgstr "Videoelőnézet"
 msgid "Contact Map View"
 msgstr "Partner térképnézete"
 
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
 msgid "Save"
 msgstr "Mentés"
 
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
 msgstr "Hibakeresési ablak"
 
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
 msgstr "Szünet"
 
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
 msgstr "Szint "
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
 msgid "Debug"
 msgstr "Hibakeresés"
 
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
 msgid "Info"
 msgstr "Információ"
 
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
 msgid "Message"
 msgstr "Ãœzenet"
 
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
 msgid "Critical"
 msgstr "Kritikus"
 
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
 msgid "Error"
 msgstr "Hiba"
 
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
 msgid "Time"
 msgstr "Idő"
 
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
 msgid "Domain"
 msgstr "Tartomány"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
 msgstr "Kategória"
 
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "Szint"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4417,16 +4552,16 @@ msgstr ""
 "A kiválasztott kapcsolatkezelő nem támogatja a távoli hibakeresési "
 "kiterjesztést."
 
-#: ../src/empathy-invite-participant-dialog.c:429
-#: ../src/empathy-invite-participant-dialog.c:477
+#: ../src/empathy-invite-participant-dialog.c:179
+#: ../src/empathy-invite-participant-dialog.c:205
 msgid "Invite Participant"
 msgstr "Résztvevő meghívása"
 
-#: ../src/empathy-invite-participant-dialog.c:430
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Válassza ki a társalgásba meghívandó partnert:"
 
-#: ../src/empathy-invite-participant-dialog.c:473
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "Meghívás"
 
@@ -4437,12 +4572,15 @@ msgstr ""
 "lépjen ki"
 
 #: ../src/empathy-accounts.c:187
-msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
-msgstr "Ne jelenítsen meg ablakokat, kivéve ha csak „Közeli emberek� fiókok vannak"
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr ""
+"Ne jelenítsen meg ablakokat, kivéve ha csak „Közeli emberek� fiókok vannak"
 
 #: ../src/empathy-accounts.c:191
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr "A megadott fiók kiválasztása (például: gabble/jabber/foo_40example_2eorg0)"
+msgstr ""
+"A megadott fiók kiválasztása (például: gabble/jabber/foo_40example_2eorg0)"
 
 #: ../src/empathy-accounts.c:193
 msgid "<account-id>"
@@ -4456,7 +4594,15 @@ msgstr "– Empathy fiókkezelő"
 msgid "Empathy Accounts"
 msgstr "Empathy fiókkezelő"
 
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr "Adott szolgáltatás megjelenítése"
+
+#: ../src/empathy-debugger.c:75
+msgid "- Empathy Debugger"
+msgstr "– Empathy hibakereső"
+
+#: ../src/empathy-debugger.c:114
 msgid "Empathy Debugger"
 msgstr "Empathy hibakereső"
 
@@ -4469,11 +4615,13 @@ msgid "Respond"
 msgstr "Válasz"
 
 #: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1459
 msgid "Reject"
 msgstr "Visszautasítás"
 
 #: ../src/empathy-notifications-approver.c:222
 #: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1460
 msgid "Answer"
 msgstr "Válasz"
 
@@ -4491,37 +4639,42 @@ msgstr "Visszalépés"
 msgid "Accept"
 msgstr "Elfogadás"
 
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
 #: ../src/empathy-notifications-approver.c:260
 msgid "Provide"
 msgstr "Megadás"
 
-#: ../src/empathy-call-observer.c:135
+#: ../src/empathy-call-observer.c:134
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s megpróbálta felhívni, de Ön egy másik beszélgetést folytatott."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:558 ../src/empathy-call-window.c:572
+#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:1012
-#, c-format
-msgid "Call with %d participants"
-msgstr "Hívás %d résztvevővel"
+#: ../src/empathy-call-window.c:2775
+msgid "On hold"
+msgstr "Várakoztatás"
+
+#: ../src/empathy-call-window.c:2778
+msgid "Mute"
+msgstr "Némítás"
+
+#: ../src/empathy-call-window.c:2780
+msgid "Duration"
+msgstr "Időtartam"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:1913
+#: ../src/empathy-call-window.c:2783
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s – %d.%02dp"
 
-#: ../src/empathy-call-window.c:1914
-msgid "On hold"
-msgstr "Várakoztatás"
-
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "Kis- és _nagybetű"
-
diff --git a/po/id.po b/po/id.po
index 644ffa75c..5f0f2d95f 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,4 +1,4 @@
-# translation of empathy.master.po to Bahasa Indonesia
+# translation of empathy to Bahasa Indonesia
 # Copyright (C) YEAR THE empathy'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the empathy package.
 #
@@ -8,10 +8,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy.master\n"
+"Project-Id-Version: empathy master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-08-16 14:32+0000\n"
-"PO-Revision-Date: 2011-08-16 21:42+0700\n"
+"POT-Creation-Date: 2011-09-25 06:33+0000\n"
+"PO-Revision-Date: 2011-09-25 13:59+0700\n"
 "Last-Translator: Andika Triwidada <andika@gmail.com>\n"
 "Language-Team: GNOME Indonesian Translation Team <gnome@i15n.org>\n"
 "MIME-Version: 1.0\n"
@@ -50,391 +50,398 @@ msgid "Call volume, as a percentage."
 msgstr "Volume panggilan, dalam persentase."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-#| msgid "Camera On"
 msgid "Camera device"
 msgstr "Perangkat kamera"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "Posisi kamera"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid "Character to add after nickname when using nick completion (tab) in group chat."
 msgstr "Karakter yang ditambahkan setelah nama panggilan saat menggunakan penyelesaian nama panggilan (tab) dalam grup obrolan."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "Tema jendela obrolan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Chat window theme variant"
 msgstr "Varian tema jendela obrolan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr "Daftar yang dipisahkan koma dari bahasa pemeriksa ejaan yang digunakan (misalnya \"en, fr, nl\")."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "Daftar kontak ringkas"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "Manajer koneksi yang mesti digunakan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "Kriteria urutan daftar kontak"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr "Perangkat kamera bawaan untuk dipakai dalam panggilan video, mis. /dev/video0."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
 msgstr "Direktori bawaan untuk memilih gambar avatar"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr "Nonaktifkan pemberitahuan popup ketika pergi"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr "Nonaktifkan suara ketika pergi"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
 msgstr "Tampilkan kejadian masuk di area status"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Display incoming events in the status area. If false, present them to the user immediately."
 msgstr "Tampilkan kejadian masuk di area status. Bila false, sajikan mereka seketika ke pengguna."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Echo cancellation support"
 msgstr "Dukungan penghilangan gaung"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr "Empathy dapat mempublikasikan lokasi pengguna"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy dapat menggunakan GPS untuk menebak lokasi"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy dapat menggunakan jaringan selular untuk menebak lokasi"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy dapat menggunakan jaringan untuk menebak lokasi"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr "Folder unduh bawaan Empathy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
 msgstr "Empathy telah memindahkan log kupu-kupu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy harus otomatis berstatus pergi saat menganggur"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy mesti otomatis terhubung pada saat awalan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy harus mengurangi akurasi lokasi"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy harus menggunakan avatar dari kontak sebagai ikon jendela obrolan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr "Aktifkan Perangkat Pengembang WebKit"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "Aktifkan pemberitahuan popup untuk pesan baru"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "Aktifkan pemeriksa ejaan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "Sembunyikan jendela utama"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "Sembunyikan jendela utama."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "Karakter lengkap panggilan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "Buka obrolan baru di jendela terpisah"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "Jalur tema Adium untuk digunakan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "Jalur tema Adium yang digunakan jika tema yang digunakan untuk mengobrol adalah Adium."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Putar suara untuk pesan masuk"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "Putar suara untuk percakapan baru"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Putar suara untuk pesan keluar"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "Putar suara saat kontak masuk"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "Putar suara saat kontak keluar"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "Putar suara saat kita masuk"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "Putar suara saat kita keluar"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Munculkan pemberitahuan jika obrolan tidak terfokus"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "munculkan pemberitahuan bila kontak masuk"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "Munculkan pemberitahuan bila kontak keluar"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr "Posisi pratilik kamera saat memanggil."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Show Balance in contact list"
 msgstr "Tampilkan Kredit di daftar kontak"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "Tampilkan avatar"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "Tampilkan daftar kontak di ruang"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr "Tampilkan petunjuk tentang menutup jendela utama"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr "Tampilkan kontak luring"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
 msgstr "Tampilkan protokol"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "Bahasa pemeriksaan ejaan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr "Folder bawaan untuk menyimpan berkas masuk."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Direktori terakhir tempat gambar avatar dipilih darinya."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
 msgstr "Posisi panel sisi jendela obrolan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "Posisi tersimpan (dalam piksel) dari panel sisi jendela obrolan."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Tema yang digunakan untuk menampilkan percakapan di jendela obrolan."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "The theme variant that is used to display the conversation in chat windows."
 msgstr "Varian tema yang digunakan untuk menampilkan percakapan di jendela obrolan."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Gunakan smiley grafis"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "Gunakan suara pemberitahuan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "Gunakan tema untuk ruang obrolan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Apakah Empathy dapat mempublikasikan lokasi pengguna ke kontak mereka."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Apakah Empathy dapat menggunakan GPS untuk menebak lokasi."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Apakah Empathy dapat menggunakan jaringan selular untuk menebak lokasi."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Apakah Empathy dapat menggunakan jaringan untuk menebak lokasi."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "Apakah Empathy telah memindahkan log kupu-kupu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Apakah Empathy akan secara otomatis masuk ke akun Anda pada startup."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr "Apakah Empathy harus pergi ke modus pergi secara otomatis jika pengguna menganggur."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "Apakah Empathy harus mengurangi akurasi lokasi untuk alasan privasi."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "Apakah Empathy harus menggunakan avatar dari kontak sebagai ikon jendela obrolan."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "Apakah perangkat pengembang WebKit, seperti Inspektur Web, harus diaktifkan."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
 msgstr "Apakah manajer konektivitas harus digunakan untuk secara otomatis melepas/menyambung kembali."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid "Whether to check words typed against the languages you want to check with."
 msgstr "Apakah akan memeriksa kata-kata yang diketik terhadap bahasa yang ingin memeriksa dengannya."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "Apakah akan mengkonversi smiley menjadi gambar grafis dalam percakapan."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr "Apakah akan mengaktifkan penyaring penghilangan gaung Pulseaudio."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "Apakah akan memainkan suara untuk memberitahu kontak masuk ke jaringan."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "Apakah akan memainkan suara untuk memberitahu kontak keluar dari jaringan."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "Apakah akan memainkan suara untuk memberitahukan peristiwa."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Apakah akan memainkan suara untuk memberitahukan pesan masuk."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Apakah akan memainkan suara untuk memberitahukan pembicaraan baru."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Apakah akan memainkan suara untuk memberitahukan pesan keluar."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "Apakah akan memainkan suara ketika masuk ke jaringan."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Apakah akan memainkan suara ketika keluar dari jaringan."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr "Apakah akan memainkan suara pemberitahuan ketika pergi atau sibuk."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "Apakah akan menampilkan pemberitahuan popup ketika kontak pergi luring."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "Apakah akan menampilkan pemberitahuan popup ketika kontak menjadi daring."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
 msgstr "Apakah akan menampilkan pemberitahuan popup saat menerima pesan baru bahkan jika obrolan sudah terbuka, tapi tidak terfokus."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "Apakah akan menampilkan pemberitahuan popup saat menerima pesan baru."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show account balances in the contact list."
 msgstr "Apakah akan menampilkan sisa kredit akun dalam daftar kontak."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "Apakah akan menampilkan avatar untuk kontak dalam daftar kontak dan jendela obrolan."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "Apakah akan menampilkan kontak yang sedang luring dalam daftar kontak."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
 msgstr "Apakah akan menampilkan pemberitahuan popup ketika pergi atau sibuk."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "Apakah akan menampilkan protokol untuk kontak dalam daftar kontak."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Apakah akan menampilkan daftar kontak di ruang mengobrol."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "Apakah akan menampilkan daftar kontak dalam mode kompak."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
 msgstr "Apakah akan menampilkan dialog pesan tentang menutup jendela utama dengan tombol 'x' pada panel judul."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "Apakah akan menggunakan tema untuk ruang mengobrol."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid "Which criterion to use when sorting the contact list. Default is to sort by the contact's name with the value \"name\". A value of \"state\" will sort the contact list by state."
 msgstr "Kriteria mana yang digunakan saat mngurutkan daftar kontak. Standar adalah untuk mengurutkan berdasarkan nama kontak dengan nilai \"nama\". Nilai \"negara\" akan menyortir daftar kontak berdasar negara."
 
@@ -453,33 +460,33 @@ msgid "File transfer completed, but the file was corrupted"
 msgstr "Transfer berkas selesai, tapi berkas rusak"
 
 # belum konsisten: file - berkas
-#: ../libempathy/empathy-ft-handler.c:1113
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
 msgstr "Transfer berkas tidak didukung oleh kontak remote"
 
 # belum konsisten: file - berkas
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is not a regular file"
 msgstr "Berkas yang dipilih bukan merupakan berkas biasa"
 
 # belum konsisten: file - berkas
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1176
 msgid "The selected file is empty"
 msgstr "Berkas yang dipilih kosong"
 
-#: ../libempathy/empathy-message.c:413
-#: ../src/empathy-call-observer.c:132
+#: ../libempathy/empathy-message.c:415
+#: ../src/empathy-call-observer.c:131
 #, c-format
 msgid "Missed call from %s"
 msgstr "Panggilan tak terjawab dari %s"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:417
+#: ../libempathy/empathy-message.c:419
 #, c-format
 msgid "Called %s"
 msgstr "Memanggil %s"
 
-#: ../libempathy/empathy-message.c:420
+#: ../libempathy/empathy-message.c:422
 #, c-format
 msgid "Call from %s"
 msgstr "Panggilan dari %s"
@@ -517,171 +524,171 @@ msgid "The other participant is unable to transfer the file"
 msgstr "Peserta lainnya tidak dapat mentransfer berkas"
 
 #: ../libempathy/empathy-tp-file.c:405
-#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:312
 msgid "Unknown reason"
 msgstr "Alasan yang tidak diketahui"
 
-#: ../libempathy/empathy-utils.c:212
+#: ../libempathy/empathy-utils.c:232
 msgid "Available"
 msgstr "Tersedia"
 
-#: ../libempathy/empathy-utils.c:214
+#: ../libempathy/empathy-utils.c:234
 msgid "Busy"
 msgstr "Sibuk"
 
-#: ../libempathy/empathy-utils.c:217
+#: ../libempathy/empathy-utils.c:237
 msgid "Away"
 msgstr "Pergi"
 
-#: ../libempathy/empathy-utils.c:219
+#: ../libempathy/empathy-utils.c:239
 msgid "Invisible"
 msgstr "Tak kelihatan"
 
-#: ../libempathy/empathy-utils.c:221
+#: ../libempathy/empathy-utils.c:241
 msgid "Offline"
 msgstr "Luring"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:224
+#: ../libempathy/empathy-utils.c:244
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Tak dikenal"
 
 # msgid "Unknown"
 # msgstr "Tidak Diketahui"
-#: ../libempathy/empathy-utils.c:264
+#: ../libempathy/empathy-utils.c:284
 msgid "No reason specified"
 msgstr "Tidak ada alasan tertentu"
 
-#: ../libempathy/empathy-utils.c:266
-#: ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:286
+#: ../libempathy/empathy-utils.c:342
 msgid "Status is set to offline"
 msgstr "Status diatur ke luring"
 
 # Kesalahan jaringan?
-#: ../libempathy/empathy-utils.c:268
-#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:322
 #: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "Kesalahan jaringan"
 
-#: ../libempathy/empathy-utils.c:270
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:290
+#: ../libempathy/empathy-utils.c:324
 msgid "Authentication failed"
 msgstr "Otentikasi gagal"
 
 # Kesalahan penyandian?
 # Saya tetap memakai enkripsi sebagai lawan dari dekripsi (decryption) dengan acuan dari KBBI
-#: ../libempathy/empathy-utils.c:272
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:326
 msgid "Encryption error"
 msgstr "Kesalahan enkripsi"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:294
 msgid "Name in use"
 msgstr "Nama sedang dipakai"
 
-#: ../libempathy/empathy-utils.c:276
-#: ../libempathy/empathy-utils.c:308
+#: ../libempathy/empathy-utils.c:296
+#: ../libempathy/empathy-utils.c:328
 msgid "Certificate not provided"
 msgstr "Sertifikat tidak disediakan"
 
-#: ../libempathy/empathy-utils.c:278
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:298
+#: ../libempathy/empathy-utils.c:330
 msgid "Certificate untrusted"
 msgstr "Sertifikat tidak dipercaya"
 
-#: ../libempathy/empathy-utils.c:280
-#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:332
 msgid "Certificate expired"
 msgstr "Sertifikat kadaluarsa"
 
-#: ../libempathy/empathy-utils.c:282
-#: ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:334
 msgid "Certificate not activated"
 msgstr "Sertifikat tidak diaktifkan"
 
-#: ../libempathy/empathy-utils.c:284
-#: ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:336
 msgid "Certificate hostname mismatch"
 msgstr "Nama host sertifikat tidak cocok"
 
-#: ../libempathy/empathy-utils.c:286
-#: ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:338
 msgid "Certificate fingerprint mismatch"
 msgstr "Sidik jari sertifikat tidak cocok"
 
-#: ../libempathy/empathy-utils.c:288
-#: ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:308
+#: ../libempathy/empathy-utils.c:340
 msgid "Certificate self-signed"
 msgstr "Sertifikat ditandatangani sendiri"
 
-#: ../libempathy/empathy-utils.c:290
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate error"
 msgstr "Sertifikat salah"
 
-#: ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:344
 msgid "Encryption is not available"
 msgstr "Enkripsi tidak tersedia"
 
-#: ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:346
 msgid "Certificate is invalid"
 msgstr "Sertifikat tak valid"
 
-#: ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:348
 msgid "Connection has been refused"
 msgstr "Koneksi telah ditolak"
 
-#: ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:350
 msgid "Connection can't be established"
 msgstr "Koneksi tak dapat dijalin"
 
-#: ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:352
 msgid "Connection has been lost"
 msgstr "Koneksi telah terputus"
 
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:354
 msgid "This resource is already connected to the server"
 msgstr "Sumber daya ini sudah tersambung ke server"
 
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:356
 msgid "Connection has been replaced by a new connection using the same resource"
 msgstr "Koneksi telah digantikan oleh koneksi baru memakai sumberdaya yang sama"
 
-#: ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:359
 msgid "The account already exists on the server"
 msgstr "Akun ini sudah ada di server"
 
-#: ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:361
 msgid "Server is currently too busy to handle the connection"
 msgstr "Server kini terlalu sibuk untuk menangani koneksi"
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:363
 msgid "Certificate has been revoked"
 msgstr "Sertifikat telah dicabut"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:365
 msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "Sertifikat memakai algorima cipher yang tak aman atau lemah secara kriptografi"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:368
 msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
 msgstr "Panjang sertifikat server, atau kedalaman rantai sertifikat server, melampaui batas yang diberlakukan oleh pustaka kriptografi"
 
-#: ../libempathy/empathy-utils.c:509
+#: ../libempathy/empathy-utils.c:529
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "Orang-orang Berada di Sekitar"
 
-#: ../libempathy/empathy-utils.c:514
+#: ../libempathy/empathy-utils.c:534
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Jepang"
 
-#: ../libempathy/empathy-utils.c:543
+#: ../libempathy/empathy-utils.c:563
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:544
+#: ../libempathy/empathy-utils.c:564
 msgid "Facebook Chat"
 msgstr "Obrolan Facebook"
 
@@ -725,71 +732,81 @@ msgstr[0] "%d bulan yang lalu"
 msgid "in the future"
 msgstr "di masa mendatang"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:539
+#: ../libempathy-gtk/empathy-account-chooser.c:540
 msgid "All accounts"
 msgstr "Semua akun"
 
-#: ../libempathy-gtk/empathy-account-widget.c:693
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "Akun"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "Sandi"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Porta"
 
-#: ../libempathy-gtk/empathy-account-widget.c:768
-#: ../libempathy-gtk/empathy-account-widget.c:825
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1166
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "Akun Webku"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "Akun %s disunting melalui Akun Webku."
+msgid "The account %s is edited via %s."
+msgstr "Akun %s disunting melalui %s."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1172
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "Akun %s tak dapat disunting di Empathy."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
 msgstr "Luncurkan Akun Webku"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1532
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "Sunting %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Nama pengguna:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1850
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "Tera_pkan"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1880
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
 msgstr "_Masuk"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1954
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "Akun ini sudah ada di server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1957
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "Buat akun baru pada server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2149
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "_Batal"
 
@@ -798,19 +815,19 @@ msgstr "_Batal"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2427
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s pada %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2453
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "Akun %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2457
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "Akun baru"
 
@@ -932,36 +949,36 @@ msgstr "Apa UIN ICQ Anda?"
 msgid "What is your ICQ password?"
 msgstr "Apa sandi ICQ Anda?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:184
-#: ../libempathy-gtk/empathy-account-widget-sip.c:217
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "Otomatis"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:187
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:193
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:222
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "Register"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:227
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "Pilihan"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "Tidak ada"
 
@@ -1188,14 +1205,18 @@ msgid "Transport:"
 msgstr "Transportasi:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Gunakan akun ini untuk memanggi_l telepon tetap dan seluler"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "Apa sandi akun SIP Anda?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Apa ID masuk SIP Anda?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "Nama pengg_una:"
 
@@ -1219,36 +1240,36 @@ msgstr "I_D Yahoo!:"
 msgid "_Room List locale:"
 msgstr "Daftar _Ruang lokal:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:474
-#: ../libempathy-gtk/empathy-avatar-chooser.c:559
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "Tidak dapat mengubah gambar"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:475
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "Tidak ada dari format gambar yang diterima, didukung pada sistem Anda"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:822
-msgid "Couldn't save pixbuf to png"
-msgstr "Tak bisa menyimpan pixbuf ke png"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+msgid "Couldn't save picture to file"
+msgstr "Tak bisa menyimpan gambar ke berkas"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "Pilih Gambar Avatar Anda"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:942
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
 msgstr "Ambil gambar..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:945
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "Tidak Ada Gambar"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "Gambar"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1009
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "Semua File"
 
@@ -1277,179 +1298,179 @@ msgstr "Kontak yang dinyatakan tak valid"
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Panggilan darurat tak didukung protokol ini"
 
-#: ../libempathy-gtk/empathy-chat.c:702
+#: ../libempathy-gtk/empathy-chat.c:704
 msgid "Failed to open private chat"
 msgstr "Gagal membuka obrolan pribadi"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:765
 msgid "Topic not supported on this conversation"
 msgstr "Topik tidak didukung pada percakapan ini"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:771
 msgid "You are not allowed to change the topic"
 msgstr "Anda tidak diperbolehkan untuk mengubah topik"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:975
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "\"%s\" bukan ID kontak yang valid"
 
-#: ../libempathy-gtk/empathy-chat.c:1030
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: menghapus semua pesan dari percakapan aktif saat ini"
 
-#: ../libempathy-gtk/empathy-chat.c:1033
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topik> : Mengatur topik percakapan aktif saat itu"
 
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ID ruang mengobrol>: Bergabung dengan ruang mengbrol baru"
 
-#: ../libempathy-gtk/empathy-chat.c:1039
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ID ruang mengobrol>: Bergabung dengan ruang mengobrol baru"
 
-#: ../libempathy-gtk/empathy-chat.c:1043
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one"
 msgstr "/part [<ID ruang obrolan>][<alasan>]: meninggalkan ruang obrolan, secara baku yang sedang aktif"
 
-#: ../libempathy-gtk/empathy-chat.c:1047
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ID kontak> [<pesan>]: Membuka obrolan pribadi"
 
-#: ../libempathy-gtk/empathy-chat.c:1050
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ID kontak><pesan>: Membuka obrolan pribadi"
 
-#: ../libempathy-gtk/empathy-chat.c:1053
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nama panggilan>: Mengubah nama panggilan Anda pada server saat ini"
 
-#: ../libempathy-gtk/empathy-chat.c:1056
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <pesan>: Mengirim pesan TINDAKAN untuk percakapan aktif saat itu"
 
-#: ../libempathy-gtk/empathy-chat.c:1059
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/say <message>: send <message> to the current conversation. This is used to send a message starting with a '/'. For example: \"/say /join is used to join a new chat room\""
 msgstr "/say <pesan>: Mengirim <pesan> pada percakapan aktif saat itu. Ini digunakan untuk mengirim pesan yang dimulai dengan sebuah '/'. Sebagai contoh: \"/say /join digunakan untuk bergabung dalam ruang mengobrol baru\""
 
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ID kontak>: menampilkan informasi tentang kontak"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
 msgstr "/help [<perintah>]: Menampilkan semua perintah yang didukung. Jika <perintah> didefinisikan, menunjukkan cara penggunaannya."
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1114
 #, c-format
 msgid "Usage: %s"
 msgstr "Penggunaan: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1116
+#: ../libempathy-gtk/empathy-chat.c:1159
 msgid "Unknown command"
 msgstr "Perintah tidak dikenal"
 
-#: ../libempathy-gtk/empathy-chat.c:1242
+#: ../libempathy-gtk/empathy-chat.c:1285
 msgid "Unknown command; see /help for the available commands"
 msgstr "Perintah tak dikenal; lihat /help untuk perintah yang tersedia"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1412
+#: ../libempathy-gtk/empathy-chat.c:1455
 msgid "insufficient balance to send message"
 msgstr "tak cukup kredit untuk mengirim pesan"
 
-#: ../libempathy-gtk/empathy-chat.c:1414
+#: ../libempathy-gtk/empathy-chat.c:1457
 msgid "not capable"
 msgstr "tak mampu"
 
-#: ../libempathy-gtk/empathy-chat.c:1421
+#: ../libempathy-gtk/empathy-chat.c:1464
 msgid "offline"
 msgstr "luring"
 
-#: ../libempathy-gtk/empathy-chat.c:1424
+#: ../libempathy-gtk/empathy-chat.c:1467
 msgid "invalid contact"
 msgstr "kontak tidak valid"
 
-#: ../libempathy-gtk/empathy-chat.c:1427
+#: ../libempathy-gtk/empathy-chat.c:1470
 msgid "permission denied"
 msgstr "ijin ditolak"
 
-#: ../libempathy-gtk/empathy-chat.c:1430
+#: ../libempathy-gtk/empathy-chat.c:1473
 msgid "too long message"
 msgstr "pesan terlalu panjang"
 
-#: ../libempathy-gtk/empathy-chat.c:1433
+#: ../libempathy-gtk/empathy-chat.c:1476
 msgid "not implemented"
 msgstr "tidak dilaksanakan"
 
-#: ../libempathy-gtk/empathy-chat.c:1437
+#: ../libempathy-gtk/empathy-chat.c:1480
 msgid "unknown"
 msgstr "tidak diketahui"
 
-#: ../libempathy-gtk/empathy-chat.c:1443
+#: ../libempathy-gtk/empathy-chat.c:1486
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Kesalahan pengiriman pesan '%s':%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1447
+#: ../libempathy-gtk/empathy-chat.c:1490
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Galat saat mengirim pesan: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1508
-#: ../src/empathy-chat-window.c:760
+#: ../libempathy-gtk/empathy-chat.c:1551
+#: ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Topik:"
 
-#: ../libempathy-gtk/empathy-chat.c:1520
+#: ../libempathy-gtk/empathy-chat.c:1563
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Topik diatur ke: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "No topic defined"
 msgstr "Tidak ada topik didefinisikan"
 
-#: ../libempathy-gtk/empathy-chat.c:2031
+#: ../libempathy-gtk/empathy-chat.c:2074
 msgid "(No Suggestions)"
 msgstr "(Tidak Ada Saran)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2099
+#: ../libempathy-gtk/empathy-chat.c:2142
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Tambahkan '%s' ke Kamus"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2136
+#: ../libempathy-gtk/empathy-chat.c:2179
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Tambahkan '%s' ke Kamus %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2206
+#: ../libempathy-gtk/empathy-chat.c:2249
 msgid "Insert Smiley"
 msgstr "Sisipkan Smiley"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2224
-#: ../libempathy-gtk/empathy-ui-utils.c:1819
+#: ../libempathy-gtk/empathy-chat.c:2267
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "_Kirim"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2278
+#: ../libempathy-gtk/empathy-chat.c:2321
 msgid "_Spelling Suggestions"
 msgstr "_Saran Ejaan"
 
-#: ../libempathy-gtk/empathy-chat.c:2367
+#: ../libempathy-gtk/empathy-chat.c:2410
 msgid "Failed to retrieve recent logs"
 msgstr "Gagal mengambil catatan terbaru"
 
-#: ../libempathy-gtk/empathy-chat.c:2504
+#: ../libempathy-gtk/empathy-chat.c:2547
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s telah terputus"
@@ -1457,12 +1478,12 @@ msgstr "%s telah terputus"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2511
+#: ../libempathy-gtk/empathy-chat.c:2554
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s ditendang oleh %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2514
+#: ../libempathy-gtk/empathy-chat.c:2557
 #, c-format
 msgid "%s was kicked"
 msgstr "%s ditendang"
@@ -1470,17 +1491,17 @@ msgstr "%s ditendang"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2522
+#: ../libempathy-gtk/empathy-chat.c:2565
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s dilarang oleh %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2525
+#: ../libempathy-gtk/empathy-chat.c:2568
 #, c-format
 msgid "%s was banned"
 msgstr "%s dilarang"
 
-#: ../libempathy-gtk/empathy-chat.c:2529
+#: ../libempathy-gtk/empathy-chat.c:2572
 #, c-format
 msgid "%s has left the room"
 msgstr "%s telah meninggalkan ruangan"
@@ -1490,70 +1511,75 @@ msgstr "%s telah meninggalkan ruangan"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2538
+#: ../libempathy-gtk/empathy-chat.c:2581
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2606
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s telah bergabung dengan ruangan"
 
-#: ../libempathy-gtk/empathy-chat.c:2588
+#: ../libempathy-gtk/empathy-chat.c:2631
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s sekarang dikenal sebagai %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2727
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2784
 #: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1241
-#: ../src/empathy-call-window.c:2269
+#: ../src/empathy-event-manager.c:1240
+#: ../src/empathy-call-window.c:1432
+#: ../src/empathy-call-window.c:1482
+#: ../src/empathy-call-window.c:2527
 msgid "Disconnected"
 msgstr "Terputus"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3374
+#: ../libempathy-gtk/empathy-chat.c:3428
 msgid "Would you like to store this password?"
 msgstr "Apakah Anda ingin menyimpan sandi ini?"
 
-#: ../libempathy-gtk/empathy-chat.c:3380
+#: ../libempathy-gtk/empathy-chat.c:3434
 msgid "Remember"
 msgstr "Ingat"
 
-#: ../libempathy-gtk/empathy-chat.c:3390
+#: ../libempathy-gtk/empathy-chat.c:3444
 msgid "Not now"
 msgstr "Jangan sekarang"
 
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3488
 msgid "Retry"
 msgstr "Mencoba kembali"
 
-#: ../libempathy-gtk/empathy-chat.c:3438
+#: ../libempathy-gtk/empathy-chat.c:3492
 msgid "Wrong password; please try again:"
 msgstr "Sandi salah, coba lagi:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3568
+#: ../libempathy-gtk/empathy-chat.c:3622
 msgid "This room is protected by a password:"
 msgstr "Ruangan ini dilindungi oleh sandi:"
 
-#: ../libempathy-gtk/empathy-chat.c:3595
+#: ../libempathy-gtk/empathy-chat.c:3649
 msgid "Join"
 msgstr "Gabung"
 
-#: ../libempathy-gtk/empathy-chat.c:3797
-#: ../src/empathy-event-manager.c:1262
+#: ../libempathy-gtk/empathy-chat.c:3851
+#: ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "Terhubung"
 
-#: ../libempathy-gtk/empathy-chat.c:3852
+#: ../libempathy-gtk/empathy-chat.c:3906
 msgid "Conversation"
 msgstr "Percakapan"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3857
+#: ../libempathy-gtk/empathy-chat.c:3911
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1584,9 +1610,9 @@ msgstr "Sunting Kontak Yang Diblokir"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:521
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1495
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
@@ -1606,13 +1632,13 @@ msgstr "Buang"
 
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:1417
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "Salin Alamat _Tautan"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:1424
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Buka Tautan"
 
@@ -1644,18 +1670,18 @@ msgid "Block %s?"
 msgstr "Blok %s?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Anda yakin ingin memblokir '%s' agar tak bisa menghubungi Anda lagi?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:274
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
 msgid "_Block"
 msgstr "_Blok"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:283
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "Lapo_rkan kontak ini sebagai abusif?"
@@ -1680,38 +1706,38 @@ msgstr "Tak dikelompokkan"
 msgid "Favorite People"
 msgstr "Orang Favorit"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1983
-#: ../libempathy-gtk/empathy-individual-view.c:2375
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Apakah Anda benar-benar ingin menghapus grup '%s'?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1985
-#: ../libempathy-gtk/empathy-individual-view.c:2378
+#: ../libempathy-gtk/empathy-contact-list-view.c:1988
+#: ../libempathy-gtk/empathy-individual-view.c:2379
 msgid "Removing group"
 msgstr "Menghapus grup"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2034
-#: ../libempathy-gtk/empathy-contact-list-view.c:2111
-#: ../libempathy-gtk/empathy-individual-view.c:2433
-#: ../libempathy-gtk/empathy-individual-view.c:2636
+#: ../libempathy-gtk/empathy-contact-list-view.c:2037
+#: ../libempathy-gtk/empathy-contact-list-view.c:2114
+#: ../libempathy-gtk/empathy-individual-view.c:2434
+#: ../libempathy-gtk/empathy-individual-view.c:2637
 msgid "_Remove"
 msgstr "_Hapus"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2064
-#: ../libempathy-gtk/empathy-individual-view.c:2500
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
+#: ../libempathy-gtk/empathy-individual-view.c:2501
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Apakah Anda benar-benar ingin menghapus kontak '%s'?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2066
-#: ../libempathy-gtk/empathy-individual-view.c:2521
+#: ../libempathy-gtk/empathy-contact-list-view.c:2069
+#: ../libempathy-gtk/empathy-individual-view.c:2522
 msgid "Removing contact"
 msgstr "Menghapus kontak"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "T_ambah Kontak..."
 
@@ -1720,48 +1746,48 @@ msgid "_Block Contact"
 msgstr "_Blok Kontak"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:548
-#: ../src/empathy-main-window.ui.h:16
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "_Obrolan"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:639
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Panggilan Suar_a"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:684
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "Panggilan _Video"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:737
-#: ../src/empathy-main-window.ui.h:27
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "_Percakapan Sebelumnya"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:778
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "Kirim Berkas"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:820
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
 msgstr "Berbagi Desktop Saya"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1890
-#: ../libempathy-gtk/empathy-individual-menu.c:855
-#: ../libempathy-gtk/empathy-individual-widget.c:1386
+#: ../libempathy-gtk/empathy-contact-widget.c:1886
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "Favorit"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:883
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "Infor_masi"
 
@@ -1771,33 +1797,41 @@ msgid "_Edit"
 msgstr "_Edit"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1070
-#: ../src/empathy-chat-window.c:1010
+#: ../libempathy-gtk/empathy-individual-menu.c:1284
+#: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "Mengundang Anda ke ruangan ini"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1116
+#: ../libempathy-gtk/empathy-individual-menu.c:1330
 msgid "_Invite to Chat Room"
 msgstr "_Undang ke Ruang Mengobrol"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:514
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
 msgid "Search contacts"
 msgstr "Cari kontak"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:544
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
 msgid "Search: "
 msgstr "Cari:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:602
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
 msgid "_Add Contact"
 msgstr "T_ambah Kontak"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:620
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
 msgid "No contacts found"
 msgstr "Kontak tak ditemukan"
 
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr "Pesan perkenalan diri Anda:"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
+msgstr "Mohon ijinkan saya melihat ketika Anda daring. Terima kasih!"
+
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "Pilih kontak"
@@ -1850,157 +1884,157 @@ msgstr "Pesan pergi:"
 msgid "Channels:"
 msgstr "Kanal:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
 msgstr "Kode ISO Negara:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Country:"
 msgstr "Negara:"
 
 # pada konteks ini, rasanya state = negara bagian
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "State:"
 msgstr "Negara Bagian:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "City:"
 msgstr "Kota:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Area:"
 msgstr "Area:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
 msgstr "Kode Pos:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Street:"
 msgstr "Jalan:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
 msgstr "Gedung:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Floor:"
 msgstr "Lantai:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Room:"
 msgstr "Kamar:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Text:"
 msgstr "Teks:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:517
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Description:"
 msgstr "Keterangan:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:519
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:521
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
 msgstr "Tingkat Keakuratan:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:523
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr "Kesalahan:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
 msgstr "Kesalahan Vertikal(meter):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:527
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
 msgstr "Kesalahan Horisontal (meter):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:529
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr "Kecepatan:"
 
 # bearing = arah?
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:531
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Bearing:"
 msgstr "Arah:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:533
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
 msgstr "Kecepatan Mendaki:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:535
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
 msgstr "Terakhir Diperbarui:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:537
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
 msgstr "Bujur:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:945
-#: ../libempathy-gtk/empathy-individual-widget.c:539
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
 msgstr "Lintang:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:947
-#: ../libempathy-gtk/empathy-individual-widget.c:541
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
 msgstr "Ketinggian:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1000
-#: ../libempathy-gtk/empathy-contact-widget.c:1015
-#: ../libempathy-gtk/empathy-individual-widget.c:629
-#: ../libempathy-gtk/empathy-individual-widget.c:644
-#: ../src/empathy-preferences.ui.h:16
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "Lokasi"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1017
-#: ../libempathy-gtk/empathy-individual-widget.c:646
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
 # man strftime
 # %B %e, %Y = nama_bulan tanggal, tahun
-#: ../libempathy-gtk/empathy-contact-widget.c:1069
-#: ../libempathy-gtk/empathy-individual-widget.c:695
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e %B %Y pada %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1151
-#: ../libempathy-gtk/empathy-individual-widget.c:931
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
 msgid "Save Avatar"
 msgstr "Simpan Avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1207
-#: ../libempathy-gtk/empathy-individual-widget.c:989
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
 msgid "Unable to save avatar"
 msgstr "Tidak dapat menyimpan avatar"
 
@@ -2012,7 +2046,7 @@ msgstr "<b>Lokasi</b> pada (date)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1321
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr "Alias:"
 
@@ -2032,7 +2066,7 @@ msgstr "Rincian Kontak"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1525
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "Identifair:"
 
@@ -2067,16 +2101,16 @@ msgid "Select"
 msgstr "Pilih"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1835
+#: ../src/empathy-main-window.c:1807
 msgid "Group"
 msgstr "Grup"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:257
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Identitas berikut akan diblokir:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:264
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Identitas berikut tak dapat diblokir:"
@@ -2101,39 +2135,64 @@ msgstr "Kontak yang dipilih pada daftar di sebelah kiri akan dikaitkan bersama-s
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:138
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "Pilih akun yang dipakai untuk memanggil"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "Panggilan"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+msgid "Mobile"
+msgstr "Seluler"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "Kantor"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "RUMAH"
+
 #. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:594
-#: ../libempathy-gtk/empathy-new-message-dialog.c:248
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:931
+#: ../libempathy-gtk/empathy-individual-menu.c:1142
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Sunting"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:957
+#: ../libempathy-gtk/empathy-individual-menu.c:1168
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "_Kaitkan Kontak..."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2340
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 msgid "Delete and _Block"
 msgstr "Hapus dan _Blokir"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2509
+#: ../libempathy-gtk/empathy-individual-view.c:2510
 #, c-format
 msgid "Do you really want to remove the linked contact '%s'? Note that this will remove all the contacts which make up this linked contact."
 msgstr "Anda yakin ingin menghapus kontak terkait '%s'? Hal ini akan menghapus semua kontak yang menyusun kontak terkait ini."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1672
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2213,129 +2272,135 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "_Lepaskan"
 
-#: ../libempathy-gtk/empathy-log-window.c:458
+#: ../libempathy-gtk/empathy-log-window.c:634
 msgid "History"
 msgstr "Riwayat"
 
-#: ../libempathy-gtk/empathy-log-window.c:510
+#: ../libempathy-gtk/empathy-log-window.c:689
 msgid "Show"
 msgstr "Tampilkan"
 
-#: ../libempathy-gtk/empathy-log-window.c:532
+#: ../libempathy-gtk/empathy-log-window.c:711
 msgid "Search"
 msgstr "Pencarian"
 
-#: ../libempathy-gtk/empathy-log-window.c:946
+#: ../libempathy-gtk/empathy-log-window.c:1159
 #, c-format
 msgid "Chat in %s"
 msgstr "Obrolan di %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:948
+#: ../libempathy-gtk/empathy-log-window.c:1161
 #, c-format
 msgid "Chat with %s"
 msgstr "Obrolan dengan %s"
 
 # %A %d %B %Y?
-#: ../libempathy-gtk/empathy-log-window.c:998
-#: ../libempathy-gtk/empathy-log-window.c:1176
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1118
+#: ../libempathy-gtk/empathy-log-window.c:1300
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1124
+#: ../libempathy-gtk/empathy-log-window.c:1306
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1195
-#: ../libempathy-gtk/empathy-log-window.c:1197
-#: ../src/empathy-ft-manager.c:1026
-msgid "%"
-msgstr "%"
+#: ../libempathy-gtk/empathy-log-window.c:1382
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s detik"
 
-#: ../libempathy-gtk/empathy-log-window.c:1204
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s menit"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Panggilan selama %s, berakhir pada %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1536
+#: ../libempathy-gtk/empathy-log-window.c:1729
 msgid "Today"
 msgstr "Hari ini"
 
-#: ../libempathy-gtk/empathy-log-window.c:1540
+#: ../libempathy-gtk/empathy-log-window.c:1733
 msgid "Yesterday"
 msgstr "Kemarin"
 
 # %A %d %B %Y?
-#: ../libempathy-gtk/empathy-log-window.c:1556
-msgctxt "A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1637
-#: ../libempathy-gtk/empathy-log-window.c:3203
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3444
 msgid "Anytime"
 msgstr "Kapanpun"
 
-#: ../libempathy-gtk/empathy-log-window.c:1717
-#: ../libempathy-gtk/empathy-log-window.c:2154
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2372
 msgid "Anyone"
 msgstr "Siapapun"
 
-#: ../libempathy-gtk/empathy-log-window.c:2451
+#: ../libempathy-gtk/empathy-log-window.c:2685
 msgid "Who"
 msgstr "Siapa"
 
-#: ../libempathy-gtk/empathy-log-window.c:2655
+#: ../libempathy-gtk/empathy-log-window.c:2889
 msgid "When"
 msgstr "Kapan"
 
-#: ../libempathy-gtk/empathy-log-window.c:2771
+#: ../libempathy-gtk/empathy-log-window.c:3005
 msgid "Anything"
 msgstr "Apapun"
 
-#: ../libempathy-gtk/empathy-log-window.c:2773
+#: ../libempathy-gtk/empathy-log-window.c:3007
 msgid "Text chats"
 msgstr "Obrolan teks"
 
-#: ../libempathy-gtk/empathy-log-window.c:2775
+#: ../libempathy-gtk/empathy-log-window.c:3009
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "Panggilan"
 
-#: ../libempathy-gtk/empathy-log-window.c:2780
+#: ../libempathy-gtk/empathy-log-window.c:3014
 msgid "Incoming calls"
 msgstr "Panggilan masuk"
 
-#: ../libempathy-gtk/empathy-log-window.c:2781
+#: ../libempathy-gtk/empathy-log-window.c:3015
 msgid "Outgoing calls"
 msgstr "Panggilan keluar"
 
-#: ../libempathy-gtk/empathy-log-window.c:2782
+#: ../libempathy-gtk/empathy-log-window.c:3016
 msgid "Missed calls"
 msgstr "Panggilan tak terjawab"
 
-#: ../libempathy-gtk/empathy-log-window.c:2804
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "What"
 msgstr "Apa"
 
-#: ../libempathy-gtk/empathy-log-window.c:3506
+#: ../libempathy-gtk/empathy-log-window.c:3747
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Anda yakin ingin menghapus semua log dari percakapan sebelumnya?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3510
+#: ../libempathy-gtk/empathy-log-window.c:3751
 msgid "Clear All"
 msgstr "Hapus Semua"
 
-#: ../libempathy-gtk/empathy-log-window.c:3517
+#: ../libempathy-gtk/empathy-log-window.c:3758
 msgid "Delete from:"
 msgstr "Hapus dari:"
 
@@ -2343,14 +2408,6 @@ msgstr "Hapus dari:"
 msgid "<span size=\"x-large\">Loading...</span>"
 msgstr "<span size=\"x-large\">Memuat...</span>"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call"
-msgstr "Panggilan"
-
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
 #: ../src/empathy-chat-window.ui.h:3
 msgid "Chat"
@@ -2373,7 +2430,7 @@ msgstr "Video"
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
 #: ../src/empathy-call-window.ui.h:28
 #: ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window-menubar.ui.h:20
 msgid "_Edit"
 msgstr "_Sunting"
 
@@ -2390,27 +2447,27 @@ msgid "Contact ID:"
 msgstr "ID Kontak:"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:258
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
 msgid "C_hat"
 msgstr "O_brolan"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:277
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
 msgstr "Percakapan baru"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:231
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
 msgid "Send _Video"
 msgstr "Kirim _Video"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
 msgid "C_all"
 msgstr "P_anggil"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:252
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "New Call"
 msgstr "Panggilan Baru"
 
@@ -2470,24 +2527,24 @@ msgid "New %s account"
 msgstr "Akun %s baru"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "Cari Selanjutnya"
+msgid "Find:"
+msgstr "Cari:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "Cari Sebelumnya"
+msgid "Mat_ch case"
+msgstr "_Cocokkan huruf"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Find:"
-msgstr "Cari:"
+msgid "Phrase not found"
+msgstr "Frasa tidak ditemukan"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "Cocokkan huruf"
+msgid "_Next"
+msgstr "Selanjut_nya"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "Phrase not found"
-msgstr "Frasa tidak ditemukan"
+msgid "_Previous"
+msgstr "Se_belumnya"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2533,28 +2590,28 @@ msgstr "Suara panggilan berakhir"
 msgid "Edit Custom Messages"
 msgstr "Sunting Pesan Gubahan"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1121
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
 #, c-format
 msgid "Message edited at %s"
 msgstr "Pesan disunting pada %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1943
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
 msgid "Normal"
 msgstr "Normal"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:75
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "Klasik"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:76
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "Sederhana"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:77
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "Bersih"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:78
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "Biru"
 
@@ -2628,24 +2685,24 @@ msgstr "Ingat pilihan ini bagi koneksi di masa depan"
 msgid "Certificate Details"
 msgstr "Rincian Sertifikat"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1715
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
 msgstr "Tidak dapat membuka URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1811
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
 msgstr "Pilih berkas"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1883
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
 msgid "Insufficient free space to save file"
 msgstr "Tak cukup ruang untuk menyimpan berkas"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1891
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
 #, c-format
 msgid "%s of free space are required to save this file, but only %s is available. Please choose another location."
 msgstr "Diperlukan ruang kosong %s untuk menyimpan berkas ini, tapi hanya tersedia %s. Silakan pilih lokasi lain."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1935
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Berkas masuk dari %s"
@@ -2833,23 +2890,23 @@ msgstr "Tidak ada pesan kesalahan"
 msgid "Instant Message (Empathy)"
 msgstr "Pesan Instan (Empathy)"
 
-#: ../src/empathy.c:354
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "Jangan menyambung saat memulai"
 
-#: ../src/empathy.c:358
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Jangan menampilkan daftar kontak atau dialog lainnya pada startup"
 
-#: ../src/empathy.c:373
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr "- Klien IM Empathy"
 
-#: ../src/empathy.c:560
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
 msgstr "Galat saat menghubungi Manajer Akun"
 
-#: ../src/empathy.c:562
+#: ../src/empathy.c:639
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. The error was:\n"
@@ -2878,7 +2935,10 @@ msgstr "Klien Perpesanan Instan untuk GNOME"
 
 #: ../src/empathy-about-dialog.c:113
 msgid "translator-credits"
-msgstr "Taufiq Wirahman <taufiq.wirahman@gmail.com>, 2010."
+msgstr ""
+"Taufiq Wirahman <taufiq.wirahman@gmail.com>, 2010.\n"
+"Dirgita <dirgitadevina@yahoo.co.id>, 2011.\n"
+"Andika Triwidada <andika@gmail.com>, 2011."
 
 #: ../src/empathy-account-assistant.c:167
 msgid "There was an error while importing the accounts."
@@ -3025,7 +3085,7 @@ msgstr "Akun baru Anda belum tersimpan."
 
 #: ../src/empathy-accounts-dialog.c:345
 #: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1103
+#: ../src/empathy-call-window.c:1216
 msgid "Connecting…"
 msgstr "Menyambung..."
 
@@ -3126,12 +3186,12 @@ msgid "People nearby"
 msgstr "Orang-orang terdekat"
 
 #: ../src/empathy-av.c:118
-#: ../src/empathy-call.c:127
+#: ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr "- Klien Audio/Video Empathy"
 
 #: ../src/empathy-av.c:134
-#: ../src/empathy-call.c:152
+#: ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "Klien Audio/Video Empathy"
 
@@ -3174,33 +3234,33 @@ msgstr "Rincian"
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1604
+#: ../src/empathy-call-window.c:1825
 #, c-format
 msgid "Call with %s"
 msgstr "Panggil dengan %s"
 
 #: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:1848
+#: ../src/empathy-call-window.c:2069
 msgid "The IP address as seen by the machine"
 msgstr "Alamat IP sebagaimana dilihat oleh mesin"
 
 #: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:1850
+#: ../src/empathy-call-window.c:2071
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Alamat IP sebagaimana dilihat oleh server di Internet"
 
 #: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:1852
+#: ../src/empathy-call-window.c:2073
 msgid "The IP address of the peer as seen by the other side"
 msgstr "Alamat IP dari peer sebagaimana dilihat oleh sisi lain"
 
 #: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:1854
+#: ../src/empathy-call-window.c:2075
 msgid "The IP address of a relay server"
 msgstr "Alamat IP dari server relay"
 
 #: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:1856
+#: ../src/empathy-call-window.c:2077
 msgid "The IP address of the multicast group"
 msgstr "Alamat IP dari grup multicast"
 
@@ -3231,66 +3291,66 @@ msgid "Connected — %d:%02dm"
 msgstr "Terhubung — %d:%02dm"
 
 #: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2588
+#: ../src/empathy-call-window.c:2846
 msgid "Technical Details"
 msgstr "Rincian Teknis"
 
 #: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2626
+#: ../src/empathy-call-window.c:2884
 #, c-format
 msgid "%s's software does not understand any of the audio formats supported by your computer"
 msgstr "Perangkat lunak %s tidak memahami format audio apapun yang didukung oleh komputer Anda"
 
 #: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2631
+#: ../src/empathy-call-window.c:2889
 #, c-format
 msgid "%s's software does not understand any of the video formats supported by your computer"
 msgstr "Perangkat lunak %s tidak memahami format video apapun yang didukung oleh komputer Anda"
 
 #: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2637
+#: ../src/empathy-call-window.c:2895
 #, c-format
 msgid "Can't establish a connection to %s. One of you might be on a network that does not allow direct connections."
 msgstr "Tidak dapat membuat sambungan ke %s. Salah satu dari Anda mungkin berada pada jaringan yang tidak mengizinkan koneksi langsung."
 
 #: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2643
+#: ../src/empathy-call-window.c:2901
 msgid "There was a failure on the network"
 msgstr "Ada kegagalan pada jaringan"
 
 #: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2647
+#: ../src/empathy-call-window.c:2905
 msgid "The audio formats necessary for this call are not installed on your computer"
 msgstr "Format audio yang diperlukan untuk panggilan ini tidak diinstal pada komputer Anda"
 
 #: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2650
+#: ../src/empathy-call-window.c:2908
 msgid "The video formats necessary for this call are not installed on your computer"
 msgstr "Format video yang diperlukan untuk panggilan ini tidak diinstal pada komputer Anda"
 
 #: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2662
+#: ../src/empathy-call-window.c:2920
 #, c-format
 msgid "Something unexpected happened in a Telepathy component. Please <a href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' window in the Help menu."
 msgstr "Sesuatu yang tidak terduga terjadi dalam komponen Telepathy. Silakan <a href=\"%s\">laporkan bug ini</a> dan melampirkan log yang dikumpulkan dari jendela 'Debug' dalam menu Bantuan."
 
 #: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2671
+#: ../src/empathy-call-window.c:2929
 msgid "There was a failure in the call engine"
 msgstr "Ada kegagalan dalam mesin panggilan"
 
 #: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2674
+#: ../src/empathy-call-window.c:2932
 msgid "The end of the stream was reached"
 msgstr "Akhir stream tercapai"
 
 #: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2714
+#: ../src/empathy-call-window.c:2972
 msgid "Can't establish audio stream"
 msgstr "Tidak dapat membangun aliran audio"
 
 #: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2724
+#: ../src/empathy-call-window.c:2982
 msgid "Can't establish video stream"
 msgstr "Tidak bisa membangun aliran video"
 
@@ -3368,7 +3428,6 @@ msgid "Start an audio call"
 msgstr "Mulai panggilan audio"
 
 #: ../src/empathy-call-window.ui.h:18
-#| msgid "Disable camera"
 msgid "Swap camera"
 msgstr "Tukar kamera"
 
@@ -3383,10 +3442,10 @@ msgstr "Jungkitkan transmisi video"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2224
-#: ../src/empathy-call-window.c:2225
-#: ../src/empathy-call-window.c:2226
-#: ../src/empathy-call-window.c:2227
+#: ../src/empathy-call-window.c:2476
+#: ../src/empathy-call-window.c:2477
+#: ../src/empathy-call-window.c:2478
+#: ../src/empathy-call-window.c:2479
 msgid "Unknown"
 msgstr "Tidak Diketahui"
 
@@ -3400,24 +3459,23 @@ msgid "_Call"
 msgstr "_Panggil"
 
 #: ../src/empathy-call-window.ui.h:25
-#| msgid "Camera On"
 msgid "_Camera"
 msgstr "_Kamera"
 
 #: ../src/empathy-call-window.ui.h:26
 #: ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window-menubar.ui.h:18
 msgid "_Contents"
 msgstr "_Isi"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-main-window-menubar.ui.h:19
 msgid "_Debug"
 msgstr "_Debug"
 
 #: ../src/empathy-call-window.ui.h:29
 #: ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window-menubar.ui.h:22
 msgid "_Help"
 msgstr "_Bantuan"
 
@@ -3430,47 +3488,47 @@ msgid "_Settings"
 msgstr "_Pengaturan"
 
 #: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window.ui.h:30
+#: ../src/empathy-main-window-menubar.ui.h:30
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_Lihat"
 
-#: ../src/empathy-chat-window.c:480
-#: ../src/empathy-chat-window.c:500
+#: ../src/empathy-chat-window.c:481
+#: ../src/empathy-chat-window.c:501
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d belum dibaca)"
 
-#: ../src/empathy-chat-window.c:492
+#: ../src/empathy-chat-window.c:493
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (dan %u lainnya)"
 
-#: ../src/empathy-chat-window.c:508
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d belum dibaca dari lainnya)"
 
-#: ../src/empathy-chat-window.c:517
+#: ../src/empathy-chat-window.c:518
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d belum dibaca dari semua)"
 
-#: ../src/empathy-chat-window.c:732
+#: ../src/empathy-chat-window.c:733
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:742
+#: ../src/empathy-chat-window.c:743
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "Sedang mengirim %d pesan"
 
-#: ../src/empathy-chat-window.c:764
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
 msgstr "Ketik pesan."
 
@@ -3551,99 +3609,102 @@ msgstr "Tersambung-Otomatis"
 msgid "Manage Favorite Rooms"
 msgstr "Mengelola Ruang Favorit"
 
-#: ../src/empathy-event-manager.c:522
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming video call"
 msgstr "Panggilan video masuk"
 
-#: ../src/empathy-event-manager.c:522
+#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-call-window.c:1449
 msgid "Incoming call"
 msgstr "Panggilan masuk"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:525
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s memanggil Anda lewat video. Apakah Anda ingin menjawab?"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s memanggil Anda. Apakah Anda ingin menjawab?"
 
-#: ../src/empathy-event-manager.c:530
-#: ../src/empathy-event-manager.c:731
-#: ../src/empathy-event-manager.c:764
+#: ../src/empathy-event-manager.c:529
+#: ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Panggilan masuk dari %s"
 
-#: ../src/empathy-event-manager.c:555
+#: ../src/empathy-event-manager.c:554
 msgid "_Reject"
 msgstr "_Tolak"
 
-#: ../src/empathy-event-manager.c:563
-#: ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:562
+#: ../src/empathy-event-manager.c:570
 msgid "_Answer"
 msgstr "_Jawab"
 
-#: ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:570
 msgid "_Answer with video"
 msgstr "J_awab dengan video"
 
-#: ../src/empathy-event-manager.c:731
-#: ../src/empathy-event-manager.c:764
+#: ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Panggilan video masuk dari %s"
 
-#: ../src/empathy-event-manager.c:837
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
 msgstr "Undangan ruang"
 
-#: ../src/empathy-event-manager.c:839
+#: ../src/empathy-event-manager.c:838
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Undangan untuk bergabung di %s"
 
-#: ../src/empathy-event-manager.c:846
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s mengundang Anda untuk bergabung dengan %s"
 
-#: ../src/empathy-event-manager.c:854
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
 msgstr "_Tolak"
 
-#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Gabung"
 
-#: ../src/empathy-event-manager.c:886
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s mengundang Anda untuk bergabung dengan %s"
 
-#: ../src/empathy-event-manager.c:892
+#: ../src/empathy-event-manager.c:891
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Anda diundang untuk bergabung di %s"
 
-#: ../src/empathy-event-manager.c:943
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Kedatangan transfer berkas dari %s"
 
-#: ../src/empathy-event-manager.c:1135
+#: ../src/empathy-event-manager.c:1134
 #: ../src/empathy-main-window.c:375
 msgid "Password required"
 msgstr "Memerlukan sandi"
 
-#: ../src/empathy-event-manager.c:1191
+#: ../src/empathy-event-manager.c:1190
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s ingin dapat melihat ketika Anda daring"
 
-#: ../src/empathy-event-manager.c:1195
+#: ../src/empathy-event-manager.c:1194
 #, c-format
 msgid ""
 "\n"
@@ -3746,6 +3807,10 @@ msgstr "Memeriksa integritas \"%s\""
 msgid "Hashing \"%s\""
 msgstr "Hashing \"%s\""
 
+#: ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "%"
+
 #: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "Berkas"
@@ -3819,110 +3884,106 @@ msgid "Top up account credit"
 msgstr "Isi ulang kredit akun"
 
 #. top up button
-#: ../src/empathy-main-window.c:1050
+#: ../src/empathy-main-window.c:1046
 msgid "Top Up..."
 msgstr "Isi Ulang..."
 
-#: ../src/empathy-main-window.c:1817
+#: ../src/empathy-main-window.c:1789
 msgid "Contact"
 msgstr "Kontak"
 
-#: ../src/empathy-main-window.c:2145
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "Daftar Kontak"
 
-#: ../src/empathy-main-window.c:2263
-msgid "Show and edit accounts"
-msgstr "Tampilkan dan sunting akun"
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "Kontak pada Pe_ta"
 
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-main-window-menubar.ui.h:2
 msgid "Credit Balance"
 msgstr "Sisa Kredit"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "Cari di _Daftar Kontak"
 
 # favorite -> favorit
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "Gabung _Favorit"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "Mengelola Favorit"
 
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "Ukuran N_ormal"
 
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window-menubar.ui.h:7
 #: ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "_Panggilan Baru ..."
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "Ukuran Normal Dengan _Avatar"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "P_referensi"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "Tampilkan P_rotokol"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "Urutkan menurut _Nama"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "Urutkan menurut _Status"
 
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Akun"
 
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "Kontak Yang Di_blokir"
 
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "Ukuran _Ringkas"
 
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "Trans_fer Berkas"
 
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "_Gabung..."
 
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window-menubar.ui.h:24
 #: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "Percakapa_n Baru..."
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "K_ontak Luring"
 
-#: ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "Informasi _Personal"
 
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "_Ruang"
 
-#: ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-main-window-menubar.ui.h:29
 msgid "_Search for Contacts…"
 msgstr "_Cari Kontak..."
 
@@ -3986,79 +4047,79 @@ msgstr "Daftar Ruang"
 msgid "_Room:"
 msgstr "_Ruang:"
 
-#: ../src/empathy-preferences.c:172
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr "Pesan diterima"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr "Pesan terkirim"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
 msgstr "Percakapan baru"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
 msgstr "Kontak pergi daring"
 
-#: ../src/empathy-preferences.c:176
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
 msgstr "Kontak pergi luring"
 
-#: ../src/empathy-preferences.c:177
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
 msgstr "Akun terhubung"
 
-#: ../src/empathy-preferences.c:178
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
 msgstr "Akun terputus"
 
-#: ../src/empathy-preferences.c:487
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr "Bahasa"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:737
+#: ../src/empathy-preferences.c:734
 msgid "Juliet"
 msgstr "Juliet"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:741
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:747
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "O Romeo, Romeo, wherefore art thou Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:750
 msgid "Deny thy father and refuse thy name;"
 msgstr "Deny thy father and refuse thy name;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:753
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Or if thou wilt not, be but sworn my love"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:756
 msgid "And I'll no longer be a Capulet."
 msgstr "And I'll no longer be a Capulet."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:759
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Shall I hear more, or shall I speak at this?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:765
+#: ../src/empathy-preferences.c:762
 msgid "Juliet has disconnected"
 msgstr "Juliet telah terputus"
 
-#: ../src/empathy-preferences.c:1173
+#: ../src/empathy-preferences.c:1166
 msgid "Preferences"
 msgstr "Preferensi"
 
@@ -4087,120 +4148,124 @@ msgid "Display incoming events in the notification area"
 msgstr "Tampilkan kejadian masuk di area pemberitahuan"
 
 #: ../src/empathy-preferences.ui.h:9
+msgid "Echo cancellation helps to make your voice sound clearer to the other person, but may cause problems on some computers. If you or the other person hear strange noises or glitches during calls, try turning echo cancellation off and restarting the call."
+msgstr "Pembatalan gaung membantu membuat suara Anda terdengar lebih jelas bagi pihak lain, tapi mungkin menyebabkan masalah pada beberapa komputer. Bila Anda atau pihak lain mendengar derau aneh atau gangguang selama panggilan, cobalah mematikan pembatalan gaung dan memulai ulang panggilan."
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "Aktifkan pemberitahuan bila kontak daring"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "Aktifkan pemberitahuan bila kontak luring"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Aktifkan pemberitahuan bila _obrolan tidak fokus"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "Aktifkan pemeriksaan ejaan untuk bahasa:"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "Umum"
 
-#: ../src/empathy-preferences.ui.h:14
-msgid "Input level"
-msgstr "Tingkat masukan"
-
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input volume"
-msgstr "Volume masukan"
+msgid "Input level:"
+msgstr "Tingkat masukan:"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "Volume masukan:"
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "Sumber lokasi:"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "Log percakapan"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "Notifikasi"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Putar suara untuk acara"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "Pribadi"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:23
 msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published.  GPS coordinates will be accurate to 1 decimal place."
 msgstr "Mengurangi ketepatan lokasi berarti bahwa jika tidak ada yang lebih tepat dari kota Anda, propinsi dan negara akan dipublikasikan. Koordinat GPS akan akurat sampai 1 tempat desimal."
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "Tampilkan _smiley sebagai gambar"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "Tampi_lkan daftar kontak di ruang"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "Suara"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "Pemeriksaan Ejaan"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
 msgid "The list of languages reflects only the languages for which you have a dictionary installed."
 msgstr "Daftar bahasa yang ada hanya mencerminkan bahasa yang telah memiliki kamus yang terinstal."
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "Tema"
 
 # bearing = arah?
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "Varian:"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "Koneksi otom_atis saat memulai"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "Telepon _seluler"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "Aktifkan pemberitahuan g_elembung"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "Aktifkan p_emberitahuan suara"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "Jaringa_n (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "Buka _obrolan baru di jendela terpisah"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "Tam_pilkan lokasi untuk kontak saya"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "Ku_rangi akurasi lokasi"
 
@@ -4325,16 +4390,16 @@ msgstr "Tingkat"
 msgid "The selected connection manager does not support the remote debugging extension."
 msgstr "Manajer koneksi yang dipilih tidak mendukung ekstensi pengawakutuan jauh."
 
+#: ../src/empathy-invite-participant-dialog.c:179
 #: ../src/empathy-invite-participant-dialog.c:205
-#: ../src/empathy-invite-participant-dialog.c:231
 msgid "Invite Participant"
 msgstr "Undang Peserta"
 
-#: ../src/empathy-invite-participant-dialog.c:206
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Pilih kontak untuk diundang ke percakapan:"
 
-#: ../src/empathy-invite-participant-dialog.c:227
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "Undang"
 
@@ -4383,11 +4448,13 @@ msgid "Respond"
 msgstr "Tanggapan"
 
 #: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1459
 msgid "Reject"
 msgstr "Tolak"
 
 #: ../src/empathy-notifications-approver.c:222
 #: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1460
 msgid "Answer"
 msgstr "Jawab"
 
@@ -4405,36 +4472,39 @@ msgstr "Tolak"
 msgid "Accept"
 msgstr "Terima"
 
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
 #: ../src/empathy-notifications-approver.c:260
 msgid "Provide"
 msgstr "Sediakan"
 
-#: ../src/empathy-call-observer.c:135
+#: ../src/empathy-call-observer.c:134
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s baru saja mencoba memanggil, tapi Anda sedang menerima panggilan lain."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1008
-#: ../src/empathy-call-window.c:1027
+#: ../src/empathy-call-window.c:1088
+#: ../src/empathy-call-window.c:1111
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2539
+#: ../src/empathy-call-window.c:2775
 msgid "On hold"
 msgstr "Ditahan"
 
-#: ../src/empathy-call-window.c:2542
+#: ../src/empathy-call-window.c:2778
 msgid "Mute"
 msgstr "Bisu"
 
-#: ../src/empathy-call-window.c:2544
+#: ../src/empathy-call-window.c:2780
 msgid "Duration"
 msgstr "Durasi"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2547
+#: ../src/empathy-call-window.c:2783
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
diff --git a/po/it.po b/po/it.po
index 1579ad880..2800a631a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,16 +8,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Empathy\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=empathy&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-03-22 12:06+0000\n"
-"PO-Revision-Date: 2011-03-21 16:01+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-09-16 19:01+0200\n"
+"PO-Revision-Date: 2011-09-16 19:03+0200\n"
 "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/empathy.desktop.in.in.h:1
@@ -42,6 +41,22 @@ msgid "Always open a separate chat window for new chats."
 msgstr "Apre sempre in una finestra separata le nuove conversazioni."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr "Volume chiamata"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr "Volume della chiamata in percentuale."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Camera device"
+msgstr "Device della videocamera"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "Posizione della videocamera"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -49,47 +64,55 @@ msgstr ""
 "Il carattere da usare dopo il soprannome quando viene usato il completamento "
 "del soprannome nelle conversazioni di gruppo."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
-msgstr "Tema finestra conversazione"
+msgstr "Tema finestra di conversazione"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+msgid "Chat window theme variant"
+msgstr "Variante del tema della finestra di conversazione"
 
 # (ndt) non metto fr neanche dopo morto! :D
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "Elenco dizionari per il controllo ortografico, separare gli elementi con "
 "virgole (es. \"it, en, nl\")."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "Elenco contatti compatto"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "Indica se deve essere usato il gestore delle connessioni"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "Criterio di ordinamento dell'elenco contatti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Device della videocamera predefinito da usare, come /dev/video0."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
 msgstr "Directory predefinita da cui selezionare un'immagine per l'avatar"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr "Disabilita le notifiche quando assenti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr "Disabilita i suoni quando assenti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
 msgstr "Visualizza gli eventi in arrivo nell'area di stato"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -97,261 +120,280 @@ msgstr ""
 "Visualizza gli eventi in arrivo nell'area di stato. Se FALSO, li mostra "
 "direttamente all'utente."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+msgid "Echo cancellation support"
+msgstr "Supporto soppressione dell'eco"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr ""
 "Indica se il programma può pubblicare la posizione geografica dell'utente"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr ""
 "Indica se il programma può utilizzare il GPS per ipotizzare la posizione "
 "geografica"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr ""
 "Indica se il programma può utilizzare la rete dei telefoni cellulari per "
 "ipotizzare la posizione geografica"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr ""
 "Indica se il programma può utilizzare la rete per ipotizzare la posizione "
 "geografica"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr "Cartella predefinita per gli scaricamenti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
 msgstr ""
 "Indica se il programma ha eseguito la migrazione dei registri di butterfly"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr ""
 "Indica se il programma deve impostare automaticamente lo stato di assenza "
 "quando inattivo"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "Indica se il programma deve connettersi automaticamente all'avvio"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr ""
 "Indica se il programma deve ridurre la precisione della posizione geografica"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
 "Indica se il programma deve usare l'immagine del contatto come icona della "
 "finestra della conversazione"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr "Abilita gli strumenti per sviluppatori di WebKit"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "Abilita le notifiche per i nuovi messaggi"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "Abilita il correttore ortografico"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "Nasconde la finestra principale"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "Nasconde la finestra principale."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "Carattere soprannome completato"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "Apre nuove conversazioni in finestre separate"
 
 # (ndt) messo con la maiuscola, dovrebbe essere con la maiuscola il nome originale
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "Percorso al tema di Adium da usare"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
 "Il percorso al tema di Adium da usare se il tema scelto per la conversazione "
 "è Adium."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Emette un suono all'arrivo dei messaggi"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "Emette un suono per le nuove conversazioni"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Emette un suono all'invio dei messaggi"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "Emette un suono quando un contatto si collega"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "Emette un suono quando un contatto si scollega"
 
 # (ndt) per cercare di renderla impersonale
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "Emette un suono quando l'utente locale si collega"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "Emette un suono quando l'utente locale si scollega"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Notifica se la conversazione non ha il focus"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "Notifica quando un contatto si collega"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "Notifica quando un contatto si scollega"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr "La posizione dell'anteprima della videocamera durante una chiamata."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+msgid "Show Balance in contact list"
+msgstr "Mostra il saldo nell'elenco contatti"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "Mostra gli avatar"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "Mostra l'elenco contatti nelle stanze di conversazione"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr "Mostra suggerimento riguardo la chiusura della finestra principale"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr "Mostra contatti fuori rete"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
 msgstr "Mostra i protocolli"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "Lingue controllo ortografico"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr "La cartella predefinita in cui salvare i file ricevuti."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
 msgstr "L'ultima directory da cui è stata scelta un'immagine per l'avatar."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
 msgstr "La posizione del riquadro laterale della finestra di conversazione"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr ""
 "Lo posizione (in pixel) salvata del riquadro laterale della finestra di "
 "conversazione."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr ""
 "Il tema usato per mostrare le conversazioni nelle finestre di conversazione."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr ""
+"La variante del tema usato per mostrare le conversazioni nelle finestre di "
+"conversazione."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Utilizza faccine grafiche"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "Utilizza suoni per le notifiche"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "Utilizza un tema per le stanze di conversazione"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr ""
 "Indica se il programma può pubblicare o meno la propria posizione geografica "
 "agli altri contatti."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr ""
 "Indica se il programma può usare o meno il GPS per ipotizzare la posizione "
 "geografica."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
 "Indica se il programma può usare o meno la rete dei telefoni cellulari per "
 "ipotizzare la posizione geografica."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
 msgstr ""
 "Indica se il programma può usare o meno la rete per ipotizzare la posizione "
 "geografica."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "Indica se il programma ha migrato o meno i registri di butterfly."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr ""
 "Indica se il programma deve collegarsi o meno automaticamente agli account "
 "all'avvio."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
 "Indica se il programma deve impostare o meno automaticamente lo stato di "
 "assenza se l'utente è inattivo."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 "Indica se il programma deve ridurre o meno la precisione della posizione "
 "geografica per motivi di privacy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 "Indica se il programma deve usare o meno l'immagine del contatto come icona "
 "della finestra della conversazione."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Indica se gli strumenti per sviluppatori di WebKit, come \"Ispettore web\", "
 "debbano essere abilitati."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
@@ -359,71 +401,76 @@ msgstr ""
 "Indica se deve essere usato o meno il gestore della connessione per "
 "disconnettersi/connettersi automaticamente."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr ""
 "Indica se verificare o meno le parole digitate con le lingue selezionate."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr ""
 "Indica se convertire o meno le faccine in immagini grafiche durante le "
 "conversazioni."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr ""
+"Indica se abilitare o meno il filtro di soppressione dell'eco di Pulseaudio."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr ""
 "Indica se emettere o meno un suono quando i contatti si collegano alla rete."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
 "Indica se emettere o meno un suono quando i contatti si scollegano dalla "
 "rete."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "Indica se emettere o meno un suono per segnalare gli eventi."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Indica se emettere o meno un suono all'arrivo dei messaggi."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Indica se emettere o meno un suono per le nuove conversazioni."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Indica se emettere o meno un suono per l'invio dei messaggi."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "Indica se emettere o meno un suono quando ci si collega in una rete."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Indica se emettere o meno un suono quando ci si scollega da una rete."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr ""
 "Indica se emettere o meno notifiche sonore quando si è assenti o non "
 "disponibili."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr ""
 "Indica se mostrare o meno una notifica quando un contatto va fuori rete."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr ""
 "Indica se mostrare o meno una notifica quando un contatto entra in rete."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -431,43 +478,47 @@ msgstr ""
 "Indica se mostrare o meno una notifica quando si riceve un nuovo messaggio "
 "anche se la finestra di conversazione è già aperta, ma non ha il focus."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr ""
 "Indica se mostrare o meno una notifica quando si riceve un nuovo messaggio."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+msgid "Whether to show account balances in the contact list."
+msgstr "Indica se mostrare o meno il saldo dell'account nell'elenco contatti."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 "Indica se mostrare o meno le immagini dei contatti nell'elenco contatti e "
 "nelle finestre di conversazione."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr ""
 "Indica se mostrare o meno i contatti fuori rete nell'elenco dei contatti."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
 msgstr ""
 "Indica se mostrare o meno notifiche quando si è assenti o non disponibili."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr ""
 "Indica se mostrare o meno i protocolli per i contatti nell'elenco contatti."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr ""
 "Indica se mostrare o meno l'elenco contatti nelle stanze di conversazione."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "Indica se mostrare o meno l'elenco contatti in modalità compatta."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -475,11 +526,11 @@ msgstr ""
 "Indica se mostrare o meno un dialogo riguardo la chiusura della finestra "
 "principale con il pulsante \"x\" nella barra del titolo."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "Indica se usare o meno un tema per le stanze di conversazione."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -495,7 +546,7 @@ msgstr "Gestisce account di messaggistica e VoIP"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2269
+#: ../src/empathy-accounts-dialog.c:2324
 msgid "Messaging and VoIP Accounts"
 msgstr "Account di messaggistica e VoIP"
 
@@ -503,18 +554,35 @@ msgstr "Account di messaggistica e VoIP"
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Trasferimento file completato, ma il file era danneggiato"
 
-#: ../libempathy/empathy-ft-handler.c:1113
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
 msgstr "Il trasferimento di file non è supportato dal contatto remoto"
 
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is not a regular file"
 msgstr "Il file selezionato non è un file regolare"
 
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1176
 msgid "The selected file is empty"
 msgstr "Il file selezionato è vuoto"
 
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#, c-format
+msgid "Missed call from %s"
+msgstr "Chiamata persa da %s"
+
+# (ndt) quello che c'è dopo è il nome del contatto
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, c-format
+msgid "Called %s"
+msgstr "%s ha chiamato"
+
+#: ../libempathy/empathy-message.c:422
+#, c-format
+msgid "Call from %s"
+msgstr "Chiamata da %s"
+
 #: ../libempathy/empathy-tp-file.c:268
 msgid "Socket type not supported"
 msgstr "Tipo di socket non supportato"
@@ -543,146 +611,144 @@ msgstr "Errore nel tentativo di trasferire il file"
 msgid "The other participant is unable to transfer the file"
 msgstr "L'altro utente non è in grado di trasferire il file"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:382
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
 msgid "Unknown reason"
 msgstr "Motivo sconosciuto"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:222
 msgid "Available"
 msgstr "Disponibile"
 
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:224
 msgid "Busy"
 msgstr "Non disponibile"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:227
 msgid "Away"
 msgstr "Assente"
 
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:229
 msgid "Invisible"
 msgstr "Invisibile"
 
-#: ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-utils.c:231
 msgid "Offline"
 msgstr "Fuori rete"
 
-#: ../libempathy/empathy-utils.c:315
-#: ../src/empathy-streamed-media-window.c:1904
-#: ../src/empathy-streamed-media-window.c:1905
-#: ../src/empathy-streamed-media-window.c:1906
-#: ../src/empathy-streamed-media-window.c:1907
-#: ../src/empathy-call-window.ui.h:18
+#. translators: presence type is unknown
+#: ../libempathy/empathy-utils.c:234
+msgctxt "presence"
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:274
 msgid "No reason specified"
 msgstr "Nessun motivo specificato"
 
-#: ../libempathy/empathy-utils.c:356 ../libempathy/empathy-utils.c:412
+#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
 msgid "Status is set to offline"
 msgstr "Lo stato è impostato a «Fuori rete»"
 
-#: ../libempathy/empathy-utils.c:358 ../libempathy/empathy-utils.c:392
+#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "Errore di rete"
 
-#: ../libempathy/empathy-utils.c:360 ../libempathy/empathy-utils.c:394
+#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
 msgid "Authentication failed"
 msgstr "Autenticazione non riuscita"
 
-#: ../libempathy/empathy-utils.c:362 ../libempathy/empathy-utils.c:396
+#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
 msgid "Encryption error"
 msgstr "Errore di cifratura"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:284
 msgid "Name in use"
 msgstr "Nome in uso"
 
-#: ../libempathy/empathy-utils.c:366 ../libempathy/empathy-utils.c:398
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
 msgid "Certificate not provided"
 msgstr "Certificato non fornito"
 
-#: ../libempathy/empathy-utils.c:368 ../libempathy/empathy-utils.c:400
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
 msgid "Certificate untrusted"
 msgstr "Certificato non fidato"
 
-#: ../libempathy/empathy-utils.c:370 ../libempathy/empathy-utils.c:402
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
 msgid "Certificate expired"
 msgstr "Certificato scaduto"
 
-#: ../libempathy/empathy-utils.c:372 ../libempathy/empathy-utils.c:404
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
 msgid "Certificate not activated"
 msgstr "Certificato non attivato"
 
-#: ../libempathy/empathy-utils.c:374 ../libempathy/empathy-utils.c:406
+#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
 msgid "Certificate hostname mismatch"
 msgstr "Corrispondenza errata nel nome host del certificato"
 
-#: ../libempathy/empathy-utils.c:376 ../libempathy/empathy-utils.c:408
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate fingerprint mismatch"
 msgstr "Corrispondenza errata nell'impronta del certificato"
 
-#: ../libempathy/empathy-utils.c:378 ../libempathy/empathy-utils.c:410
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate self-signed"
 msgstr "Certificato auto-firmato"
 
-#: ../libempathy/empathy-utils.c:380
+#: ../libempathy/empathy-utils.c:300
 msgid "Certificate error"
 msgstr "Errore nel certificato"
 
-#: ../libempathy/empathy-utils.c:414
+#: ../libempathy/empathy-utils.c:334
 msgid "Encryption is not available"
 msgstr "La cifratura non è disponibile"
 
-#: ../libempathy/empathy-utils.c:416
+#: ../libempathy/empathy-utils.c:336
 msgid "Certificate is invalid"
 msgstr "Il certificato non è valido"
 
-#: ../libempathy/empathy-utils.c:418
+#: ../libempathy/empathy-utils.c:338
 msgid "Connection has been refused"
 msgstr "La connessione è stata rifiutata"
 
-#: ../libempathy/empathy-utils.c:420
+#: ../libempathy/empathy-utils.c:340
 msgid "Connection can't be established"
 msgstr "La connessione non può essere stabilita"
 
-#: ../libempathy/empathy-utils.c:422
+#: ../libempathy/empathy-utils.c:342
 msgid "Connection has been lost"
 msgstr "La connessione è stata persa"
 
-#: ../libempathy/empathy-utils.c:424
+#: ../libempathy/empathy-utils.c:344
 msgid "This resource is already connected to the server"
 msgstr "Questa risorsa è già collegata al server"
 
-#: ../libempathy/empathy-utils.c:426
+#: ../libempathy/empathy-utils.c:346
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "La connessione è stata sostituita con una nuova che sfrutta la stessa risorsa"
 
-#: ../libempathy/empathy-utils.c:429
+#: ../libempathy/empathy-utils.c:349
 msgid "The account already exists on the server"
 msgstr "L'account esiste già sul server"
 
 # (ndt) rivedere too busy
-#: ../libempathy/empathy-utils.c:431
+#: ../libempathy/empathy-utils.c:351
 msgid "Server is currently too busy to handle the connection"
 msgstr "Il server è troppo carico per gestire la connessione"
 
-#: ../libempathy/empathy-utils.c:433
+#: ../libempathy/empathy-utils.c:353
 msgid "Certificate has been revoked"
 msgstr "Il certificato è stato revocato"
 
-#: ../libempathy/empathy-utils.c:435
+#: ../libempathy/empathy-utils.c:355
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Il cifrario utilizzato dall'algoritmo del certificato non è sicuro o ha una "
 "cifratura debole"
 
-#: ../libempathy/empathy-utils.c:438
+#: ../libempathy/empathy-utils.c:358
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -690,153 +756,147 @@ msgstr ""
 "La lunghezza del certificato o la profondità della catena del certificato "
 "del server supera i limiti imposti dalla libreria di cifratura"
 
-#: ../libempathy/empathy-utils.c:601
+#: ../libempathy/empathy-utils.c:519
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "Persone nelle vicinanze"
 
 # (ndt) opzione
-#: ../libempathy/empathy-utils.c:606
+#: ../libempathy/empathy-utils.c:524
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Giappone"
 
-#: ../libempathy/empathy-utils.c:635
+#: ../libempathy/empathy-utils.c:553
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:636
+#: ../libempathy/empathy-utils.c:554
 msgid "Facebook Chat"
 msgstr "Chat di Facebook"
 
-#: ../libempathy/empathy-time.c:137
+#: ../libempathy/empathy-time.c:88
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d secondo fa"
 msgstr[1] "%d secondi fa"
 
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:93
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minuto fa"
 msgstr[1] "%d minuti fa"
 
-#: ../libempathy/empathy-time.c:147
+#: ../libempathy/empathy-time.c:98
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d ora fa"
 msgstr[1] "%d ore fa"
 
-#: ../libempathy/empathy-time.c:152
+#: ../libempathy/empathy-time.c:103
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d giorno fa"
 msgstr[1] "%d giorni fa"
 
-#: ../libempathy/empathy-time.c:157
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d settimana fa"
 msgstr[1] "%d settimane fa"
 
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:113
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d mese fa"
 msgstr[1] "%d mesi fa"
 
-#: ../libempathy/empathy-time.c:167
+#: ../libempathy/empathy-time.c:136
 msgid "in the future"
 msgstr "nel futuro"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:491
-msgid "All"
-msgstr "Tutti"
+#: ../libempathy-gtk/empathy-account-chooser.c:540
+msgid "All accounts"
+msgstr "Tutti gli account"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../libempathy-gtk/empathy-log-window.c:643
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "Account"
 
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "Password"
 
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:685
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Porta"
 
-#: ../libempathy-gtk/empathy-account-widget.c:757
-#: ../libempathy-gtk/empathy-account-widget.c:814
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "Account online"
+
 # (ndt) idee su dove/cosa sia My Web Accounts?
-#: ../libempathy-gtk/empathy-account-widget.c:1166
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "L'account %s viene modificato attraverso «My Web Accounts»."
+msgid "The account %s is edited via %s."
+msgstr "L'account %s viene modificato attraverso «%s»."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1172
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "L'account %s non può essere modificato utilizzando il programma."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
-msgstr "Lancia «My Web Accounts»"
+msgstr "Lancia «Account online»"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1530
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "Modifica %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Nome utente:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1897
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "A_pplica"
 
 # (ndt) pulsante
-#: ../libempathy-gtk/empathy-account-widget.c:1927
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
 msgstr "Acce_di"
 
-#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1993
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:520
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1481
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "Account:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2004
-msgid "_Enabled"
-msgstr "_Abilitato"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2069
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "Questo account esiste già sul server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2072
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "Creare un nuovo account sul server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2264
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "A_nnulla"
 
@@ -845,7 +905,7 @@ msgstr "A_nnulla"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2561
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s su %2$s"
@@ -853,12 +913,12 @@ msgstr "%1$s su %2$s"
 # (ndt) il %s pare sia il protocollo
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2587
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "Account %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2591
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "Nuovo account"
 
@@ -871,6 +931,7 @@ msgstr "<b>Esempio:</b> IlMioNominativo"
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -884,7 +945,7 @@ msgstr "Avanzate"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "Pass_word:"
 msgstr "Pass_word:"
@@ -894,7 +955,7 @@ msgstr "Pass_word:"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
 msgid "Remember Password"
 msgstr "Ricordare la password"
 
@@ -904,7 +965,7 @@ msgstr "Ricordare la password"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 #: ../libempathy-gtk/empathy-password-dialog.c:311
 msgid "Remember password"
@@ -981,76 +1042,84 @@ msgstr "Qual è il numero ICQ?"
 msgid "What is your ICQ password?"
 msgstr "Qual è la password di ICQ?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:183
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "Automatico"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:221
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "Register"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:226
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "Opzioni"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "Nessuno"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Character set:"
 msgstr "Codifica caratteri:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"La maggior parte dei server IRC non necessita di una password. Se in dubbio, "
+"non inserirne alcuna."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Network"
 msgstr "Rete"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Network:"
 msgstr "Rete:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Soprannome:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "Password:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "Messaggio di uscita:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "Nome reale:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Servers"
 msgstr "Server"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "What is your IRC nickname?"
 msgstr "Qual è il soprannome IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Quale rete IRC?"
 
@@ -1110,11 +1179,11 @@ msgstr "Qual è la password di Facebook?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
 msgid "What is your Facebook username?"
-msgstr "Qual è il proprio nome utente di Facebook?"
+msgstr "Qual è il nome utente di Facebook?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 msgid "What is your Google ID?"
-msgstr "Qual è il proprio identificativo di Google?"
+msgstr "Qual è il identificativo di Google?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 msgid "What is your Google password?"
@@ -1122,7 +1191,7 @@ msgstr "Qual è la password di Google?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
 msgid "What is your Jabber ID?"
-msgstr "Qual è il proprio identificativo di Jabber?"
+msgstr "Qual è l'identificativo di Jabber?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
 msgid "What is your Jabber password?"
@@ -1142,7 +1211,7 @@ msgstr "<b>Esempio:</b> utente@hotmail.it"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
 msgid "What is your Windows Live ID?"
-msgstr "Qual è il proprio identificativo di Windows Live?"
+msgstr "Qual è l'identificativo di Windows Live?"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live password?"
@@ -1192,60 +1261,69 @@ msgid "Discover the STUN server automatically"
 msgstr "Rilevare automaticamente il server STUN"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "Ignore TLS Errors"
+msgstr "Ignorare errori TLS"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Interval (seconds)"
 msgstr "Intervallo (secondi)"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
 msgid "Keep-Alive Options"
 msgstr "Opzioni Keep-Alive"
 
 # (ndt) Routing libero mi suona troppo da sagra...
 # usare "slegato" non so se chi ci capisce qualche cosa possa cogliere...
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
 msgid "Loose Routing"
 msgstr "Routing \"loose\""
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Mechanism:"
 msgstr "Meccanismo:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
 msgid "Miscellaneous Options"
 msgstr "Opzioni varie"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 msgid "NAT Traversal Options"
 msgstr "Opzioni attraversamento NAT"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 msgid "Port:"
 msgstr "Porta:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 msgid "Proxy Options"
 msgstr "Opzioni proxy"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "STUN Server:"
 msgstr "Server STUN:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.c:347
 msgid "Server:"
 msgstr "Server:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid "Transport:"
 msgstr "Trasporto:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "_Usare questo account per chiamate a telefoni fissi e cellulari"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "Qual è la password dell'account SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
-msgstr "Qual è il proprio identificativo di accesso SIP?"
+msgstr "Qual è l'identificativo di accesso SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "_Nome utente:"
 
@@ -1256,7 +1334,7 @@ msgstr "I_gnorare inviti per conferenze e stanze di conversazione"
 # (ndt) metto Yahoo!?
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "What is your Yahoo! ID?"
-msgstr "Qual è il proprio identificativo Yahoo?"
+msgstr "Qual è l'identificativo Yahoo?"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "What is your Yahoo! password?"
@@ -1270,29 +1348,37 @@ msgstr "I_D Yahoo:"
 msgid "_Room List locale:"
 msgstr "_Nazione elenco stanze:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:448
-#: ../libempathy-gtk/empathy-avatar-chooser.c:524
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "Impossibile convertire l'immagine"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "Nessuno dei formati di immagine accettati è supportato dal sistema"
 
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+msgid "Couldn't save picture to file"
+msgstr "Impossibile salvare l'immagine su file"
+
 # (ndt) titolo dialogo
-#: ../libempathy-gtk/empathy-avatar-chooser.c:930
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "Selezione immagine"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
+msgid "Take a picture..."
+msgstr "Scatta foto..."
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "Nessuna immagine"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:995
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "Immagini"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:999
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "Tutti i file"
 
@@ -1300,35 +1386,61 @@ msgstr "Tutti i file"
 msgid "Click to enlarge"
 msgstr "Clic per ingrandire"
 
-#: ../libempathy-gtk/empathy-chat.c:652
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
+msgid "There was an error starting the call"
+msgstr "Si è verificato un errore nell'iniziare la chiamata"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact doesn't support calls"
+msgstr "Il contatto specificato non supporta le chiamate"
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is offline"
+msgstr "Il contatto specificato è fuori rete"
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "The specified contact is not valid"
+msgstr "Il contatto specificato non è valido"
+
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "Emergency calls are not supported on this protocol"
+msgstr "Le chiamate di emergenza non sono supportate su questo protocollo"
+
+#: ../libempathy-gtk/empathy-chat.c:702
 msgid "Failed to open private chat"
 msgstr "Apertura della conversazione privata non riuscita"
 
-#: ../libempathy-gtk/empathy-chat.c:717
+#: ../libempathy-gtk/empathy-chat.c:763
 msgid "Topic not supported on this conversation"
 msgstr "Argomento non supportato in questa conversazione"
 
-#: ../libempathy-gtk/empathy-chat.c:723
+#: ../libempathy-gtk/empathy-chat.c:769
 msgid "You are not allowed to change the topic"
 msgstr "Non si è autorizzati a modificare l'argomento"
 
-#: ../libempathy-gtk/empathy-chat.c:906
+#: ../libempathy-gtk/empathy-chat.c:973
+#, c-format
+msgid "“%s� is not a valid contact ID"
+msgstr "«%s» non è un ID di contatto valido"
+
+#: ../libempathy-gtk/empathy-chat.c:1058
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: pulisce tutti i messaggi dalla conversazione attuale"
 
-#: ../libempathy-gtk/empathy-chat.c:909
+#: ../libempathy-gtk/empathy-chat.c:1061
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <argomento>: imposta l'argomento per la conversazione attuale"
 
-#: ../libempathy-gtk/empathy-chat.c:912
+#: ../libempathy-gtk/empathy-chat.c:1064
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ID stanza>: entra in una nuova stanza"
 
-#: ../libempathy-gtk/empathy-chat.c:915
+#: ../libempathy-gtk/empathy-chat.c:1067
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ID stanza>: entra in una nuova stanza"
 
-#: ../libempathy-gtk/empathy-chat.c:920
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1336,23 +1448,23 @@ msgstr ""
 "/part [<ID stanza>] [<motivo>]: esce dalla stanza, in modo predefinito "
 "quella attuale"
 
-#: ../libempathy-gtk/empathy-chat.c:925
+#: ../libempathy-gtk/empathy-chat.c:1075
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ID contatto> [<messaggio>]: apre una conversazione privata"
 
-#: ../libempathy-gtk/empathy-chat.c:928
+#: ../libempathy-gtk/empathy-chat.c:1078
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ID contatto> <messaggio>: apre una conversazione privata"
 
-#: ../libempathy-gtk/empathy-chat.c:931
+#: ../libempathy-gtk/empathy-chat.c:1081
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <soprannome>: modifica il proprio soprannome sul server attuale"
 
-#: ../libempathy-gtk/empathy-chat.c:934
+#: ../libempathy-gtk/empathy-chat.c:1084
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <messaggio>: invia un messaggio ACTION alla conversazione attuale"
 
-#: ../libempathy-gtk/empathy-chat.c:937
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1362,7 +1474,11 @@ msgstr ""
 "inviare un messaggio che inizia con «/». Per esempio: \"/say /join è usato "
 "per entrare in una nuova stanza\""
 
-#: ../libempathy-gtk/empathy-chat.c:942
+#: ../libempathy-gtk/empathy-chat.c:1092
+msgid "/whois <contact ID>: display information about a contact"
+msgstr "/whois <ID contatto>: visualizza informazioni riguardo un contatto"
+
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1370,99 +1486,114 @@ msgstr ""
 "/help [<comando>]: mostra tutti i comandi supportati. Se <comando> è "
 "definito, ne mostra l'uso."
 
-#: ../libempathy-gtk/empathy-chat.c:952
+#: ../libempathy-gtk/empathy-chat.c:1112
 #, c-format
 msgid "Usage: %s"
 msgstr "Uso: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:991
+#: ../libempathy-gtk/empathy-chat.c:1157
 msgid "Unknown command"
 msgstr "Comando sconosciuto"
 
-#: ../libempathy-gtk/empathy-chat.c:1117
+#: ../libempathy-gtk/empathy-chat.c:1283
 msgid "Unknown command; see /help for the available commands"
 msgstr "Comando sconosciuto. Provare /help per i comandi disponibili."
 
-#: ../libempathy-gtk/empathy-chat.c:1254
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1453
+msgid "insufficient balance to send message"
+msgstr "saldo non sufficiente per inviare messaggi"
+
+#: ../libempathy-gtk/empathy-chat.c:1455
+msgid "not capable"
+msgstr "non possibile"
+
+#: ../libempathy-gtk/empathy-chat.c:1462
 msgid "offline"
 msgstr "fuori rete"
 
-#: ../libempathy-gtk/empathy-chat.c:1257
+#: ../libempathy-gtk/empathy-chat.c:1465
 msgid "invalid contact"
 msgstr "contatto non valido"
 
-#: ../libempathy-gtk/empathy-chat.c:1260
+#: ../libempathy-gtk/empathy-chat.c:1468
 msgid "permission denied"
 msgstr "permesso negato"
 
-#: ../libempathy-gtk/empathy-chat.c:1263
+#: ../libempathy-gtk/empathy-chat.c:1471
 msgid "too long message"
 msgstr "messaggio troppo lungo"
 
-#: ../libempathy-gtk/empathy-chat.c:1266
+#: ../libempathy-gtk/empathy-chat.c:1474
 msgid "not implemented"
 msgstr "non implementato"
 
-#: ../libempathy-gtk/empathy-chat.c:1270
+#: ../libempathy-gtk/empathy-chat.c:1478
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: ../libempathy-gtk/empathy-chat.c:1274
+#: ../libempathy-gtk/empathy-chat.c:1484
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Errore nell'inviare il messaggio «%s»: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1335 ../src/empathy-chat-window.c:717
+#: ../libempathy-gtk/empathy-chat.c:1488
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Errore nell'inviare il messaggio: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1549 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Argomento:"
 
-#: ../libempathy-gtk/empathy-chat.c:1347
+#: ../libempathy-gtk/empathy-chat.c:1561
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Argomento impostato a: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1349
+#: ../libempathy-gtk/empathy-chat.c:1563
 msgid "No topic defined"
 msgstr "Nessun argomento definito"
 
-#: ../libempathy-gtk/empathy-chat.c:1848
+#: ../libempathy-gtk/empathy-chat.c:2072
 msgid "(No Suggestions)"
 msgstr "(Nessun suggerimento)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1916
+#: ../libempathy-gtk/empathy-chat.c:2140
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Aggiungi «%s» al dizionario"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1953
+#: ../libempathy-gtk/empathy-chat.c:2177
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Aggiungi «%s» al dizionario %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2010
+#: ../libempathy-gtk/empathy-chat.c:2247
 msgid "Insert Smiley"
 msgstr "Inserisci faccina"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2028
-#: ../libempathy-gtk/empathy-ui-utils.c:1808
+#: ../libempathy-gtk/empathy-chat.c:2265
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "_Invia"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2063
+#: ../libempathy-gtk/empathy-chat.c:2319
 msgid "_Spelling Suggestions"
 msgstr "_Suggerimenti ortografici"
 
-#: ../libempathy-gtk/empathy-chat.c:2152
+#: ../libempathy-gtk/empathy-chat.c:2408
 msgid "Failed to retrieve recent logs"
 msgstr "Recupero dei registri recenti non riuscito"
 
 # (ndt) messa così per renderla asessuale
-#: ../libempathy-gtk/empathy-chat.c:2263
+#: ../libempathy-gtk/empathy-chat.c:2545
 #, c-format
 msgid "%s has disconnected"
 msgstr "L'utente %s si è disconnesso"
@@ -1470,13 +1601,13 @@ msgstr "L'utente %s si è disconnesso"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2270
+#: ../libempathy-gtk/empathy-chat.c:2552
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s ha espulso %1$s"
 
 # (ndt) messa così per renderla asessuale
-#: ../libempathy-gtk/empathy-chat.c:2273
+#: ../libempathy-gtk/empathy-chat.c:2555
 #, c-format
 msgid "%s was kicked"
 msgstr "L'utente %s è stato espulso"
@@ -1484,19 +1615,19 @@ msgstr "L'utente %s è stato espulso"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2281
+#: ../libempathy-gtk/empathy-chat.c:2563
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s ha bandito %1$s"
 
 # (ndt) messa così per renderla asessuale
-#: ../libempathy-gtk/empathy-chat.c:2284
+#: ../libempathy-gtk/empathy-chat.c:2566
 #, c-format
 msgid "%s was banned"
 msgstr "L'utente %s è stato bandito"
 
 # (ndt) messa così per renderla asessuale
-#: ../libempathy-gtk/empathy-chat.c:2288
+#: ../libempathy-gtk/empathy-chat.c:2570
 #, c-format
 msgid "%s has left the room"
 msgstr "L'utente %s ha lasciato la stanza"
@@ -1506,112 +1637,144 @@ msgstr "L'utente %s ha lasciato la stanza"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2297
+#: ../libempathy-gtk/empathy-chat.c:2579
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
 # (ndt) per renderla "asessuale"
-#: ../libempathy-gtk/empathy-chat.c:2322
+#: ../libempathy-gtk/empathy-chat.c:2604
 #, c-format
 msgid "%s has joined the room"
 msgstr "L'utente %s è entrato nella stanza"
 
 # (ndt) per cercare di stare "asessuali"
-#: ../libempathy-gtk/empathy-chat.c:2347
+#: ../libempathy-gtk/empathy-chat.c:2629
 #, c-format
 msgid "%s is now known as %s"
 msgstr "L'utente %s è ora conosciuto come %s"
 
 # (ndt) plurale per comprendere uomini e donne
-#: ../libempathy-gtk/empathy-chat.c:2486
-#: ../src/empathy-streamed-media-window.c:1949
-#: ../src/empathy-event-manager.c:1122
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2768
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1391
+#: ../src/empathy-call-window.c:1441 ../src/empathy-call-window.c:2479
 msgid "Disconnected"
 msgstr "Disconnessi"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3116
+#: ../libempathy-gtk/empathy-chat.c:3415
 msgid "Would you like to store this password?"
 msgstr "Salvare questa password?"
 
 # (ndt) pulsante
-#: ../libempathy-gtk/empathy-chat.c:3122
+#: ../libempathy-gtk/empathy-chat.c:3421
 msgid "Remember"
 msgstr "Ricorda"
 
 # (ndt) pulsante
-#: ../libempathy-gtk/empathy-chat.c:3132
+#: ../libempathy-gtk/empathy-chat.c:3431
 msgid "Not now"
 msgstr "Non ora"
 
-#: ../libempathy-gtk/empathy-chat.c:3176
+#: ../libempathy-gtk/empathy-chat.c:3475
 msgid "Retry"
 msgstr "Riprova"
 
-#: ../libempathy-gtk/empathy-chat.c:3180
+#: ../libempathy-gtk/empathy-chat.c:3479
 msgid "Wrong password; please try again:"
 msgstr "Password errata. Provare nuovamente:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3297
+#: ../libempathy-gtk/empathy-chat.c:3609
 msgid "This room is protected by a password:"
 msgstr "Questa stanza è protetta da una password:"
 
 # (ndt) pulsante
-#: ../libempathy-gtk/empathy-chat.c:3324
+#: ../libempathy-gtk/empathy-chat.c:3636
 msgid "Join"
 msgstr "Entra"
 
-#: ../libempathy-gtk/empathy-chat.c:3494 ../src/empathy-event-manager.c:1144
+#: ../libempathy-gtk/empathy-chat.c:3838 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "Connessi"
 
-#: ../libempathy-gtk/empathy-chat.c:3547
-#: ../libempathy-gtk/empathy-log-window.c:650
+#: ../libempathy-gtk/empathy-chat.c:3893
 msgid "Conversation"
 msgstr "Conversazione"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:422
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:3898
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (SMS)"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
 msgid "Unknown or invalid identifier"
 msgstr "Identificatore sconosciuto o non valido"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
 msgid "Contact blocking temporarily unavailable"
 msgstr "Blocco del contatto momentaneamente non disponibile"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
 msgid "Contact blocking unavailable"
 msgstr "Blocco del contatto non disponibile"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
 msgid "Permission Denied"
 msgstr "Permesso negato"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
 msgid "Could not block contact"
 msgstr "Impossibile bloccare il contatto"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:701
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
 msgid "Edit Blocked Contacts"
 msgstr "Modifica contatti bloccati"
 
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Account:"
+msgstr "Account:"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "Contatti bloccati"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Rimuovi"
+
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:794
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Copia indirizzo collegamento"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:801
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "Apri c_ollegamento"
 
 # (ndt) domenica 01 ottobre 2007
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:420
+#: ../libempathy-gtk/empathy-chat-text-view.c:415
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
@@ -1631,24 +1794,24 @@ msgid "New Contact"
 msgstr "Nuovo contatto"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:199
+#: ../libempathy-gtk/empathy-individual-dialogs.c:200
 #, c-format
 msgid "Block %s?"
 msgstr "Bloccare %s?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:247
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Bloccare veramente «%s»? "
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
 msgid "_Block"
 msgstr "_Blocca"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:278
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Segnalare abuso da questo contatto"
@@ -1678,307 +1841,339 @@ msgstr "Non raggruppati"
 msgid "Favorite People"
 msgstr "Preferiti"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2001
-#: ../libempathy-gtk/empathy-individual-view.c:2336
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Rimuovere veramente il gruppo «%s»?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2003
-#: ../libempathy-gtk/empathy-individual-view.c:2339
+#: ../libempathy-gtk/empathy-contact-list-view.c:1988
+#: ../libempathy-gtk/empathy-individual-view.c:2379
 msgid "Removing group"
 msgstr "Rimozione gruppo"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2052
-#: ../libempathy-gtk/empathy-contact-list-view.c:2129
-#: ../libempathy-gtk/empathy-individual-view.c:2394
-#: ../libempathy-gtk/empathy-individual-view.c:2588
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../libempathy-gtk/empathy-contact-list-view.c:2037
+#: ../libempathy-gtk/empathy-contact-list-view.c:2114
+#: ../libempathy-gtk/empathy-individual-view.c:2434
+#: ../libempathy-gtk/empathy-individual-view.c:2637
 msgid "_Remove"
 msgstr "_Rimuovi"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2082
-#: ../libempathy-gtk/empathy-individual-view.c:2458
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
+#: ../libempathy-gtk/empathy-individual-view.c:2501
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Rimuovere veramente il contatto «%s»?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2084
-#: ../libempathy-gtk/empathy-individual-view.c:2479
+#: ../libempathy-gtk/empathy-contact-list-view.c:2069
+#: ../libempathy-gtk/empathy-individual-view.c:2522
 msgid "Removing contact"
 msgstr "Rimozione contatto"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:219
-#: ../src/empathy-main-window.ui.h:13
+#: ../libempathy-gtk/empathy-contact-menu.c:220
+#: ../src/empathy-main-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "A_ggiungi contatto..."
 
-#: ../libempathy-gtk/empathy-contact-menu.c:299
+#: ../libempathy-gtk/empathy-contact-menu.c:300
 msgid "_Block Contact"
 msgstr "_Blocca contatto"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:328
-#: ../libempathy-gtk/empathy-individual-menu.c:517
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:329
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "_Conversazione"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:359
-#: ../libempathy-gtk/empathy-individual-menu.c:560
+#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "Chiamata _audio"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:390
-#: ../libempathy-gtk/empathy-individual-menu.c:602
+#: ../libempathy-gtk/empathy-contact-menu.c:394
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "Chiamata _video"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:436
-#: ../libempathy-gtk/empathy-individual-menu.c:645
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:440
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "Conversazioni _precedenti"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:458
-#: ../libempathy-gtk/empathy-individual-menu.c:686
+#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "Invia file"
 
 # (ndt) voce di menù
-#: ../libempathy-gtk/empathy-contact-menu.c:481
-#: ../libempathy-gtk/empathy-individual-menu.c:728
+#: ../libempathy-gtk/empathy-contact-menu.c:485
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
 msgstr "Condividi desktop"
 
 # (ndt) dovrebbe essere relativo a un contatto
-#: ../libempathy-gtk/empathy-contact-menu.c:521
-#: ../libempathy-gtk/empathy-contact-widget.c:1763
-#: ../libempathy-gtk/empathy-individual-menu.c:763
+#: ../libempathy-gtk/empathy-contact-menu.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:1886
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
 #: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "Preferito"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:550
-#: ../libempathy-gtk/empathy-individual-menu.c:791
+#: ../libempathy-gtk/empathy-contact-menu.c:554
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "Informa_zioni"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:596
+#: ../libempathy-gtk/empathy-contact-menu.c:600
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:650
-#: ../libempathy-gtk/empathy-individual-menu.c:972
-#: ../src/empathy-chat-window.c:935
+#: ../libempathy-gtk/empathy-contact-menu.c:654
+#: ../libempathy-gtk/empathy-individual-menu.c:1283
+#: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "Invito per questa stanza"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:681
-#: ../libempathy-gtk/empathy-individual-menu.c:1019
+#: ../libempathy-gtk/empathy-contact-menu.c:685
+#: ../libempathy-gtk/empathy-individual-menu.c:1329
 msgid "_Invite to Chat Room"
 msgstr "_Invita nella stanza"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:513
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
 msgid "Search contacts"
 msgstr "Cerca contatti"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:543
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
 msgid "Search: "
 msgstr "Cerca:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:601
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
 msgid "_Add Contact"
 msgstr "A_ggiungi contatto..."
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:619
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
 msgid "No contacts found"
 msgstr "Nessun contatto trovato"
 
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr "Un messaggio di presentazione:"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
+msgstr "Vorrei poter vedere quando sei online! Grazie!"
+
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "Seleziona un contatto"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:295
+#: ../libempathy-gtk/empathy-contact-widget.c:336
 #: ../libempathy-gtk/empathy-individual-widget.c:153
 msgid "Full name:"
 msgstr "Nome completo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:296
+#: ../libempathy-gtk/empathy-contact-widget.c:337
 #: ../libempathy-gtk/empathy-individual-widget.c:154
 msgid "Phone number:"
 msgstr "Numero di telefono:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:297
+#: ../libempathy-gtk/empathy-contact-widget.c:338
 #: ../libempathy-gtk/empathy-individual-widget.c:155
 msgid "E-mail address:"
 msgstr "Indirizzo email:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:298
+#: ../libempathy-gtk/empathy-contact-widget.c:339
 #: ../libempathy-gtk/empathy-individual-widget.c:156
 msgid "Website:"
 msgstr "Sito web:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:299
+#: ../libempathy-gtk/empathy-contact-widget.c:340
 #: ../libempathy-gtk/empathy-individual-widget.c:157
 msgid "Birthday:"
 msgstr "Compleanno:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+# (ndt) o "Ultimo avvistamento" :-)
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:346
+msgid "Last seen:"
+msgstr "Ultima attività:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:348
+msgid "Connected from:"
+msgstr "Connessione da:"
+
+# (ndt) usato lo stesso di xchat-gnome
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:353
+msgid "Away message:"
+msgstr "Messaggio di assenza:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+msgid "Channels:"
+msgstr "Canali:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
 msgstr "Codice ISO del paese:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Country:"
 msgstr "Paese:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "State:"
 msgstr "Stato:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:768
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "City:"
 msgstr "Città:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:770
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Area:"
 msgstr "Area:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:772
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
 msgstr "Codice postale:"
 
 # (ndt) nome di una colonna
-#: ../libempathy-gtk/empathy-contact-widget.c:774
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Street:"
 msgstr "Via:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:776
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
 msgstr "Edificio:"
 
 # (ndt) questo è prima di una casella di testo
 # in cui inserire il criterio di ricerca
-#: ../libempathy-gtk/empathy-contact-widget.c:778
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Floor:"
 msgstr "Piano:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:780
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Room:"
 msgstr "Stanza:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:782
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Text:"
 msgstr "Testo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:784
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Description:"
 msgstr "Descrizione:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:786
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
 msgstr "Livello di precisione:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:790
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr "Errore:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:792
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
 msgstr "Errore verticale (metri):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:794
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
 msgstr "Errore orizzontale (metri):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr "Velocità:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Bearing:"
 msgstr "Orientamento:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:800
-#: ../libempathy-gtk/empathy-individual-widget.c:526
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
 msgstr "Velocità di salita:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:802
-#: ../libempathy-gtk/empathy-individual-widget.c:528
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
 msgstr "Ultimo aggiornamento:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:804
-#: ../libempathy-gtk/empathy-individual-widget.c:530
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
 msgstr "Longitudine:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:806
-#: ../libempathy-gtk/empathy-individual-widget.c:532
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
 msgstr "Latitudine:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:808
-#: ../libempathy-gtk/empathy-individual-widget.c:534
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
 msgstr "Altitudine:"
 
 # (ndt) nome della scheda
-#: ../libempathy-gtk/empathy-contact-widget.c:871
-#: ../libempathy-gtk/empathy-contact-widget.c:888
-#: ../libempathy-gtk/empathy-individual-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:633
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "Posizione geografica"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:890
-#: ../libempathy-gtk/empathy-individual-widget.c:635
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
 #, c-format
 msgid "%s, %s"
 msgstr "%s, il giorno %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:942
-#: ../libempathy-gtk/empathy-individual-widget.c:684
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
 msgstr "%-d %B %Y alle %H.%M UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1024
-#: ../libempathy-gtk/empathy-individual-widget.c:919
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
 msgid "Save Avatar"
 msgstr "Salva immagine"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1080
-#: ../libempathy-gtk/empathy-individual-widget.c:977
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
 msgid "Unable to save avatar"
 msgstr "Impossibile salvare l'immagine"
 
@@ -1989,7 +2184,7 @@ msgstr "<b>Posizione</b> alla data\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1307
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr "Pseudonimo:"
 
@@ -2009,7 +2204,7 @@ msgstr "Dettagli contatto"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "Identificatore:"
 
@@ -2027,11 +2222,11 @@ msgstr "SO:"
 msgid "Version:"
 msgstr "Versione:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:332
+#: ../libempathy-gtk/empathy-groups-widget.c:333
 msgid "Groups"
 msgstr "Gruppi"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:344
+#: ../libempathy-gtk/empathy-groups-widget.c:345
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2040,85 +2235,118 @@ msgstr ""
 "selezionarne più di uno oppure nessuno."
 
 # (ndt) pulsante
-#: ../libempathy-gtk/empathy-groups-widget.c:363
+#: ../libempathy-gtk/empathy-groups-widget.c:364
 msgid "_Add Group"
 msgstr "A_ggiungi gruppo"
 
 # (ndt) nome di una colonna
-#: ../libempathy-gtk/empathy-groups-widget.c:398
+#: ../libempathy-gtk/empathy-groups-widget.c:399
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Selezione"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1436
+#: ../libempathy-gtk/empathy-groups-widget.c:409
+#: ../src/empathy-main-window.c:1807
 msgid "Group"
 msgstr "Gruppo"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "La seguente identità verrà bloccata:"
 msgstr[1] "Le seguenti identità verranno bloccate:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:259
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "La seguente identità non può essere bloccata:"
 msgstr[1] "Le seguenti identità non possono essere bloccate:"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
 msgstr "Contatti uniti"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:354
+#: ../libempathy-gtk/empathy-individual-linker.c:370
 msgid "Select contacts to link"
 msgstr "Selezionare i contatti da unire"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:428
+#: ../libempathy-gtk/empathy-individual-linker.c:444
 msgid "New contact preview"
 msgstr "Anteprima nuovo contatto"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:472
+#: ../libempathy-gtk/empathy-individual-linker.c:488
 msgid "Contacts selected in the list on the left will be linked together."
 msgstr "I contatti selezionati nell'elenco a sinistra verranno uniti."
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:131
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:839
+# (ndt) è un titolo...
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "Selezione account per la chiamata"
+
+# (ndt) è il titolo del dialogo
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "Chiamata"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+msgid "Mobile"
+msgstr "Cellulare"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "Lavoro"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "Casa"
+
+#. add an SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+msgid "_SMS"
+msgstr "_SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1141
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Modifica"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:865
+#: ../libempathy-gtk/empathy-individual-menu.c:1167
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "_Unisci contatti..."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2301
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 msgid "Delete and _Block"
 msgstr "Elimina e _blocca"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2467
+#: ../libempathy-gtk/empathy-individual-view.c:2510
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
 "remove all the contacts which make up this linked contact."
 msgstr ""
-"Rimuovere veramente il contatto unificato «%s»? Questa azione rimuoverà tutti "
-"i contatti di cui è composto."
+"Rimuovere veramente il contatto unificato «%s»? Questa azione rimuoverà "
+"tutti i contatti di cui è composto."
 
 # (ndt) rivedere meta-contact, trovare idee migliori...
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2204,70 +2432,206 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "_Dividi"
 
-#: ../libempathy-gtk/empathy-log-window.c:660
-msgid "Date"
-msgstr "Data"
+#: ../libempathy-gtk/empathy-log-window.c:634
+msgid "History"
+msgstr "Cronologia"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
-msgstr "Conversazioni"
+#: ../libempathy-gtk/empathy-log-window.c:689
+msgid "Show"
+msgstr "Mostra"
+
+#: ../libempathy-gtk/empathy-log-window.c:711
+msgid "Search"
+msgstr "Cerca"
+
+#: ../libempathy-gtk/empathy-log-window.c:1159
+#, c-format
+msgid "Chat in %s"
+msgstr "Conversazione in %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1161
+#, c-format
+msgid "Chat with %s"
+msgstr "Conversazione con %s"
+
+# (ndt) domenica 01 ottobre 2007
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%A %d %B %Y %X"
+
+#. Translators: this is an emote: '* Danielle waves'
+#: ../libempathy-gtk/empathy-log-window.c:1300
+#, c-format
+msgid "<i>* %s %s</i>"
+msgstr "<i>* %s %s</i>"
+
+#. Translators: this is a message: 'Danielle: hello'
+#. * The string in bold is the sender's name
+#: ../libempathy-gtk/empathy-log-window.c:1306
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1382
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s secondo"
+msgstr[1] "%s secondi"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s minuto"
+msgstr[1] "%s minuti"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "Durata della chiamata: %s. Terminata alle: %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1729
+msgid "Today"
+msgstr "Oggi"
+
+#: ../libempathy-gtk/empathy-log-window.c:1733
+msgid "Yesterday"
+msgstr "Ieri"
+
+# (ndt) domenica 01 ottobre 2007
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
+msgid "%e %B %Y"
+msgstr "%d %B %Y"
+
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3425
+msgid "Anytime"
+msgstr "Qualsiasi ora"
+
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2353
+msgid "Anyone"
+msgstr "Chiunque"
+
+#: ../libempathy-gtk/empathy-log-window.c:2666
+msgid "Who"
+msgstr "Chi"
+
+#: ../libempathy-gtk/empathy-log-window.c:2870
+msgid "When"
+msgstr "Quando"
+
+#: ../libempathy-gtk/empathy-log-window.c:2986
+msgid "Anything"
+msgstr "Qualsiasi cosa"
+
+#: ../libempathy-gtk/empathy-log-window.c:2988
+msgid "Text chats"
+msgstr "Testo conversazioni"
+
+# (ndt) è il titolo del dialogo
+#: ../libempathy-gtk/empathy-log-window.c:2990
+#: ../src/empathy-preferences.ui.h:4
+msgid "Calls"
+msgstr "Chiamate"
+
+#: ../libempathy-gtk/empathy-log-window.c:2995
+msgid "Incoming calls"
+msgstr "Chiamate in arrivo"
+
+#: ../libempathy-gtk/empathy-log-window.c:2996
+msgid "Outgoing calls"
+msgstr "Chiamate in uscita"
+
+#: ../libempathy-gtk/empathy-log-window.c:2997
+msgid "Missed calls"
+msgstr "Chiamate perse"
+
+#: ../libempathy-gtk/empathy-log-window.c:3019
+msgid "What"
+msgstr "Cosa"
+
+#: ../libempathy-gtk/empathy-log-window.c:3728
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr ""
+"Eliminare veramente tutte le registrazioni delle conversazioni precedenti?"
+
+#: ../libempathy-gtk/empathy-log-window.c:3732
+msgid "Clear All"
+msgstr "Elimina tutto"
+
+#: ../libempathy-gtk/empathy-log-window.c:3739
+msgid "Delete from:"
+msgstr "Elimina da:"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Caricamento...</span>"
 
-# (ndt) è un pulsante, si riferisce alle conversazioni
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "Successiva"
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Chat"
+msgstr "Conversazione"
 
-# (ndt) è un pulsante, si riferisce alle conversazioni
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "Precedente"
+msgid "Delete All History..."
+msgstr "Elimina cronologia..."
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr "Conversazioni precedenti"
+msgid "Profile"
+msgstr "Profilo"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Video"
+msgstr "Video"
 
-#. Tab Label
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "Cerca"
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:20
+msgid "_Edit"
+msgstr "_Modifica"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "_File"
+msgstr "_File"
 
-# (ndt) questo è prima di una casella di testo
-# in cui inserire il criterio di ricerca
-#. Searching *for* something
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "_Frase:"
+msgid "page 2"
+msgstr "page 2"
 
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
 msgid "Contact ID:"
 msgstr "ID contatto:"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:171
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
 msgid "C_hat"
 msgstr "_Conversazione"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:181
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
 msgstr "Nuova conversazione"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:253
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
 msgid "Send _Video"
 msgstr "Invia _video"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:261
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
 msgid "C_all"
 msgstr "C_hiama"
 
 # (ndt) è il titolo del dialogo
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:271
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "New Call"
 msgstr "Nuova chiamata"
 
@@ -2286,36 +2650,36 @@ msgstr ""
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Message…"
 msgstr "Messaggio personalizzato..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messages…"
 msgstr "Modifica messaggio personalizzato..."
 
 # (ndt) sono dei suggerimenti, ma indicano l'azione da compiere
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
 msgstr "Fare clic per rimuovere questo stato dai preferiti"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
 msgstr "Fare clic per aggiungere questo stato tra i preferiti"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
 msgstr "Imposta lo stato"
 
 # (ndt) come c'è scritto nel codice: this string sucks
-#: ../libempathy-gtk/empathy-presence-chooser.c:946
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
 msgid "Set your presence and current status"
 msgstr "Imposta la presenza e lo stato"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1134
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
 msgid "Custom messages…"
 msgstr "Messaggi personalizzati..."
 
@@ -2328,18 +2692,26 @@ msgstr "Messaggi personalizzati..."
 msgid "New %s account"
 msgstr "Nuovo account %s"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "Trova:"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "Maiuscole/Minuscole"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Mat_ch case"
+msgstr "_Maiuscole/minuscole"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
 msgid "Phrase not found"
 msgstr "Stringa non trovata"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "_Next"
+msgstr "_Successiva"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+msgid "_Previous"
+msgstr "_Precedente"
+
 # (ndt) dovrebbero essere gli eventi sonori
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2381,35 +2753,33 @@ msgstr "Chiamata vocale in uscita"
 msgid "Voice call ended"
 msgstr "Chiamata vocale terminata"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "Inserire il messaggio personalizzato"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
 msgstr "Modifica messaggi personalizzati"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr "Salva _nuovo messaggio di stato"
+# (ndt) quello che c'è dopo è un timestamp, che ovviamente non è localizzabile...
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#, c-format
+msgid "Message edited at %s"
+msgstr "Messaggio modificato alle %s"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Status Messages"
-msgstr "Messaggi di stato salvati"
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
+msgid "Normal"
+msgstr "Normale"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "Classico"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "Semplice"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "Pulito"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "Blu"
 
@@ -2488,20 +2858,20 @@ msgstr "Ricordare per le successive connessioni"
 msgid "Certificate Details"
 msgstr "Dettagli certificato"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1705
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
 msgstr "Impossibile aprire l'URI"
 
 # (ndt) titolo
-#: ../libempathy-gtk/empathy-ui-utils.c:1800
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
 msgstr "Seleziona un file"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
 msgid "Insufficient free space to save file"
 msgstr "Spazio insufficiente per salvare il file"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2510,7 +2880,7 @@ msgstr ""
 "%s di spazio libero sono richiesti per salvare questo file, ma sono "
 "disponibili solamente %s. Scegliere un'altra posizione."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1924
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid "Incoming file from %s"
 msgstr "File in arrivo da parte di %s"
@@ -2700,24 +3070,24 @@ msgid "Instant Message (Empathy)"
 msgstr "Messaggio istantaneo (Empathy)"
 
 # (ndt) opzione
-#: ../src/empathy.c:308
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "Non connettere all'avvio"
 
 # (ndt) opzione
-#: ../src/empathy.c:312
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Non mostrare l'elenco contatti o qualsiasi altro dialogo all'avvio"
 
-#: ../src/empathy.c:320
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr "- Messaggistica istantanea Empathy"
 
-#: ../src/empathy.c:499
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
 msgstr "Errore nel contattare il gestore di account"
 
-#: ../src/empathy.c:501
+#: ../src/empathy.c:639
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2875,8 +3245,8 @@ msgid "Select the accounts you want to import:"
 msgstr "Selezionare gli account da importare:"
 
 #: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "Yes"
 msgstr "Sì"
 
@@ -2953,36 +3323,37 @@ msgstr "Sono presenti delle modifiche non salvate per l'account %s."
 msgid "Your new account has not been saved yet."
 msgstr "Il nuovo account non è ancora stato salvato."
 
-#: ../src/empathy-accounts-dialog.c:286
-#: ../src/empathy-streamed-media-window.c:809
+#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1175
 msgid "Connecting…"
 msgstr "Connessione..."
 
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:386
 #, c-format
 msgid "Offline — %s"
 msgstr "Fuori rete — %s"
 
 # (ndt) plurale per comprendere uomini e donne
-#: ../src/empathy-accounts-dialog.c:339
+#: ../src/empathy-accounts-dialog.c:398
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Disconnessi — %s"
 
-#: ../src/empathy-accounts-dialog.c:350
+#: ../src/empathy-accounts-dialog.c:409
 msgid "Offline — No Network Connection"
 msgstr "Fuori rete — Nessuna connessione di rete"
 
-#: ../src/empathy-accounts-dialog.c:357
+#: ../src/empathy-accounts-dialog.c:416
 msgid "Unknown Status"
 msgstr "Stato sconosciuto"
 
-#: ../src/empathy-accounts-dialog.c:369
+#: ../src/empathy-accounts-dialog.c:428
 msgid "Offline — Account Disabled"
 msgstr "Fuori rete — Account disabilitato"
 
 # (ndt) messo scartate perché il pulsante nella finestra è "Scarta"
-#: ../src/empathy-accounts-dialog.c:772
+#: ../src/empathy-accounts-dialog.c:831
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2990,17 +3361,17 @@ msgstr ""
 "Sta per essere creato un nuovo account e le modifiche\n"
 "effettuate verranno scartate. Procedere veramente?"
 
-#: ../src/empathy-accounts-dialog.c:1133
+#: ../src/empathy-accounts-dialog.c:1192
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Rimuovere «%s» dal computer?"
 
-#: ../src/empathy-accounts-dialog.c:1137
+#: ../src/empathy-accounts-dialog.c:1196
 msgid "This will not remove your account on the server."
 msgstr "Questo non rimuoverà l'account dal server."
 
 # (ndt) messo scartate perché il pulsante nella finestra è "Scarta"
-#: ../src/empathy-accounts-dialog.c:1375
+#: ../src/empathy-accounts-dialog.c:1432
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3009,16 +3380,16 @@ msgstr ""
 "effettuate verranno scartate. Procedere veramente?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1593
+#: ../src/empathy-accounts-dialog.c:1643
 msgid "_Enable"
 msgstr "_Abilita"
 
-#: ../src/empathy-accounts-dialog.c:1594
+#: ../src/empathy-accounts-dialog.c:1644
 msgid "_Disable"
 msgstr "_Disabilita"
 
 # (ndt) messo scartate perché il pulsante nella finestra è "Scarta"
-#: ../src/empathy-accounts-dialog.c:2113
+#: ../src/empathy-accounts-dialog.c:2154
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3027,19 +3398,23 @@ msgstr ""
 "effettuate verranno scartate. Procedere veramente?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Aggiungi..."
+
+#: ../src/empathy-accounts-dialog.ui.h:2
 msgid "Loading account information"
 msgstr "Caricamento informazioni account"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "No protocol installed"
 msgstr "Nessun protocollo installato"
 
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Protocol:"
 msgstr "Protocollo:"
 
 # FIXME: backend, ci vuole di meglio
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3047,19 +3422,15 @@ msgstr ""
 "Per aggiungere un nuovo account è necessario installare un backend per ogni "
 "protocollo da usare."
 
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add…"
-msgstr "A_ggiungi..."
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Import…"
 msgstr "_Importa..."
 
-#: ../src/empathy-auth-client.c:246
+#: ../src/empathy-auth-client.c:249
 msgid " - Empathy authentication client"
 msgstr " - Client autenticazione Empathy"
 
-#: ../src/empathy-auth-client.c:262
+#: ../src/empathy-auth-client.c:265
 msgid "Empathy authentication client"
 msgstr "Client autenticazione Empathy"
 
@@ -3067,97 +3438,118 @@ msgstr "Client autenticazione Empathy"
 msgid "People nearby"
 msgstr "Persone nelle vicinanze"
 
-#: ../src/empathy-av.c:118
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr "- Client audio/video Empathy"
 
-#: ../src/empathy-av.c:134
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "Client audio/video Empathy"
 
-#: ../src/empathy-streamed-media-window.c:479
+#: ../src/empathy-streamed-media-window.c:431
 msgid "Contrast"
 msgstr "Contrasto"
 
-#: ../src/empathy-streamed-media-window.c:482
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Brightness"
 msgstr "Luminosità"
 
-#: ../src/empathy-streamed-media-window.c:485
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:590
+#: ../src/empathy-streamed-media-window.c:542
 msgid "Volume"
 msgstr "Volume"
 
-#: ../src/empathy-streamed-media-window.c:1166
+#: ../src/empathy-streamed-media-window.c:1110
 msgid "_Sidebar"
 msgstr "_Barra laterale"
 
-#: ../src/empathy-streamed-media-window.c:1186
+#: ../src/empathy-streamed-media-window.c:1130
 msgid "Audio input"
 msgstr "Ingresso audio"
 
-#: ../src/empathy-streamed-media-window.c:1190
+#: ../src/empathy-streamed-media-window.c:1134
 msgid "Video input"
 msgstr "Ingresso video"
 
-#: ../src/empathy-streamed-media-window.c:1194
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Dialpad"
 msgstr "Tastierino"
 
-#: ../src/empathy-streamed-media-window.c:1205
+#: ../src/empathy-streamed-media-window.c:1151
 msgid "Details"
 msgstr "Dettagli"
 
 # (ndt) quello che c'è dopo è il nome del contatto
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1274
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1782
 #, c-format
 msgid "Call with %s"
 msgstr "Chiamata con %s"
 
-# (ndt) è il titolo del dialogo
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-streamed-media-window.c:1353
-msgid "Call"
-msgstr "Chiamata"
-
-#: ../src/empathy-streamed-media-window.c:1507
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:2026
 msgid "The IP address as seen by the machine"
 msgstr "L'indirizzo IP visto dal computer"
 
-#: ../src/empathy-streamed-media-window.c:1509
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:2028
 msgid "The IP address as seen by a server on the Internet"
 msgstr "L'indirizzo IP visto da un server su Internet"
 
 # (ndt) il lato oscuro... questa è interessante e da rivedere
-#: ../src/empathy-streamed-media-window.c:1511
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:2030
 msgid "The IP address of the peer as seen by the other side"
 msgstr "L'indirizzo IP del nodo visto dall'altro lato"
 
-#: ../src/empathy-streamed-media-window.c:1513
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:2032
 msgid "The IP address of a relay server"
 msgstr "L'indirizzo IP di un relay server"
 
-#: ../src/empathy-streamed-media-window.c:1515
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:2034
 msgid "The IP address of the multicast group"
 msgstr "L'indirizzo IP del gruppo multicast"
 
+#: ../src/empathy-streamed-media-window.c:1843
+msgctxt "encoding video codec"
+msgid "Unknown"
+msgstr "Sconosciuto"
+
+#: ../src/empathy-streamed-media-window.c:1846
+msgctxt "encoding audio codec"
+msgid "Unknown"
+msgstr "Sconosciuto"
+
+#: ../src/empathy-streamed-media-window.c:1849
+msgctxt "decoding video codec"
+msgid "Unknown"
+msgstr "Sconosciuto"
+
+#: ../src/empathy-streamed-media-window.c:1852
+msgctxt "decoding audio codec"
+msgid "Unknown"
+msgstr "Sconosciuto"
+
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2266
+#: ../src/empathy-streamed-media-window.c:2144
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Connessi — %d.%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2327
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2798
 msgid "Technical Details"
 msgstr "Dettagli tecnici"
 
-#: ../src/empathy-streamed-media-window.c:2365
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2836
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3166,7 +3558,8 @@ msgstr ""
 "Il programma di %s non è in grado di comprendere alcuno dei formati audio "
 "supportati da questo computer"
 
-#: ../src/empathy-streamed-media-window.c:2370
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2841
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3175,7 +3568,8 @@ msgstr ""
 "Il programma di %s non è in grado di comprendere alcuno dei formati video "
 "supportati da questo computer"
 
-#: ../src/empathy-streamed-media-window.c:2376
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2847
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3184,23 +3578,27 @@ msgstr ""
 "Impossibile stabilire una connessione con %s. Si potrebbe essere collegati a "
 "una rete che non supporta connessioni dirette."
 
-#: ../src/empathy-streamed-media-window.c:2382
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2853
 msgid "There was a failure on the network"
 msgstr "Si è verificato un problema sulla rete"
 
 # (ndt) eliminato volutamente il riferimento a computer
-#: ../src/empathy-streamed-media-window.c:2386
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2857
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "I formati audio necessari per eseguire la chiamata non sono installati"
 
 # (ndt) eliminato volutamente il riferimento a computer
-#: ../src/empathy-streamed-media-window.c:2389
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2860
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "I formati video necessari per eseguire la chiamata non sono installati"
 
-#: ../src/empathy-streamed-media-window.c:2399
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2872
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3211,156 +3609,206 @@ msgstr ""
 "\"%s\">Segnalare un problema</a> e allegare le informazioni raccolte "
 "attraverso l'azione «Debug» presente nel menù «Aiuto»."
 
-#: ../src/empathy-streamed-media-window.c:2407
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2881
 msgid "There was a failure in the call engine"
 msgstr "Si è verificato un problema nel motore delle chiamate"
 
-#: ../src/empathy-streamed-media-window.c:2410
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2884
 msgid "The end of the stream was reached"
 msgstr "Raggiunta la fine del flusso"
 
-#: ../src/empathy-streamed-media-window.c:2450
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2924
 msgid "Can't establish audio stream"
 msgstr "Impossibile stabilire il flusso audio"
 
-#: ../src/empathy-streamed-media-window.c:2460
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2934
 msgid "Can't establish video stream"
 msgstr "Impossibile stabilire il flusso video"
 
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "Audio"
 msgstr "Audio"
 
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Richiama il contatto"
-
-# (ndt) dal codice non si capisce bene cosa siano, se suggerimenti o etichette vere e proprie, resto sul corto per il momento
 #: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "Spenta"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "Codec di decodifica:"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "Accesa"
+msgid "Disable camera"
+msgstr "Disabilita la videocamera"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Codec di decodifica:"
+msgid "Display the dialpad"
+msgstr "Visualizza il tastierino"
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Disabilita la videocamera e non invia più video"
-
-#: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Abilita la videocamera e invia video"
-
-#: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Abilita la videocamera, ma non invia video"
-
-#: ../src/empathy-call-window.ui.h:9
+#: ../src/empathy-streamed-media-window.ui.h:9
 msgid "Encoding Codec:"
 msgstr "Codec di codifica:"
 
 # (ndt) usato lo stesso anche in ekiga
 # o meglio andare con un 'Termina'?
-#: ../src/empathy-call-window.ui.h:10
+#: ../src/empathy-call-window.ui.h:7
+#: ../src/empathy-streamed-media-window.ui.h:10
 msgid "Hang up"
 msgstr "Chiudi"
 
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:8
+#: ../src/empathy-streamed-media-window.ui.h:11
 msgid "Hang up current call"
 msgstr "Chiude la chiamata corrente"
 
 # (ndt) è in un dialogo dove sono elencati i codec di codifica e decofica, questo dovrebbe indicare il codec locale... Quella un po' dopo quello remoto
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:9
+#: ../src/empathy-streamed-media-window.ui.h:12
 msgid "Local Candidate:"
 msgstr "Candidato locale:"
 
-#: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "Anteprima"
+#: ../src/empathy-call-window.ui.h:10
+msgid "Maximise me"
+msgstr "Massimizza"
 
-# (ndt) pulsante sulla barra
-#: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "Richiama"
+#: ../src/empathy-call-window.ui.h:11
+msgid "Minimise me"
+msgstr "Minimizza"
 
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-streamed-media-window.ui.h:15
 msgid "Remote Candidate:"
 msgstr "Candidato remoto:"
 
 # (ndt) pulsante
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-streamed-media-window.ui.h:16
 msgid "Send Audio"
 msgstr "Invia audio"
 
+#: ../src/empathy-call-window.ui.h:14
+msgid "Send Video"
+msgstr "Invia video"
+
+#: ../src/empathy-call-window.ui.h:15
+msgid "Show dialpad"
+msgstr "Mostra tastierino"
+
+#: ../src/empathy-call-window.ui.h:16
+msgid "Start a video call"
+msgstr "Avvia una chiamata video"
+
 #: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Abilita/Disabilita la trasmissione audio"
+msgid "Start an audio call"
+msgstr "Avvia un chiamata audio"
+
+# (ndt) non molto chiara... non so se sia per cambiare il dispositivo o per accenderlo/spegnerlo
+#: ../src/empathy-call-window.ui.h:18
+msgid "Swap camera"
+msgstr "Cambia videocamera"
 
-# (ndt) la i è safe, non c'è il menù Aiuto
 #: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ideo"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr "Abilita/Disabilita la trasmissione audio"
 
 #: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "Video"
+msgid "Toggle video transmission"
+msgstr "Abilita/Disabilita la trasmissione video"
 
-# (ndt) le tre che seguono compaiono nel menù Video, le accorcio, penso si possa capire lo stesso
 #: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "Disabilitato"
-
-#: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "Abilitato"
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:2431 ../src/empathy-call-window.c:2432
+#: ../src/empathy-call-window.c:2433 ../src/empathy-call-window.c:2434
+msgid "Unknown"
+msgstr "Sconosciuto"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "Anteprima"
+msgid "Video call"
+msgstr "Chiamata video"
 
 # (ndt) questo è un menù, non so se sia il caso di mettere Chiamata
 #: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "C_hiama"
 
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:25
+msgid "_Camera"
+msgstr "Video_camera"
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:18
+msgid "_Contents"
+msgstr "_Sommario"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
+msgid "_Debug"
+msgstr "_Debug"
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:22
+msgid "_Help"
+msgstr "A_iuto"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Microphone"
+msgstr "_Microfono"
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "_Settings"
+msgstr "Imposta_zioni"
+
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_Visualizza"
 
-#: ../src/empathy-chat-window.c:474 ../src/empathy-chat-window.c:494
+#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d non letto)"
 msgstr[1] "%s (%d non letti)"
 
-#: ../src/empathy-chat-window.c:486
+#: ../src/empathy-chat-window.c:493
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (e %u altro)"
 msgstr[1] "%s (e %u altri)"
 
-#: ../src/empathy-chat-window.c:502
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d non letto da altri)"
 msgstr[1] "%s (%d non letti da altri)"
 
-#: ../src/empathy-chat-window.c:511
+#: ../src/empathy-chat-window.c:518
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d non letto da tutti)"
 msgstr[1] "%s (%d non letti da tutti)"
 
-#: ../src/empathy-chat-window.c:721
+#: ../src/empathy-chat-window.c:733
+msgid "SMS:"
+msgstr "SMS:"
+
+#: ../src/empathy-chat-window.c:743
+#, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "Invio di %d messaggio in corso"
+msgstr[1] "Invio di %d messaggi in corso"
+
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
 msgstr "Scrittura messaggio."
 
@@ -3372,10 +3820,6 @@ msgstr "Pu_lisci"
 msgid "C_ontact"
 msgstr "C_ontatto"
 
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Conversazione"
-
 #: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
 msgstr "Inserisci _faccina"
@@ -3396,10 +3840,6 @@ msgstr "Sposta scheda a _destra"
 msgid "Notify for All Messages"
 msgstr "Notificare tutti i messaggi"
 
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
-msgid "_Contents"
-msgstr "_Sommario"
-
 #: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "_Conversazione"
@@ -3408,18 +3848,10 @@ msgstr "_Conversazione"
 msgid "_Detach Tab"
 msgstr "Dist_acca scheda"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
-msgid "_Edit"
-msgstr "_Modifica"
-
 #: ../src/empathy-chat-window.ui.h:13
 msgid "_Favorite Chat Room"
 msgstr "_Stanza preferita"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
-msgid "_Help"
-msgstr "A_iuto"
-
 #: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "Scheda _successiva"
@@ -3441,16 +3873,16 @@ msgstr "Sc_hede"
 msgid "_Undo Close Tab"
 msgstr "Riapri _scheda chiusa"
 
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
 msgstr "Stanza"
 
 # (ndt) dovrebbe essere il nome di una colonna
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "Connessione automatica"
 
@@ -3459,92 +3891,98 @@ msgstr "Connessione automatica"
 msgid "Manage Favorite Rooms"
 msgstr "Gestione stanze preferite"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming video call"
 msgstr "Chiamata video in arrivo"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1408
 msgid "Incoming call"
 msgstr "Chiamata in arrivo"
 
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:525
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s sta video-chiamando, rispondere?"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s sta chiamando, rispondere?"
 
-#: ../src/empathy-event-manager.c:515 ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1414
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Chiamata in arrivo da %s"
 
-#: ../src/empathy-event-manager.c:540
+#: ../src/empathy-event-manager.c:554
 msgid "_Reject"
 msgstr "Ri_fiuta"
 
-#: ../src/empathy-event-manager.c:546
+#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
 msgid "_Answer"
 msgstr "_Rispondi"
 
-#: ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:570
+msgid "_Answer with video"
+msgstr "Rispondi con _video"
+
+#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1414
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Chiamata video in arrivo da %s"
 
-#: ../src/empathy-event-manager.c:737
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
 msgstr "Invito in una stanza"
 
-#: ../src/empathy-event-manager.c:739
+#: ../src/empathy-event-manager.c:838
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Invito per entrare in %s"
 
-#: ../src/empathy-event-manager.c:746
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s sta inviando un invito per entrare in %s"
 
-#: ../src/empathy-event-manager.c:754
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
 msgstr "_Rifiuta"
 
 # (ndt) pulsante
-#: ../src/empathy-event-manager.c:759
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Entra"
 
-#: ../src/empathy-event-manager.c:786
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "C'è un invito per entrare in %2$s da parte di %1$s"
 
-#: ../src/empathy-event-manager.c:792
+#: ../src/empathy-event-manager.c:891
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "C'è un invito per entrare in %s"
 
-#: ../src/empathy-event-manager.c:843
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Trasferimento file in arrivo da %s"
 
-#: ../src/empathy-event-manager.c:1013 ../src/empathy-main-window.c:370
+#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
 msgid "Password required"
 msgstr "Password richiesta"
 
 # (ndt) so che non è impersonale... ma non mi viene niente di buono che sia impersonale...
-#: ../src/empathy-event-manager.c:1069
+#: ../src/empathy-event-manager.c:1190
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s vorrebbe poter visualizzare la tua presenza in rete"
 
-#: ../src/empathy-event-manager.c:1073
+#: ../src/empathy-event-manager.c:1194
 #, c-format
 msgid ""
 "\n"
@@ -3554,105 +3992,105 @@ msgstr ""
 "Messaggio: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:100
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u.%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:102
+#: ../src/empathy-ft-manager.c:103
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:179
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Sconosciuta"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s di %s a %s/s"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:275
 #, c-format
 msgid "%s of %s"
 msgstr "%s di %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:305
+#: ../src/empathy-ft-manager.c:306
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Ricezione del file «%s» da %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:309
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Invio del file «%s» a %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:338
+#: ../src/empathy-ft-manager.c:339
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Errore nel ricevere il file «%s» da %s"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:342
 msgid "Error receiving a file"
 msgstr "Errore nel ricevere un file"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:347
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Errore nell'inviare il file «%s» a %s"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:350
 msgid "Error sending a file"
 msgstr "Errore nell'inviare un file"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:489
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "File «%s» ricevuto da %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:493
+#: ../src/empathy-ft-manager.c:494
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "File «%s» inviato a %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:497
 msgid "File transfer completed"
 msgstr "Trasferimento file completato"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
 msgid "Waiting for the other participant's response"
 msgstr "Attesa della risposta dell'altro utente"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Verifica dell'integrità del file «%s»"
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Calcolo codice di controllo di «%s»"
 
-#: ../src/empathy-ft-manager.c:1016
+#: ../src/empathy-ft-manager.c:1026
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1028
+#: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "File"
 
-#: ../src/empathy-ft-manager.c:1050
+#: ../src/empathy-ft-manager.c:1060
 msgid "Remaining"
 msgstr "Restante"
 
@@ -3695,138 +4133,150 @@ msgid "Source"
 msgstr "Sorgente"
 
 # (ndt) pare tooltip... mah...
-#: ../src/empathy-main-window.c:387
+#: ../src/empathy-main-window.c:392
 msgid "Provide Password"
 msgstr "Fornisce password"
 
 # (ndt) tooltip
-#: ../src/empathy-main-window.c:393
+#: ../src/empathy-main-window.c:398
 msgid "Disconnect"
 msgstr "Disconnette"
 
-#: ../src/empathy-main-window.c:533
+#: ../src/empathy-main-window.c:622
 msgid "No match found"
 msgstr "Nessun risultato"
 
 # (ndt) suggerimento
-#: ../src/empathy-main-window.c:688
+#: ../src/empathy-main-window.c:777
 msgid "Reconnect"
 msgstr "Riconnette"
 
 # (ndt) suggerimento
-#: ../src/empathy-main-window.c:694
+#: ../src/empathy-main-window.c:783
 msgid "Edit Account"
 msgstr "Modifica account"
 
 # (ndt) suggerimento
-#: ../src/empathy-main-window.c:700
+#: ../src/empathy-main-window.c:789
 msgid "Close"
 msgstr "Chiude"
 
-#: ../src/empathy-main-window.c:1418
+#. Translators: this string will be something like:
+#. *   Top up My Account ($1.23)..."
+#: ../src/empathy-main-window.c:928
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr "Ricarica di %s (%s)..."
+
+#: ../src/empathy-main-window.c:975
+msgid "Top up account credit"
+msgstr "Ricarica account"
+
+#. top up button
+#: ../src/empathy-main-window.c:1046
+msgid "Top Up..."
+msgstr "Ricarica..."
+
+#: ../src/empathy-main-window.c:1789
 msgid "Contact"
 msgstr "Contatto"
 
-#: ../src/empathy-main-window.c:1765
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "Elenco contatti"
 
-# (ndt) suggerimento
-#: ../src/empathy-main-window.c:1881
-msgid "Show and edit accounts"
-msgstr "Mostra e modifica account"
-
 # (ndt) è una voce del menù visualizza
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "Contatti sulla _mappa"
 
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-main-window-menubar.ui.h:2
+msgid "Credit Balance"
+msgstr "Saldo crediti"
+
+#: ../src/empathy-main-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "Trova in E_lenco contatti"
 
 # (ndt) voce di menù, stanze
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "Entra nelle pre_ferite"
 
 # (ndt) stanze
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "Gestisci preferite"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "Dimensione nor_male"
 
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "Nuova c_hiamata..."
 
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "Dimensione normale con imm_agini"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "Preferen_ze"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "Mostrare p_rotocolli"
 
 # (ndt) opzione - pulsante radio
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "Ordinare per _nome"
 
 # (ndt) opzione - pulsante radio
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "Ordinare per s_tato"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Account"
 
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "Contatti _bloccati"
 
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "_Dimensione ridotta"
 
-#: ../src/empathy-main-window.ui.h:18
-msgid "_Debug"
-msgstr "_Debug"
-
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "Trasferimenti _file"
 
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "_Entra..."
 
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "_Nuova conversazione..."
 
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "C_ontatti fuori rete"
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "Informazioni _personali"
 
 # (ndt) voce di menù per accedere alle opzioni relative ai canali IRC
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "St_anza"
 
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window-menubar.ui.h:29
 msgid "_Search for Contacts…"
 msgstr "_Cerca contatti..."
 
@@ -3842,7 +4292,7 @@ msgstr "Membri"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:560
+#: ../src/empathy-new-chatroom-dialog.c:553
 #, c-format
 msgid ""
 "%s\n"
@@ -3855,16 +4305,16 @@ msgstr ""
 "Password richiesta: %s\n"
 "Membri: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "No"
 msgstr "No"
 
-#: ../src/empathy-new-chatroom-dialog.c:591
+#: ../src/empathy-new-chatroom-dialog.c:584
 msgid "Could not start room listing"
 msgstr "Impossibile recuperare l'elenco delle stanze"
 
-#: ../src/empathy-new-chatroom-dialog.c:601
+#: ../src/empathy-new-chatroom-dialog.c:594
 msgid "Could not stop room listing"
 msgstr "Impossibile bloccare il recupero dell'elenco delle stanze"
 
@@ -3901,39 +4351,79 @@ msgstr "Stan_za:"
 
 # (ndt) quelli che seguono sono
 # messaggi di eventi a cui associare un suono
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr "Messaggio ricevuto"
 
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr "Messaggio inviato"
 
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
 msgstr "Nuova conversazione"
 
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
 msgstr "Il contatto entra in rete"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
 msgstr "Il contatto va fuori rete"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
 msgstr "Account connesso"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
 msgstr "Account disconnesso"
 
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr "Lingua"
 
-#: ../src/empathy-preferences.c:875
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:734
+msgid "Juliet"
+msgstr "Giulietta"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:741
+msgid "Romeo"
+msgstr "Romeo"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:747
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr "O Romeo, Romeo, perché sei tu Romeo?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:750
+msgid "Deny thy father and refuse thy name;"
+msgstr "Rinnega tuo padre e rifiuta il tuo nome;"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:753
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr "o, se non vuoi, legati solo in giuramento all'amor mio"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:756
+msgid "And I'll no longer be a Capulet."
+msgstr "e io non sarò più una Capuleti."
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:759
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr "Starò ancora ad ascoltare, o rispondo a questo che ha detto?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:762
+msgid "Juliet has disconnected"
+msgstr "L'utente Giulietta si è disconnesso"
+
+#: ../src/empathy-preferences.c:1166
 msgid "Preferences"
 msgstr "Preferenze"
 
@@ -3941,72 +4431,93 @@ msgstr "Preferenze"
 msgid "Appearance"
 msgstr "Aspetto"
 
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
 msgstr "Comportamento"
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
 msgid "Chat Th_eme:"
 msgstr "T_ema delle conversazioni:"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
 msgid "Disable notifications when _away or busy"
 msgstr "Disabilitare le notifiche quando _assenti o non disponibili"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
 msgid "Disable sounds when _away or busy"
 msgstr "_Disabilitare i suoni quando assenti o non disponibili"
 
 # (ndt) opzione
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Visualizzare gli eventi in arrivo nell'area di notifica"
 
+#: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"La soppressione dell'eco consente di rendere la propria voce più chiara, ma "
+"potrebbe causare alcuni problemi. Se vengono uditi strani suoni o rumori "
+"statici localmente o anche dall'altra persona con cui si ha una "
+"conversazione, provare a disabilitare la soppressione dell'eco e riavviare "
+"la chiamata."
+
 # (ndt) opzione, strano che non abbia l'acceleratore
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "Abilitare le notifiche quando un contatto entra in rete"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "Abilitare le notifiche quando un contatto va fuori rete"
 
 # (ndt) opzione
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Abilitare le notifiche quando la conversazione non ha il _focus"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
-msgstr "Abilitare controllo ortografico per le lingue:"
+msgstr "Abilitare il controllo ortografico per le lingue:"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "Generale"
 
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input level:"
+msgstr "Livello di ingresso:"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "Volume di ingresso:"
+
 # (ndt) nome di una sezione
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "Sorgenti per la posizione:"
 
 # (ndt) opzione
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "Registrare le conversazioni"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "Notifiche"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Riprodurre un suono per gli eventi"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "Privacy"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -4017,26 +4528,26 @@ msgstr ""
 "precisione delle coordinate GPS sarà di una posizione decimale."
 
 # (ndt) opzione
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "Mostrare le faccin_e come immagini"
 
 # (ndt) opzione
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "Mostrare l'e_lenco contatti nelle stanze"
 
 # (ndt) titolo scheda
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "Suoni"
 
 # (ndt) titolo scheda
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "Controllo ortografico"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
@@ -4045,49 +4556,53 @@ msgstr ""
 "installato."
 
 # (ndt) titolo scheda
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "Temi"
 
+#: ../src/empathy-preferences.ui.h:30
+msgid "Variant:"
+msgstr "Variante:"
+
 # (ndt) opzione
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "C_onnettere automaticamente all'avvio"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "C_ellulare"
 
 # (ndt) opzione
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "Abilitar_e le notifiche visive"
 
 # (ndt) opzione
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "Abilitar_e le notifiche sonore"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Rete (IP, WiFi)"
 
 # (ndt) opzione
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "A_prire finestre separate per le nuove conversazioni"
 
 # (ndt) opzione
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "_Pubblicare la posizione geografica ai propri contatti"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "_Ridurre la precisione della posizione geografica"
 
@@ -4099,68 +4614,120 @@ msgstr "Stato"
 msgid "_Quit"
 msgstr "_Esci"
 
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "Richiama il contatto"
+
+# (ndt) dal codice non si capisce bene cosa siano, se suggerimenti o etichette vere e proprie, resto sul corto per il momento
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "Spenta"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "Accesa"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "Disabilita la videocamera e non invia più video"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "Abilita la videocamera e invia video"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "Abilita la videocamera, ma non invia video"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "Anteprima"
+
+# (ndt) pulsante sulla barra
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "Richiama"
+
+# (ndt) la i è safe, non c'è il menù Aiuto
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "V_ideo"
+
+# (ndt) le tre che seguono compaiono nel menù Video, le accorcio, penso si possa capire lo stesso
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "Disabilitato"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "Abilitato"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "Anteprima"
+
 # (ndt) questo è il titolo della finestra che mostra la mappa... molto libera
-#: ../src/empathy-map-view.c:442
+#: ../src/empathy-map-view.c:448
 msgid "Contact Map View"
 msgstr "Mappa posizioni dei contatti"
 
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
 msgid "Save"
 msgstr "Salva"
 
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
 msgstr "Finestra di debug"
 
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
 msgstr "Livello "
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
 msgid "Debug"
 msgstr "Debug"
 
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
 msgid "Info"
 msgstr "Informazioni"
 
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
 msgid "Message"
 msgstr "Messaggio"
 
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
 msgid "Warning"
 msgstr "Avviso"
 
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
 msgid "Critical"
 msgstr "Critico"
 
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
 msgid "Error"
 msgstr "Errore"
 
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
 msgid "Time"
 msgstr "Orario"
 
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
 msgid "Domain"
 msgstr "Dominio"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
 msgstr "Categoria"
 
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "Livello"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4168,16 +4735,16 @@ msgstr ""
 "Il gestore di connessione selezionato non sembra supportare l'estensione per "
 "il debug remoto."
 
-#: ../src/empathy-invite-participant-dialog.c:34
-#: ../src/empathy-invite-participant-dialog.c:48
+#: ../src/empathy-invite-participant-dialog.c:179
+#: ../src/empathy-invite-participant-dialog.c:205
 msgid "Invite Participant"
 msgstr "Invita partecipante"
 
-#: ../src/empathy-invite-participant-dialog.c:35
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Scegliere un contatto da invitare nella conversazione:"
 
-#: ../src/empathy-invite-participant-dialog.c:45
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "Invita"
 
@@ -4212,7 +4779,15 @@ msgstr "- Account Empathy"
 msgid "Empathy Accounts"
 msgstr "Account Empathy"
 
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr "Mostra un servizio particolare"
+
+#: ../src/empathy-debugger.c:75
+msgid "- Empathy Debugger"
+msgstr "- Debugger Empathy"
+
+#: ../src/empathy-debugger.c:114
 msgid "Empathy Debugger"
 msgstr "Debugger Empathy"
 
@@ -4220,34 +4795,71 @@ msgstr "Debugger Empathy"
 msgid "- Empathy Chat Client"
 msgstr "- Client chat Empathy"
 
-#: ../src/empathy-notifications-approver.c:184
+#: ../src/empathy-notifications-approver.c:203
 msgid "Respond"
 msgstr "Rispondi"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1418
 msgid "Reject"
 msgstr "Rifiuta"
 
-#: ../src/empathy-notifications-approver.c:194
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1419
 msgid "Answer"
 msgstr "Rispondi"
 
-#: ../src/empathy-notifications-approver.c:201
-#: ../src/empathy-notifications-approver.c:211
+#: ../src/empathy-notifications-approver.c:227
+msgid "Answer with video"
+msgstr "Rispondi con video"
+
+#: ../src/empathy-notifications-approver.c:235
+#: ../src/empathy-notifications-approver.c:245
 msgid "Decline"
 msgstr "Declina"
 
-#: ../src/empathy-notifications-approver.c:205
-#: ../src/empathy-notifications-approver.c:216
+#: ../src/empathy-notifications-approver.c:239
+#: ../src/empathy-notifications-approver.c:250
 msgid "Accept"
 msgstr "Accetta"
 
-#: ../src/empathy-call-observer.c:130
-#, c-format
-msgid "Missed call from %s"
-msgstr "Chiamata persa da %s"
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:260
+msgid "Provide"
+msgstr "Fornisce"
 
-#: ../src/empathy-call-observer.c:133
+#: ../src/empathy-call-observer.c:134
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s ha appena cercato di chiamare, ma era in corso un'altra chiamata."
+
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1047 ../src/empathy-call-window.c:1070
+msgid "i"
+msgstr "i"
+
+#: ../src/empathy-call-window.c:2727
+msgid "On hold"
+msgstr "In attesa"
+
+#: ../src/empathy-call-window.c:2730
+msgid "Mute"
+msgstr "Muto"
+
+#: ../src/empathy-call-window.c:2732
+msgid "Duration"
+msgstr "Durata"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2735
+#, c-format
+msgid "%s — %d:%02dm"
+msgstr "%s — %d.%02dm"
+
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "_Maiuscole/minuscole"
diff --git a/po/ja.po b/po/ja.po
index 164f0ad44..6da82ec74 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -23,10 +23,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=empathy&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-04-03 18:18+0000\n"
-"PO-Revision-Date: 2010-09-27 21:03+0900\n"
-"Last-Translator: Takayuki KUASNO <AE5T-KSN@asahi-net.or.jp>\n"
+"product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2011-09-16 12:29+0000\n"
+"PO-Revision-Date: 2011-09-11 00:28+0900\n"
+"Last-Translator: Jiro Matsuzawa <jmatsuzawa@src.gnome.org>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,6 +55,26 @@ msgid "Always open a separate chat window for new chats."
 msgstr "新���ャット用�別��ャットウィンドウを常�開���。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#, fuzzy
+#| msgid "Camera On"
+msgid "Camera device"
+msgstr "カメラ入"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#, fuzzy
+#| msgid "Camera On"
+msgid "Camera position"
+msgstr "カメラ入"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -62,340 +82,375 @@ msgstr ""
 "グループ・�ャット�ニック�ームを補完(tab)��際��ニック�ーム�後��追加"
 "�る文字��。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "�ャットウィンドウ�テーマ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#, fuzzy
+#| msgid "Chat window theme"
+msgid "Chat window theme variant"
+msgstr "�ャットウィンドウ�テーマ"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "スペルを�ェック�る言語をコンマ�区切��指定��� (例: \"en, fr, nl\")。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "仲間リストを����る����"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
-msgstr "接続マ�ージャを利用�る����"
+msgstr "接続マ�ージャーを利用�る����"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "仲間リストを並�替�る際��件"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
-msgstr "ア�ター�画��格��れ�デフォルト�フォルダ"
+msgstr "ア�ター�画��格��れ�デフォルト�フォルダー"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr "離席中����も�ップアップ通知�������"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr "離席中����らサウンド�演�を無効��る����"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
 msgstr "�信��イベントを表示"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
 msgstr ""
-"�信��イベントを通知領域�表示���。も� false �ら�ユーザ����通知�"
-"��。"
+"�信��イベントを通知領域�表示���。も� false �ら�ユーザー����通知"
+"���。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+msgid "Echo cancellation support"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
-msgstr "Empathy�ユーザ�場所�公開を�能��る"
+msgstr "Empathy�ユーザー�場所�公開を�能��る"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy�場所�推測�GPSを利用�る��を�能��る"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy�場所�推測�セルラー�ットワークを利用�る��を�能��る"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy�場所�推測��ットワークを利用�る��を�能��る"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
-msgstr "Empathy �使�デフォルト�ダウンロード・フォルダ"
+msgstr "Empathy �使�デフォルト�ダウンロード・フォルダー"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
 msgstr "Empathy � butterfly �ログを移行����"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr "アイドル時�自動的�離席�る����"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "起動時�自動接続�る����"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy�場所�精度を下�る����"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "仲間リスト�ア�ターを�ャットウィンドウ�アイコン��る����"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr "WebKit Developer Toolsを有効��る"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "メッセージを�信��ら�ップアップ�通知�る����"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "スペルを�ェック�る����"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "メイン・ウィンドウを隠�����"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "メイン・ウィンドウを隠�������。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "ニックを補完�る文字"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "新��会話毎�ウィンドウを開�����"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "使用�る Adium テーマ�パス"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
 "会話�使用�るテーマ� Adium �場��使用�る Adium テーマ�パスを指定��"
 "�。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "メッセージを�信��らサウンドを演��る����"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "�ャット�新��会話を��らサウンドを演��る����"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "メッセージを�信��らサウンドを演��る����"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "仲間�サインイン��らサウンドを演��る����"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "仲間�サインアウト��らサウンドを演��る����"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "サインイン��らサウンドを演��る����"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "サインアウト��らサウンドを演��る����"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr ""
 "�ャット・ウィンドウ�フォーカス�当������場���ップアップ通知�る"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "仲間�サインイン��際��ップアップ通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "仲間�サインアウト��際��ップアップ通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#, fuzzy
+#| msgid "Show co_mpact contact list"
+msgid "Show Balance in contact list"
+msgstr "仲間リストをコンパクト��る(_M)"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "ア�ターを表示�る����"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "部屋�仲間�一覧を表示�る����"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr "メイン・ウィンドウを閉�る際�ヒントを表示�る����"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr "オフライン�仲間を表示�る����"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
 msgstr "プロトコルを表示"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "スペルを�ェック�る言語"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
-msgstr "転���ファイルを�存�るデフォルト�フォルダ��。"
+msgstr "転���ファイルを�存�るデフォルト�フォルダー��。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
-msgstr "最後�ア�ターを�択��時�使用��フォルダ��。"
+msgstr "最後�ア�ターを�択��時�使用��フォルダー��。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
 msgstr "�ャットウィンドウ�横�ペイン��置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "�存�れ��ャットウィンドウ�横�ペイン��置 (ピクセル��)"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "�ャットウィンドウ�使用�るテーマ��。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#, fuzzy
+#| msgid "The theme that is used to display the conversation in chat windows."
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "�ャットウィンドウ�使用�るテーマ��。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "スマイリー・アイコンを使�����"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "状態をサウンド�演��通知�る����"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "�ャットルーム�テーマを�用�る����"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Empathy�仲間�場所を公開�る����を設定���。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Empathy�GPS�場所を推測�る����を設定���。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Empathy�セルラー�ットワーク�場所を推測�る����を設定���。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Empathy��ットワーク�場所を推測�る����を設定���。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "Empathy � butterfly �ログを移行������。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr ""
 "Empathy を起動��ら自動的�自分�アカウント�サインイン�る������。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr "アイドル状態����ら�Empathy �自動的�離席�る������。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "Empathy�プライ�シー��由�場所�精度を下�る����を設定���。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 "Empathy �仲間�ア�ターを�ャットウィンドウ�アイコン���利用�る����"
 "��。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "Web Inspector�よ��WebKit developer toolsを有効��る����。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr ""
-"自動的�切断/�接続�る��接続マ�ージャを利用�������を設定���。"
+"自動的�切断/�接続�る��接続マ�ージャーを利用�������を設定���。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "指定��言語�入力���語を�ェック�る������。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "会話中�スマイリーをグラフィカル�画��変��る������。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr ""
 "仲間�サインイン����を通知�る���サウンドを�生�る������。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
 "仲間�サインアウト����を通知�る���サウンドを�生�る������。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "イベント�発生��らサウンドを�生��通知�る������。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "メッセージを�����らサウンドを�生��通知�る������。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "新��会話を開始��らサウンドを�生��通知�る������。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "メッセージを�信��らサウンドを�生��通知�る������。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "�ットワーク�サインイン��らサウンドを�生�る������。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "�ットワーク�らサインアウト��らサウンドを�生�る������。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr "離席中���多忙����らサウンド��生�よる通知を行�������。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr ""
 "仲間�オフライン����際��ップアップ��通知を表示�る������。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr ""
 "仲間�オンライン����際��ップアップ��通知を表示�る������。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -403,38 +458,44 @@ msgstr ""
 "�ャット・ウィンドウ�開����もフォーカス�当������れ��新��メッ"
 "セージを�信�る度��ップアップ通知を行�������。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "新��メッセージを�信�る度��ップアップ通知�る������。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#, fuzzy
+#| msgid "Whether to show protocols for contacts in the contact list."
+msgid "Whether to show account balances in the contact list."
+msgstr "仲間リスト�中�仲間�プロトコルを表示�る������。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 "仲間リスト��ャットウィンドウ�中�仲間�ア�ターを表示�る������。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "仲間リスト�中�オフライン�仲間を表示�る������。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
 msgstr ""
 "状態�離席中���多忙����も�ップアップ通知を表示�る������。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "仲間リスト�中�仲間�プロトコルを表示�る������。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr "�ャットルーム�仲間リストを表示�る������。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "仲間リストを���表示�る������。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -442,11 +503,11 @@ msgstr ""
 "タイトル�ー��る 'x' ボタンをクリック��メインウィンドウを閉��らメッセー"
 "ジ・ダイアログを表示�る������。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "�ャットルーム�テーマを使用�る������。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -461,7 +522,7 @@ msgstr "メッセージング� VoIP �アカウント�管�"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2269
+#: ../src/empathy-accounts-dialog.c:2324
 msgid "Messaging and VoIP Accounts"
 msgstr "メッセージング� VoIP �アカウント"
 
@@ -471,18 +532,37 @@ msgstr "メッセージング� VoIP �アカウント"
 msgid "File transfer completed, but the file was corrupted"
 msgstr "ファイル�転��完了����"
 
-#: ../libempathy/empathy-ft-handler.c:1113
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
 msgstr "リモート��相手�ファイル転�をサ�ート�����ん。"
 
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is not a regular file"
 msgstr "�択��ファイル�一般的�ファイル���り��ん"
 
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1176
 msgid "The selected file is empty"
 msgstr "�択�れ�ファイル�空��"
 
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#, fuzzy, c-format
+#| msgid "Incoming call from %s"
+msgid "Missed call from %s"
+msgstr "%s �ん�ら�呼�出���"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, fuzzy, c-format
+#| msgid "Call with %s"
+msgid "Called %s"
+msgstr "%s�発信"
+
+#: ../libempathy/empathy-message.c:422
+#, fuzzy, c-format
+#| msgid "Incoming call from %s"
+msgid "Call from %s"
+msgstr "%s �ん�ら�呼�出���"
+
 #: ../libempathy/empathy-tp-file.c:268
 msgid "Socket type not supported"
 msgstr "サ�ート�れ����ソケットタイプ��"
@@ -511,296 +591,288 @@ msgstr "ファイル�転�中�エラー�発生����"
 msgid "The other participant is unable to transfer the file"
 msgstr "他�仲間�ファイル転�����ん���"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:383
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
 msgid "Unknown reason"
 msgstr "原因�明��"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:222
 msgid "Available"
 msgstr "在席中"
 
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:224
 msgid "Busy"
 msgstr "�り込�中"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:227
 msgid "Away"
 msgstr "離席中"
 
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:229
 msgid "Invisible"
 msgstr "�表示"
 
-#: ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-utils.c:231
 msgid "Offline"
 msgstr "オフライン"
 
 #. translators: presence type is unknown
-#. translators: encoding video codec is unknown
-#. translators: encoding audio codec is unknown
-#. translators: decoding video codec is unknown
-#. translators: decoding audio codec is unknown
-#: ../libempathy/empathy-utils.c:316
-#: ../src/empathy-streamed-media-window.c:1905
-#: ../src/empathy-streamed-media-window.c:1907
-#: ../src/empathy-streamed-media-window.c:1909
-#: ../src/empathy-streamed-media-window.c:1911
-#: ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:234
+#, fuzzy
+#| msgid "Unknown"
+msgctxt "presence"
 msgid "Unknown"
 msgstr "�明"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:274
 msgid "No reason specified"
 msgstr "原因�特定�れ����ん"
 
-#: ../libempathy/empathy-utils.c:357 ../libempathy/empathy-utils.c:413
+#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
 msgid "Status is set to offline"
 msgstr "状態�オフライン�設定�れ����"
 
-#: ../libempathy/empathy-utils.c:359 ../libempathy/empathy-utils.c:393
+#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "�ットワーク�エラー��"
 
-#: ../libempathy/empathy-utils.c:361 ../libempathy/empathy-utils.c:395
+#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
 msgid "Authentication failed"
 msgstr "�証�失敗����"
 
-#: ../libempathy/empathy-utils.c:363 ../libempathy/empathy-utils.c:397
+#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
 msgid "Encryption error"
 msgstr "暗�化�エラー��"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:284
 msgid "Name in use"
 msgstr "使用中���"
 
-#: ../libempathy/empathy-utils.c:367 ../libempathy/empathy-utils.c:399
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
 msgid "Certificate not provided"
 msgstr "証明書��り��ん"
 
-#: ../libempathy/empathy-utils.c:369 ../libempathy/empathy-utils.c:401
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
 msgid "Certificate untrusted"
 msgstr "信用���証明書��"
 
-#: ../libempathy/empathy-utils.c:371 ../libempathy/empathy-utils.c:403
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
 msgid "Certificate expired"
 msgstr "証明書�有効期��切れ����"
 
-#: ../libempathy/empathy-utils.c:373 ../libempathy/empathy-utils.c:405
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
 msgid "Certificate not activated"
 msgstr "証明書�利用����ん"
 
-#: ../libempathy/empathy-utils.c:375 ../libempathy/empathy-utils.c:407
+#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
 msgid "Certificate hostname mismatch"
 msgstr "証明書�ホスト��一致���ん"
 
-#: ../libempathy/empathy-utils.c:377 ../libempathy/empathy-utils.c:409
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate fingerprint mismatch"
 msgstr "証明書�指紋�一致���ん"
 
-#: ../libempathy/empathy-utils.c:379 ../libempathy/empathy-utils.c:411
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate self-signed"
 msgstr "証明書自身�署���"
 
-#: ../libempathy/empathy-utils.c:381
+#: ../libempathy/empathy-utils.c:300
 msgid "Certificate error"
 msgstr "証明書�関連�るエラー��"
 
-#: ../libempathy/empathy-utils.c:415
+#: ../libempathy/empathy-utils.c:334
 msgid "Encryption is not available"
 msgstr "暗��利用����ん"
 
-#: ../libempathy/empathy-utils.c:417
+#: ../libempathy/empathy-utils.c:336
 msgid "Certificate is invalid"
 msgstr "証明書�正���り��ん"
 
-#: ../libempathy/empathy-utils.c:419
+#: ../libempathy/empathy-utils.c:338
 msgid "Connection has been refused"
 msgstr "接続�拒��れ���"
 
-#: ../libempathy/empathy-utils.c:421
+#: ../libempathy/empathy-utils.c:340
 msgid "Connection can't be established"
 msgstr "接続を確立����ん���"
 
-#: ../libempathy/empathy-utils.c:423
+#: ../libempathy/empathy-utils.c:342
 msgid "Connection has been lost"
 msgstr "接続�失�れ���"
 
-#: ../libempathy/empathy-utils.c:425
+#: ../libempathy/empathy-utils.c:344
 msgid "This resource is already connected to the server"
-msgstr "��リソース�既�サー��接続済���"
+msgstr "��リソース�既�サー�ー�接続済���"
 
-#: ../libempathy/empathy-utils.c:427
+#: ../libempathy/empathy-utils.c:346
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "接続���リソースを使��新��接続�置���り���"
 
-#: ../libempathy/empathy-utils.c:430
+#: ../libempathy/empathy-utils.c:349
 msgid "The account already exists on the server"
-msgstr "アカウント�サー��既�存在�����"
+msgstr "アカウント�サー�ー�既�存在�����"
 
-#: ../libempathy/empathy-utils.c:432
+#: ../libempathy/empathy-utils.c:351
 msgid "Server is currently too busy to handle the connection"
-msgstr "サー����接続を処������ら��忙��状態��り��"
+msgstr "サー�ー���接続を処������ら��忙��状態��り��"
 
-#: ../libempathy/empathy-utils.c:434
+#: ../libempathy/empathy-utils.c:353
 msgid "Certificate has been revoked"
 msgstr "証明書�無効化�れ���"
 
-#: ../libempathy/empathy-utils.c:436
+#: ../libempathy/empathy-utils.c:355
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "証明書�安全���暗��アルゴリズムを使���る��暗�的�弱���"
 
-#: ../libempathy/empathy-utils.c:439
+#: ../libempathy/empathy-utils.c:358
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr ""
-"サー�証明書�長�や�サー�証明書��ェイン�深��暗�ライブラリ��定�れ"
-"��る長�を越�����"
+"サー�ー証明書�長�や�サー�ー証明書��ェイン�深��暗�ライブラリ��定"
+"�れ��る長�を越�����"
 
-#: ../libempathy/empathy-utils.c:602
+#: ../libempathy/empathy-utils.c:519
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "��近���る人�"
 
-#: ../libempathy/empathy-utils.c:607
+#: ../libempathy/empathy-utils.c:524
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:636
+#: ../libempathy/empathy-utils.c:553
 msgid "Google Talk"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:637
+#: ../libempathy/empathy-utils.c:554
 msgid "Facebook Chat"
 msgstr "Facebook Chat"
 
-#: ../libempathy/empathy-time.c:137
+#: ../libempathy/empathy-time.c:88
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d 秒�"
 
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:93
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分�"
 
-#: ../libempathy/empathy-time.c:147
+#: ../libempathy/empathy-time.c:98
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d 時間�"
 
-#: ../libempathy/empathy-time.c:152
+#: ../libempathy/empathy-time.c:103
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 日�"
 
-#: ../libempathy/empathy-time.c:157
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d 週間�"
 
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:113
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d ヶ月�"
 
-#: ../libempathy/empathy-time.c:167
+#: ../libempathy/empathy-time.c:136
 msgid "in the future"
 msgstr "未��"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:491
-msgid "All"
-msgstr "���"
+#: ../libempathy-gtk/empathy-account-chooser.c:540
+#, fuzzy
+#| msgid "Accounts"
+msgid "All accounts"
+msgstr "アカウント"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../libempathy-gtk/empathy-log-window.c:643
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "アカウント"
 
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "パスワード"
 
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
-msgstr "サー�"
+msgstr "サー�ー"
 
-#: ../libempathy-gtk/empathy-account-widget.c:685
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "�ート番�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:757
-#: ../libempathy-gtk/empathy-account-widget.c:814
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1166
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+#, fuzzy
+#| msgid "Empathy Accounts"
+msgid "My Web Accounts"
+msgstr "Empathy �アカウント"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
+msgid "The account %s is edited via %s."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget.c:1172
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 #, fuzzy
 #| msgid "Empathy Accounts"
 msgid "Launch My Web Accounts"
 msgstr "Empathy �アカウント"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1530
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, fuzzy, c-format
+#| msgid "_Edit"
+msgid "Edit %s"
+msgstr "編集(_E)"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
-msgstr "ユーザ�:"
+msgstr "ユーザー�:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1897
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "�用(_P)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1927
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
 msgstr "ログイン(_O)"
 
-#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1993
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:520
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1481
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "アカウント:"
-
-#. translators: this is the label of a checkbox used to enable/disable IM
-#. * accounts
-#: ../libempathy-gtk/empathy-account-widget.c:2006
-msgid "_Enabled"
-msgstr "サインイン(_E)"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2071
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
-msgstr "��アカウント����サー��存在���"
+msgstr "��アカウント����サー�ー�存在���"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2074
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
-msgstr "サー��新��アカウントを作る"
+msgstr "サー�ー�新��アカウントを作る"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2266
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "中止(_N)"
 
@@ -809,19 +881,19 @@ msgstr "中止(_N)"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2563
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%2$s ��る %1$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2589
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "%s アカウント"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2593
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "新��アカウント"
 
@@ -833,6 +905,7 @@ msgstr "<b>例:</b> MyScreenName"
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -846,7 +919,7 @@ msgstr "詳細"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "Pass_word:"
 msgstr "パスワード(_W):"
@@ -856,7 +929,7 @@ msgstr "パスワード(_W):"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
 #, fuzzy
 #| msgid "Password"
 msgid "Remember Password"
@@ -868,7 +941,7 @@ msgstr "パスワード"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 #: ../libempathy-gtk/empathy-password-dialog.c:311
 msgid "Remember password"
@@ -902,7 +975,7 @@ msgstr "�ート番�(_P):"
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
 #: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
-msgstr "サー�(_S):"
+msgstr "サー�ー(_S):"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
@@ -944,76 +1017,82 @@ msgstr "ICQ UINを入力������"
 msgid "What is your ICQ password?"
 msgstr "ICQ�パスワードを入力������"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:183
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "自動"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:221
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "Register"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:226
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "Options"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Character set:"
 msgstr "文字集�:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Network"
 msgstr "�ットワーク"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Network:"
 msgstr "�ットワーク:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "ニック�ーム:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "パスワード:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "終了時�メッセージ:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "��:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Servers"
-msgstr "サー�"
+msgstr "サー�ー"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "What is your IRC nickname?"
 msgstr "IRC �ニック�ーム�何���?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "�� IRC �ットワーク���?"
 
@@ -1035,7 +1114,7 @@ msgstr "SSL�証明書�関連�るエラー�無視(_G)"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Override server settings"
-msgstr "サー��設定を上書��る"
+msgstr "サー�ー�設定を上書��る"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
 msgid "Priori_ty:"
@@ -1053,12 +1132,12 @@ msgid ""
 "Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
 "Facebook username if you don't have one."
 msgstr ""
-"�れ�����ユーザ���。Facebook �ログイン�る時�入力�るも����り�"
-"�ん。\n"
+"�れ�����ユーザー���。Facebook �ログイン�る時�入力�るも����り"
+"��ん。\n"
 "も����� facebook.com/<b>badger</b> �ら��<b>badger</b> �入力����"
 "��。\n"
 "�����������れ��<a href=\"http://www.facebook.com/username/\">�"
-"�ページ</a>を使�� Facebook �ユーザ�を�択������。"
+"�ページ</a>を使�� Facebook �ユーザー�を�択������。"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "Use old SS_L"
@@ -1070,7 +1149,7 @@ msgstr "���� Facebook �パスワード�何���?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
 msgid "What is your Facebook username?"
-msgstr "���� Facebook �ユーザ��何���?"
+msgstr "���� Facebook �ユーザー��何���?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 msgid "What is your Google ID?"
@@ -1138,7 +1217,7 @@ msgstr "<b>例:</b> user@my.sip.server"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "Authentication username:"
-msgstr "�証用ユーザ�:"
+msgstr "�証用ユーザー�:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
 msgid "Discover Binding"
@@ -1146,63 +1225,72 @@ msgstr "�インディング�探索"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "Discover the STUN server automatically"
-msgstr "STUN サー�を自動的�探索�る"
+msgstr "STUN サー�ーを自動的�探索�る"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "Ignore TLS Errors"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Interval (seconds)"
 msgstr "間隔 (秒)"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
 msgid "Keep-Alive Options"
 msgstr "Keep-Alive オプション"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
 msgid "Loose Routing"
 msgstr "緩�ルーティング"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Mechanism:"
 msgstr "メカニズム:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
 msgid "Miscellaneous Options"
 msgstr "��他�オプション"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 msgid "NAT Traversal Options"
 msgstr "NAT 超�オプション"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 msgid "Port:"
 msgstr "�ート番�:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 msgid "Proxy Options"
 msgstr "プロキシ�オプション"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "STUN Server:"
-msgstr "STUN サー�:"
+msgstr "STUN サー�ー:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.c:347
 msgid "Server:"
-msgstr "サー�:"
+msgstr "サー�ー:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid "Transport:"
 msgstr "トランス�ート:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "SIPアカウント�パスワードを入力������"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "SIP�ログインIDを入力������"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
-msgstr "ユーザ�(_U):"
+msgstr "ユーザー�(_U):"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
 msgid "I_gnore conference and chat room invitations"
@@ -1224,28 +1312,38 @@ msgstr "Yahoo! � ID(_D):"
 msgid "_Room List locale:"
 msgstr "部屋�一覧��る場所(_R):"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:448
-#: ../libempathy-gtk/empathy-avatar-chooser.c:524
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "画�を変�����ん���"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "�付られ�画��形����使��システム�サ�ート�れ����ん"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:930
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+#, fuzzy
+#| msgid "Couldn't convert image"
+msgid "Couldn't save picture to file"
+msgstr "画�を変�����ん���"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "ア�ター�使用�る画���択"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
+msgid "Take a picture..."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "画���"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:995
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "画�ファイル"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:999
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "����ファイル"
 
@@ -1253,57 +1351,92 @@ msgstr "����ファイル"
 msgid "Click to enlarge"
 msgstr "クリック�る�大���り��"
 
-#: ../libempathy-gtk/empathy-chat.c:652
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
+#, fuzzy
+#| msgid "There was an error while creating the account."
+msgid "There was an error starting the call"
+msgstr "アカウント�作�中�エラー�発生����。"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact doesn't support calls"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+#, fuzzy
+#| msgid "The selected contact is offline."
+msgid "The specified contact is offline"
+msgstr "�択��仲間�オフライン��。"
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+#, fuzzy
+#| msgid "The selected contact is offline."
+msgid "The specified contact is not valid"
+msgstr "�択��仲間�オフライン��。"
+
+#: ../libempathy-gtk/empathy-call-utils.c:57
+#, fuzzy
+#| msgid "Topic not supported on this conversation"
+msgid "Emergency calls are not supported on this protocol"
+msgstr "��会話��トピック�サ�ート�れ����ん"
+
+#: ../libempathy-gtk/empathy-chat.c:702
 msgid "Failed to open private chat"
 msgstr "プライベート��ャットを開���ん���"
 
-#: ../libempathy-gtk/empathy-chat.c:717
+#: ../libempathy-gtk/empathy-chat.c:763
 msgid "Topic not supported on this conversation"
 msgstr "��会話��トピック�サ�ート�れ����ん"
 
-#: ../libempathy-gtk/empathy-chat.c:723
+#: ../libempathy-gtk/empathy-chat.c:769
 msgid "You are not allowed to change the topic"
 msgstr "トピック�変更�許��れ����ん"
 
-#: ../libempathy-gtk/empathy-chat.c:906
+#: ../libempathy-gtk/empathy-chat.c:973
+#, fuzzy, c-format
+#| msgid "invalid contact"
+msgid "“%s� is not a valid contact ID"
+msgstr "無効�仲間��"
+
+#: ../libempathy-gtk/empathy-chat.c:1058
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: �在�会話�ら����メッセージをクリア"
 
-#: ../libempathy-gtk/empathy-chat.c:909
+#: ../libempathy-gtk/empathy-chat.c:1061
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <トピック>: �在�会話�トピックを設定"
 
-#: ../libempathy-gtk/empathy-chat.c:912
+#: ../libempathy-gtk/empathy-chat.c:1064
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <�ャットルームID>: 新���ャットルーム��加"
 
-#: ../libempathy-gtk/empathy-chat.c:915
+#: ../libempathy-gtk/empathy-chat.c:1067
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <�ャットルームID>: 新���ャットルーム��加"
 
-#: ../libempathy-gtk/empathy-chat.c:920
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:925
+#: ../libempathy-gtk/empathy-chat.c:1075
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <コンタクトID> [<メッセージ>]: プライベート��ャットを開始"
 
-#: ../libempathy-gtk/empathy-chat.c:928
+#: ../libempathy-gtk/empathy-chat.c:1078
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <コンタクトID> <メッセージ>: プライベート��ャットを開始"
 
-#: ../libempathy-gtk/empathy-chat.c:931
+#: ../libempathy-gtk/empathy-chat.c:1081
 msgid "/nick <nickname>: change your nickname on the current server"
-msgstr "/nick <ニック�ーム>: �在�サー�������ニック�ームを変更"
+msgstr "/nick <ニック�ーム>: �在�サー�ー������ニック�ームを変更"
 
-#: ../libempathy-gtk/empathy-chat.c:934
+#: ../libempathy-gtk/empathy-chat.c:1084
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <メッセージ>: ACTION メッセージを�在�会話��る"
 
-#: ../libempathy-gtk/empathy-chat.c:937
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1313,7 +1446,11 @@ msgstr ""
 "メッセージを�信�る時�使�れ��。例: \"/say /join �新���ャットルーム�"
 "�加�る��使���\""
 
-#: ../libempathy-gtk/empathy-chat.c:942
+#: ../libempathy-gtk/empathy-chat.c:1092
+msgid "/whois <contact ID>: display information about a contact"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1321,98 +1458,114 @@ msgstr ""
 "/help [<コマンド>]: サ�ート�れ��るコマンド���を表示。<コマンド> を指定"
 "��ら���使用方法を表示"
 
-#: ../libempathy-gtk/empathy-chat.c:952
+#: ../libempathy-gtk/empathy-chat.c:1112
 #, c-format
 msgid "Usage: %s"
 msgstr "使�方: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:991
+#: ../libempathy-gtk/empathy-chat.c:1157
 msgid "Unknown command"
 msgstr "�明�コマンド"
 
-#: ../libempathy-gtk/empathy-chat.c:1117
+#: ../libempathy-gtk/empathy-chat.c:1283
 msgid "Unknown command; see /help for the available commands"
 msgstr "�明�コマンド���/help �利用�能�コマンドを表示������"
 
-#: ../libempathy-gtk/empathy-chat.c:1254
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1453
+msgid "insufficient balance to send message"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1455
+msgid "not capable"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1462
 msgid "offline"
 msgstr "オフライン"
 
-#: ../libempathy-gtk/empathy-chat.c:1257
+#: ../libempathy-gtk/empathy-chat.c:1465
 msgid "invalid contact"
 msgstr "無効�仲間��"
 
-#: ../libempathy-gtk/empathy-chat.c:1260
+#: ../libempathy-gtk/empathy-chat.c:1468
 msgid "permission denied"
 msgstr "権���り��ん"
 
-#: ../libempathy-gtk/empathy-chat.c:1263
+#: ../libempathy-gtk/empathy-chat.c:1471
 msgid "too long message"
 msgstr "メッセージ�長����"
 
-#: ../libempathy-gtk/empathy-chat.c:1266
+#: ../libempathy-gtk/empathy-chat.c:1474
 msgid "not implemented"
 msgstr "未実装��"
 
-#: ../libempathy-gtk/empathy-chat.c:1270
+#: ../libempathy-gtk/empathy-chat.c:1478
 msgid "unknown"
 msgstr "原因�明��"
 
-#: ../libempathy-gtk/empathy-chat.c:1274
+#: ../libempathy-gtk/empathy-chat.c:1484
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "'%s' ���メッセージを�信�る際�エラー: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1335 ../src/empathy-chat-window.c:717
+#: ../libempathy-gtk/empathy-chat.c:1488
+#, fuzzy, c-format
+#| msgid "Error sending message '%s': %s"
+msgid "Error sending message: %s"
+msgstr "'%s' ���メッセージを�信�る際�エラー: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1549 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "トピック:"
 
-#: ../libempathy-gtk/empathy-chat.c:1347
+#: ../libempathy-gtk/empathy-chat.c:1561
 #, c-format
 msgid "Topic set to: %s"
 msgstr "新��トピック: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1349
+#: ../libempathy-gtk/empathy-chat.c:1563
 msgid "No topic defined"
 msgstr "トピック��り��ん"
 
-#: ../libempathy-gtk/empathy-chat.c:1848
+#: ../libempathy-gtk/empathy-chat.c:2072
 msgid "(No Suggestions)"
 msgstr "(�案��)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1916
+#: ../libempathy-gtk/empathy-chat.c:2140
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr ""
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1953
+#: ../libempathy-gtk/empathy-chat.c:2177
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2010
+#: ../libempathy-gtk/empathy-chat.c:2247
 msgid "Insert Smiley"
 msgstr "スマイリー�挿入"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2028
-#: ../libempathy-gtk/empathy-ui-utils.c:1808
+#: ../libempathy-gtk/empathy-chat.c:2265
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "�信(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2063
+#: ../libempathy-gtk/empathy-chat.c:2319
 msgid "_Spelling Suggestions"
 msgstr "スペル��案(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2152
+#: ../libempathy-gtk/empathy-chat.c:2408
 msgid "Failed to retrieve recent logs"
 msgstr "最近�ログ��得�失敗����"
 
-#: ../libempathy-gtk/empathy-chat.c:2263
+#: ../libempathy-gtk/empathy-chat.c:2545
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s �切断�れ���"
@@ -1420,12 +1573,12 @@ msgstr "%s �切断�れ���"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2270
+#: ../libempathy-gtk/empathy-chat.c:2552
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s � %2$s �kick�れ���"
 
-#: ../libempathy-gtk/empathy-chat.c:2273
+#: ../libempathy-gtk/empathy-chat.c:2555
 #, c-format
 msgid "%s was kicked"
 msgstr "%s �kick�れ���"
@@ -1433,17 +1586,17 @@ msgstr "%s �kick�れ���"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2281
+#: ../libempathy-gtk/empathy-chat.c:2563
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s � %2$s �BAN�れ���"
 
-#: ../libempathy-gtk/empathy-chat.c:2284
+#: ../libempathy-gtk/empathy-chat.c:2566
 #, c-format
 msgid "%s was banned"
 msgstr "%s �BAN�れ���"
 
-#: ../libempathy-gtk/empathy-chat.c:2288
+#: ../libempathy-gtk/empathy-chat.c:2570
 #, c-format
 msgid "%s has left the room"
 msgstr "%s �ん�部屋�ら退室����"
@@ -1453,111 +1606,148 @@ msgstr "%s �ん�部屋�ら退室����"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2297
+#: ../libempathy-gtk/empathy-chat.c:2579
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2322
+#: ../libempathy-gtk/empathy-chat.c:2604
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s �ん�部屋�入室����"
 
-#: ../libempathy-gtk/empathy-chat.c:2347
+#: ../libempathy-gtk/empathy-chat.c:2629
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s � %s ��り���"
 
-#: ../libempathy-gtk/empathy-chat.c:2486
-#: ../src/empathy-streamed-media-window.c:1953
-#: ../src/empathy-event-manager.c:1126
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2768
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1391
+#: ../src/empathy-call-window.c:1441 ../src/empathy-call-window.c:2479
 msgid "Disconnected"
 msgstr "�通"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3116
+#: ../libempathy-gtk/empathy-chat.c:3415
 msgid "Would you like to store this password?"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:3122
+#: ../libempathy-gtk/empathy-chat.c:3421
 #, fuzzy
 #| msgid "Members"
 msgid "Remember"
 msgstr "メン�ー"
 
-#: ../libempathy-gtk/empathy-chat.c:3132
+#: ../libempathy-gtk/empathy-chat.c:3431
 msgid "Not now"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:3176
+#: ../libempathy-gtk/empathy-chat.c:3475
 msgid "Retry"
 msgstr "�挑戦"
 
-#: ../libempathy-gtk/empathy-chat.c:3180
+#: ../libempathy-gtk/empathy-chat.c:3479
 msgid "Wrong password; please try again:"
 msgstr "パスワード�間��������度挑戦������:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3297
+#: ../libempathy-gtk/empathy-chat.c:3609
 msgid "This room is protected by a password:"
 msgstr "��部屋�パスワード��護�れ����:"
 
-#: ../libempathy-gtk/empathy-chat.c:3324
+#: ../libempathy-gtk/empathy-chat.c:3636
 msgid "Join"
 msgstr "入室�る"
 
-#: ../libempathy-gtk/empathy-chat.c:3494 ../src/empathy-event-manager.c:1147
+#: ../libempathy-gtk/empathy-chat.c:3838 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "オンライン"
 
-#: ../libempathy-gtk/empathy-chat.c:3547
-#: ../libempathy-gtk/empathy-log-window.c:650
+#: ../libempathy-gtk/empathy-chat.c:3893
 msgid "Conversation"
 msgstr "会話"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:422
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:3898
+#, fuzzy, c-format
+#| msgid "%s (%s)"
+msgid "%s (SMS)"
+msgstr "%s (%s)"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
 msgid "Unknown or invalid identifier"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
 msgid "Contact blocking temporarily unavailable"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
 msgid "Contact blocking unavailable"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
 #, fuzzy
 #| msgid "permission denied"
 msgid "Permission Denied"
 msgstr "権���り��ん"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
 msgid "Could not block contact"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:701
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
 #, fuzzy
 #| msgid "Linked Contacts"
 msgid "Edit Blocked Contacts"
 msgstr "リンク中�仲間"
 
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Account:"
+msgstr "アカウント:"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+#, fuzzy
+#| msgid "Linked Contacts"
+msgid "Blocked Contacts"
+msgstr "リンク中�仲間"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+#, fuzzy
+#| msgid "_Remove"
+msgid "Remove"
+msgstr "削除(_R)"
+
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:794
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "リンク先�コピー(_C)"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:801
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "リンクを開�(_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:420
+#: ../libempathy-gtk/empathy-chat-text-view.c:415
 msgid "%A %B %d %Y"
 msgstr "%Yå¹´%B%eæ—¥ %A"
 
@@ -1576,24 +1766,24 @@ msgid "New Contact"
 msgstr "新��仲間"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:199
+#: ../libempathy-gtk/empathy-individual-dialogs.c:200
 #, c-format
 msgid "Block %s?"
 msgstr ""
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:247
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr ""
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
 msgid "_Block"
 msgstr ""
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:278
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] ""
@@ -1618,311 +1808,349 @@ msgstr "グループ無所属"
 msgid "Favorite People"
 msgstr "�気�入り�人�"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2001
-#: ../libempathy-gtk/empathy-individual-view.c:2336
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "本当� '%s' ���グループを削除����?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2003
-#: ../libempathy-gtk/empathy-individual-view.c:2339
+#: ../libempathy-gtk/empathy-contact-list-view.c:1988
+#: ../libempathy-gtk/empathy-individual-view.c:2379
 msgid "Removing group"
 msgstr "グループ�削除"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2052
-#: ../libempathy-gtk/empathy-contact-list-view.c:2129
-#: ../libempathy-gtk/empathy-individual-view.c:2394
-#: ../libempathy-gtk/empathy-individual-view.c:2588
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../libempathy-gtk/empathy-contact-list-view.c:2037
+#: ../libempathy-gtk/empathy-contact-list-view.c:2114
+#: ../libempathy-gtk/empathy-individual-view.c:2434
+#: ../libempathy-gtk/empathy-individual-view.c:2637
 msgid "_Remove"
 msgstr "削除(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2082
-#: ../libempathy-gtk/empathy-individual-view.c:2458
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
+#: ../libempathy-gtk/empathy-individual-view.c:2501
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "本当� '%s' ���仲間を削除����?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2084
-#: ../libempathy-gtk/empathy-individual-view.c:2479
+#: ../libempathy-gtk/empathy-contact-list-view.c:2069
+#: ../libempathy-gtk/empathy-individual-view.c:2522
 msgid "Removing contact"
 msgstr "仲間�削除"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:219
-#: ../src/empathy-main-window.ui.h:13
+#: ../libempathy-gtk/empathy-contact-menu.c:220
+#: ../src/empathy-main-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "仲間�追加(_A)…"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:299
+#: ../libempathy-gtk/empathy-contact-menu.c:300
 #, fuzzy
 #| msgid "_Contact"
 msgid "_Block Contact"
 msgstr "仲間(_C)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:328
-#: ../libempathy-gtk/empathy-individual-menu.c:517
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:329
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "会話(_C)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:359
-#: ../libempathy-gtk/empathy-individual-menu.c:560
+#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "音声�会話(_A)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:390
-#: ../libempathy-gtk/empathy-individual-menu.c:602
+#: ../libempathy-gtk/empathy-contact-menu.c:394
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "映��会話(_V)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:436
-#: ../libempathy-gtk/empathy-individual-menu.c:645
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:440
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "会話�履歴(_P)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:458
-#: ../libempathy-gtk/empathy-individual-menu.c:686
+#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "ファイル��信"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:481
-#: ../libempathy-gtk/empathy-individual-menu.c:728
+#: ../libempathy-gtk/empathy-contact-menu.c:485
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
 msgstr "デスクトップを共有�る"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:521
-#: ../libempathy-gtk/empathy-contact-widget.c:1763
-#: ../libempathy-gtk/empathy-individual-menu.c:763
+#: ../libempathy-gtk/empathy-contact-menu.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:1886
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
 #: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "�気�入り"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:550
-#: ../libempathy-gtk/empathy-individual-menu.c:791
+#: ../libempathy-gtk/empathy-contact-menu.c:554
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "情報(_M)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:596
+#: ../libempathy-gtk/empathy-contact-menu.c:600
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "編集(_E)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:650
-#: ../libempathy-gtk/empathy-individual-menu.c:972
-#: ../src/empathy-chat-window.c:935
+#: ../libempathy-gtk/empathy-contact-menu.c:654
+#: ../libempathy-gtk/empathy-individual-menu.c:1283
+#: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "��部屋�招待���"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:681
-#: ../libempathy-gtk/empathy-individual-menu.c:1019
+#: ../libempathy-gtk/empathy-contact-menu.c:685
+#: ../libempathy-gtk/empathy-individual-menu.c:1329
 msgid "_Invite to Chat Room"
 msgstr "�ャットルーム�招待�る(_I)"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:513
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
 #, fuzzy
 #| msgid "Select a contact"
 msgid "Search contacts"
 msgstr "連絡先��択"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:543
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
 #, fuzzy
 #| msgid "Search"
 msgid "Search: "
 msgstr "検索"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:601
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
 #, fuzzy
 #| msgid "_Add Contact…"
 msgid "_Add Contact"
 msgstr "仲間�追加(_A)…"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:619
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
 #, fuzzy
 #| msgid "No match found"
 msgid "No contacts found"
 msgstr "見��り��ん���"
 
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
+msgstr ""
+
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "連絡先��択"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:295
+#: ../libempathy-gtk/empathy-contact-widget.c:336
 #: ../libempathy-gtk/empathy-individual-widget.c:153
 msgid "Full name:"
 msgstr "��:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:296
+#: ../libempathy-gtk/empathy-contact-widget.c:337
 #: ../libempathy-gtk/empathy-individual-widget.c:154
 msgid "Phone number:"
 msgstr "電話番�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:297
+#: ../libempathy-gtk/empathy-contact-widget.c:338
 #: ../libempathy-gtk/empathy-individual-widget.c:155
 msgid "E-mail address:"
 msgstr "E-メールアドレス:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:298
+#: ../libempathy-gtk/empathy-contact-widget.c:339
 #: ../libempathy-gtk/empathy-individual-widget.c:156
 msgid "Website:"
 msgstr "ウェブサイト:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:299
+#: ../libempathy-gtk/empathy-contact-widget.c:340
 #: ../libempathy-gtk/empathy-individual-widget.c:157
 msgid "Birthday:"
 msgstr "誕生日:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:346
+#, fuzzy
+#| msgid "_Last Name:"
+msgid "Last seen:"
+msgstr "�字(_L):"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:348
+#, fuzzy
+#| msgid "Connected"
+msgid "Connected from:"
+msgstr "オンライン"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:353
+#, fuzzy
+#| msgid "Quit message:"
+msgid "Away message:"
+msgstr "終了時�メッセージ:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+#, fuzzy
+#| msgid "Ca_ncel"
+msgid "Channels:"
+msgstr "中止(_N)"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
 msgstr "ISO�よる国コード:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Country:"
 msgstr "国:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "State:"
 msgstr "連邦・州:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:768
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "City:"
 msgstr "都市:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:770
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Area:"
 msgstr "地域:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:772
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
 msgstr "郵便番�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:774
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Street:"
 msgstr "通り:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:776
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
 msgstr "ビル:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:778
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Floor:"
 msgstr "階:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:780
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Room:"
 msgstr "部屋番�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:782
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Text:"
 msgstr "テキスト:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:784
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Description:"
 msgstr "説明:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:786
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
 msgstr "精度�レベル:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:790
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr "エラー:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:792
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
 msgstr "垂直誤差 (メートル):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:794
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
 msgstr "水平誤差 (メートル):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr "速度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Bearing:"
 msgstr "方�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:800
-#: ../libempathy-gtk/empathy-individual-widget.c:526
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
 msgstr "上昇速度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:802
-#: ../libempathy-gtk/empathy-individual-widget.c:528
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
 msgstr "最後�アップデート�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:804
-#: ../libempathy-gtk/empathy-individual-widget.c:530
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
 msgstr "経度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:806
-#: ../libempathy-gtk/empathy-individual-widget.c:532
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
 msgstr "緯度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:808
-#: ../libempathy-gtk/empathy-individual-widget.c:534
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
 msgstr "高度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:871
-#: ../libempathy-gtk/empathy-contact-widget.c:888
-#: ../libempathy-gtk/empathy-individual-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:633
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "場所"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:890
-#: ../libempathy-gtk/empathy-individual-widget.c:635
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:942
-#: ../libempathy-gtk/empathy-individual-widget.c:684
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
 msgstr "%Yå¹´%B%eæ—¥ %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1024
-#: ../libempathy-gtk/empathy-individual-widget.c:919
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
 msgid "Save Avatar"
 msgstr "ア�ター��存"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1080
-#: ../libempathy-gtk/empathy-individual-widget.c:977
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
 msgid "Unable to save avatar"
 msgstr "ア�ターを�存����ん"
 
@@ -1932,7 +2160,7 @@ msgstr "<b>場所</b> � (date)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1307
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr "別�:"
 
@@ -1952,7 +2180,7 @@ msgstr "仲間�詳細"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "スクリーン�:"
 
@@ -1969,11 +2197,11 @@ msgstr "OS:"
 msgid "Version:"
 msgstr "�ージョン:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:332
+#: ../libempathy-gtk/empathy-groups-widget.c:333
 msgid "Groups"
 msgstr "グループ"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:344
+#: ../libempathy-gtk/empathy-groups-widget.c:345
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -1981,81 +2209,116 @@ msgstr ""
 "��仲間を登録�るグループを�択������ (1�以上�グループを�択��り�"
 "�る��全��択����も構���ん)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:363
+#: ../libempathy-gtk/empathy-groups-widget.c:364
 msgid "_Add Group"
 msgstr "グループ�追加(_A)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:398
+#: ../libempathy-gtk/empathy-groups-widget.c:399
 #, fuzzy
 #| msgid "Select"
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "�択"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1436
+#: ../libempathy-gtk/empathy-groups-widget.c:409
+#: ../src/empathy-main-window.c:1807
 msgid "Group"
 msgstr "グループ"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] ""
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:259
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] ""
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
 msgstr "リンク中�仲間"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:354
+#: ../libempathy-gtk/empathy-individual-linker.c:370
 msgid "Select contacts to link"
 msgstr "リンク�る連絡先��択"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:428
+#: ../libempathy-gtk/empathy-individual-linker.c:444
 msgid "New contact preview"
 msgstr "新��仲間をプレビュー"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:472
+#: ../libempathy-gtk/empathy-individual-linker.c:488
 msgid "Contacts selected in the list on the left will be linked together."
 msgstr "左�一覧��択��仲間�互��リンク�����"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:131
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:839
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr ""
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "発信"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+#, fuzzy
+#| msgid "File"
+msgid "Mobile"
+msgstr "ファイル"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+#, fuzzy
+#| msgid "Word"
+msgid "Work"
+msgstr "�語"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr ""
+
+#. add an SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+msgid "_SMS"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1141
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "編集(_E)"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:865
+#: ../libempathy-gtk/empathy-individual-menu.c:1167
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "仲間をリンク(_L)…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2301
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 msgid "Delete and _Block"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-individual-view.c:2467
+#: ../libempathy-gtk/empathy-individual-view.c:2510
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
 "remove all the contacts which make up this linked contact."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, fuzzy, c-format
 #| msgid "Meta-contact containing %u contact"
 #| msgid_plural "Meta-contact containing %u contacts"
@@ -2092,7 +2355,7 @@ msgstr "�択"
 
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:280
 msgid "new server"
-msgstr "新��サー�"
+msgstr "新��サー�ー"
 
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:535
 msgid "SSL"
@@ -2149,65 +2412,230 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "リンクを外�(_U)"
 
-#: ../libempathy-gtk/empathy-log-window.c:660
-msgid "Date"
-msgstr "日付"
+#: ../libempathy-gtk/empathy-log-window.c:634
+msgid "History"
+msgstr ""
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
-msgstr "会話"
+#: ../libempathy-gtk/empathy-log-window.c:689
+msgid "Show"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:711
+msgid "Search"
+msgstr "検索"
+
+#: ../libempathy-gtk/empathy-log-window.c:1159
+#, fuzzy, c-format
+#| msgid "Call with %s"
+msgid "Chat in %s"
+msgstr "%s�発信"
+
+#: ../libempathy-gtk/empathy-log-window.c:1161
+#, fuzzy, c-format
+#| msgid "Call with %s"
+msgid "Chat with %s"
+msgstr "%s�発信"
+
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
+#, fuzzy
+#| msgid "%A %B %d %Y"
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%Yå¹´%B%eæ—¥ %A"
+
+#. Translators: this is an emote: '* Danielle waves'
+#: ../libempathy-gtk/empathy-log-window.c:1300
+#, c-format
+msgid "<i>* %s %s</i>"
+msgstr ""
+
+#. Translators: this is a message: 'Danielle: hello'
+#. * The string in bold is the sender's name
+#: ../libempathy-gtk/empathy-log-window.c:1306
+#, fuzzy, c-format
+#| msgid "<b>Topic:</b>"
+msgid "<b>%s:</b> %s"
+msgstr "<b>トピック:</b>"
+
+#: ../libempathy-gtk/empathy-log-window.c:1382
+#, fuzzy, c-format
+#| msgid "%d second ago"
+#| msgid_plural "%d seconds ago"
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%d 秒�"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, fuzzy, c-format
+#| msgid "%d minute ago"
+#| msgid_plural "%d minutes ago"
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%d 分�"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:1729
+msgid "Today"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:1733
+#, fuzzy
+#| msgid "Western"
+msgid "Yesterday"
+msgstr "西欧"
+
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
+#, fuzzy
+#| msgid "%A %B %d %Y"
+msgid "%e %B %Y"
+msgstr "%Yå¹´%B%eæ—¥ %A"
+
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3425
+msgid "Anytime"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2353
+#, fuzzy
+#| msgid "None"
+msgid "Anyone"
+msgstr "��"
+
+#: ../libempathy-gtk/empathy-log-window.c:2666
+msgid "Who"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:2870
+msgid "When"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:2986
+msgid "Anything"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:2988
+#, fuzzy
+#| msgid "Set status"
+msgid "Text chats"
+msgstr "状態を設定"
+
+#: ../libempathy-gtk/empathy-log-window.c:2990
+#: ../src/empathy-preferences.ui.h:4
+#, fuzzy
+#| msgid "Call"
+msgid "Calls"
+msgstr "発信"
+
+#: ../libempathy-gtk/empathy-log-window.c:2995
+#, fuzzy
+#| msgid "Incoming call"
+msgid "Incoming calls"
+msgstr "�信��り��"
+
+#: ../libempathy-gtk/empathy-log-window.c:2996
+#, fuzzy
+#| msgid "Outgoing voice call"
+msgid "Outgoing calls"
+msgstr "音声�呼����"
+
+#: ../libempathy-gtk/empathy-log-window.c:2997
+#, fuzzy
+#| msgid "Incoming call from %s"
+msgid "Missed calls"
+msgstr "%s �ん�ら�呼�出���"
+
+#: ../libempathy-gtk/empathy-log-window.c:3019
+#, fuzzy
+#| msgid "Chat"
+msgid "What"
+msgstr "�ャット"
+
+#: ../libempathy-gtk/empathy-log-window.c:3728
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:3732
+#, fuzzy
+#| msgid "C_lear"
+msgid "Clear All"
+msgstr "クリア(_L)"
+
+#: ../libempathy-gtk/empathy-log-window.c:3739
+msgid "Delete from:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr ""
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "次を検索"
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Chat"
+msgstr "�ャット"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "�を検索"
+msgid "Delete All History..."
+msgstr ""
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr "会話�履歴"
+msgid "Profile"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Video"
+msgstr "映�"
 
-#. Tab Label
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "検索"
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:20
+msgid "_Edit"
+msgstr "編集(_E)"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+#, fuzzy
+#| msgid "File"
+msgid "_File"
+msgstr "ファイル"
 
-#. Searching *for* something
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "検索�る文字(_F):"
+msgid "page 2"
+msgstr ""
 
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
 msgid "Contact ID:"
 msgstr "仲間� ID:"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:171
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
 msgid "C_hat"
 msgstr "�ャット(_H)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:181
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
 msgstr "新��会話"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:253
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
 msgid "Send _Video"
 msgstr "映���信(_V)"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:261
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
 msgid "C_all"
 msgstr "呼�出�(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:271
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "New Call"
 msgstr "新�呼出"
 
@@ -2224,34 +2652,34 @@ msgstr ""
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Message…"
 msgstr "独自�メッセージ…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messages…"
 msgstr "独自�メッセージを編集…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
 msgstr "�気�入り�状態�ら解除�る��クリック���"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
 msgstr "��状態を�気�入り��る��クリック���"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
 msgstr "状態を設定"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:946
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
 msgid "Set your presence and current status"
 msgstr "在席中���在�状態を設定�る"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1134
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
 msgid "Custom messages…"
 msgstr "独自�メッセージ…"
 
@@ -2264,18 +2692,30 @@ msgstr "独自�メッセージ…"
 msgid "New %s account"
 msgstr "新�� %s �ん�アカウント"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "検索:"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+#, fuzzy
+#| msgid "Match case"
+msgid "Mat_ch case"
 msgstr "大文字�文字を区別��一致"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
 msgid "Phrase not found"
 msgstr "フレーズ�見��り��ん���"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "_Next"
+msgstr "次�(_N)"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+#, fuzzy
+#| msgid "_Previous Tab"
+msgid "_Previous"
+msgstr "��タブ�(_P)"
+
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
 msgstr "インスタント・メッセージを�信��"
@@ -2298,11 +2738,11 @@ msgstr "仲間�サインアウト��"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:61
 msgid "Connected to server"
-msgstr "サー��接続��"
+msgstr "サー�ー�接続��"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:63
 msgid "Disconnected from server"
-msgstr "サー��接続を断��"
+msgstr "サー�ー�接続を断��"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:65
 msgid "Incoming voice call"
@@ -2316,37 +2756,35 @@ msgstr "音声�呼����"
 msgid "Voice call ended"
 msgstr "音声�会話�終了��"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "独自�メッセージを入力"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
 msgstr "独自�メッセージを編集"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr ""
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#, fuzzy, c-format
+#| msgid "Message received"
+msgid "Message edited at %s"
+msgstr "メッセージを�信��"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
 #, fuzzy
-#| msgid "Edit Custom Messages"
-msgid "Saved Status Messages"
-msgstr "独自�メッセージを編集"
+#| msgid "N_ormal Size"
+msgid "Normal"
+msgstr "ア�ター���通常サイズ(_O)"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "クラッシック"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "シンプル"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "クリーン"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "ブルー"
 
@@ -2354,7 +2792,7 @@ msgstr "ブルー"
 #, fuzzy
 #| msgid "The identity provided by the chat server cannot be verified.\n"
 msgid "The identity provided by the chat server cannot be verified."
-msgstr "�ャットサー��ら�供�れるアイデンティティを検証����ん。\n"
+msgstr "�ャットサー�ー�ら�供�れるアイデンティティを検証����ん。\n"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:157
 #, fuzzy
@@ -2385,7 +2823,7 @@ msgstr "証明書�期待��フィンガープリント���り��ん
 #| msgid ""
 #| "The hostname verified by the certificate doesn't match the server name"
 msgid "The hostname verified by the certificate doesn't match the server name."
-msgstr "証明書�検証�れ�ホスト��サー����一致���ん"
+msgstr "証明書�検証�れ�ホスト��サー�ー���一致���ん"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:174
 #, fuzzy
@@ -2445,26 +2883,26 @@ msgstr "���択を将��接続�も記憶�る"
 msgid "Certificate Details"
 msgstr "証明書�詳細"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1705
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
 msgstr "URI を開���ん"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1800
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
 msgstr "ファイル��択"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
 msgid "Insufficient free space to save file"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1924
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid "Incoming file from %s"
 msgstr "%s �ん�ら�られ���ファイル"
@@ -2652,23 +3090,23 @@ msgstr "エラーメッセージ��"
 msgid "Instant Message (Empathy)"
 msgstr "インスタント メッセージ (Empathy)"
 
-#: ../src/empathy.c:308
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "起動��ら自動的�サインイン���"
 
-#: ../src/empathy.c:312
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "起動時�仲間リストや他�ダイアログを表示���"
 
-#: ../src/empathy.c:320
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr "- Empathy インスタント・メッセンジャー"
 
-#: ../src/empathy.c:499
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
 msgstr ""
 
-#: ../src/empathy.c:501
+#: ../src/empathy.c:639
 #, fuzzy, c-format
 #| msgid "There was an error while parsing the account details."
 msgid ""
@@ -2818,8 +3256,8 @@ msgid "Select the accounts you want to import:"
 msgstr "イン�ート���アカウントを�択���:"
 
 #: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "Yes"
 msgstr "��"
 
@@ -2895,34 +3333,35 @@ msgstr "�存�れ���　%s アカウント��変更��り��。
 msgid "Your new account has not been saved yet."
 msgstr "����新��アカウント����存�れ����ん。"
 
-#: ../src/empathy-accounts-dialog.c:286
-#: ../src/empathy-streamed-media-window.c:809
+#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1175
 msgid "Connecting…"
 msgstr "接続中…"
 
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:386
 #, c-format
 msgid "Offline — %s"
 msgstr "オフライン — %s"
 
-#: ../src/empathy-accounts-dialog.c:339
+#: ../src/empathy-accounts-dialog.c:398
 #, c-format
 msgid "Disconnected — %s"
 msgstr "切断 - %s"
 
-#: ../src/empathy-accounts-dialog.c:350
+#: ../src/empathy-accounts-dialog.c:409
 msgid "Offline — No Network Connection"
 msgstr "オフライン - �ットワーク接続��り��ん"
 
-#: ../src/empathy-accounts-dialog.c:357
+#: ../src/empathy-accounts-dialog.c:416
 msgid "Unknown Status"
 msgstr "�明�状態"
 
-#: ../src/empathy-accounts-dialog.c:369
+#: ../src/empathy-accounts-dialog.c:428
 msgid "Offline — Account Disabled"
 msgstr "オフライン - アカウント�無効"
 
-#: ../src/empathy-accounts-dialog.c:772
+#: ../src/empathy-accounts-dialog.c:831
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2930,16 +3369,16 @@ msgstr ""
 "変更を破棄��新��アカウントを生��よ�������。\n"
 "本当�継続����?"
 
-#: ../src/empathy-accounts-dialog.c:1133
+#: ../src/empathy-accounts-dialog.c:1192
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "コンピューター�ら %s を削除����?"
 
-#: ../src/empathy-accounts-dialog.c:1137
+#: ../src/empathy-accounts-dialog.c:1196
 msgid "This will not remove your account on the server."
 msgstr "�れ�よ���サー�ー�らアカウント�削除�れる����り��ん。"
 
-#: ../src/empathy-accounts-dialog.c:1375
+#: ../src/empathy-accounts-dialog.c:1432
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2948,19 +3387,19 @@ msgstr ""
 "本当�継続����?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1593
+#: ../src/empathy-accounts-dialog.c:1643
 #, fuzzy
 #| msgid "_Enabled"
 msgid "_Enable"
 msgstr "サインイン(_E)"
 
-#: ../src/empathy-accounts-dialog.c:1594
+#: ../src/empathy-accounts-dialog.c:1644
 #, fuzzy
 #| msgid "_Enabled"
 msgid "_Disable"
 msgstr "サインイン(_E)"
 
-#: ../src/empathy-accounts-dialog.c:2113
+#: ../src/empathy-accounts-dialog.c:2154
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2969,18 +3408,24 @@ msgstr ""
 "本当�継続����?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
+#, fuzzy
+#| msgid "_Add…"
+msgid "Add…"
+msgstr "追加(_A)…"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
 msgid "Loading account information"
 msgstr "アカウント�情報を読�込�中"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "No protocol installed"
 msgstr "プロトコル�インストール�れ����ん"
 
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Protocol:"
 msgstr "プロトコル:"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -2988,19 +3433,15 @@ msgstr ""
 "新��アカウントを登録�る�����最��利用�るプロトコル��ックエンドを"
 "インストール���������。"
 
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add…"
-msgstr "追加(_A)…"
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Import…"
 msgstr "イン�ート(_I)…"
 
-#: ../src/empathy-auth-client.c:250
+#: ../src/empathy-auth-client.c:249
 msgid " - Empathy authentication client"
 msgstr " - Empathy �証クライアント"
 
-#: ../src/empathy-auth-client.c:266
+#: ../src/empathy-auth-client.c:265
 msgid "Empathy authentication client"
 msgstr "Empathy �証クライアント"
 
@@ -3008,112 +3449,144 @@ msgstr "Empathy �証クライアント"
 msgid "People nearby"
 msgstr "��近���る人�"
 
-#: ../src/empathy-av.c:118
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathy 音声/映�クライアント"
 
-#: ../src/empathy-av.c:134
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy 音声/映�クライアント"
 
-#: ../src/empathy-streamed-media-window.c:479
+#: ../src/empathy-streamed-media-window.c:431
 msgid "Contrast"
 msgstr "コントラスト"
 
-#: ../src/empathy-streamed-media-window.c:482
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Brightness"
 msgstr "明る�"
 
-#: ../src/empathy-streamed-media-window.c:485
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Gamma"
 msgstr "ガンマ"
 
-#: ../src/empathy-streamed-media-window.c:590
+#: ../src/empathy-streamed-media-window.c:542
 msgid "Volume"
 msgstr "音�"
 
-#: ../src/empathy-streamed-media-window.c:1166
+#: ../src/empathy-streamed-media-window.c:1110
 msgid "_Sidebar"
 msgstr "サイド�ー(_S)"
 
-#: ../src/empathy-streamed-media-window.c:1186
+#: ../src/empathy-streamed-media-window.c:1130
 msgid "Audio input"
 msgstr "音声"
 
-#: ../src/empathy-streamed-media-window.c:1190
+#: ../src/empathy-streamed-media-window.c:1134
 msgid "Video input"
 msgstr "映�"
 
-#: ../src/empathy-streamed-media-window.c:1194
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Dialpad"
 msgstr "ダイアルパッド"
 
-#: ../src/empathy-streamed-media-window.c:1205
+#: ../src/empathy-streamed-media-window.c:1151
 msgid "Details"
 msgstr "詳細"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1274
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1782
 #, c-format
 msgid "Call with %s"
 msgstr "%s�発信"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-streamed-media-window.c:1353
-msgid "Call"
-msgstr "発信"
-
-#: ../src/empathy-streamed-media-window.c:1507
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:2026
 msgid "The IP address as seen by the machine"
 msgstr "��マシン�見���IPアドレス"
 
-#: ../src/empathy-streamed-media-window.c:1509
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:2028
 msgid "The IP address as seen by a server on the Internet"
-msgstr "インター�ット上�サー��見���IPアドレス"
+msgstr "インター�ット上�サー�ー�見���IPアドレス"
 
-#: ../src/empathy-streamed-media-window.c:1511
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:2030
 msgid "The IP address of the peer as seen by the other side"
 msgstr "も�一方����見���ピア�IPアドレス"
 
-#: ../src/empathy-streamed-media-window.c:1513
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:2032
 msgid "The IP address of a relay server"
-msgstr "リレーサー��IPアドレス"
+msgstr "リレーサー�ー�IPアドレス"
 
-#: ../src/empathy-streamed-media-window.c:1515
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:2034
 msgid "The IP address of the multicast group"
 msgstr "マル�キャストグループ�IPアドレス"
 
+#: ../src/empathy-streamed-media-window.c:1843
+#, fuzzy
+#| msgid "Unknown"
+msgctxt "encoding video codec"
+msgid "Unknown"
+msgstr "�明"
+
+#: ../src/empathy-streamed-media-window.c:1846
+#, fuzzy
+#| msgid "Unknown"
+msgctxt "encoding audio codec"
+msgid "Unknown"
+msgstr "�明"
+
+#: ../src/empathy-streamed-media-window.c:1849
+#, fuzzy
+#| msgid "Unknown"
+msgctxt "decoding video codec"
+msgid "Unknown"
+msgstr "�明"
+
+#: ../src/empathy-streamed-media-window.c:1852
+#, fuzzy
+#| msgid "Unknown"
+msgctxt "decoding audio codec"
+msgid "Unknown"
+msgstr "�明"
+
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2270
+#: ../src/empathy-streamed-media-window.c:2144
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "接続���� — %d分%02d秒"
 
-#: ../src/empathy-streamed-media-window.c:2331
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2798
 msgid "Technical Details"
 msgstr "技術的�詳細"
 
-#: ../src/empathy-streamed-media-window.c:2369
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2836
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr ""
-"%s �ソフトウェア�����コンピュータ�サ�ート�れ��る��音声形�も�解"
-"����ん"
+"%s �ソフトウェア�����コンピューター�サ�ート�れ��る��音声形�も�"
+"解����ん"
 
-#: ../src/empathy-streamed-media-window.c:2374
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2841
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr ""
-"%s �ソフトウェア�����コンピュータ�サ�ート�れ��る��映�形�も�解"
-"����ん"
+"%s �ソフトウェア�����コンピューター�サ�ート�れ��る��映�形�も�"
+"解����ん"
 
-#: ../src/empathy-streamed-media-window.c:2380
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2847
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3122,25 +3595,29 @@ msgstr ""
 "%s ��接続を確立����ん���。�ットワーク上���ら��直接接続を許��"
 "れ������も�れ��ん。"
 
-#: ../src/empathy-streamed-media-window.c:2386
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2853
 msgid "There was a failure on the network"
 msgstr "�ットワーク��題�発生����"
 
-#: ../src/empathy-streamed-media-window.c:2390
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2857
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
-"��呼�出��必��音声形������コンピュータ�インストール�れ����"
-"ã‚“"
+"��呼�出��必��音声形������コンピューター�インストール�れ���"
+"�ん"
 
-#: ../src/empathy-streamed-media-window.c:2393
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2860
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
-"��呼�出��必��映�形������コンピュータ�インストール�れ����"
-"ã‚“"
+"��呼�出��必��映�形������コンピューター�インストール�れ���"
+"�ん"
 
-#: ../src/empathy-streamed-media-window.c:2403
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2872
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3151,143 +3628,213 @@ msgstr ""
 "��具�を報告</a>������。��時��ヘルプメニュー�　'デ�ッグ' ウィン"
 "ドウ�集��ログを添付������。"
 
-#: ../src/empathy-streamed-media-window.c:2411
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2881
 msgid "There was a failure in the call engine"
 msgstr "呼�出�エンジン��題�発生����"
 
-#: ../src/empathy-streamed-media-window.c:2414
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2884
 msgid "The end of the stream was reached"
 msgstr "ストリーム�終端�到�����"
 
-#: ../src/empathy-streamed-media-window.c:2454
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2924
 msgid "Can't establish audio stream"
 msgstr "音声ストリームを確立����ん"
 
-#: ../src/empathy-streamed-media-window.c:2464
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2934
 msgid "Can't establish video stream"
 msgstr "映�ストリームを確立����ん"
 
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "Audio"
 msgstr "音声"
 
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "仲間を�度呼�出�"
-
 #: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "カメラ切"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "デコード用コーデック:"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "カメラ入"
+#, fuzzy
+#| msgid "_Enabled"
+msgid "Disable camera"
+msgstr "サインイン(_E)"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "デコード用コーデック:"
+msgid "Display the dialpad"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "カメラを無効���映���信を中止"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "エンコード�るコーデック:"
 
 #: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "カメラを有効���映�を�る"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Hang up"
+msgstr "接続を切る"
 
 #: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "カメラを有効��る�映�を�ら��"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Hang up current call"
+msgstr "�在�通話を止�る"
 
 #: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "エンコード�るコーデック:"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "ローカル�候補:"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "接続を切る"
+msgid "Maximise me"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr "�在�通話を止�る"
+msgid "Minimise me"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "ローカル�候補:"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "リモート�候補:"
 
 #: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "プレビュー"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Send Audio"
+msgstr "音声��信"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "リダイアル"
+#, fuzzy
+#| msgid "Send _Video"
+msgid "Send Video"
+msgstr "映���信(_V)"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "リモート�候補:"
+#, fuzzy
+#| msgid "Dialpad"
+msgid "Show dialpad"
+msgstr "ダイアルパッド"
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "音声��信"
+msgid "Start a video call"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "音声�転�をオン・オフ"
+msgid "Start an audio call"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:18
+msgid "Swap camera"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "映�(_I)"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr "音声�転�をオン・オフ"
 
 #: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "映�"
+#, fuzzy
+#| msgid "Toggle audio transmission"
+msgid "Toggle video transmission"
+msgstr "音声�転�をオン・オフ"
 
 #: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "映�切"
-
-#: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "映�入"
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:2431 ../src/empathy-call-window.c:2432
+#: ../src/empathy-call-window.c:2433 ../src/empathy-call-window.c:2434
+msgid "Unknown"
+msgstr "�明"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "映��プレビュー"
+#, fuzzy
+#| msgctxt "menu item"
+#| msgid "_Video Call"
+msgid "Video call"
+msgstr "映��会話(_V)"
 
 #: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "呼�出�(_C)"
 
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:25
+#, fuzzy
+#| msgid "Camera On"
+msgid "_Camera"
+msgstr "カメラ入"
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:18
+msgid "_Contents"
+msgstr "目次(_C)"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
+msgid "_Debug"
+msgstr "デ�ッグ(_D)"
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:22
+msgid "_Help"
+msgstr "ヘルプ(_H)"
+
+#: ../src/empathy-call-window.ui.h:30
+#, fuzzy
+#| msgid "Megaphone"
+msgid "_Microphone"
+msgstr "メガホン"
+
+#: ../src/empathy-call-window.ui.h:31
+#, fuzzy
+#| msgid "<b>Settings</b>"
+msgid "_Settings"
+msgstr "<b>設定</b>"
+
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "表示(_V)"
 
-#: ../src/empathy-chat-window.c:474 ../src/empathy-chat-window.c:494
+#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (未読 %d)"
 
-#: ../src/empathy-chat-window.c:486
+#: ../src/empathy-chat-window.c:493
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (他� %u)"
 
-#: ../src/empathy-chat-window.c:502
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (他�ら %d �未読)"
 
-#: ../src/empathy-chat-window.c:511
+#: ../src/empathy-chat-window.c:518
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (未読�全部� %d)"
 
-#: ../src/empathy-chat-window.c:721
+#: ../src/empathy-chat-window.c:733
+msgid "SMS:"
+msgstr ""
+
+#: ../src/empathy-chat-window.c:743
+#, fuzzy, c-format
+#| msgid "Typing a message."
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "メッセージを入力�����"
+
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
 msgstr "メッセージを入力�����"
 
@@ -3299,10 +3846,6 @@ msgstr "クリア(_L)"
 msgid "C_ontact"
 msgstr "仲間(_O)"
 
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "�ャット"
-
 #: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
 msgstr "スマイリー�挿入(_S)"
@@ -3323,10 +3866,6 @@ msgstr "タブを��移動(_R)"
 msgid "Notify for All Messages"
 msgstr "����メッセージを通知"
 
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
-msgid "_Contents"
-msgstr "目次(_C)"
-
 #: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "会話(_C)"
@@ -3335,18 +3874,10 @@ msgstr "会話(_C)"
 msgid "_Detach Tab"
 msgstr "タブ��り外�(_D)"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
-msgid "_Edit"
-msgstr "編集(_E)"
-
 #: ../src/empathy-chat-window.ui.h:13
 msgid "_Favorite Chat Room"
 msgstr "�気�入り��ャットルーム(_F)"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
-msgid "_Help"
-msgstr "ヘルプ(_H)"
-
 #: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "次�タブ�(_N)"
@@ -3367,15 +3898,15 @@ msgstr "タブ(_T)"
 msgid "_Undo Close Tab"
 msgstr "閉��タブを戻�(_U)"
 
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "��"
 
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
 msgstr "部屋"
 
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "自動サインイン"
 
@@ -3383,93 +3914,99 @@ msgstr "自動サインイン"
 msgid "Manage Favorite Rooms"
 msgstr "�気�入り�部屋"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming video call"
 msgstr "映��呼���られ�"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1408
 msgid "Incoming call"
 msgstr "�信��り��"
 
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:525
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s �ん�ら�映���信����応答����?"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s �ん�ら��信����応答����?"
 
-#: ../src/empathy-event-manager.c:515 ../src/empathy-event-manager.c:667
+#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1414
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s �ん�ら�呼�出���"
 
-#: ../src/empathy-event-manager.c:540
+#: ../src/empathy-event-manager.c:554
 msgid "_Reject"
 msgstr "拒��る(_R)"
 
-#: ../src/empathy-event-manager.c:546
+#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
 msgid "_Answer"
 msgstr "応答�る(_A)"
 
-#: ../src/empathy-event-manager.c:667
+#: ../src/empathy-event-manager.c:570
+msgid "_Answer with video"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1414
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "%s �ん�ら�映���呼�出���"
 
-#: ../src/empathy-event-manager.c:744
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
 msgstr "�ャットルーム��招待"
 
-#: ../src/empathy-event-manager.c:746
+#: ../src/empathy-event-manager.c:838
 #, c-format
 msgid "Invitation to join %s"
 msgstr "%s ���加�招待"
 
-#: ../src/empathy-event-manager.c:753
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s �ん����を %s �招待�����"
 
-#: ../src/empathy-event-manager.c:761
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
 msgstr "�断り�る(_D)"
 
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "�加�る(_J)"
 
-#: ../src/empathy-event-manager.c:793
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s �ん����を %s �招待����"
 
-#: ../src/empathy-event-manager.c:799
+#: ../src/empathy-event-manager.c:891
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "���� %s ���加�招待を���り���"
 
-#: ../src/empathy-event-manager.c:850
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "%s �ん�らファイル転���知ら���"
 
-#: ../src/empathy-event-manager.c:1020 ../src/empathy-main-window.c:370
+#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
 #, fuzzy
 #| msgid "Password"
 msgid "Password required"
 msgstr "パスワード"
 
-#: ../src/empathy-event-manager.c:1076
+#: ../src/empathy-event-manager.c:1190
 #, fuzzy, c-format
 #| msgid "%s would like to send you a file"
 msgid "%s would like permission to see when you are online"
 msgstr "%s �ん�����ファイルを�信���よ���"
 
-#: ../src/empathy-event-manager.c:1080
+#: ../src/empathy-event-manager.c:1194
 #, c-format
 msgid ""
 "\n"
@@ -3479,105 +4016,105 @@ msgstr ""
 "メッセージ: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:100
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:102
+#: ../src/empathy-ft-manager.c:103
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:179
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "�明"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s / %s � %s/s"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:275
 #, c-format
 msgid "%s of %s"
 msgstr "%s / %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:305
+#: ../src/empathy-ft-manager.c:306
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "\"%s\" を %s �ん�ら�信中"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:309
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "\"%s\" �ら %s ��信中"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:338
+#: ../src/empathy-ft-manager.c:339
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "\"%s\" を %s �ら�信エラー"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:342
 msgid "Error receiving a file"
 msgstr "ファイル�信エラー"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:347
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "\"%s\" � %s ���信エラー"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:350
 msgid "Error sending a file"
 msgstr "ファイル転�エラー"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:489
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" を %s �ん�ら�信����"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:493
+#: ../src/empathy-ft-manager.c:494
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" を %s �ん��信���"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:497
 msgid "File transfer completed"
 msgstr "ファイル�転��完了����"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
 msgid "Waiting for the other participant's response"
 msgstr "他��加者�応答を待�����"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "\"%s\" �完全性を�ェック�����"
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "�ッシュ計算中 \"%s\""
 
-#: ../src/empathy-ft-manager.c:1016
+#: ../src/empathy-ft-manager.c:1026
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1028
+#: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "ファイル"
 
-#: ../src/empathy-ft-manager.c:1050
+#: ../src/empathy-ft-manager.c:1060
 msgid "Remaining"
 msgstr "残り"
 
@@ -3614,135 +4151,150 @@ msgstr "プロトコル"
 msgid "Source"
 msgstr "�供元"
 
-#: ../src/empathy-main-window.c:387
+#: ../src/empathy-main-window.c:392
 #, fuzzy
 #| msgid "Password"
 msgid "Provide Password"
 msgstr "パスワード"
 
-#: ../src/empathy-main-window.c:393
+#: ../src/empathy-main-window.c:398
 #, fuzzy
 #| msgid "Disconnected"
 msgid "Disconnect"
 msgstr "�通"
 
-#: ../src/empathy-main-window.c:533
+#: ../src/empathy-main-window.c:622
 msgid "No match found"
 msgstr "見��り��ん���"
 
-#: ../src/empathy-main-window.c:688
+#: ../src/empathy-main-window.c:777
 msgid "Reconnect"
 msgstr "�接続"
 
-#: ../src/empathy-main-window.c:694
+#: ../src/empathy-main-window.c:783
 msgid "Edit Account"
 msgstr "アカウント�編集"
 
-#: ../src/empathy-main-window.c:700
+#: ../src/empathy-main-window.c:789
 msgid "Close"
 msgstr "閉�る"
 
-#: ../src/empathy-main-window.c:1418
+#. Translators: this string will be something like:
+#. *   Top up My Account ($1.23)..."
+#: ../src/empathy-main-window.c:928
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr ""
+
+#: ../src/empathy-main-window.c:975
+#, fuzzy
+#| msgid "Salut account is created"
+msgid "Top up account credit"
+msgstr "Salut �アカウントを生��る����"
+
+#. top up button
+#: ../src/empathy-main-window.c:1046
+msgid "Top Up..."
+msgstr ""
+
+#: ../src/empathy-main-window.c:1789
 msgid "Contact"
 msgstr "仲間"
 
-#: ../src/empathy-main-window.c:1765
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "仲間リスト"
 
-#: ../src/empathy-main-window.c:1881
-msgid "Show and edit accounts"
-msgstr "アカウント�一覧を表示��編集���"
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "地図上�仲間(_M)"
 
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-main-window-menubar.ui.h:2
+msgid "Credit Balance"
+msgstr ""
+
+#: ../src/empathy-main-window-menubar.ui.h:3
 #, fuzzy
 #| msgid "Contact List"
 msgid "Find in Contact _List"
 msgstr "仲間リスト"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "�気�入り�追加(_F)"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "�気�入り�管�"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "ア�ター���通常サイズ(_O)"
 
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "新��呼�出�(_C)…"
 
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "ア�ター�り�通常サイズ(_A)"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "設定(_R)"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "プロトコル�表示(_R)"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "��順�並�替�(_N)"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "状態�並�替�(_S)"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "アカウント(_A)"
 
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:15
 #, fuzzy
 #| msgid "Linked Contacts"
 msgid "_Blocked Contacts"
 msgstr "リンク中�仲間"
 
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "コンパクトサイズ(_C)"
 
-#: ../src/empathy-main-window.ui.h:18
-msgid "_Debug"
-msgstr "デ�ッグ(_D)"
-
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "ファイル転�(_F)"
 
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "�加(_J)…"
 
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "新��会話(_N)…"
 
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "オフライン�仲間を表示(_O)"
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "個人情報(_P)"
 
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "部屋(_R)"
 
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window-menubar.ui.h:29
 #, fuzzy
 #| msgctxt "Link individual (contextual menu)"
 #| msgid "_Link Contacts…"
@@ -3759,7 +4311,7 @@ msgstr "メン�ー"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:560
+#: ../src/empathy-new-chatroom-dialog.c:553
 #, c-format
 msgid ""
 "%s\n"
@@ -3772,16 +4324,16 @@ msgstr ""
 "パスワード�必�: %s\n"
 "メン�ー数: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "No"
 msgstr "���"
 
-#: ../src/empathy-new-chatroom-dialog.c:591
+#: ../src/empathy-new-chatroom-dialog.c:584
 msgid "Could not start room listing"
 msgstr "部屋リスト�作�を開始����ん"
 
-#: ../src/empathy-new-chatroom-dialog.c:601
+#: ../src/empathy-new-chatroom-dialog.c:594
 msgid "Could not stop room listing"
 msgstr "部屋リスト�作�を�止����ん"
 
@@ -3801,8 +4353,8 @@ msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
 msgstr ""
-"��部屋を�供���るサー�を入力�る�������部屋��在利用���る"
-"サー���る場��空����������"
+"��部屋を�供���るサー�ーを入力�る�������部屋��在利用���る"
+"サー�ー��る場��空����������"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid "Join Room"
@@ -3816,39 +4368,85 @@ msgstr "部屋�一覧"
 msgid "_Room:"
 msgstr "部屋(_R):"
 
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr "メッセージを�信��"
 
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr "メッセージを�信��"
 
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
 msgstr "新��会話を始��"
 
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
 msgstr "仲間�サインイン��"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
 msgstr "仲間�サインアウト��"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
 msgstr "自分�サインイン��"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
 msgstr "自分�サインアウト��"
 
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr "言語"
 
-#: ../src/empathy-preferences.c:875
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:734
+#, fuzzy
+#| msgid "Client:"
+msgid "Juliet"
+msgstr "クライアント:"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:741
+#, fuzzy
+#| msgid "Room"
+msgid "Romeo"
+msgstr "部屋"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:747
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:750
+msgid "Deny thy father and refuse thy name;"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:753
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:756
+msgid "And I'll no longer be a Capulet."
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:759
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:762
+#, fuzzy
+#| msgid "%s has disconnected"
+msgid "Juliet has disconnected"
+msgstr "%s �切断�れ���"
+
+#: ../src/empathy-preferences.c:1166
 msgid "Preferences"
 msgstr "設定"
 
@@ -3856,67 +4454,83 @@ msgstr "設定"
 msgid "Appearance"
 msgstr "外観"
 
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
 msgstr "挙動"
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
 msgid "Chat Th_eme:"
 msgstr "テーマ(_E):"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
 msgid "Disable notifications when _away or busy"
 msgstr "離席中����ら通知を無効��る(_A)"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
 msgid "Disable sounds when _away or busy"
 msgstr "離席中����らサウンド�演�を無効��る(_A)"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "�信��イベントを通知領域�表示�る"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "仲間�在席中����ら通知を有効��る"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "仲間�オフライン����ら通知を有効��る"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "�ャット・ウィンドウ�フォーカス�無��も通知�る(_C)"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "スペル�ェックを有効��る:"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "全般"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input level:"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "場所�ソース:"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "会話を記録"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "通知"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "イベント�サウンドを鳴ら�"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "プライ�シー"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -3925,66 +4539,72 @@ msgstr ""
 "�置精度を下�る����市町�や国�公表�より正確�����り��。GPS座標�"
 "�数点第1���正確��。"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "スマイリーをアイコン�表示�る(_S)"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "部屋�仲間リストを表示�る(_L)"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "サウンド"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "スペル��ェック"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "言語�一覧�インストール���る辞書�言語��を�映���。"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "テーマ"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:30
+#, fuzzy
+#| msgid "Bearing:"
+msgid "Variant:"
+msgstr "方�:"
+
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "起動��ら自動的�接続(_A)"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "�帯(_C)"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "�ップアップ通知を有効��る(_E)"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "サウンド演��よる通知を有効��る(_E)"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "GPS(_G)"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "�ットワーク(IP�Wi-Fi)(_N)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "新��会話�度�別�ウィンドウを開�(_O)"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "自分�仲間��置を公表�る(_P)"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "�置精度を下�る(_R)"
 
@@ -3996,82 +4616,130 @@ msgstr "状態"
 msgid "_Quit"
 msgstr "終了(_Q)"
 
-#: ../src/empathy-map-view.c:442
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "仲間を�度呼�出�"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "カメラ切"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "カメラ入"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "カメラを無効���映���信を中止"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "カメラを有効���映�を�る"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "カメラを有効��る�映�を�ら��"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "プレビュー"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "リダイアル"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "映�(_I)"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "映�切"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "映�入"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "映��プレビュー"
+
+#: ../src/empathy-map-view.c:448
 msgid "Contact Map View"
 msgstr "Contact Map View"
 
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
 msgid "Save"
 msgstr "�存"
 
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
 msgstr "デ�ッグ・ウィンドウ"
 
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
 msgstr "一時�止"
 
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
 msgstr "レベル "
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
 msgid "Debug"
 msgstr "デ�ッグ"
 
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
 msgid "Info"
 msgstr "情報"
 
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
 msgid "Message"
 msgstr "メッセージ"
 
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
 msgid "Warning"
 msgstr "注�"
 
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
 msgid "Critical"
 msgstr "�険"
 
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
 msgid "Error"
 msgstr "エラー"
 
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
 msgid "Time"
 msgstr "時刻"
 
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
 msgid "Domain"
 msgstr "ドメイン"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
 msgstr "分類"
 
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "レベル"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
-msgstr "�択��接続マ�ージャ�リモートデ�ッグ拡張をサ�ート�����ん。"
+msgstr "�択��接続マ�ージャー�リモートデ�ッグ拡張をサ�ート�����ん。"
 
-#: ../src/empathy-invite-participant-dialog.c:34
-#: ../src/empathy-invite-participant-dialog.c:48
+#: ../src/empathy-invite-participant-dialog.c:179
+#: ../src/empathy-invite-participant-dialog.c:205
 msgid "Invite Participant"
 msgstr "�加者を招待"
 
-#: ../src/empathy-invite-participant-dialog.c:35
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "会話�招待�る仲間を�ん�����"
 
-#: ../src/empathy-invite-participant-dialog.c:45
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "招待�る"
 
@@ -4104,9 +4772,19 @@ msgstr "- Empathy �アカウント"
 msgid "Empathy Accounts"
 msgstr "Empathy �アカウント"
 
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr ""
+
+#: ../src/empathy-debugger.c:75
+#, fuzzy
+#| msgid "Empathy Debugger"
+msgid "- Empathy Debugger"
+msgstr "Empathy デ�ッガー"
+
+#: ../src/empathy-debugger.c:114
 msgid "Empathy Debugger"
-msgstr "Empathy デ�ッガ"
+msgstr "Empathy デ�ッガー"
 
 #: ../src/empathy-chat.c:107
 #, fuzzy
@@ -4114,39 +4792,117 @@ msgstr "Empathy デ�ッガ"
 msgid "- Empathy Chat Client"
 msgstr "- Empathy インスタント・メッセンジャー"
 
-#: ../src/empathy-notifications-approver.c:184
+#: ../src/empathy-notifications-approver.c:203
 msgid "Respond"
 msgstr "応答�る"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1418
 msgid "Reject"
 msgstr "拒�"
 
-#: ../src/empathy-notifications-approver.c:194
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1419
 msgid "Answer"
 msgstr "応答"
 
-#: ../src/empathy-notifications-approver.c:201
-#: ../src/empathy-notifications-approver.c:211
+#: ../src/empathy-notifications-approver.c:227
+msgid "Answer with video"
+msgstr ""
+
+#: ../src/empathy-notifications-approver.c:235
+#: ../src/empathy-notifications-approver.c:245
 msgid "Decline"
 msgstr "�断り"
 
-#: ../src/empathy-notifications-approver.c:205
-#: ../src/empathy-notifications-approver.c:216
+#: ../src/empathy-notifications-approver.c:239
+#: ../src/empathy-notifications-approver.c:250
 msgid "Accept"
 msgstr "���る"
 
-#: ../src/empathy-call-observer.c:130
-#, fuzzy, c-format
-#| msgid "Incoming call from %s"
-msgid "Missed call from %s"
-msgstr "%s �ん�ら�呼�出���"
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:260
+#, fuzzy
+#| msgid "Preview"
+msgid "Provide"
+msgstr "プレビュー"
 
-#: ../src/empathy-call-observer.c:133
+#: ../src/empathy-call-observer.c:134
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr ""
 
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1047 ../src/empathy-call-window.c:1070
+msgid "i"
+msgstr ""
+
+#: ../src/empathy-call-window.c:2727
+msgid "On hold"
+msgstr ""
+
+#: ../src/empathy-call-window.c:2730
+msgid "Mute"
+msgstr ""
+
+#: ../src/empathy-call-window.c:2732
+#, fuzzy
+#| msgid "Location"
+msgid "Duration"
+msgstr "場所"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2735
+#, fuzzy, c-format
+#| msgid "Connected — %d:%02dm"
+msgid "%s — %d:%02dm"
+msgstr "接続���� — %d分%02d秒"
+
+#: ../libempathy-gtk/empathy-search-bar.c:243
+#, fuzzy
+#| msgid "Match case"
+msgid "_Match case"
+msgstr "大文字�文字を区別��一致"
+
+#~ msgid "All"
+#~ msgstr "���"
+
+#~ msgid "_Enabled"
+#~ msgstr "サインイン(_E)"
+
+#~ msgid "Date"
+#~ msgstr "日付"
+
+#~ msgid "Conversations"
+#~ msgstr "会話"
+
+#~ msgid "Find Next"
+#~ msgstr "次を検索"
+
+#~ msgid "Find Previous"
+#~ msgstr "�を検索"
+
+#~ msgid "Previous Conversations"
+#~ msgstr "会話�履歴"
+
+#~ msgid "_For:"
+#~ msgstr "検索�る文字(_F):"
+
+#~ msgid "Enter Custom Message"
+#~ msgstr "独自�メッセージを入力"
+
+#, fuzzy
+#~| msgid "Edit Custom Messages"
+#~ msgid "Saved Status Messages"
+#~ msgstr "独自�メッセージを編集"
+
+#~ msgid "Show and edit accounts"
+#~ msgstr "アカウント�一覧を表示��編集���"
+
 #~ msgid "Empathy has asked about importing accounts"
 #~ msgstr "アカウント��り込�を�����る����"
 
@@ -4199,9 +4955,6 @@ msgstr ""
 #~ msgid "MC 4 accounts have been imported."
 #~ msgstr "MC 4 アカウントをイン�ート済�����。"
 
-#~ msgid "Salut account is created"
-#~ msgstr "Salut �アカウントを生��る����"
-
 #~ msgid ""
 #~ "Whether or not the Salut account has been created on the first Empathy "
 #~ "run."
@@ -4242,9 +4995,6 @@ msgstr ""
 #~ msgid "The contact's avatar token. Empty means contact has no avatar."
 #~ msgstr "仲間リスト�ア�ター"
 
-#~ msgid "Megaphone"
-#~ msgstr "メガホン"
-
 #~ msgid "Talk!"
 #~ msgstr "仲間�話�を���よ�!"
 
@@ -4292,12 +5042,6 @@ msgstr ""
 #~ "���由�����アカウントを追加�直��時��利用��るよ���る���"
 #~ "�。"
 
-#~ msgid "_Next"
-#~ msgstr "次�(_N)"
-
-#~ msgid "Accounts"
-#~ msgstr "アカウント"
-
 #~ msgid "Add new"
 #~ msgstr "新��追加�る"
 
@@ -4367,7 +5111,7 @@ msgstr ""
 #~ msgstr "<b>�ットワーク</b>"
 
 #~ msgid "<b>Servers</b>"
-#~ msgstr "<b>サー�</b>"
+#~ msgstr "<b>サー�ー</b>"
 
 #~ msgid "Remove the selected IRC network"
 #~ msgstr "�択�� IRC �ットワークを削除���"
@@ -4375,9 +5119,6 @@ msgstr ""
 #~ msgid "_Check Word Spelling..."
 #~ msgstr "スペル・�ェック(_C)..."
 
-#~ msgid "<b>Topic:</b>"
-#~ msgstr "<b>トピック:</b>"
-
 #~ msgid "Group Chat"
 #~ msgstr "グループ・�ャット"
 
@@ -4394,9 +5135,6 @@ msgstr ""
 #~ msgid "<b>Groups</b>"
 #~ msgstr "<b>グループ</b>"
 
-#~ msgid "Word"
-#~ msgstr "�語"
-
 #~ msgid "Suggestions for the word"
 #~ msgstr "推奨�る�語"
 
@@ -4409,9 +5147,6 @@ msgstr ""
 #~ msgid "<b>New Account</b>"
 #~ msgstr "<b>新��アカウント</b>"
 
-#~ msgid "<b>Settings</b>"
-#~ msgstr "<b>設定</b>"
-
 #~ msgid "Import Accounts..."
 #~ msgstr "アカウント��り込�..."
 
@@ -4434,7 +5169,7 @@ msgstr ""
 #~ msgstr "��(_A):"
 
 #~ msgid "S_erver:"
-#~ msgstr "サー�(_E):"
+#~ msgstr "サー�ー(_E):"
 
 #~ msgctxt "file size"
 #~ msgid "Unknown"
@@ -4480,7 +5215,7 @@ msgstr ""
 #~ msgid ""
 #~ "This list represents all chat rooms hosted on the server you have entered."
 #~ msgstr ""
-#~ "��一覧��サー��ら�供�れ��る�ャットルーム����表示�れ��"
+#~ "��一覧��サー�ー�ら�供�れ��る�ャットルーム����表示�れ��"
 
 #~ msgid "<b>Contact List</b>"
 #~ msgstr "<b>仲間リスト</b>"
@@ -4491,8 +5226,5 @@ msgstr ""
 #~ msgid "Show _avatars"
 #~ msgstr "ア�ターを表示�る(_A)"
 
-#~ msgid "Show co_mpact contact list"
-#~ msgstr "仲間リストをコンパクト��る(_M)"
-
 #~ msgid "_Import..."
 #~ msgstr "イン�ート...(_I)"
diff --git a/po/ko.po b/po/ko.po
index 7efc4081a..553804c54 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -17,6 +17,7 @@
 #   - away -> �리 비움
 #   - busy -> 다른 용무 중
 #   - offline -> 연결 중지, 연결 중지 �태, 연결 �기다
+#   - SMS -> 단문 문�
 # - 기타 고유 명사 �역
 #   - Adium -> ��디엄 (OS X용 메신저)
 #   - Facebook -> 페�스�
@@ -31,9 +32,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=empathy&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-03-14 13:26+0000\n"
-"PO-Revision-Date: 2011-03-19 22:11+0900\n"
+"product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2011-09-15 13:17+0000\n"
+"PO-Revision-Date: 2011-09-24 07:31+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: GNOME Korea <gnome-kr@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -64,50 +65,74 @@ msgid "Always open a separate chat window for new chats."
 msgstr "새로운 대화는 항� 별�� 대화 표시창� 엽니다."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr "통화 볼륨"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr "통화 볼륨, �센트 값."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Camera device"
+msgstr "카메� 장치"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "카메� 위치"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr "그룹 대화�서 �� 완성� (Tab 키) 사용할 경우 대화명 뒤� 붙� 문�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "대화 표시창 테마"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+msgid "Chat window theme variant"
+msgstr "대화 표시창 테마 변종"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "맞춤법 검사�서 사용할 언어� 목�, 쉼표로 구분 (예를 들어 \"en, fr, nl\")."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "간략한 연�처 목�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "연결 관리�를 사용합니다"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "연�처 목� 정렬 기준"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "�� 통화� 사용할 기본 카메� 장치, 예를 들어 /dev/video0."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
 msgstr "아바타 그림� 선�할 기본 디렉터리"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr "�리 비움� 때 �업 알림 사용하지 않기"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr "�리 비움� 때 소리 사용하지 않기"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
 msgstr "�태 �역� 새로 들어온 �벤트 표시"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -115,283 +140,304 @@ msgstr ""
 "�태 �역� 새로 들어온 �벤트를 표시합니다. 거짓�면 사용��게 즉시 �벤트"
 "를 알립니다."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+msgid "Echo cancellation support"
+msgstr "�향 반향 제거 기능"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr "사용�� 위치를 공개할 수 있습니다"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "GPS를 �용해 위치를 파악할 수 있습니다"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "휴대전화 네트워�를 사용해 위치를 파악할 수 있습니다"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr "네트워�를 사용해 위치를 파악할 수 있습니다"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr "엠�시 기본 다운로드 ��"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
 msgstr "엠�시�서 버터플�� 기�� 가져옴"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr "엠�시�서 입력� 없으면 �리 비움"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "엠�시 시작할 때 �� 연결"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "위치를 부정확하게 만듭니다"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "엠�시 대화 표시창� 아�콘으로 연�처� 아바타 사용"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr "웹키트 개발 �구 사용"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "새 메시지� �업 알림 사용"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "맞춤법 검사 사용"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "메� 창 �추기"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "메� 창� �춥니다."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "대화명 완성 문�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "새로운 대화는 별� 창� 열기"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "사용할 ��디엄 테마� 경로"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "사용할 ��디엄 테마� 경로, 대화� 사용할 테마가 아디움� 경우."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "메시지를 받으면 소리 내기"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "새 대화 내용� 있으면 소리 내기"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "메시지를 보내면 소리 내기"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "연�처� 누군가가 로그�하면 소리 내기"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "연�처� 누군가가 로그아웃하면 소리 내기"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "로그�하면 소리 내기"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "로그아웃하면 소리 내기"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "대화� �커스가 없으면 �업 알림"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "연�처� 있는 사람� 들어오면 �업 알림"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "연�처� 있는 사람� 나가면 �업 알림"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr "통화 중� 카메� 미리 보기� 위치."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+msgid "Show Balance in contact list"
+msgstr "연�처 목�� 잔액 표시"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "아바타 표시"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "방� 연�처 목� 표시"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr "메� 창� 닫� 때 안내를 표시합니다."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr "연결 중지 �태 연�처 표시"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
 msgstr "프로토콜 표시"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "맞춤법 검사 언어"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr "전송 받� 파�� 저장할 기본 ��."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
 msgstr "최근� 아바타 그림� 선�한 디렉터리."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
 msgstr "대화 가장�리 창� 위치"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "대화 가장�리 창� 저장한 위치 (픽셀 단위)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "대화 표시창�서 대화 내용� 표시하는� 사용하는 테마."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "대화 표시창�서 대화 내용� 표시하는� 사용하는 테마 변종."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "그래픽 �모티콘 사용"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "알리는 소리 사용"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "대화방� 테마 사용"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "사용�� 위치를 연�처� 있는 사람들�게 공개할지 여부."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "GPS를 �용해 위치를 파악할지 여부."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "휴대전화 네트워�를 �용해 위치를 파악할지 여부."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "네트워�를 �용해 위치를 파악할지 여부."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "엠�시�서 버터플�� 기�� 가져왔는지 여부."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "엠�시가 시작할 때 계정� �� 로그�할지 여부."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr "사용� 입력� 없� 때 엠�시가 �리 비움 모드로 전환할지 여부."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "개� 정보 보호를 위해 위치를 부정확하게 만들지 여부."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "엠�시� 대화 표시창 아�콘으로 연�처� 아바타를 사용할지 여부."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "웹키트 개발 툴� (Web Inspector 따위) 사용할지 여부."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr "연결 관리�를 �용해 연결� ��으로 �고 다시 연결할 지 여부."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "설정한 언어� 따� 입력하는 중� 단어� 맞춤법� 검사할지 여부."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "대화 내용� 있는 �모티콘� 그림으로 바꿔 표시할지 여부."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "펄스오디오� �향 반향 제거 기능 사용 여부."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "연�처� 누군가가 네트워�� 로그�할 때 알림 소리를 낼지 여부."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "연�처� 누군가가 네트워��서 로그아웃할 때 알림 소리를 낼지 여부."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "�벤트를 알릴 때 소리를 낼지 여부."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "메시지를 받으면 소리를 낼지 여부."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "새 대화 내용� 있으면 소리를 낼지 여부."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "메시지를 보내면 소리를 낼지 여부."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "네트워�� 로그�할 때 소리를 낼지 여부."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "네트워��서 로그아웃할 때 소리를 낼지 여부."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr "�리 비움�거나 다른 용무 중� 때 알림 소리를 낼지 여부."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "연�처� 사람� 연결� �어지면 �업 알림 창� 표시할지 여부."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "연�처� 사람� 연결하면 �업 알림 창� 표시할지 여부."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -399,47 +445,51 @@ msgstr ""
 "대화를 열었지만 �커스가 없� 경우�� 새 메시지를 받았� 때 �업 알림 창� "
 "표시할지 여부."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "새 메시지를 받았� 때 �업 알림 창� 표시할지 여부."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+msgid "Whether to show account balances in the contact list."
+msgstr "연�처 목�� 계정 잔액� 표시할지 여부."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "연�처 목�과 대화 표시창� 연�처� 아바타를 표시할지 여부."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "연�처 목�� 연결 중지 �태� 연�처를 표시할지 여부."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
 msgstr "�리 비움�거나 다른 용무 중� 때 �업 알림 창� 표시할지 여부."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "연�처 목�� 연�처� 프로토콜� 표시할지 여부."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr "대화방� 연�처 목�� 표시할지 여부."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "연�처 목�� 간략하게 표시할지 여부."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
 msgstr ""
 "제목 표시줄� 'x' 단추로 메� 창� 닫� 때 알림 대화 창� 표시할지 여부."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "대화방� 테마를 사용할지 여부."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -454,7 +504,7 @@ msgstr "메신저 � VoIP 계정 관리"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2242
+#: ../src/empathy-accounts-dialog.c:2324
 msgid "Messaging and VoIP Accounts"
 msgstr "메신저 � VoIP 계정"
 
@@ -462,18 +512,34 @@ msgstr "메신저 � VoIP 계정"
 msgid "File transfer completed, but the file was corrupted"
 msgstr "파� 전송 완료�었지만, 파�� ���어 있습니다"
 
-#: ../libempathy/empathy-ft-handler.c:1116
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
 msgstr "�격 �대 측�서 파� 전송� 지�하지 않습니다"
 
-#: ../libempathy/empathy-ft-handler.c:1172
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is not a regular file"
 msgstr "선�한 파�� �반 파�� 아닙니다"
 
-#: ../libempathy/empathy-ft-handler.c:1181
+#: ../libempathy/empathy-ft-handler.c:1176
 msgid "The selected file is empty"
 msgstr "선�한 파�� 빈 파�입니다"
 
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#, c-format
+msgid "Missed call from %s"
+msgstr "%s�서 온 놓친 호출"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, c-format
+msgid "Called %s"
+msgstr "호출함: %s"
+
+#: ../libempathy/empathy-message.c:422
+#, c-format
+msgid "Call from %s"
+msgstr "호출 받�: %s"
+
 #: ../libempathy/empathy-tp-file.c:268
 msgid "Socket type not supported"
 msgstr "� 소켓 종류를 지�하지 않습니다"
@@ -502,143 +568,141 @@ msgstr "파�� 전송하는 중� 오류가 발�했습니다"
 msgid "The other participant is unable to transfer the file"
 msgstr "�대가 파�� 전송할 수 없습니다"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:383
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
 msgid "Unknown reason"
 msgstr "알 수 없는 �유"
 
-#: ../libempathy/empathy-utils.c:305
+#: ../libempathy/empathy-utils.c:222
 msgid "Available"
 msgstr "대화 가능"
 
-#: ../libempathy/empathy-utils.c:307
+#: ../libempathy/empathy-utils.c:224
 msgid "Busy"
 msgstr "다른 용무 중"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:227
 msgid "Away"
 msgstr "�리 비움"
 
-#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:229
 msgid "Invisible"
 msgstr "�태 �춤"
 
-#: ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:231
 msgid "Offline"
 msgstr "연결 중지"
 
-#: ../libempathy/empathy-utils.c:316
-#: ../src/empathy-streamed-media-window.c:1897
-#: ../src/empathy-streamed-media-window.c:1898
-#: ../src/empathy-streamed-media-window.c:1899
-#: ../src/empathy-streamed-media-window.c:1900
-#: ../src/empathy-call-window.ui.h:18
+#. translators: presence type is unknown
+#: ../libempathy/empathy-utils.c:234
+msgctxt "presence"
 msgid "Unknown"
 msgstr "알 수 없�"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:274
 msgid "No reason specified"
 msgstr "�유를 지정하지 않았습니다"
 
-#: ../libempathy/empathy-utils.c:357 ../libempathy/empathy-utils.c:413
+#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
 msgid "Status is set to offline"
 msgstr "�태가 연결 중지로 설정�었습니다"
 
-#: ../libempathy/empathy-utils.c:359 ../libempathy/empathy-utils.c:393
+#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "네트워� 오류"
 
-#: ../libempathy/empathy-utils.c:361 ../libempathy/empathy-utils.c:395
+#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
 msgid "Authentication failed"
 msgstr "�� 실패"
 
-#: ../libempathy/empathy-utils.c:363 ../libempathy/empathy-utils.c:397
+#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
 msgid "Encryption error"
 msgstr "암호화 오류"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:284
 msgid "Name in use"
 msgstr "�름� 사용 중입니다"
 
-#: ../libempathy/empathy-utils.c:367 ../libempathy/empathy-utils.c:399
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
 msgid "Certificate not provided"
 msgstr "��서가 없습니다"
 
-#: ../libempathy/empathy-utils.c:369 ../libempathy/empathy-utils.c:401
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
 msgid "Certificate untrusted"
 msgstr "��서를 신뢰할 수 없습니다"
 
-#: ../libempathy/empathy-utils.c:371 ../libempathy/empathy-utils.c:403
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
 msgid "Certificate expired"
 msgstr "��서가 만료�었습니다"
 
-#: ../libempathy/empathy-utils.c:373 ../libempathy/empathy-utils.c:405
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
 msgid "Certificate not activated"
 msgstr "��서를 활성화하지 않았습니다"
 
-#: ../libempathy/empathy-utils.c:375 ../libempathy/empathy-utils.c:407
+#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
 msgid "Certificate hostname mismatch"
 msgstr "��서 호스트 �름� 맞지 않습니다"
 
-#: ../libempathy/empathy-utils.c:377 ../libempathy/empathy-utils.c:409
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate fingerprint mismatch"
 msgstr "��서 핑거프린트가 맞지 않습니다"
 
-#: ../libempathy/empathy-utils.c:379 ../libempathy/empathy-utils.c:411
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate self-signed"
 msgstr "�기만 서명한 ��서입니다"
 
-#: ../libempathy/empathy-utils.c:381
+#: ../libempathy/empathy-utils.c:300
 msgid "Certificate error"
 msgstr "��서 오류"
 
-#: ../libempathy/empathy-utils.c:415
+#: ../libempathy/empathy-utils.c:334
 msgid "Encryption is not available"
 msgstr "암호화를 사용할 수 없습니다"
 
-#: ../libempathy/empathy-utils.c:417
+#: ../libempathy/empathy-utils.c:336
 msgid "Certificate is invalid"
 msgstr "��서가 올바르지 않습니다"
 
-#: ../libempathy/empathy-utils.c:419
+#: ../libempathy/empathy-utils.c:338
 msgid "Connection has been refused"
 msgstr "연결� 거부�었습니다"
 
-#: ../libempathy/empathy-utils.c:421
+#: ../libempathy/empathy-utils.c:340
 msgid "Connection can't be established"
 msgstr "연결� 완료�지 않았습니다"
 
-#: ../libempathy/empathy-utils.c:423
+#: ../libempathy/empathy-utils.c:342
 msgid "Connection has been lost"
 msgstr "연결� �어졌습니다"
 
-#: ../libempathy/empathy-utils.c:425
+#: ../libempathy/empathy-utils.c:344
 msgid "This resource is already connected to the server"
 msgstr "� 리소스는 �미 서버와 연결�어 있습니다"
 
-#: ../libempathy/empathy-utils.c:427
+#: ../libempathy/empathy-utils.c:346
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "기존 연결� 같� 리소스를 사용해 새롭게 연결�었습니다"
 
-#: ../libempathy/empathy-utils.c:430
+#: ../libempathy/empathy-utils.c:349
 msgid "The account already exists on the server"
 msgstr "서버� 해당 계정� �미 있습니다"
 
-#: ../libempathy/empathy-utils.c:432
+#: ../libempathy/empathy-utils.c:351
 msgid "Server is currently too busy to handle the connection"
 msgstr "서버가 사용량� 너무 많아 연결� 받아들� 수 없습니다"
 
-#: ../libempathy/empathy-utils.c:434
+#: ../libempathy/empathy-utils.c:353
 msgid "Certificate has been revoked"
 msgstr "��서가 철회�었습니다"
 
-#: ../libempathy/empathy-utils.c:436
+#: ../libempathy/empathy-utils.c:355
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "��서가 안전하지 않� 암호화 알고리즘� 사용하거나 암호화가 취약합니다"
 
-#: ../libempathy/empathy-utils.c:439
+#: ../libempathy/empathy-utils.c:358
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -646,144 +710,138 @@ msgstr ""
 "서버 ��서� 길� 혹� 서버 ��서 체�� 단계가 암호화 ��브러리가 지정한 "
 "한계를 넘아갔습니다"
 
-#: ../libempathy/empathy-utils.c:602
+#: ../libempathy/empathy-utils.c:519
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "주변 사람"
 
-#: ../libempathy/empathy-utils.c:607
+#: ../libempathy/empathy-utils.c:524
 msgid "Yahoo! Japan"
 msgstr "야후! �본"
 
-#: ../libempathy/empathy-utils.c:636
+#: ../libempathy/empathy-utils.c:553
 msgid "Google Talk"
 msgstr "구글 토�"
 
-#: ../libempathy/empathy-utils.c:637
+#: ../libempathy/empathy-utils.c:554
 msgid "Facebook Chat"
 msgstr "페�스� 대화"
 
-#: ../libempathy/empathy-time.c:137
+#: ../libempathy/empathy-time.c:88
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%dì´ˆ ì „"
 
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:93
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d분 전"
 
-#: ../libempathy/empathy-time.c:147
+#: ../libempathy/empathy-time.c:98
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d시간 전"
 
-#: ../libempathy/empathy-time.c:152
+#: ../libempathy/empathy-time.c:103
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d� 전"
 
-#: ../libempathy/empathy-time.c:157
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d주 전"
 
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:113
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d달 전"
 
-#: ../libempathy/empathy-time.c:167
+#: ../libempathy/empathy-time.c:136
 msgid "in the future"
 msgstr "미래"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:501
-msgid "All"
-msgstr "모�"
+#: ../libempathy-gtk/empathy-account-chooser.c:540
+msgid "All accounts"
+msgstr "모든 계정"
 
-#: ../libempathy-gtk/empathy-account-widget.c:679
-#: ../libempathy-gtk/empathy-log-window.c:647
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "계정"
 
-#: ../libempathy-gtk/empathy-account-widget.c:680
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "암호"
 
-#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "서버"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "�트"
 
-#: ../libempathy-gtk/empathy-account-widget.c:754
-#: ../libempathy-gtk/empathy-account-widget.c:811
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1163
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "내 웹 계정"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "%s 계정� 내 웹 계정� 통해 편집했습니다."
+msgid "The account %s is edited via %s."
+msgstr "%s 계정� %s�(를) 통해 편집했습니다."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1169
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "%s 계정� 엠�시�서 편집할 수 없습니다."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1189
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
 msgstr "내 웹 계정 실행"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1527
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "%s 편집"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "사용� �름:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1894
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "�용(_P)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1924
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
 msgstr "로그�(_O)"
 
-#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1990
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:515
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1479
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "계정:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2001
-msgid "_Enabled"
-msgstr "사용(_E)"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2066
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "서버� � 계정� �미 있습니다"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2069
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "서버� 새 계정 만들기"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2261
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "취소(_N)"
 
@@ -792,19 +850,19 @@ msgstr "취소(_N)"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2558
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s (서버 %2$s)"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2584
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "%s 계정"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2588
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "새 계정"
 
@@ -816,6 +874,7 @@ msgstr "<b>예:</b> 내대화명"
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -829,7 +888,7 @@ msgstr "고급"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "Pass_word:"
 msgstr "암호(_W):"
@@ -839,7 +898,7 @@ msgstr "암호(_W):"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
 msgid "Remember Password"
 msgstr "암호 저장"
 
@@ -849,7 +908,7 @@ msgstr "암호 저장"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 #: ../libempathy-gtk/empathy-password-dialog.c:311
 msgid "Remember password"
@@ -925,78 +984,84 @@ msgstr "ICQ 사용� 번호가 무엇입니까?"
 msgid "What is your ICQ password?"
 msgstr "ICQ 암호가 무엇입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:183
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 # keep alive mechanism, "등�" 따위로 번역하기는 부�절함
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:221
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "Register"
 
 # keep alive mechanism, "옵션" 따위로 번역하기는 부�절함
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:226
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "Options"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "없�"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Character set:"
 msgstr "문� �코딩:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr "대부분 IRC 서버는 암호가 필요 없습니다. 그러므로 잘 모르겠으면 암호를 입력하지 마십시오."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Network"
 msgstr "네트워�"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Network:"
 msgstr "네트워�:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "대화명:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "암호:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "나갈 때 메시지:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "실제 �름:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Servers"
 msgstr "서버"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "What is your IRC nickname?"
 msgstr "IRC 대화명� 무엇입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "어� IRC 네트워�입니까?"
 
@@ -1132,58 +1197,67 @@ msgid "Discover the STUN server automatically"
 msgstr "��으로 STUN 서버 검색"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "Ignore TLS Errors"
+msgstr "TLS 오류 무시"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Interval (seconds)"
 msgstr "간격 (초 단위)"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
 msgid "Keep-Alive Options"
 msgstr "연결 유지 옵션"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
 msgid "Loose Routing"
 msgstr "�슨한 �우팅"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Mechanism:"
 msgstr "방�:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
 msgid "Miscellaneous Options"
 msgstr "기타 옵션"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 msgid "NAT Traversal Options"
 msgstr "NAT 통과 옵션"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 msgid "Port:"
 msgstr "�트:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 msgid "Proxy Options"
 msgstr "프�시 옵션"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "STUN Server:"
 msgstr "STUN 서버:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.c:347
 msgid "Server:"
 msgstr "서버:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid "Transport:"
 msgstr "전송 방법:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "� 계정� 사용해 유선 전화나 휴대 전화로 통화(_L)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "SIP 계정 암호가 무엇입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "SIP 로그� 아�디가 무엇입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "사용� �름(_U):"
 
@@ -1207,20 +1281,28 @@ msgstr "야후! 아�디(_D):"
 msgid "_Room List locale:"
 msgstr "방 목� 로캘(_R):"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:448
-#: ../libempathy-gtk/empathy-avatar-chooser.c:524
+#: ../libempathy-gtk/empathy-avatar-chooser.c:470
+#: ../libempathy-gtk/empathy-avatar-chooser.c:555
 msgid "Couldn't convert image"
 msgstr "그림� 변환할 수 없습니다"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
 msgid "None of the accepted image formats are supported on your system"
 msgstr "허용하는 그림 형� 중�서 � 시스템�서 지�하는 형�� 없습니다"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:936
+#: ../libempathy-gtk/empathy-avatar-chooser.c:818
+msgid "Couldn't save picture to file"
+msgstr "그림� 파�로 저장할 수 없습니다"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:934
 msgid "Select Your Avatar Image"
 msgstr "아바타 그림 선�"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:939
+#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+msgid "Take a picture..."
+msgstr "사진 �기..."
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:941
 msgid "No Image"
 msgstr "그림 없�"
 
@@ -1236,35 +1318,61 @@ msgstr "모든 파�"
 msgid "Click to enlarge"
 msgstr "누르면 �게 봅니다"
 
-#: ../libempathy-gtk/empathy-chat.c:655
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
+msgid "There was an error starting the call"
+msgstr "통화를 시작하는� 오류가 발�했습니다"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact doesn't support calls"
+msgstr "지정한 계정� 통화를 지�하지 않습니다"
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is offline"
+msgstr "지정한 연�처는 연결 중지 �태입니다"
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "The specified contact is not valid"
+msgstr "지정한 연�처는 올바르지 않습니다"
+
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "Emergency calls are not supported on this protocol"
+msgstr "� 프로토콜�서는 비� 통화를 지�하지 않습니다"
+
+#: ../libempathy-gtk/empathy-chat.c:702
 msgid "Failed to open private chat"
 msgstr "개� 대화를 시작하는� 실패했습니다"
 
-#: ../libempathy-gtk/empathy-chat.c:720
+#: ../libempathy-gtk/empathy-chat.c:763
 msgid "Topic not supported on this conversation"
 msgstr "� 대화�서는 주제 설정� 지�하지 않습니다"
 
-#: ../libempathy-gtk/empathy-chat.c:726
+#: ../libempathy-gtk/empathy-chat.c:769
 msgid "You are not allowed to change the topic"
 msgstr "주제를 바꿀 권한� 없습니다"
 
-#: ../libempathy-gtk/empathy-chat.c:909
+#: ../libempathy-gtk/empathy-chat.c:973
+#, c-format
+msgid "“%s� is not a valid contact ID"
+msgstr "“%s��(는) 올바른 연�처� 아�디가 아닙니다"
+
+#: ../libempathy-gtk/empathy-chat.c:1058
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: 현재 대화� 모든 메시지를 지�니다"
 
-#: ../libempathy-gtk/empathy-chat.c:912
+#: ../libempathy-gtk/empathy-chat.c:1061
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <주제>: 현재 대화� 주제를 설정합니다"
 
-#: ../libempathy-gtk/empathy-chat.c:915
+#: ../libempathy-gtk/empathy-chat.c:1064
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <대화방아�디>: 새 대화방� 입장합니다"
 
-#: ../libempathy-gtk/empathy-chat.c:918
+#: ../libempathy-gtk/empathy-chat.c:1067
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <대화방아�디>: 새 대화방� 참여합니다"
 
-#: ../libempathy-gtk/empathy-chat.c:923
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1272,23 +1380,23 @@ msgstr ""
 "/part [<대화방아�디>] [<�유>]: 대화방� 떠납니다. 기본값� 현재 대화방� 떠"
 "납니다"
 
-#: ../libempathy-gtk/empathy-chat.c:928
+#: ../libempathy-gtk/empathy-chat.c:1075
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <연�처아�디> [<메시지>]: 개� 대화를 시작합니다"
 
-#: ../libempathy-gtk/empathy-chat.c:931
+#: ../libempathy-gtk/empathy-chat.c:1078
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <연�처아�디> [<메시지>]: 개� 대화를 시작합니다"
 
-#: ../libempathy-gtk/empathy-chat.c:934
+#: ../libempathy-gtk/empathy-chat.c:1081
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <대화명>: 서버�서 대화명� 바꿉니다"
 
-#: ../libempathy-gtk/empathy-chat.c:937
+#: ../libempathy-gtk/empathy-chat.c:1084
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <메시지>: 현재 대화�서 ACTION 메시지를 보냅니다"
 
-#: ../libempathy-gtk/empathy-chat.c:940
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1298,7 +1406,11 @@ msgstr ""
 "지를 보낼 때 사용합니다. 예를 들어: \"/say /join 명령으로 대화방� 입장합니다"
 "\""
 
-#: ../libempathy-gtk/empathy-chat.c:945
+#: ../libempathy-gtk/empathy-chat.c:1092
+msgid "/whois <contact ID>: display information about a contact"
+msgstr "/whois <대화명>: 대화 �대� 대한 정보를 표시합니다"
+
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1306,98 +1418,113 @@ msgstr ""
 "/help [<명령어>]: 명령어 목�� 표시합니다. <명령어>가 있으면 해당 명령어 사"
 "용법� 표시합니다."
 
-#: ../libempathy-gtk/empathy-chat.c:955
+#: ../libempathy-gtk/empathy-chat.c:1112
 #, c-format
 msgid "Usage: %s"
 msgstr "사용법: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:997
+#: ../libempathy-gtk/empathy-chat.c:1157
 msgid "Unknown command"
 msgstr "알 수 없는 명령어"
 
-#: ../libempathy-gtk/empathy-chat.c:1123
+#: ../libempathy-gtk/empathy-chat.c:1283
 msgid "Unknown command; see /help for the available commands"
 msgstr "알 수 없는 명령어. 명령어 목�� /help 명령�서 보십시오"
 
-#: ../libempathy-gtk/empathy-chat.c:1263
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1453
+msgid "insufficient balance to send message"
+msgstr "메시지를 보내는� 필요한 잔액� 부족합니다"
+
+#: ../libempathy-gtk/empathy-chat.c:1455
+msgid "not capable"
+msgstr "권한 없�"
+
+#: ../libempathy-gtk/empathy-chat.c:1462
 msgid "offline"
 msgstr "연결 중지"
 
-#: ../libempathy-gtk/empathy-chat.c:1266
+#: ../libempathy-gtk/empathy-chat.c:1465
 msgid "invalid contact"
 msgstr "연�처가 잘못�었습니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1269
+#: ../libempathy-gtk/empathy-chat.c:1468
 msgid "permission denied"
 msgstr "권한� 없습니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1272
+#: ../libempathy-gtk/empathy-chat.c:1471
 msgid "too long message"
 msgstr "메시지가 너무 �니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1275
+#: ../libempathy-gtk/empathy-chat.c:1474
 msgid "not implemented"
 msgstr "구현하지 않았습니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1279
+#: ../libempathy-gtk/empathy-chat.c:1478
 msgid "unknown"
 msgstr "알 수 없�"
 
-#: ../libempathy-gtk/empathy-chat.c:1283
+#: ../libempathy-gtk/empathy-chat.c:1484
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "메시지를 보내는� 오류, '%s': %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1344 ../src/empathy-chat-window.c:707
+#: ../libempathy-gtk/empathy-chat.c:1488
+#, c-format
+msgid "Error sending message: %s"
+msgstr "메시지를 보내는� 오류: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1549 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "주제:"
 
-#: ../libempathy-gtk/empathy-chat.c:1356
+#: ../libempathy-gtk/empathy-chat.c:1561
 #, c-format
 msgid "Topic set to: %s"
 msgstr "주제를 설정했습니다: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1358
+#: ../libempathy-gtk/empathy-chat.c:1563
 msgid "No topic defined"
 msgstr "주제를 정하지 않았습니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1857
+#: ../libempathy-gtk/empathy-chat.c:2072
 msgid "(No Suggestions)"
 msgstr "(제안 없�)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1925
+#: ../libempathy-gtk/empathy-chat.c:2140
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "사전� '%s' 추가"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1962
+#: ../libempathy-gtk/empathy-chat.c:2177
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "%2$s 사전� '%1$s' 추가"
 
-#: ../libempathy-gtk/empathy-chat.c:2021
+#: ../libempathy-gtk/empathy-chat.c:2247
 msgid "Insert Smiley"
 msgstr "�모티콘 입력"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2039
-#: ../libempathy-gtk/empathy-ui-utils.c:1810
+#: ../libempathy-gtk/empathy-chat.c:2265
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "보내기(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2319
 msgid "_Spelling Suggestions"
 msgstr "맞춤법 제안(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2163
+#: ../libempathy-gtk/empathy-chat.c:2408
 msgid "Failed to retrieve recent logs"
 msgstr "최근 기�� 가져오는� 실패했습니다"
 
-#: ../libempathy-gtk/empathy-chat.c:2274
+#: ../libempathy-gtk/empathy-chat.c:2545
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 님� 연결� �겼습니다"
@@ -1405,12 +1532,12 @@ msgstr "%s 님� 연결� �겼습니다"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2281
+#: ../libempathy-gtk/empathy-chat.c:2552
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 님� %2$s 님� �해 퇴장당했습니다."
 
-#: ../libempathy-gtk/empathy-chat.c:2284
+#: ../libempathy-gtk/empathy-chat.c:2555
 #, c-format
 msgid "%s was kicked"
 msgstr "%1$s 님� 퇴장당했습니다."
@@ -1418,17 +1545,17 @@ msgstr "%1$s 님� 퇴장당했습니다."
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2292
+#: ../libempathy-gtk/empathy-chat.c:2563
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s 님� %2$s 님� �해 입장 금지�습니다"
 
-#: ../libempathy-gtk/empathy-chat.c:2295
+#: ../libempathy-gtk/empathy-chat.c:2566
 #, c-format
 msgid "%s was banned"
 msgstr "%s 님� 입장 금지�습니다"
 
-#: ../libempathy-gtk/empathy-chat.c:2299
+#: ../libempathy-gtk/empathy-chat.c:2570
 #, c-format
 msgid "%s has left the room"
 msgstr "%s 님� 방� 떠났습니다"
@@ -1438,105 +1565,137 @@ msgstr "%s 님� 방� 떠났습니다"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2308
+#: ../libempathy-gtk/empathy-chat.c:2579
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2333
+#: ../libempathy-gtk/empathy-chat.c:2604
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s 님� 방� 들어왔습니다"
 
-#: ../libempathy-gtk/empathy-chat.c:2358
+#: ../libempathy-gtk/empathy-chat.c:2629
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 님� 대화명� �제부터 %s 입니다"
 
-#: ../libempathy-gtk/empathy-chat.c:2497
-#: ../src/empathy-streamed-media-window.c:1942
-#: ../src/empathy-event-manager.c:1122
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2768
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1391
+#: ../src/empathy-call-window.c:1441 ../src/empathy-call-window.c:2479
 msgid "Disconnected"
 msgstr "연결 �김"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3127
+#: ../libempathy-gtk/empathy-chat.c:3415
 msgid "Would you like to store this password?"
 msgstr "� 암호를 저장하시겠습니까?"
 
-#: ../libempathy-gtk/empathy-chat.c:3133
+#: ../libempathy-gtk/empathy-chat.c:3421
 msgid "Remember"
 msgstr "저장"
 
-#: ../libempathy-gtk/empathy-chat.c:3143
+#: ../libempathy-gtk/empathy-chat.c:3431
 msgid "Not now"
 msgstr "지금 안 함"
 
-#: ../libempathy-gtk/empathy-chat.c:3187
+#: ../libempathy-gtk/empathy-chat.c:3475
 msgid "Retry"
 msgstr "다시 시�"
 
-#: ../libempathy-gtk/empathy-chat.c:3191
+#: ../libempathy-gtk/empathy-chat.c:3479
 msgid "Wrong password; please try again:"
 msgstr "암호가 틀렸습니다. 다시 시�해 보십시오:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3308
+#: ../libempathy-gtk/empathy-chat.c:3609
 msgid "This room is protected by a password:"
 msgstr "� 방� 암호가 설정�어 있습니다:"
 
-#: ../libempathy-gtk/empathy-chat.c:3335
+#: ../libempathy-gtk/empathy-chat.c:3636
 msgid "Join"
 msgstr "입장"
 
-#: ../libempathy-gtk/empathy-chat.c:3505 ../src/empathy-event-manager.c:1144
+#: ../libempathy-gtk/empathy-chat.c:3838 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "연결함"
 
-#: ../libempathy-gtk/empathy-chat.c:3558
-#: ../libempathy-gtk/empathy-log-window.c:654
+#: ../libempathy-gtk/empathy-chat.c:3893
 msgid "Conversation"
 msgstr "대화"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:422
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:3898
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (단문 문�)"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
 msgid "Unknown or invalid identifier"
 msgstr "아�디를 알 수 없거나 아�디가 올바르지 않습니다"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
 msgid "Contact blocking temporarily unavailable"
 msgstr "연�처 차단� 임시로 사용할 수 없습니다"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
 msgid "Contact blocking unavailable"
 msgstr "연�처 차단� 사용할 수 없습니다"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
 msgid "Permission Denied"
 msgstr "권한� 없습니다"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
 msgid "Could not block contact"
 msgstr "연�처를 차단할 수 없습니다"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:701
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
 msgid "Edit Blocked Contacts"
 msgstr "차단 연�처 편집"
 
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Account:"
+msgstr "계정:"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "차단한 연�처"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "제거"
+
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:794
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "�� 주소 복사(_C)"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:801
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "�� 열기(_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:420
+#: ../libempathy-gtk/empathy-chat-text-view.c:415
 msgid "%A %B %d %Y"
 msgstr "%Y년 %B %d� %A"
 
@@ -1554,25 +1713,25 @@ msgstr "개� 정보"
 msgid "New Contact"
 msgstr "새 연�처"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:532
-#: ../libempathy-gtk/empathy-individual-dialogs.c:198
+#: ../libempathy-gtk/empathy-contact-dialogs.c:533
+#: ../libempathy-gtk/empathy-individual-dialogs.c:200
 #, c-format
 msgid "Block %s?"
 msgstr "%s 차단하시겠습니까?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:537
-#: ../libempathy-gtk/empathy-individual-dialogs.c:239
+#: ../libempathy-gtk/empathy-contact-dialogs.c:538
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "'%s' 사용�가 연�하지 못하�� 차단하시겠습니까?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:542
-#: ../libempathy-gtk/empathy-individual-dialogs.c:261
+#: ../libempathy-gtk/empathy-contact-dialogs.c:543
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
 msgid "_Block"
 msgstr "차단(_B)"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:552
-#: ../libempathy-gtk/empathy-individual-dialogs.c:270
+#: ../libempathy-gtk/empathy-contact-dialogs.c:559
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "� 연�처를 불량 사용�로 신고(_R)"
@@ -1597,301 +1756,331 @@ msgstr "그룹 없�"
 msgid "Favorite People"
 msgstr "�주 연�하는 사람"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2012
-#: ../libempathy-gtk/empathy-individual-view.c:2327
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "정�로 '%s' 그룹� 지우시겠습니까?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2014
-#: ../libempathy-gtk/empathy-individual-view.c:2330
+#: ../libempathy-gtk/empathy-contact-list-view.c:1988
+#: ../libempathy-gtk/empathy-individual-view.c:2379
 msgid "Removing group"
 msgstr "그룹 지우기"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2063
-#: ../libempathy-gtk/empathy-contact-list-view.c:2140
-#: ../libempathy-gtk/empathy-individual-view.c:2385
-#: ../libempathy-gtk/empathy-individual-view.c:2552
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../libempathy-gtk/empathy-contact-list-view.c:2037
+#: ../libempathy-gtk/empathy-contact-list-view.c:2114
+#: ../libempathy-gtk/empathy-individual-view.c:2434
+#: ../libempathy-gtk/empathy-individual-view.c:2637
 msgid "_Remove"
 msgstr "제거(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2093
-#: ../libempathy-gtk/empathy-individual-view.c:2438
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
+#: ../libempathy-gtk/empathy-individual-view.c:2501
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "정�로 '%s' 연�처를 지우시겠습니까?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2095
-#: ../libempathy-gtk/empathy-individual-view.c:2457
+#: ../libempathy-gtk/empathy-contact-list-view.c:2069
+#: ../libempathy-gtk/empathy-individual-view.c:2522
 msgid "Removing contact"
 msgstr "연�처를 지�니다"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:219
-#: ../src/empathy-main-window.ui.h:13
+#: ../libempathy-gtk/empathy-contact-menu.c:220
+#: ../src/empathy-main-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "연�처 추가(_A)…"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:296
+#: ../libempathy-gtk/empathy-contact-menu.c:300
 msgid "_Block Contact"
 msgstr "연�처 차단(_B)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:325
-#: ../libempathy-gtk/empathy-individual-menu.c:517
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:329
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "대화(_C)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:356
-#: ../libempathy-gtk/empathy-individual-menu.c:560
+#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "�성 호출(_A)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:387
-#: ../libempathy-gtk/empathy-individual-menu.c:602
+#: ../libempathy-gtk/empathy-contact-menu.c:394
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "�� 호출(_V)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:433
-#: ../libempathy-gtk/empathy-individual-menu.c:645
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:440
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "예전 대화(_P)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:455
-#: ../libempathy-gtk/empathy-individual-menu.c:686
+#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "파� 보내기"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:478
-#: ../libempathy-gtk/empathy-individual-menu.c:728
+#: ../libempathy-gtk/empathy-contact-menu.c:485
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
 msgstr "내 �스�톱 공유"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:518
-#: ../libempathy-gtk/empathy-contact-widget.c:1762
-#: ../libempathy-gtk/empathy-individual-menu.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:1370
+#: ../libempathy-gtk/empathy-contact-menu.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:1886
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "�겨 찾기"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:547
-#: ../libempathy-gtk/empathy-individual-menu.c:789
+#: ../libempathy-gtk/empathy-contact-menu.c:554
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "ì •ë³´(_M)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:593
+#: ../libempathy-gtk/empathy-contact-menu.c:600
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "편집(_E)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:647
-#: ../libempathy-gtk/empathy-individual-menu.c:970
-#: ../src/empathy-chat-window.c:919
+#: ../libempathy-gtk/empathy-contact-menu.c:654
+#: ../libempathy-gtk/empathy-individual-menu.c:1283
+#: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "� 방� 초대"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:678
-#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-contact-menu.c:685
+#: ../libempathy-gtk/empathy-individual-menu.c:1329
 msgid "_Invite to Chat Room"
 msgstr "대화방� 초대(_I)"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:508
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
 msgid "Search contacts"
 msgstr "연�처 검색"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:538
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
 msgid "Search: "
 msgstr "검색: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:596
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
 msgid "_Add Contact"
 msgstr "연�처 추가(_A)"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:614
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
 msgid "No contacts found"
 msgstr "연�처가 없습니다"
 
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr "나� 대해 소개하는 메시지:"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
+msgstr "연결하면 제게 연�해 주세요. �사합니다!"
+
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "연�처 선�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:295
+#: ../libempathy-gtk/empathy-contact-widget.c:336
 #: ../libempathy-gtk/empathy-individual-widget.c:153
 msgid "Full name:"
 msgstr "전체 �름:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:296
+#: ../libempathy-gtk/empathy-contact-widget.c:337
 #: ../libempathy-gtk/empathy-individual-widget.c:154
 msgid "Phone number:"
 msgstr "전화번호:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:297
+#: ../libempathy-gtk/empathy-contact-widget.c:338
 #: ../libempathy-gtk/empathy-individual-widget.c:155
 msgid "E-mail address:"
 msgstr "전�메� 주소:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:298
+#: ../libempathy-gtk/empathy-contact-widget.c:339
 #: ../libempathy-gtk/empathy-individual-widget.c:156
 msgid "Website:"
 msgstr "웹사�트:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:299
+#: ../libempathy-gtk/empathy-contact-widget.c:340
 #: ../libempathy-gtk/empathy-individual-widget.c:157
 msgid "Birthday:"
 msgstr "��:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:346
+msgid "Last seen:"
+msgstr "최근 본 때:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:348
+msgid "Connected from:"
+msgstr "연결 받�, 위치:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:353
+msgid "Away message:"
+msgstr "�리 비움 메시지:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+msgid "Channels:"
+msgstr "채� 수:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
 msgstr "ISO 국가 코드:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Country:"
 msgstr "êµ­ê°€:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "State:"
 msgstr "지역:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:768
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "City:"
 msgstr "�시:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:770
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Area:"
 msgstr "구역:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:772
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
 msgstr "우편번호:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:774
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Street:"
 msgstr "길:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:776
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
 msgstr "건물:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:778
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Floor:"
 msgstr "층수:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:780
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Room:"
 msgstr "ë°©:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:782
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Text:"
 msgstr "간�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:784
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Description:"
 msgstr "설명:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:786
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
 msgstr "정확�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:790
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr "오류:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:792
-#: ../libempathy-gtk/empathy-individual-widget.c:517
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
 msgstr "수� 오차 (미터):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:794
-#: ../libempathy-gtk/empathy-individual-widget.c:519
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
 msgstr "수� 오차 (미터):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:521
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr "��:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:523
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Bearing:"
 msgstr "관계:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:800
-#: ../libempathy-gtk/empathy-individual-widget.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
 msgstr "�승 ��:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:802
-#: ../libempathy-gtk/empathy-individual-widget.c:527
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
 msgstr "최근 업��트 시�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:804
-#: ../libempathy-gtk/empathy-individual-widget.c:529
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
 msgstr "경�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:806
-#: ../libempathy-gtk/empathy-individual-widget.c:531
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
 msgstr "위�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:808
-#: ../libempathy-gtk/empathy-individual-widget.c:533
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
 msgstr "고�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:871
-#: ../libempathy-gtk/empathy-contact-widget.c:888
-#: ../libempathy-gtk/empathy-individual-widget.c:615
-#: ../libempathy-gtk/empathy-individual-widget.c:632
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "위치"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:890
-#: ../libempathy-gtk/empathy-individual-widget.c:634
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:942
-#: ../libempathy-gtk/empathy-individual-widget.c:683
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
 msgstr "%Y년 %B %e� %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1024
-#: ../libempathy-gtk/empathy-individual-widget.c:918
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
 msgid "Save Avatar"
 msgstr "아바타 저장"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1080
-#: ../libempathy-gtk/empathy-individual-widget.c:976
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
 msgid "Unable to save avatar"
 msgstr "아바타를 저장할 수 없습니다"
 
@@ -1901,7 +2090,7 @@ msgstr "<b>위치</b> (날짜별)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1305
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr "별명:"
 
@@ -1921,7 +2110,7 @@ msgstr "연�처 �세히"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1509
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "아�디:"
 
@@ -1938,11 +2127,11 @@ msgstr "운� 체제:"
 msgid "Version:"
 msgstr "버전:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:332
+#: ../libempathy-gtk/empathy-groups-widget.c:333
 msgid "Groups"
 msgstr "그룹"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:344
+#: ../libempathy-gtk/empathy-groups-widget.c:345
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -1950,72 +2139,103 @@ msgstr ""
 "� 연�처가 나타날 그룹� 고르십시오. 여러 개� 그룹� 고를 수� 있고 그룹� "
 "고르지 않� 수� 있습니다."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:363
+#: ../libempathy-gtk/empathy-groups-widget.c:364
 msgid "_Add Group"
 msgstr "그룹 추가(_A)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:398
+#: ../libempathy-gtk/empathy-groups-widget.c:399
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "선�"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1436
+#: ../libempathy-gtk/empathy-groups-widget.c:409
+#: ../src/empathy-main-window.c:1807
 msgid "Group"
 msgstr "그룹"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:244
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "다� 아�디를 차단할 예정입니다:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:251
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "다� 아�디를 차단할 수 없습니다:"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
 msgstr "연결할 연�처"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:354
+#: ../libempathy-gtk/empathy-individual-linker.c:370
 msgid "Select contacts to link"
 msgstr "연결할 연�처 선�"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:428
+#: ../libempathy-gtk/empathy-individual-linker.c:444
 msgid "New contact preview"
 msgstr "새 연�처 미리 보기"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:472
+#: ../libempathy-gtk/empathy-individual-linker.c:488
 msgid "Contacts selected in the list on the left will be linked together."
 msgstr "왼쪽� 목��서 선�한 연�처를 서로 연결합니다."
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:131
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:837
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "통화를 할 때 사용할 계정 선�"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "호출"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+msgid "Mobile"
+msgstr "휴대전화"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "�장"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "집"
+
+#. add an SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+msgid "_SMS"
+msgstr "단문 문�(_S)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1141
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "편집(_E)"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:863
+#: ../libempathy-gtk/empathy-individual-menu.c:1167
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "연�처 연결(_L)…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2292
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 msgid "Delete and _Block"
 msgstr "삭제 � 차단(_B)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2446
+#: ../libempathy-gtk/empathy-individual-view.c:2510
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2024,7 +2244,7 @@ msgstr ""
 "정�로 연결� '%s' 연�처를 제거하시겠습니까? 그러면 연결� 항목� 들어 있는 "
 "모든 연�처가 지워집니다."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1650
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2106,65 +2326,199 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "연결 해제(_U)"
 
-#: ../libempathy-gtk/empathy-log-window.c:664
-msgid "Date"
-msgstr "시�"
+#: ../libempathy-gtk/empathy-log-window.c:634
+msgid "History"
+msgstr "기�"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
-msgstr "대화"
+#: ../libempathy-gtk/empathy-log-window.c:689
+msgid "Show"
+msgstr "보�기"
+
+#: ../libempathy-gtk/empathy-log-window.c:711
+msgid "Search"
+msgstr "검색"
+
+#: ../libempathy-gtk/empathy-log-window.c:1159
+#, c-format
+msgid "Chat in %s"
+msgstr "대화, 장소: %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1161
+#, c-format
+msgid "Chat with %s"
+msgstr "대화, �대: %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%Y년 %B %e� %A, %X"
+
+#. Translators: this is an emote: '* Danielle waves'
+#: ../libempathy-gtk/empathy-log-window.c:1300
+#, c-format
+msgid "<i>* %s %s</i>"
+msgstr "<i>* %s %s</i>"
+
+#. Translators: this is a message: 'Danielle: hello'
+#. * The string in bold is the sender's name
+#: ../libempathy-gtk/empathy-log-window.c:1306
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1382
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%sì´ˆ"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s분"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "통화 시간 %s, 종료 %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1729
+msgid "Today"
+msgstr "오늘"
+
+#: ../libempathy-gtk/empathy-log-window.c:1733
+msgid "Yesterday"
+msgstr "어제"
+
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
+msgid "%e %B %Y"
+msgstr "%Y년 %B %e�"
+
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3425
+msgid "Anytime"
+msgstr "모든 시간"
+
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2353
+msgid "Anyone"
+msgstr "모든 �대"
+
+#: ../libempathy-gtk/empathy-log-window.c:2666
+msgid "Who"
+msgstr "�대"
+
+#: ../libempathy-gtk/empathy-log-window.c:2870
+msgid "When"
+msgstr "시간"
+
+#: ../libempathy-gtk/empathy-log-window.c:2986
+msgid "Anything"
+msgstr "모�"
+
+#: ../libempathy-gtk/empathy-log-window.c:2988
+msgid "Text chats"
+msgstr "�스트 채팅"
+
+#: ../libempathy-gtk/empathy-log-window.c:2990
+#: ../src/empathy-preferences.ui.h:4
+msgid "Calls"
+msgstr "통화"
+
+#: ../libempathy-gtk/empathy-log-window.c:2995
+msgid "Incoming calls"
+msgstr "받� 통화"
+
+#: ../libempathy-gtk/empathy-log-window.c:2996
+msgid "Outgoing calls"
+msgstr "보낸 통화"
+
+#: ../libempathy-gtk/empathy-log-window.c:2997
+msgid "Missed calls"
+msgstr "놓친 통화"
+
+#: ../libempathy-gtk/empathy-log-window.c:3019
+msgid "What"
+msgstr "ë‚´ìš©"
+
+#: ../libempathy-gtk/empathy-log-window.c:3728
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr "정�로 �전 대화 기�� 삭제하시겠습니까?"
+
+#: ../libempathy-gtk/empathy-log-window.c:3732
+msgid "Clear All"
+msgstr "모� 지우기"
+
+#: ../libempathy-gtk/empathy-log-window.c:3739
+msgid "Delete from:"
+msgstr "삭제할 곳:"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">�어들�는 중...</span>"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "다� 찾기"
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Chat"
+msgstr "대화"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "�전 찾기"
+msgid "Delete All History..."
+msgstr "모든 기� 삭제..."
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr "예전 대화"
+msgid "Profile"
+msgstr "프로파�"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Video"
+msgstr "��"
 
-#. Tab Label
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "검색"
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:20
+msgid "_Edit"
+msgstr "편집(_E)"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "_File"
+msgstr "파�(_F)"
 
-#. Searching *for* something
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "검색할 �(_F):"
+msgid "page 2"
+msgstr "페�지 2"
 
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
 msgid "Contact ID:"
 msgstr "연�처 아�디:"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:171
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
 msgid "C_hat"
 msgstr "대화(_H)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:181
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
 msgstr "새 대화"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:252
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
 msgid "Send _Video"
 msgstr "�� 보내기(_V)"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:260
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
 msgid "C_all"
 msgstr "호출(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:270
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "New Call"
 msgstr "새 호출"
 
@@ -2183,34 +2537,34 @@ msgstr ""
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Message…"
 msgstr "사용� 지정 메시지…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messages…"
 msgstr "사용� 설정 메시지 편집…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
 msgstr "� �태를 선호하는 값�서 지우려면 누르십시오"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
 msgstr "� �태를 선호하는 값으로 하려면 누르십시오"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
 msgstr "�태 설정"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:948
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
 msgid "Set your presence and current status"
 msgstr "현재 �태를 설정합니다"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1136
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
 msgid "Custom messages…"
 msgstr "사용� 지정 메시지…"
 
@@ -2223,18 +2577,26 @@ msgstr "사용� 지정 메시지…"
 msgid "New %s account"
 msgstr "새 %s 계정"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "찾기:"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "대소문� 구별"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Mat_ch case"
+msgstr "대소문� 구별(_C)"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
 msgid "Phrase not found"
 msgstr "찾지 못했습니다"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "_Next"
+msgstr "다�(_N)"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+msgid "_Previous"
+msgstr "�전(_P)"
+
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
 msgstr "�스턴스 메시지를 받았습니다"
@@ -2275,35 +2637,33 @@ msgstr "�성 호출 보냈습니다"
 msgid "Voice call ended"
 msgstr "�성 통화를 마쳤습니다"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "사용� 설정 메시지 입력"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
 msgstr "사용� 설정 메시지 편집"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr "새 �태 메시지 저장(_N)"
+# �태 메시지
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#, c-format
+msgid "Message edited at %s"
+msgstr "메시지 편집, %s"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Status Messages"
-msgstr "저장한 �태 메시지"
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
+msgid "Normal"
+msgstr "보통"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "�래�"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "간단"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "깔�"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "파랑"
 
@@ -2378,26 +2738,28 @@ msgstr "앞으로 연결할 때 �렇게 선�"
 msgid "Certificate Details"
 msgstr "��서 �세 정보"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1707
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
 msgstr "URI를 열 수 없습니다"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1802
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
 msgstr "파�� 선�하십시오"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1874
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
 msgid "Insufficient free space to save file"
 msgstr "파�� 저장할 빈 공간� 부족합니다"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1882
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
-msgstr "� 파�� 저장하려면 %s 만�� 빈 공간� 필요하지만, 남� 용량� %s입니다. 다른 위치를 선�하십시오."
+msgstr ""
+"� 파�� 저장하려면 %s 만�� 빈 공간� 필요하지만, 남� 용량� %s입니다. 다"
+"른 위치를 선�하십시오."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1926
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid "Incoming file from %s"
 msgstr "%s�서 온 파�"
@@ -2585,24 +2947,24 @@ msgstr "오류 메시지 없�"
 msgid "Instant Message (Empathy)"
 msgstr "메신저 (엠�시)"
 
-#: ../src/empathy.c:308
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "시작할 때 연결하지 않습니다"
 
-#: ../src/empathy.c:312
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "시작할 때 연�처 목��나 기타 대화창� 표시하지 않습니다"
 
 # IM� 메신저�고 번역
-#: ../src/empathy.c:320
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr "- 엠�시 메신저 ���언트"
 
-#: ../src/empathy.c:499
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
 msgstr "계정 관리� 연결하는� 오류"
 
-#: ../src/empathy.c:501
+#: ../src/empathy.c:639
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2686,7 +3048,7 @@ msgstr ""
 "중� 편집 메뉴�서 계정� 추가할 수� 있습니다."
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1268
+#: ../src/empathy-account-assistant.c:1271
 msgid "An error occurred"
 msgstr "오류가 발�했습니다"
 
@@ -2750,17 +3112,17 @@ msgstr "아니오, 현재 주위� 연결한 사람� 보고 싶습니다"
 msgid "Select the accounts you want to import:"
 msgstr "가져오려는 계정� 선�하십시오:"
 
-#: ../src/empathy-account-assistant.c:810
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-account-assistant.c:813
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "Yes"
 msgstr "예"
 
-#: ../src/empathy-account-assistant.c:817
+#: ../src/empathy-account-assistant.c:820
 msgid "No, that's all for now"
 msgstr "아니오, 지금� �습니다"
 
-#: ../src/empathy-account-assistant.c:1082
+#: ../src/empathy-account-assistant.c:1085
 msgid ""
 "Empathy can automatically discover and chat with the people connected on the "
 "same network as you. If you want to use this feature, please check that the "
@@ -2771,16 +3133,16 @@ msgstr ""
 "사용하려면 먼저 아래 사항� 올바른지 확�하십시오. '계정' 대화창�서 � 설정"
 "� 바꿀 수� 있고, � 기능� � 수� 있습니다."
 
-#: ../src/empathy-account-assistant.c:1088
-#: ../src/empathy-account-assistant.c:1144
+#: ../src/empathy-account-assistant.c:1091
+#: ../src/empathy-account-assistant.c:1147
 msgid "Edit->Accounts"
 msgstr "편집->계정"
 
-#: ../src/empathy-account-assistant.c:1104
+#: ../src/empathy-account-assistant.c:1107
 msgid "I do _not want to enable this feature for now"
 msgstr "� 기능 사용하지 않기(_N)"
 
-#: ../src/empathy-account-assistant.c:1140
+#: ../src/empathy-account-assistant.c:1143
 msgid ""
 "You won't be able to chat with people connected to your local network, as "
 "telepathy-salut is not installed. If you want to enable this feature, please "
@@ -2791,24 +3153,24 @@ msgstr ""
 "수 없습니다. � 기능� 사용하려면 telepathy-salut 패키지를 설치하고 '계정' 대"
 "화창�서 '주변 사람\"� 만드십시오"
 
-#: ../src/empathy-account-assistant.c:1146
+#: ../src/empathy-account-assistant.c:1149
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut를 설치하지 않았습니다"
 
-#: ../src/empathy-account-assistant.c:1192
+#: ../src/empathy-account-assistant.c:1195
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "메신저 � VoIP 계정 �우미"
 
-#: ../src/empathy-account-assistant.c:1226
+#: ../src/empathy-account-assistant.c:1229
 msgid "Welcome to Empathy"
 msgstr "안녕하세요, 엠�시입니다"
 
 # tooltip
-#: ../src/empathy-account-assistant.c:1235
+#: ../src/empathy-account-assistant.c:1238
 msgid "Import your existing accounts"
 msgstr "기존 계정� 가져옵니다"
 
-#: ../src/empathy-account-assistant.c:1253
+#: ../src/empathy-account-assistant.c:1256
 msgid "Please enter personal details"
 msgstr "개� 정보를 입력하십시오"
 
@@ -2825,34 +3187,35 @@ msgstr "%s 계정� 저장하지 않� 수정 사항� 있습니다."
 msgid "Your new account has not been saved yet."
 msgstr "새로 만든 계정� 아� 저장하지 않았습니다."
 
-#: ../src/empathy-accounts-dialog.c:286
-#: ../src/empathy-streamed-media-window.c:809
+#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1175
 msgid "Connecting…"
 msgstr "연결하는 중…"
 
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:386
 #, c-format
 msgid "Offline — %s"
 msgstr "연결 중지 �태 — %s"
 
-#: ../src/empathy-accounts-dialog.c:339
+#: ../src/empathy-accounts-dialog.c:398
 #, c-format
 msgid "Disconnected — %s"
 msgstr "연결 �김 — %s"
 
-#: ../src/empathy-accounts-dialog.c:350
+#: ../src/empathy-accounts-dialog.c:409
 msgid "Offline — No Network Connection"
 msgstr "연결 중지 �태 — 네트워� 연결 없�"
 
-#: ../src/empathy-accounts-dialog.c:357
+#: ../src/empathy-accounts-dialog.c:416
 msgid "Unknown Status"
 msgstr "알 수 없는 �태"
 
-#: ../src/empathy-accounts-dialog.c:369
+#: ../src/empathy-accounts-dialog.c:428
 msgid "Offline — Account Disabled"
 msgstr "연결 중지 �태 — 계정 사용하지 않�"
 
-#: ../src/empathy-accounts-dialog.c:772
+#: ../src/empathy-accounts-dialog.c:831
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2860,16 +3223,16 @@ msgstr ""
 "새 계정� 만드려 합니다. 그러면 바� 사항� 잃어버리게 �니다. 정� 계� 하시"
 "겠습니까?"
 
-#: ../src/empathy-accounts-dialog.c:1133
+#: ../src/empathy-accounts-dialog.c:1192
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "정�로 컴퓨터�서 %s 계정� 제거하시겠습니까?"
 
-#: ../src/empathy-accounts-dialog.c:1137
+#: ../src/empathy-accounts-dialog.c:1196
 msgid "This will not remove your account on the server."
 msgstr "서버� 계정� 제거하지 않습니다."
 
-#: ../src/empathy-accounts-dialog.c:1375
+#: ../src/empathy-accounts-dialog.c:1432
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2878,15 +3241,15 @@ msgstr ""
 "하시겠습니까?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1571
+#: ../src/empathy-accounts-dialog.c:1643
 msgid "_Enable"
 msgstr "사용(_E)"
 
-#: ../src/empathy-accounts-dialog.c:1572
+#: ../src/empathy-accounts-dialog.c:1644
 msgid "_Disable"
 msgstr "사용 않기(_D)"
 
-#: ../src/empathy-accounts-dialog.c:2086
+#: ../src/empathy-accounts-dialog.c:2154
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2895,36 +3258,36 @@ msgstr ""
 "니까?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "추가…"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
 msgid "Loading account information"
 msgstr "계정 정보를 �어들�는 중입니다"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "No protocol installed"
 msgstr "프로토콜� 설치하지 않았습니다"
 
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Protocol:"
 msgstr "프로토콜:"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr "새 계정� 만들면, 해당 프로토콜� 백엔드를 먼저 설치해야 합니다."
 
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add…"
-msgstr "추가(_A)…"
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Import…"
 msgstr "가져오기(_I)…"
 
-#: ../src/empathy-auth-client.c:243
+#: ../src/empathy-auth-client.c:249
 msgid " - Empathy authentication client"
 msgstr " - 엠�시 �� ���언트"
 
-#: ../src/empathy-auth-client.c:259
+#: ../src/empathy-auth-client.c:265
 msgid "Empathy authentication client"
 msgstr "엠�시 �� ���언트"
 
@@ -2932,94 +3295,116 @@ msgstr "엠�시 �� ���언트"
 msgid "People nearby"
 msgstr "주변 사람"
 
-#: ../src/empathy-av.c:118
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr "- 엠�시 �성/�� ���언트"
 
-#: ../src/empathy-av.c:134
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "엠�시 �성/�� ���언트"
 
-#: ../src/empathy-streamed-media-window.c:479
+#: ../src/empathy-streamed-media-window.c:431
 msgid "Contrast"
 msgstr "대비"
 
-#: ../src/empathy-streamed-media-window.c:482
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Brightness"
 msgstr "�기"
 
-#: ../src/empathy-streamed-media-window.c:485
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Gamma"
 msgstr "�마"
 
-#: ../src/empathy-streamed-media-window.c:590
+#: ../src/empathy-streamed-media-window.c:542
 msgid "Volume"
 msgstr "볼륨"
 
-#: ../src/empathy-streamed-media-window.c:1165
+#: ../src/empathy-streamed-media-window.c:1110
 msgid "_Sidebar"
 msgstr "가장�리 창(_S)"
 
-#: ../src/empathy-streamed-media-window.c:1185
+#: ../src/empathy-streamed-media-window.c:1130
 msgid "Audio input"
 msgstr "�성 입력"
 
-#: ../src/empathy-streamed-media-window.c:1189
+#: ../src/empathy-streamed-media-window.c:1134
 msgid "Video input"
 msgstr "�� 입력"
 
-#: ../src/empathy-streamed-media-window.c:1193
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Dialpad"
 msgstr "숫��"
 
-#: ../src/empathy-streamed-media-window.c:1198
+#: ../src/empathy-streamed-media-window.c:1151
 msgid "Details"
 msgstr "�세히"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1267
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1782
 #, c-format
 msgid "Call with %s"
 msgstr "호출: %s"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-streamed-media-window.c:1346
-msgid "Call"
-msgstr "호출"
-
-#: ../src/empathy-streamed-media-window.c:1500
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:2026
 msgid "The IP address as seen by the machine"
 msgstr "컴퓨터�서 확�한 IP 주소"
 
-#: ../src/empathy-streamed-media-window.c:1502
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:2028
 msgid "The IP address as seen by a server on the Internet"
 msgstr "�터넷 서버�서 확�한 IP 주소"
 
-#: ../src/empathy-streamed-media-window.c:1504
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:2030
 msgid "The IP address of the peer as seen by the other side"
 msgstr "다른 �대편 컴퓨터�서 확�한 IP 주소"
 
-#: ../src/empathy-streamed-media-window.c:1506
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:2032
 msgid "The IP address of a relay server"
 msgstr "중계 서버가 확�한 IP 주소"
 
-#: ../src/empathy-streamed-media-window.c:1508
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:2034
 msgid "The IP address of the multicast group"
 msgstr "멀티�스트 그룹� IP 주소"
 
+#: ../src/empathy-streamed-media-window.c:1843
+msgctxt "encoding video codec"
+msgid "Unknown"
+msgstr "알 수 없�"
+
+#: ../src/empathy-streamed-media-window.c:1846
+msgctxt "encoding audio codec"
+msgid "Unknown"
+msgstr "알 수 없�"
+
+#: ../src/empathy-streamed-media-window.c:1849
+msgctxt "decoding video codec"
+msgid "Unknown"
+msgstr "알 수 없�"
+
+#: ../src/empathy-streamed-media-window.c:1852
+msgctxt "decoding audio codec"
+msgid "Unknown"
+msgstr "알 수 없�"
+
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-streamed-media-window.c:2144
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "연결 — %d:%02d"
 
-#: ../src/empathy-streamed-media-window.c:2320
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2798
 msgid "Technical Details"
 msgstr "기술 정보"
 
-#: ../src/empathy-streamed-media-window.c:2358
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2836
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3028,7 +3413,8 @@ msgstr ""
 "� 컴퓨터�서 지�하는 �성 형� 중�서 %s 측� 소프트웨어�서 지�하지 않는 "
 "�성 형�� 있습니다."
 
-#: ../src/empathy-streamed-media-window.c:2363
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2841
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3037,7 +3423,8 @@ msgstr ""
 "� 컴퓨터�서 지�하는 �� 형� 중�서 %s 측� 소프트웨어�서 지�하지 않는 "
 "�� 형�� 있습니다."
 
-#: ../src/empathy-streamed-media-window.c:2369
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2847
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3046,23 +3433,27 @@ msgstr ""
 "%s� 연결할 수 없습니다. 현재 �접 연결� 허용하지 않는 네트워�� 연결�어 "
 "있� 수� 있습니다."
 
-#: ../src/empathy-streamed-media-window.c:2375
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2853
 msgid "There was a failure on the network"
 msgstr "네트워� 관련해 실패했습니다."
 
-#: ../src/empathy-streamed-media-window.c:2379
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2857
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "� 호출� 필요한 �성 형�� 지�하는 기능� 컴퓨터� 설치하지 않았습니다."
 
-#: ../src/empathy-streamed-media-window.c:2382
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2860
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "� 호출� 필요한 �� 형�� 지�하는 기능� 컴퓨터� 설치하지 않았습니다."
 
-#: ../src/empathy-streamed-media-window.c:2392
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2872
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3072,143 +3463,195 @@ msgstr ""
 "텔레파시 컴�넌트� 예�치 못한 �� 발�했습니다. <a href=\"%s\">� 버그를 "
 "보고해 주시고</a> �움� 메뉴� '디버깅' 창� 있는 기�� 첨부하십시오."
 
-#: ../src/empathy-streamed-media-window.c:2400
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2881
 msgid "There was a failure in the call engine"
 msgstr "호출 엔진� 실패가 발�했습니다"
 
-#: ../src/empathy-streamed-media-window.c:2403
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2884
 msgid "The end of the stream was reached"
 msgstr "스트림� �났습니다"
 
-#: ../src/empathy-streamed-media-window.c:2443
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2924
 msgid "Can't establish audio stream"
 msgstr "�성 스트림� 연결할 수 없습니다"
 
-#: ../src/empathy-streamed-media-window.c:2453
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2934
 msgid "Can't establish video stream"
 msgstr "�� 스트림� 연결할 수 없습니다"
 
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "Audio"
 msgstr "�성"
 
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "� 연�처� 다시 호출"
-
 #: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "카메� �기"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "디코딩 코�:"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "카메� 켜기"
+msgid "Disable camera"
+msgstr "카메� 사용 않기"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "디코딩 코�:"
+msgid "Display the dialpad"
+msgstr "숫�� 표시"
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "카메�를 사용하지 않고 �� 보내기를 중지합니다"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "�코딩 코�:"
 
 #: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "카메�를 사용하고 ��� 보냅니다"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Hang up"
+msgstr "�기"
 
 #: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "카메�를 사용하지만 ��� 보내지 않습니다"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Hang up current call"
+msgstr "현재 호출� �습니다"
 
 #: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "�코딩 코�:"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "로컬 후보:"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "�기"
+msgid "Maximise me"
+msgstr "최대화"
 
 #: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr "현재 호출� �습니다"
+msgid "Minimise me"
+msgstr "최소화"
 
 #: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "로컬 후보:"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "�격 후보:"
 
 #: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "미리 보기"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Send Audio"
+msgstr "�성 보내기"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "다시 걸기"
+msgid "Send Video"
+msgstr "�� 보내기"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "�격 후보:"
+msgid "Show dialpad"
+msgstr "숫�� 표시"
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "�성 보내기"
+msgid "Start a video call"
+msgstr "�� 통화 시작"
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "오디오 전송� 켜고 �니다"
+msgid "Start an audio call"
+msgstr "�성 통화 시작"
+
+#: ../src/empathy-call-window.ui.h:18
+msgid "Swap camera"
+msgstr "카메� 바꾸기"
 
 #: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "��(_I)"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr "오디오 전송� 켜고 �니다"
 
 #: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "��"
+msgid "Toggle video transmission"
+msgstr "비디오 전송� 켜고 �니다"
 
 #: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "�� �기"
-
-#: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "�� 켜기"
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:2431 ../src/empathy-call-window.c:2432
+#: ../src/empathy-call-window.c:2433 ../src/empathy-call-window.c:2434
+msgid "Unknown"
+msgstr "알 수 없�"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "�� 미리 보기"
+msgid "Video call"
+msgstr "�� 통화"
 
 #: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
-msgstr "호출(_C)"
+msgstr "통화(_C)"
+
+#: ../src/empathy-call-window.ui.h:25
+msgid "_Camera"
+msgstr "카메�(_C)"
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:18
+msgid "_Contents"
+msgstr "차례(_C)"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
+msgid "_Debug"
+msgstr "디버깅(_D)"
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:22
+msgid "_Help"
+msgstr "�움�(_H)"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Microphone"
+msgstr "마��(_M)"
 
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:31
+msgid "_Settings"
+msgstr "설정(_S)"
+
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "보기(_V)"
 
-#: ../src/empathy-chat-window.c:472 ../src/empathy-chat-window.c:492
+#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d개 �지 않�)"
 
-#: ../src/empathy-chat-window.c:484
+#: ../src/empathy-chat-window.c:493
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (기타 %u개)"
 
-#: ../src/empathy-chat-window.c:500
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (다른 탭 %d개 �지 않�)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:518
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (모� %d개 �지 않�)"
 
-#: ../src/empathy-chat-window.c:711
+#: ../src/empathy-chat-window.c:733
+msgid "SMS:"
+msgstr "단문 문�:"
+
+#: ../src/empathy-chat-window.c:743
+#, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "메시지 %d개 보내는 중"
+
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
 msgstr "메시지를 입력하는 중입니다."
 
@@ -3220,10 +3663,6 @@ msgstr "지우기(_L)"
 msgid "C_ontact"
 msgstr "연�처(_O)"
 
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "대화"
-
 #: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
 msgstr "�모티콘 입력(_S)"
@@ -3244,10 +3683,6 @@ msgstr "탭 오른쪽으로 ��(_R)"
 msgid "Notify for All Messages"
 msgstr "모든 메시지 알리기"
 
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
-msgid "_Contents"
-msgstr "차례(_C)"
-
 #: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "대화(_C)"
@@ -3256,18 +3691,10 @@ msgstr "대화(_C)"
 msgid "_Detach Tab"
 msgstr "탭 떼어내기(_D)"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
-msgid "_Edit"
-msgstr "편집(_E)"
-
 #: ../src/empathy-chat-window.ui.h:13
 msgid "_Favorite Chat Room"
 msgstr "�겨 찾는 대화방(_F)"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
-msgid "_Help"
-msgstr "�움�(_H)"
-
 #: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "다� 탭(_N)"
@@ -3288,15 +3715,15 @@ msgstr "탭(_T)"
 msgid "_Undo Close Tab"
 msgstr "탭 닫기 실행 취소(_U)"
 
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "�름"
 
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
 msgstr "ë°©"
 
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "�� 연결"
 
@@ -3304,90 +3731,96 @@ msgstr "�� 연결"
 msgid "Manage Favorite Rooms"
 msgstr "�겨 찾기 대화방 관리"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming video call"
 msgstr "�� 호출 받�"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1408
 msgid "Incoming call"
 msgstr "호출 받�"
 
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:525
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s 님� �� 호출하고 있습니다. �답하시겠습니까?"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s 님� 호출하고 있습니다. �답하시겠습니까?"
 
-#: ../src/empathy-event-manager.c:515 ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1414
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s�서 온 호출"
 
-#: ../src/empathy-event-manager.c:540
+#: ../src/empathy-event-manager.c:554
 msgid "_Reject"
 msgstr "거부(_R)"
 
-#: ../src/empathy-event-manager.c:546
+#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
 msgid "_Answer"
 msgstr "�답(_A)"
 
-#: ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:570
+msgid "_Answer with video"
+msgstr "��으로 �답(_A)"
+
+#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1414
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "%s�서 온 �� 호출"
 
-#: ../src/empathy-event-manager.c:737
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
 msgstr "방 초대"
 
-#: ../src/empathy-event-manager.c:739
+#: ../src/empathy-event-manager.c:838
 #, c-format
 msgid "Invitation to join %s"
 msgstr "%s 방� 초대"
 
-#: ../src/empathy-event-manager.c:746
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s 님� %s 방� 초대합니다"
 
-#: ../src/empathy-event-manager.c:754
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
 msgstr "ê±°ì ˆ(_D)"
 
-#: ../src/empathy-event-manager.c:759
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "입장(_J)"
 
-#: ../src/empathy-event-manager.c:786
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s 님� %s 방� 초대했습니다"
 
-#: ../src/empathy-event-manager.c:792
+#: ../src/empathy-event-manager.c:891
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "%s 방� 초대 받았습니다"
 
-#: ../src/empathy-event-manager.c:843
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "파� 전송� 받았습니다 (%s�서)"
 
-#: ../src/empathy-event-manager.c:1013 ../src/empathy-main-window.c:370
+#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
 msgid "Password required"
 msgstr "암호 필요"
 
-#: ../src/empathy-event-manager.c:1069
+#: ../src/empathy-event-manager.c:1190
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "\"%s\"님� 연결�었� 때 알 수 있는 권한� 요청합니다"
 
-#: ../src/empathy-event-manager.c:1073
+#: ../src/empathy-event-manager.c:1194
 #, c-format
 msgid ""
 "\n"
@@ -3397,105 +3830,105 @@ msgstr ""
 "메시지: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:100
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:102
+#: ../src/empathy-ft-manager.c:103
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:179
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "알 수 없�"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s (전체 %s, �� %s/s)"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:275
 #, c-format
 msgid "%s of %s"
 msgstr "%s (ì „ì²´ %s)"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:305
+#: ../src/empathy-ft-manager.c:306
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "\"%s\" 파� 받는 중 (%s�서)"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:309
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "\"%s\" 파� 보내는 중 (%s�게)"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:338
+#: ../src/empathy-ft-manager.c:339
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "\"%s\" 파�� %s�서 받는 중 오류"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:342
 msgid "Error receiving a file"
 msgstr "파�� 받는� 오류"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:347
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "\"%s\" 파�� %s� 보내는 중 오류"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:350
 msgid "Error sending a file"
 msgstr "파�� 보내는� 오류"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:489
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" 파� 받� (%s�서)"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:493
+#: ../src/empathy-ft-manager.c:494
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" 파� 보냄 (%s�게)"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:497
 msgid "File transfer completed"
 msgstr "파� 전송 완료"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
 msgid "Waiting for the other participant's response"
 msgstr "다른 참��� �답� 기다리는 중입니다"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "\"%s\" 파�� 올바른지 검사하는 중입니다"
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "\"%s\"� 해시를 구하는 중입니다"
 
-#: ../src/empathy-ft-manager.c:1016
+#: ../src/empathy-ft-manager.c:1026
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1028
+#: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "파�"
 
-#: ../src/empathy-ft-manager.c:1050
+#: ../src/empathy-ft-manager.c:1060
 msgid "Remaining"
 msgstr "남�"
 
@@ -3530,127 +3963,140 @@ msgstr "프로토콜"
 msgid "Source"
 msgstr "소스"
 
-#: ../src/empathy-main-window.c:387
+#: ../src/empathy-main-window.c:392
 msgid "Provide Password"
 msgstr "암호 입력"
 
-#: ../src/empathy-main-window.c:393
+#: ../src/empathy-main-window.c:398
 msgid "Disconnect"
 msgstr "연결 �기"
 
-#: ../src/empathy-main-window.c:533
+#: ../src/empathy-main-window.c:622
 msgid "No match found"
 msgstr "해당 사항� 없습니다"
 
-#: ../src/empathy-main-window.c:688
+#: ../src/empathy-main-window.c:777
 msgid "Reconnect"
 msgstr "다시 연결"
 
-#: ../src/empathy-main-window.c:694
+#: ../src/empathy-main-window.c:783
 msgid "Edit Account"
 msgstr "계정 편집"
 
-#: ../src/empathy-main-window.c:700
+#: ../src/empathy-main-window.c:789
 msgid "Close"
 msgstr "닫기"
 
-#: ../src/empathy-main-window.c:1418
+#. Translators: this string will be something like:
+#. *   Top up My Account ($1.23)..."
+#: ../src/empathy-main-window.c:928
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr "%s 올리기 (%s)..."
+
+#: ../src/empathy-main-window.c:975
+msgid "Top up account credit"
+msgstr "계정 �레디트 올리기"
+
+#. top up button
+#: ../src/empathy-main-window.c:1046
+msgid "Top Up..."
+msgstr "올리기..."
+
+#: ../src/empathy-main-window.c:1789
 msgid "Contact"
 msgstr "연�처"
 
-#: ../src/empathy-main-window.c:1765
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "연�처 목�"
 
-#: ../src/empathy-main-window.c:1881
-msgid "Show and edit accounts"
-msgstr "계정� 보고 편집합니다"
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "지� 위� 연�처(_M)"
 
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-main-window-menubar.ui.h:2
+msgid "Credit Balance"
+msgstr "�레디트 잔액"
+
+#: ../src/empathy-main-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "연�처 목��서 찾기(_L)"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "�겨 찾기� 입장(_F)"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "�겨 찾기 관리"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "보통 �기(_O)"
 
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "새 호출(_C)…"
 
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "보통 �기, 아바타 �함(_A)"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "기본 설정(_R)"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "프로토콜 표시(_R)"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "�름 순서로 정렬(_N)"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "�태 순서로 정렬(_S)"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "계정(_A)"
 
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "차단한 연�처(_B)"
 
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "작� �기(_C)"
 
-#: ../src/empathy-main-window.ui.h:18
-msgid "_Debug"
-msgstr "디버깅(_D)"
-
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "파� 전송(_F)"
 
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "입장(_J)…"
 
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "새 대화(_N)…"
 
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "연결 중지 �태 연�처(_O)"
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "개� 정보(_P)"
 
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "ë°©(_R)"
 
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window-menubar.ui.h:29
 msgid "_Search for Contacts…"
 msgstr "연�처 검색(_S)…"
 
@@ -3664,7 +4110,7 @@ msgstr "구성�"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:560
+#: ../src/empathy-new-chatroom-dialog.c:553
 #, c-format
 msgid ""
 "%s\n"
@@ -3677,16 +4123,16 @@ msgstr ""
 "암호 필요: %s\n"
 "구성�: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "No"
 msgstr "아니요"
 
-#: ../src/empathy-new-chatroom-dialog.c:591
+#: ../src/empathy-new-chatroom-dialog.c:584
 msgid "Could not start room listing"
 msgstr "방 목�� 시작할 수 없습니다"
 
-#: ../src/empathy-new-chatroom-dialog.c:601
+#: ../src/empathy-new-chatroom-dialog.c:594
 msgid "Could not stop room listing"
 msgstr "방 목�� 중지할 수 없습니다"
 
@@ -3720,45 +4166,85 @@ msgid "_Room:"
 msgstr "대화방(_R):"
 
 # �태 메시지
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr "메시지 받�"
 
 # �태 메시지
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr "메시지 보냄"
 
 # �태 메시지
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
 msgstr "새 대화"
 
 # �태 메시지
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
 msgstr "연�처가 온��"
 
 # �태 메시지
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
 msgstr "연�처가 연결 중지 �태"
 
 # �태 메시지
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
 msgstr "계정 연결"
 
 # �태 메시지
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
 msgstr "계정 연결 �김"
 
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr "언어"
 
-#: ../src/empathy-preferences.c:875
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:734
+msgid "Juliet"
+msgstr "줄리엣"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:741
+msgid "Romeo"
+msgstr "로미오"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:747
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr "아, 로미오! 로미오! 어째서 당신 �름� 로미오�가요?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:750
+msgid "Deny thy father and refuse thy name;"
+msgstr "아버지를 잊으시고 그 �름� 버리세요."
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:753
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr "그게 싫거든 저를 사랑한다고 맹세만��� 해주세요."
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:756
+msgid "And I'll no longer be a Capulet."
+msgstr "그렇게 못하시겠다면 차�리 제가 � �� �플리트 가문� 성� 쓰지 않겠어요."
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:759
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr "좀 � 들어볼까? 아니면 지금 �� 걸어볼까? "
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:762
+msgid "Juliet has disconnected"
+msgstr "줄리엣 님� 연결� �겼습니다"
+
+#: ../src/empathy-preferences.c:1166
 msgid "Preferences"
 msgstr "기본 설정"
 
@@ -3766,68 +4252,84 @@ msgstr "기본 설정"
 msgid "Appearance"
 msgstr "모양"
 
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
 msgstr "�작"
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
 msgid "Chat Th_eme:"
 msgstr "대화 테마(_E):"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
 msgid "Disable notifications when _away or busy"
 msgstr "�리 비움�거나 다른 용무 중� 때 알리지 않기(_A)"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
 msgid "Disable sounds when _away or busy"
 msgstr "�리 비움�거나 다른 용무 중� 때 소리 사용하지 않기(_A)"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "알림 �역� 새로 들어온 �벤트 표시"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr "�향 반향 제거 기능� 사용하면 내 목소리가 �대방�게 � 분명히 들립니다. 하지만 �부 컴퓨터�서 문제가 발�할 수 있습니다. 통화 중� 나 �는 �대방�게 잡�� 들린 다면 �향 반향 제거 기능� �고 다시 통화해 보십시오."
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "연�처� 사람� 연결하면 알리기"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "연�처� 사람� 연결� �어지면 알리기"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "대화� �커스가 없으면 �업 알리기(_C)"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "맞춤법 검사를 사용할 언어:"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "�반"
 
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input level:"
+msgstr "입력 단계:"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "입력 볼륨:"
+
 # 위치 정보를 알아내는 방법
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "위치 검색 방법:"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "대화 내용 기�"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "알림"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "�벤트 소리 내기"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "개� 정보"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -3836,66 +4338,70 @@ msgstr ""
 "위치 부정확하게 만들기를 사용하면 �시, 지역, 국가 정� �� �세히 표시하지 "
 "않습니다. GPS 좌표는 소수� 1�리까지만 허용합니다."
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "�모티콘� 그림으로 표시(_S)"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "방� 연�처 목� 표시(_L)"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "소리"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "맞춤법 검사"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "� 언어 목�� 사전� 설치한 언어�만 �용�니다."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "테마"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:30
+msgid "Variant:"
+msgstr "변종:"
+
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "시작할 때 ��으로 연결(_A)"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "휴대전화(_C)"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "�선 알림 사용(_E)"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "사운드 알림 사용(_E)"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "네트워�(_N) (IP, Wi-FI)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "새로운 대화는 별� 창� 열기(_O)"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "위치를 연�처� 있는 사람들�게 공개(_P)"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "위치 부정확하게 만들기(_R)"
 
@@ -3907,82 +4413,130 @@ msgstr "�태"
 msgid "_Quit"
 msgstr "�내기(_Q)"
 
-#: ../src/empathy-map-view.c:442
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "� 연�처� 다시 호출"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "카메� �기"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "카메� 켜기"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "카메�를 사용하지 않고 �� 보내기를 중지합니다"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "카메�를 사용하고 ��� 보냅니다"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "카메�를 사용하지만 ��� 보내지 않습니다"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "미리 보기"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "다시 걸기"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "��(_I)"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "�� �기"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "�� 켜기"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "�� 미리 보기"
+
+#: ../src/empathy-map-view.c:448
 msgid "Contact Map View"
 msgstr "연�처 지� 보기"
 
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
 msgid "Save"
 msgstr "저장"
 
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
 msgstr "디버깅 창"
 
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
 msgstr "�시 중지"
 
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
 msgstr "단계 "
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
 msgid "Debug"
 msgstr "디버깅"
 
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
 msgid "Info"
 msgstr "ì •ë³´"
 
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
 msgid "Message"
 msgstr "메시지"
 
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
 msgid "Warning"
 msgstr "경고"
 
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
 msgid "Critical"
 msgstr "치명�"
 
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
 msgid "Error"
 msgstr "오류"
 
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
 msgid "Time"
 msgstr "시�"
 
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
 msgid "Domain"
 msgstr "범위"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
 msgstr "분류"
 
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "단계"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "선�한 연결 관리�는 �격 디버깅 확장 기능� 지�하지 않습니다."
 
-#: ../src/empathy-invite-participant-dialog.c:34
-#: ../src/empathy-invite-participant-dialog.c:48
+#: ../src/empathy-invite-participant-dialog.c:179
+#: ../src/empathy-invite-participant-dialog.c:205
 msgid "Invite Participant"
 msgstr "참�� 초대"
 
-#: ../src/empathy-invite-participant-dialog.c:35
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "대화� 초대할 연�처를 고르십시오:"
 
-#: ../src/empathy-invite-participant-dialog.c:45
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "초대"
 
@@ -4013,7 +4567,15 @@ msgstr "- 엠�시 계정"
 msgid "Empathy Accounts"
 msgstr "엠�시 계정"
 
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr "특정 서비스 표시"
+
+#: ../src/empathy-debugger.c:75
+msgid "- Empathy Debugger"
+msgstr "- 엠�시 디버깅"
+
+#: ../src/empathy-debugger.c:114
 msgid "Empathy Debugger"
 msgstr "엠�시 디버깅"
 
@@ -4021,34 +4583,71 @@ msgstr "엠�시 디버깅"
 msgid "- Empathy Chat Client"
 msgstr "- 엠�시 채팅 ���언트"
 
-#: ../src/empathy-notifications-approver.c:184
+#: ../src/empathy-notifications-approver.c:203
 msgid "Respond"
 msgstr "�답"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1418
 msgid "Reject"
 msgstr "거부"
 
-#: ../src/empathy-notifications-approver.c:194
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1419
 msgid "Answer"
 msgstr "�답"
 
-#: ../src/empathy-notifications-approver.c:201
-#: ../src/empathy-notifications-approver.c:211
+#: ../src/empathy-notifications-approver.c:227
+msgid "Answer with video"
+msgstr "��으로 �답"
+
+#: ../src/empathy-notifications-approver.c:235
+#: ../src/empathy-notifications-approver.c:245
 msgid "Decline"
 msgstr "ê±°ì ˆ"
 
-#: ../src/empathy-notifications-approver.c:205
-#: ../src/empathy-notifications-approver.c:216
+#: ../src/empathy-notifications-approver.c:239
+#: ../src/empathy-notifications-approver.c:250
 msgid "Accept"
 msgstr "허용"
 
-#: ../src/empathy-call-observer.c:130
-#, c-format
-msgid "Missed call from %s"
-msgstr "%s�서 온 놓친 호출"
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:260
+msgid "Provide"
+msgstr "ìž…ë ¥"
 
-#: ../src/empathy-call-observer.c:133
+#: ../src/empathy-call-observer.c:134
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s�서 호출� 시�했지만, 다른 호출 중�었습니다."
+
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1047 ../src/empathy-call-window.c:1070
+msgid "i"
+msgstr "i"
+
+#: ../src/empathy-call-window.c:2727
+msgid "On hold"
+msgstr "�시 중지"
+
+#: ../src/empathy-call-window.c:2730
+msgid "Mute"
+msgstr "묵�"
+
+#: ../src/empathy-call-window.c:2732
+msgid "Duration"
+msgstr "시간"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2735
+#, c-format
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02d"
+
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "대소문� 구별(_M)"
diff --git a/po/lt.po b/po/lt.po
index d2854aa57..b1b55df91 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -5,19 +5,21 @@
 # Gintautas Miliauskas <gintas@akl.lt>, 2006.
 # Saulius <saulius.shopaga@gmail.com>, 2008, 2009.
 # Žygimantas Beru�ka <zygis@gnome.org>, 2004-2010, 2010, 2011.
+# Algimantas Margevi�ius <gymka@mail.ru>, 2011.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-08-30 09:49+0000\n"
-"PO-Revision-Date: 2011-09-01 23:07+0300\n"
+"POT-Creation-Date: 2011-10-07 08:13+0000\n"
+"PO-Revision-Date: 2011-10-09 00:16+0300\n"
 "Last-Translator: Aurimas ÄŒernius <aurisc4@gmail.com>\n"
-"Language-Team: Lithuanian\n"
+"Language-Team: Lietuvių <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: lt\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 "X-Generator: Virtaal 0.5.2\n"
 
 #: ../data/empathy.desktop.in.in.h:1
@@ -41,7 +43,6 @@ msgid "Always open a separate chat window for new chats."
 msgstr "Naujiems pokalbiams visada atverti atskirÄ… pokalbio langÄ…."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-#| msgid "Call from %s"
 msgid "Call volume"
 msgstr "Skambu�io garsumas"
 
@@ -50,12 +51,10 @@ msgid "Call volume, as a percentage."
 msgstr "Skambu�io garsumas procentais."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-#| msgid "Camera On"
 msgid "Camera device"
 msgstr "Kameros įrenginys"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-#| msgid "Camera On"
 msgid "Camera position"
 msgstr "Kameros padÄ—tis"
 
@@ -88,57 +87,57 @@ msgid "Contact list sort criterion"
 msgstr "Adresatų sąrašo rikiavimo kriterijus"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "PaskutinÄ—s paskyros, pasirinktos prijungti prie kambario, D-Bus objekto kelias."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr "Numatytasis kameros įrenginys vaizdo skambu�iams, pvz. /dev/video0."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Default directory to select an avatar image from"
 msgstr "Numatytasis aplankas, iš kurio pasirinktinas pseudoportreto paveikslėlis"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable popup notifications when away"
 msgstr "Išjungti iškylan�ius pranešimų langus, kai manęs nėra"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Disable sounds when away"
 msgstr "Išjungti garsus, kai manęs nėra"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Display incoming events in the status area"
 msgstr "Rodyti gaunamus įvykius būsenos srityje"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Display incoming events in the status area. If false, present them to the user immediately."
 msgstr "Rodyti gaunamus įvykius būsenos srityje. Jei reikšmė neigiama, pateikti juos naudotojui nedelsiant."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Echo cancellation support"
 msgstr "Aido atšaukimo palaikymas"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can publish the user's location"
 msgstr "Empathy gali rodyti naudotojo vietovÄ™"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy gali naudoti GPS, siekiant atspÄ—ti vietovÄ™"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy naudoti mobiliojo ryšio tinklą, siekiant atspėti vietovę"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy gali naudoti tinklÄ…, siekiant atspÄ—ti vietovÄ™"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy default download folder"
 msgstr "Numatytasis Empathy atsiuntimo aplankas"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "Empathy perkėlė butterfly žurnalus"
-
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr "Nenaudojant Empathy, turėtų būti nustatoma nebuvimo būsena"
@@ -176,149 +175,149 @@ msgid "Hide the main window."
 msgstr "Paslėpti pagrindinį langą."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+msgid "Last account selected in Join Room dialog"
+msgstr "PaskutinÄ— paskyra, pasirinkta prisijungimo prie kambario dialoge"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Nick completed character"
 msgstr "Slapyvardžio užbaigimo simbolis"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Open new chats in separate windows"
 msgstr "Atverti naujus pokalbius atskiruose languose"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use"
 msgstr "Naudotinos Adium temos kelias"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "Naudotinos Adium temos kelias, jei pokalbiui naudojama tema yra Adium."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for incoming messages"
 msgstr "Gavus žinutę sugroti garsą"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for new conversations"
 msgstr "Pradedant naują pokalbį sugroti garsą"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound for outgoing messages"
 msgstr "Išsiun�iant žinutes sugroti garsą"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs in"
 msgstr "Prisijungus adresatui sugroti garsÄ…"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when a contact logs out"
 msgstr "Atsijungus adresatui sugroti garsÄ…"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log in"
 msgstr "Jums prisijungus sugroti garsÄ…"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Play a sound when we log out"
 msgstr "Jums atsijungus sugroti garsÄ…"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Rodyti iškylan�ius pranešimus, jei pokalbio langas nesuaktyvintas"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs in"
 msgstr "Rodyti iškylan�ius pranešimus, kai adresatas prisijungia"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "Pop up notifications when a contact logs out"
 msgstr "Rodyti iškylan�ius pranešimus, kai adresatas atsijungia"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Position the camera preview should be during a call."
 msgstr "Kameros peržiūros padėtis skambu�io metu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show Balance in contact list"
 msgstr "Rodyti balansą adresatų sąraše"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show avatars"
 msgstr "Rodyti pseudoportretus"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show contact list in rooms"
 msgstr "Rodyti adresatų sąrašą kambariuose"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show hint about closing the main window"
 msgstr "Perspėti apie pagrindinio lango užvėrimą"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show offline contacts"
 msgstr "Rodyti atsijungusius adresatus"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Show protocols"
 msgstr "Rodyti protokolus"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Spell checking languages"
 msgstr "Kalbos, kurių rašyba tikrinama"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The default folder to save file transfers in."
 msgstr "Numatytasis aplankas, kuriame įrašomi atsiųsti failai."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Aplankas, kuriame praeitÄ… kartÄ… buvo pasirinktas pseudoportretas."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The position for the chat window side pane"
 msgstr "Pokalbių lango šoninio polangio padėtis"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "Įrašyta pokalbio lango šoninio polangio padėtis (pikseliais)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Tema, naudojama pokalbio rodymui pokalbių languose."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "The theme variant that is used to display the conversation in chat windows."
 msgstr "Temos variantas, naudojamas pokalbio rodymui pokalbių languose."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use graphical smileys"
 msgstr "Naudoti grafines Å¡ypsenÄ—les"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use notification sounds"
 msgstr "Naudoti pranešimų garsus"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Use theme for chat rooms"
 msgstr "Naudoti temą pokalbių kambariams"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Ar Empathy gali rodyti naudotojo vietovÄ™ jo adresatams."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Ar Empathy gali naudoti GPS vietovÄ—s spÄ—jimui."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Ar Empathy gali naudoti mobiliojo ryšio tinklą vietovės spėjimui."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Ar Empathy gali naudoti tinklÄ… vietovÄ—s spÄ—jimui."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Ar Empathy perkėlė butterfly žurnalus."
-
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Ar Empathy turėtų automatiškai prisijungti prie paskyrų ją paleidus."
@@ -457,19 +456,19 @@ msgstr "Tvarkyti pokalbių ir VoIP paskyras"
 msgid "Messaging and VoIP Accounts"
 msgstr "Pokalbių ir VoIP paskyros"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:838
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Failo siuntimas baigtas, ta�iau failas buvo sugadintas"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1124
 msgid "File transfer not supported by remote contact"
 msgstr "Nutolęs adresatas nepalaiko failų siuntimo"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1180
 msgid "The selected file is not a regular file"
 msgstr "Pasirinktas failas nÄ—ra normalus failas"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1189
 msgid "The selected file is empty"
 msgstr "Pasirinktas failas yra tuš�ias"
 
@@ -490,195 +489,195 @@ msgstr "Skambinta %s"
 msgid "Call from %s"
 msgstr "Skambino %s"
 
-#: ../libempathy/empathy-tp-file.c:268
+#: ../libempathy/empathy-tp-file.c:258
 msgid "Socket type not supported"
 msgstr "Nepalaikomas lizdo tipas"
 
-#: ../libempathy/empathy-tp-file.c:387
+#: ../libempathy/empathy-tp-file.c:377
 msgid "No reason was specified"
 msgstr "Nenurodyta priežastis"
 
-#: ../libempathy/empathy-tp-file.c:390
+#: ../libempathy/empathy-tp-file.c:380
 msgid "The change in state was requested"
 msgstr "Būsenos keitimo užklausa"
 
-#: ../libempathy/empathy-tp-file.c:393
+#: ../libempathy/empathy-tp-file.c:383
 msgid "You canceled the file transfer"
 msgstr "Atšaukėte failo siuntimą"
 
-#: ../libempathy/empathy-tp-file.c:396
+#: ../libempathy/empathy-tp-file.c:386
 msgid "The other participant canceled the file transfer"
 msgstr "Kitas dalyvis atšaukė failo siuntimą"
 
-#: ../libempathy/empathy-tp-file.c:399
+#: ../libempathy/empathy-tp-file.c:389
 msgid "Error while trying to transfer the file"
 msgstr "Klaida bandant persiųsti failą"
 
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-tp-file.c:392
 msgid "The other participant is unable to transfer the file"
 msgstr "Kitas dalyvis negali persiųsti failo"
 
-#: ../libempathy/empathy-tp-file.c:405
-#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-tp-file.c:395
+#: ../libempathy/empathy-utils.c:312
 msgid "Unknown reason"
 msgstr "Nežinoma priežastis"
 
-#: ../libempathy/empathy-utils.c:222
+#: ../libempathy/empathy-utils.c:232
 msgid "Available"
 msgstr "Esu"
 
-#: ../libempathy/empathy-utils.c:224
+#: ../libempathy/empathy-utils.c:234
 msgid "Busy"
 msgstr "Užsiėmęs (-usi)"
 
-#: ../libempathy/empathy-utils.c:227
+#: ../libempathy/empathy-utils.c:237
 msgid "Away"
 msgstr "Pasitraukęs (-usi)"
 
-#: ../libempathy/empathy-utils.c:229
+#: ../libempathy/empathy-utils.c:239
 msgid "Invisible"
 msgstr "Nematomas (-a)"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:241
 msgid "Offline"
 msgstr "Atsijungęs (-usi)"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:244
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Nežinoma"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:284
 msgid "No reason specified"
 msgstr "Nenurodyta priežastis"
 
-#: ../libempathy/empathy-utils.c:276
-#: ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:286
+#: ../libempathy/empathy-utils.c:342
 msgid "Status is set to offline"
 msgstr "Būsena nustatyta į „atsijungta“"
 
-#: ../libempathy/empathy-utils.c:278
-#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:322
 #: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "Tinklo klaida"
 
-#: ../libempathy/empathy-utils.c:280
-#: ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:290
+#: ../libempathy/empathy-utils.c:324
 msgid "Authentication failed"
 msgstr "Nepavyko nustatyti tapatybÄ—s"
 
-#: ../libempathy/empathy-utils.c:282
-#: ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:326
 msgid "Encryption error"
 msgstr "Å ifravimo klaida"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:294
 msgid "Name in use"
 msgstr "Vardas jau naudojamas"
 
-#: ../libempathy/empathy-utils.c:286
-#: ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:296
+#: ../libempathy/empathy-utils.c:328
 msgid "Certificate not provided"
 msgstr "Nepateiktas liudijimas"
 
-#: ../libempathy/empathy-utils.c:288
-#: ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:298
+#: ../libempathy/empathy-utils.c:330
 msgid "Certificate untrusted"
 msgstr "Liudijimas nepatikimas"
 
-#: ../libempathy/empathy-utils.c:290
-#: ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:332
 msgid "Certificate expired"
 msgstr "Nebegaliojantis liudijimas"
 
-#: ../libempathy/empathy-utils.c:292
-#: ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:334
 msgid "Certificate not activated"
 msgstr "Liudijimas neaktyvuotas"
 
-#: ../libempathy/empathy-utils.c:294
-#: ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:336
 msgid "Certificate hostname mismatch"
 msgstr "Neatitinka liudijimo kompiuterio vardas"
 
-#: ../libempathy/empathy-utils.c:296
-#: ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:338
 msgid "Certificate fingerprint mismatch"
 msgstr "Neatitinka liudijimo kontrolinis kodas"
 
-#: ../libempathy/empathy-utils.c:298
-#: ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:308
+#: ../libempathy/empathy-utils.c:340
 msgid "Certificate self-signed"
 msgstr "Paties pasirašytas liudijimas"
 
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate error"
 msgstr "Liudijimo klaida"
 
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:344
 msgid "Encryption is not available"
 msgstr "Å ifravimas neprieinamas"
 
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:346
 msgid "Certificate is invalid"
 msgstr "Liudijimas netinkamas"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:348
 msgid "Connection has been refused"
 msgstr "Ryšys atmestas"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:350
 msgid "Connection can't be established"
 msgstr "Nepavyko užmegzti ryšio"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:352
 msgid "Connection has been lost"
 msgstr "Ryšys nutrūko"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:354
 msgid "This resource is already connected to the server"
 msgstr "Šis išteklius jau prisijungęs prie serverio"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:356
 msgid "Connection has been replaced by a new connection using the same resource"
 msgstr "Ryšį pakeitė naujas ryšys, naudojantis tą patį išteklių"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:359
 msgid "The account already exists on the server"
 msgstr "Å i paskyra jau yra serveryje"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:361
 msgid "Server is currently too busy to handle the connection"
 msgstr "Serveris šiuo metu per daug užimtas, kad galėtų apdoroti šį ryšį"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:363
 msgid "Certificate has been revoked"
 msgstr "Liudijimas atšauktas"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:365
 msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "Liudijimas naudoja nesaugų šifravimo algoritmą arba yra kriptografiškai silpnas"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:368
 msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
 msgstr "Serverio liudijimo ilgis, arba serverio liudijimų sekos gylis, viršija kriptografijos bibliotekos numatytas ribas"
 
-#: ../libempathy/empathy-utils.c:519
+#: ../libempathy/empathy-utils.c:529
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "Žmonės netoliese"
 
-#: ../libempathy/empathy-utils.c:524
+#: ../libempathy/empathy-utils.c:534
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:553
+#: ../libempathy/empathy-utils.c:563
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:554
+#: ../libempathy/empathy-utils.c:564
 msgid "Facebook Chat"
 msgstr "Facebook pokalbis"
 
@@ -734,71 +733,81 @@ msgstr[2] "prieš %d mėnesių"
 msgid "in the future"
 msgstr "ateityje"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:539
+#: ../libempathy-gtk/empathy-account-chooser.c:540
 msgid "All accounts"
 msgstr "Visos paskyros"
 
-#: ../libempathy-gtk/empathy-account-widget.c:693
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "Paskyra"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "Slaptažodis"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Serveris"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Prievadas"
 
-#: ../libempathy-gtk/empathy-account-widget.c:768
-#: ../libempathy-gtk/empathy-account-widget.c:825
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1166
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "Mano internetinÄ—s paskyros"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1209
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "Paskyra %s taisoma naudojantis mano žiniatinklio paskyromis."
+msgid "The account %s is edited via %s."
+msgstr "Paskyra %s taisoma naudojantis %s."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1172
+#: ../libempathy-gtk/empathy-account-widget.c:1215
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "Paskyros %s Empathy programoje taisyti negalima."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1234
 msgid "Launch My Web Accounts"
 msgstr "Paleisti mano žiniatinklio paskyras"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1532
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1242
+#, c-format
+msgid "Edit %s"
+msgstr "Taisyti %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1592
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Naudotojo vardas:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1850
+#: ../libempathy-gtk/empathy-account-widget.c:1910
 msgid "A_pply"
 msgstr "_Pritaikyti"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1880
+#: ../libempathy-gtk/empathy-account-widget.c:1940
 msgid "L_og in"
 msgstr "_Prisijungti"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1954
+#: ../libempathy-gtk/empathy-account-widget.c:2014
 msgid "This account already exists on the server"
 msgstr "Å i paskyra jau yra serveryje"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1957
+#: ../libempathy-gtk/empathy-account-widget.c:2017
 msgid "Create a new account on the server"
 msgstr "Sukurti naujÄ… paskyrÄ… serveryje"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2149
+#: ../libempathy-gtk/empathy-account-widget.c:2209
 msgid "Ca_ncel"
 msgstr "_Atšaukti"
 
@@ -807,19 +816,19 @@ msgstr "_Atšaukti"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2427
+#: ../libempathy-gtk/empathy-account-widget.c:2487
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s serveryje %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2453
+#: ../libempathy-gtk/empathy-account-widget.c:2513
 #, c-format
 msgid "%s Account"
 msgstr "%s paskyra"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2457
+#: ../libempathy-gtk/empathy-account-widget.c:2517
 msgid "New account"
 msgstr "Nauja paskyra"
 
@@ -980,7 +989,7 @@ msgstr "Simbolių koduotė:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Most IRC servers don't need a password, so if you're not sure, don't enter a password."
-msgstr "Daugumai IRC serverių nereikia slaptažodžio, todėl jei nesate tikras, neįveskite slaptažodio."
+msgstr "Daugumai IRC serverių nereikia slaptažodžio, todėl jei nesate tikras, neįveskite slaptažodžio."
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Network"
@@ -1230,37 +1239,36 @@ msgstr "Yahoo! I_D:"
 msgid "_Room List locale:"
 msgstr "_Kambarių sąrašo lokalė:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:470
-#: ../libempathy-gtk/empathy-avatar-chooser.c:555
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "Nepavyko konvertuoti paveikslÄ—lio"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "Jokie priimti paveikslėlių formatai jūsų sistemoje nepalaikomi"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:818
-#| msgid "Couldn't save pixbuf to png"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
 msgid "Couldn't save picture to file"
 msgstr "Nepavyko išsaugoti paveikslėlio į failą"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:934
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "Pasirinkite savo pseudoportretÄ…"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
 msgstr "Padaryti nuotraukÄ…..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:941
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "PaveikslÄ—lio nÄ—ra"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "PaveikslÄ—liai"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "Visi failai"
 
@@ -1289,179 +1297,179 @@ msgstr "Nurodytas adresatas yra neteisingas"
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Kritiniai skambu�iai šiuo protokolu nepalaikomi"
 
-#: ../libempathy-gtk/empathy-chat.c:702
+#: ../libempathy-gtk/empathy-chat.c:704
 msgid "Failed to open private chat"
 msgstr "Nepavyko atverti privataus pokalbio"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:765
 msgid "Topic not supported on this conversation"
-msgstr "Å iame pokalbyje tema yra napalaikoma"
+msgstr "Å iame pokalbyje tema yra nepalaikoma"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:771
 msgid "You are not allowed to change the topic"
 msgstr "Jums neleidžiama pakeisti temos"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:975
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "„%s“ yra netinkamas adresato ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1030
+#: ../libempathy-gtk/empathy-chat.c:1070
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: ištrinti visus dabartinio pokalbio pranešimus"
 
-#: ../libempathy-gtk/empathy-chat.c:1033
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topic>: nustatyti dabartinio pokalbio temÄ…"
 
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1076
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <pokalbių kambario ID>: prisijungti prie naujo pokalbių kambario"
 
-#: ../libempathy-gtk/empathy-chat.c:1039
+#: ../libempathy-gtk/empathy-chat.c:1079
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <pokalbių kambario ID>: prisijungti prie naujo pokalbių kambario"
 
-#: ../libempathy-gtk/empathy-chat.c:1043
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one"
 msgstr "/part [<pokalbių kambario ID>] [<priežastis>]: išeiti iš pokalbių kambario; dabartinio, jei nenurodyta kitaip"
 
-#: ../libempathy-gtk/empathy-chat.c:1047
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <adresato ID> [<žinutė>]: atverti privatų pokalbį"
 
-#: ../libempathy-gtk/empathy-chat.c:1050
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <adresato ID> <žinutė>: atverti privatų pokalbį"
 
-#: ../libempathy-gtk/empathy-chat.c:1053
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <slapyvardis>: keisti savo slapyvardį dabartiniame serveryje"
 
-#: ../libempathy-gtk/empathy-chat.c:1056
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <žinutė>: siųsti dabartiniam pokalbiui žinutę ACTION"
 
-#: ../libempathy-gtk/empathy-chat.c:1059
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid "/say <message>: send <message> to the current conversation. This is used to send a message starting with a '/'. For example: \"/say /join is used to join a new chat room\""
 msgstr "/say <žinutė>: siųsti dabartiniam pokalbiui <žinutę>. Tai naudojama norint siųsti žinutę, prasidedan�ia simboliu „/“. Pavyzdžiui: „/say /join naudojama norint prisijungti prie naujo pokalbių kambario“"
 
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <adresato ID>: parodo informacijÄ… apie adresatÄ…"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
 msgstr "/help [<komanda>]: rodyti visas palaikomas komandas. Jei <komanda> apibrėžta, rodyti, kaip ją naudoti."
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1126
 #, c-format
 msgid "Usage: %s"
 msgstr "Naudojimas: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1116
+#: ../libempathy-gtk/empathy-chat.c:1171
 msgid "Unknown command"
 msgstr "Nežinoma komanda"
 
-#: ../libempathy-gtk/empathy-chat.c:1242
+#: ../libempathy-gtk/empathy-chat.c:1297
 msgid "Unknown command; see /help for the available commands"
 msgstr "Nežinoma komanda. Galimas komandas galite pamatyti įvykdę komandą /help"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1412
+#: ../libempathy-gtk/empathy-chat.c:1467
 msgid "insufficient balance to send message"
 msgstr "nepakankamas balansas žinutės siuntimui"
 
-#: ../libempathy-gtk/empathy-chat.c:1414
+#: ../libempathy-gtk/empathy-chat.c:1469
 msgid "not capable"
 msgstr "nepalaiko"
 
-#: ../libempathy-gtk/empathy-chat.c:1421
+#: ../libempathy-gtk/empathy-chat.c:1476
 msgid "offline"
 msgstr "atsijungęs"
 
-#: ../libempathy-gtk/empathy-chat.c:1424
+#: ../libempathy-gtk/empathy-chat.c:1479
 msgid "invalid contact"
 msgstr "netinkamas adresatas"
 
-#: ../libempathy-gtk/empathy-chat.c:1427
+#: ../libempathy-gtk/empathy-chat.c:1482
 msgid "permission denied"
-msgstr "prieeiga uždrausta"
+msgstr "prieiga uždrausta"
 
-#: ../libempathy-gtk/empathy-chat.c:1430
+#: ../libempathy-gtk/empathy-chat.c:1485
 msgid "too long message"
 msgstr "per ilga žinutė"
 
-#: ../libempathy-gtk/empathy-chat.c:1433
+#: ../libempathy-gtk/empathy-chat.c:1488
 msgid "not implemented"
 msgstr "Å¡i funkcija dar nerealizuota"
 
-#: ../libempathy-gtk/empathy-chat.c:1437
+#: ../libempathy-gtk/empathy-chat.c:1492
 msgid "unknown"
 msgstr "nežinoma"
 
-#: ../libempathy-gtk/empathy-chat.c:1443
+#: ../libempathy-gtk/empathy-chat.c:1498
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Klaida siun�iant žinutę „%s“: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1447
+#: ../libempathy-gtk/empathy-chat.c:1502
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Klaida siun�iant žinutę: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1508
+#: ../libempathy-gtk/empathy-chat.c:1563
 #: ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Tema:"
 
-#: ../libempathy-gtk/empathy-chat.c:1520
+#: ../libempathy-gtk/empathy-chat.c:1575
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Tema nustatyta į: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1577
 msgid "No topic defined"
 msgstr "Nenurodyta jokia tema"
 
-#: ../libempathy-gtk/empathy-chat.c:2031
+#: ../libempathy-gtk/empathy-chat.c:2086
 msgid "(No Suggestions)"
 msgstr "(Nėra pasiūlymų)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2099
+#: ../libempathy-gtk/empathy-chat.c:2154
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Įtraukti „%s“ į žodyną"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2136
+#: ../libempathy-gtk/empathy-chat.c:2191
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Įtraukti „%s“ į %s žodyną"
 
-#: ../libempathy-gtk/empathy-chat.c:2206
+#: ../libempathy-gtk/empathy-chat.c:2261
 msgid "Insert Smiley"
 msgstr "Įterpti šypsenėlę"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2224
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2279
+#: ../libempathy-gtk/empathy-ui-utils.c:1840
 msgid "_Send"
 msgstr "_Siųsti"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2278
+#: ../libempathy-gtk/empathy-chat.c:2333
 msgid "_Spelling Suggestions"
 msgstr "_Rašybos pasiūlymai"
 
-#: ../libempathy-gtk/empathy-chat.c:2367
+#: ../libempathy-gtk/empathy-chat.c:2422
 msgid "Failed to retrieve recent logs"
 msgstr "Nepavyko gauti naujausių žurnalų"
 
-#: ../libempathy-gtk/empathy-chat.c:2504
+#: ../libempathy-gtk/empathy-chat.c:2559
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s atsijungÄ—"
@@ -1469,12 +1477,12 @@ msgstr "%s atsijungÄ—"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2511
+#: ../libempathy-gtk/empathy-chat.c:2566
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s išspyrė naudotoją %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2514
+#: ../libempathy-gtk/empathy-chat.c:2569
 #, c-format
 msgid "%s was kicked"
 msgstr "%s buvo išspirtas"
@@ -1482,17 +1490,17 @@ msgstr "%s buvo išspirtas"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2522
+#: ../libempathy-gtk/empathy-chat.c:2577
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s užblokavo naudotoją %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2525
+#: ../libempathy-gtk/empathy-chat.c:2580
 #, c-format
 msgid "%s was banned"
 msgstr "%s buvo užblokuotas"
 
-#: ../libempathy-gtk/empathy-chat.c:2529
+#: ../libempathy-gtk/empathy-chat.c:2584
 #, c-format
 msgid "%s has left the room"
 msgstr "%s paliko pokalbių kambarį"
@@ -1502,70 +1510,75 @@ msgstr "%s paliko pokalbių kambarį"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2538
+#: ../libempathy-gtk/empathy-chat.c:2593
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2618
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s prisijungė prie pokalbių kambario"
 
-#: ../libempathy-gtk/empathy-chat.c:2588
+#: ../libempathy-gtk/empathy-chat.c:2643
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s dabar žinomas (-a) kaip %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2727
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2796
 #: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240
-#: ../src/empathy-call-window.c:2335
+#: ../src/empathy-event-manager.c:1260
+#: ../src/empathy-call-window.c:1546
+#: ../src/empathy-call-window.c:1596
+#: ../src/empathy-call-window.c:2641
 msgid "Disconnected"
 msgstr "Atsijungęs (-usi)"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3374
+#: ../libempathy-gtk/empathy-chat.c:3440
 msgid "Would you like to store this password?"
 msgstr "Ar norėtumėte įrašyti šį slaptažodį?"
 
-#: ../libempathy-gtk/empathy-chat.c:3380
+#: ../libempathy-gtk/empathy-chat.c:3446
 msgid "Remember"
 msgstr "Įrašyti"
 
-#: ../libempathy-gtk/empathy-chat.c:3390
+#: ../libempathy-gtk/empathy-chat.c:3456
 msgid "Not now"
 msgstr "Ne dabar"
 
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3500
 msgid "Retry"
 msgstr "Bandyti dar kartÄ…"
 
-#: ../libempathy-gtk/empathy-chat.c:3438
+#: ../libempathy-gtk/empathy-chat.c:3504
 msgid "Wrong password; please try again:"
 msgstr "Neteisingas slaptažodis, bandykite dar kartą:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3568
+#: ../libempathy-gtk/empathy-chat.c:3634
 msgid "This room is protected by a password:"
 msgstr "Šis kambarys yra apsaugotas slaptažodžiu:"
 
-#: ../libempathy-gtk/empathy-chat.c:3595
+#: ../libempathy-gtk/empathy-chat.c:3661
 msgid "Join"
 msgstr "Prisijungti"
 
-#: ../libempathy-gtk/empathy-chat.c:3797
-#: ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:3863
+#: ../src/empathy-event-manager.c:1281
 msgid "Connected"
 msgstr "Prisijungęs (-usi)"
 
-#: ../libempathy-gtk/empathy-chat.c:3852
+#: ../libempathy-gtk/empathy-chat.c:3918
 msgid "Conversation"
 msgstr "Pokalbis"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3857
+#: ../libempathy-gtk/empathy-chat.c:3923
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1598,7 +1611,7 @@ msgstr "Taisyti blokuotus adresatus"
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:512
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1485
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
@@ -1606,7 +1619,6 @@ msgid "Account:"
 msgstr "Paskyra:"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
-#| msgid "_Blocked Contacts"
 msgid "Blocked Contacts"
 msgstr "Užblokuoti adresatai"
 
@@ -1694,33 +1706,33 @@ msgstr "Nesugrupuota"
 msgid "Favorite People"
 msgstr "Mėgiami žmonės"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
+#: ../libempathy-gtk/empathy-contact-list-view.c:1985
+#: ../libempathy-gtk/empathy-individual-view.c:2375
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Ar tikrai norite pašalinti grupę „%s“?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
+#: ../libempathy-gtk/empathy-contact-list-view.c:1987
+#: ../libempathy-gtk/empathy-individual-view.c:2378
 msgid "Removing group"
 msgstr "Å alinama grupÄ—"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
+#: ../libempathy-gtk/empathy-contact-list-view.c:2036
+#: ../libempathy-gtk/empathy-contact-list-view.c:2113
+#: ../libempathy-gtk/empathy-individual-view.c:2433
+#: ../libempathy-gtk/empathy-individual-view.c:2636
 msgid "_Remove"
 msgstr "_Pašalinti"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
+#: ../libempathy-gtk/empathy-contact-list-view.c:2066
+#: ../libempathy-gtk/empathy-individual-view.c:2500
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Ar tikrai norite pašalinti adresatą „%s“?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
+#: ../libempathy-gtk/empathy-contact-list-view.c:2068
+#: ../libempathy-gtk/empathy-individual-view.c:2521
 msgid "Removing contact"
 msgstr "Å alinamas adresatas"
 
@@ -1768,9 +1780,9 @@ msgid "Share My Desktop"
 msgstr "Dalintis mano darbastaliu"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
+#: ../libempathy-gtk/empathy-contact-widget.c:1887
 #: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1373
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "MÄ—giamas"
 
@@ -1785,13 +1797,13 @@ msgid "_Edit"
 msgstr "_Taisyti"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1283
+#: ../libempathy-gtk/empathy-individual-menu.c:1284
 #: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "Jus kvie�ia į šį kambarį"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1329
+#: ../libempathy-gtk/empathy-individual-menu.c:1330
 msgid "_Invite to Chat Room"
 msgstr "_Pakviesti į pokalbių kambarį"
 
@@ -1975,7 +1987,7 @@ msgstr "Kilimo greitis:"
 #: ../libempathy-gtk/empathy-contact-widget.c:937
 #: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
-msgstr "Paskutinįkart atnaujinta:"
+msgstr "Paskutinį kartą atnaujinta:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:939
 #: ../libempathy-gtk/empathy-individual-widget.c:511
@@ -1990,13 +2002,13 @@ msgstr "Platuma:"
 #: ../libempathy-gtk/empathy-contact-widget.c:943
 #: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
-msgstr "AltitudÄ—:"
+msgstr "Aukštuma:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:996
 #: ../libempathy-gtk/empathy-contact-widget.c:1011
 #: ../libempathy-gtk/empathy-individual-widget.c:607
 #: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "VietovÄ—"
 
@@ -2048,7 +2060,7 @@ msgstr "Adresato informacija"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1515
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "Identifikatorius:"
 
@@ -2083,7 +2095,7 @@ msgid "Select"
 msgstr "Pasirinkti"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../src/empathy-main-window.c:1833
 msgid "Group"
 msgstr "GrupÄ—"
 
@@ -2140,7 +2152,6 @@ msgid "Call"
 msgstr "Skambutis"
 
 #: ../libempathy-gtk/empathy-individual-menu.c:378
-#| msgid "Profile"
 msgid "Mobile"
 msgstr "Mobilusis"
 
@@ -2158,28 +2169,28 @@ msgstr "NAMAI"
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1141
+#: ../libempathy-gtk/empathy-individual-menu.c:1142
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Taisyti"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1167
+#: ../libempathy-gtk/empathy-individual-menu.c:1168
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "_Susieti adresatus…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-view.c:2340
 msgid "Delete and _Block"
 msgstr "IÅ¡trinti ir _blokuoti"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2509
 #, c-format
 msgid "Do you really want to remove the linked contact '%s'? Note that this will remove all the contacts which make up this linked contact."
 msgstr "Ar tikrai norite pašalinti susietąjį adresatą „%s“? Atminkite, jog bus pašalinti visi adresatai, sudarantys šį susietąjį adresatą."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1662
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2258,128 +2269,137 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "_IÅ¡skaityti"
 
-#: ../libempathy-gtk/empathy-log-window.c:633
+#: ../libempathy-gtk/empathy-log-window.c:634
 msgid "History"
 msgstr "Istorija"
 
-#: ../libempathy-gtk/empathy-log-window.c:685
+#: ../libempathy-gtk/empathy-log-window.c:689
 msgid "Show"
 msgstr "Rodyti"
 
-#: ../libempathy-gtk/empathy-log-window.c:707
+#: ../libempathy-gtk/empathy-log-window.c:711
 msgid "Search"
 msgstr "Ieškoti"
 
-#: ../libempathy-gtk/empathy-log-window.c:1155
+#: ../libempathy-gtk/empathy-log-window.c:1159
 #, c-format
-#| msgid "Chat with %s"
 msgid "Chat in %s"
 msgstr "KalbÄ—ti kanale %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1157
+#: ../libempathy-gtk/empathy-log-window.c:1161
 #, c-format
 msgid "Chat with %s"
 msgstr "KalbÄ—ti su %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1207
-#: ../libempathy-gtk/empathy-log-window.c:1354
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1296
+#: ../libempathy-gtk/empathy-log-window.c:1300
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1302
+#: ../libempathy-gtk/empathy-log-window.c:1306
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
-#: ../libempathy-gtk/empathy-log-window.c:1375
-#: ../src/empathy-ft-manager.c:1026
-msgid "%"
-msgstr "%"
-
 #: ../libempathy-gtk/empathy-log-window.c:1382
 #, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s sekundÄ—"
+msgstr[1] "%s sekundÄ—s"
+msgstr[2] "%s sekundžių"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s minutÄ—"
+msgstr[1] "%s minutÄ—s"
+msgstr[2] "%s minu�ių"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
+#, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Pokalbis truko %s, baigÄ—si %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1714
+#: ../libempathy-gtk/empathy-log-window.c:1729
 msgid "Today"
 msgstr "Å iandien"
 
-#: ../libempathy-gtk/empathy-log-window.c:1718
+#: ../libempathy-gtk/empathy-log-window.c:1733
 msgid "Yesterday"
 msgstr "Vakar"
 
-#: ../libempathy-gtk/empathy-log-window.c:1734
-msgctxt "A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1815
-#: ../libempathy-gtk/empathy-log-window.c:3396
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3444
 msgid "Anytime"
 msgstr "Bet kada"
 
-#: ../libempathy-gtk/empathy-log-window.c:1895
-#: ../libempathy-gtk/empathy-log-window.c:2325
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2372
 msgid "Anyone"
 msgstr "Bet kas"
 
-#: ../libempathy-gtk/empathy-log-window.c:2637
+#: ../libempathy-gtk/empathy-log-window.c:2685
 msgid "Who"
 msgstr "Kas"
 
-#: ../libempathy-gtk/empathy-log-window.c:2841
+#: ../libempathy-gtk/empathy-log-window.c:2889
 msgid "When"
 msgstr "Kada"
 
-#: ../libempathy-gtk/empathy-log-window.c:2957
+#: ../libempathy-gtk/empathy-log-window.c:3005
 msgid "Anything"
 msgstr "Bet kas"
 
-#: ../libempathy-gtk/empathy-log-window.c:2959
+#: ../libempathy-gtk/empathy-log-window.c:3007
 msgid "Text chats"
-msgstr "Tekstiniai pakalbiai"
+msgstr "Tekstiniai pokalbiai"
 
-#: ../libempathy-gtk/empathy-log-window.c:2961
+#: ../libempathy-gtk/empathy-log-window.c:3009
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "Skambu�iai"
 
-#: ../libempathy-gtk/empathy-log-window.c:2966
+#: ../libempathy-gtk/empathy-log-window.c:3014
 msgid "Incoming calls"
 msgstr "Įeinantys skambu�iai"
 
-#: ../libempathy-gtk/empathy-log-window.c:2967
+#: ../libempathy-gtk/empathy-log-window.c:3015
 msgid "Outgoing calls"
 msgstr "Išeinantys skambu�iai"
 
-#: ../libempathy-gtk/empathy-log-window.c:2968
+#: ../libempathy-gtk/empathy-log-window.c:3016
 msgid "Missed calls"
 msgstr "Praleistas skambu�iai"
 
-#: ../libempathy-gtk/empathy-log-window.c:2990
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "What"
 msgstr "Kas"
 
-#: ../libempathy-gtk/empathy-log-window.c:3699
+#: ../libempathy-gtk/empathy-log-window.c:3747
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Ar tikrai norite ištrinti visų buvusių pokalbių žurnalus?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3703
+#: ../libempathy-gtk/empathy-log-window.c:3751
 msgid "Clear All"
 msgstr "IÅ¡valyti visus"
 
-#: ../libempathy-gtk/empathy-log-window.c:3710
+#: ../libempathy-gtk/empathy-log-window.c:3758
 msgid "Delete from:"
 msgstr "Trinti nuo:"
 
@@ -2510,7 +2530,6 @@ msgid "Find:"
 msgstr "Ieškoti:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-#| msgid "Match case"
 msgid "Mat_ch case"
 msgstr "Skirti raidžių _registrą"
 
@@ -2519,12 +2538,10 @@ msgid "Phrase not found"
 msgstr "FrazÄ— nerasta"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:4
-#| msgid "_Next Tab"
 msgid "_Next"
 msgstr "_Kitas"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-#| msgid "_Previous Tab"
 msgid "_Previous"
 msgstr "_Ankstesnis"
 
@@ -2572,12 +2589,12 @@ msgstr "Baigtas garsinis skambutis"
 msgid "Edit Custom Messages"
 msgstr "Taisykite pasirinktinę žinutę"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1030
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
 #, c-format
 msgid "Message edited at %s"
 msgstr "Žinutė redaguota %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1720
+#: ../libempathy-gtk/empathy-theme-adium.c:1740
 msgid "Normal"
 msgstr "Normalus"
 
@@ -2671,20 +2688,20 @@ msgstr "Liudijimo informacija"
 msgid "Unable to open URI"
 msgstr "Nepavyko atverti URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1832
 msgid "Select a file"
 msgstr "Pasirinkite failÄ…"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1904
 msgid "Insufficient free space to save file"
 msgstr "Nepakanka laisvos vietos failui įrašyti"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1912
 #, c-format
 msgid "%s of free space are required to save this file, but only %s is available. Please choose another location."
 msgstr "Šiam failui įrašyti reikia %s laisvos vietos, ta�iau prieinama tik %s. Pasirinkite kitą vietą."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1956
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Failas jums nuo %s"
@@ -2872,23 +2889,23 @@ msgstr "Nėra klaidų pranešimų"
 msgid "Instant Message (Empathy)"
 msgstr "Tikralaikė žinutė (Empathy)"
 
-#: ../src/empathy.c:400
+#: ../src/empathy.c:434
 msgid "Don't connect on startup"
 msgstr "Paleidimo metu neprisijungti"
 
-#: ../src/empathy.c:404
+#: ../src/empathy.c:438
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Paleidus nerodyti adresatų sąrašo ar kitų dialogų"
 
-#: ../src/empathy.c:419
+#: ../src/empathy.c:453
 msgid "- Empathy IM Client"
 msgstr "– Tikralaikių pokalbių klientas Empathy"
 
-#: ../src/empathy.c:606
+#: ../src/empathy.c:640
 msgid "Error contacting the Account Manager"
 msgstr "Klaida susisiekiant su paskyrų tvarkykle"
 
-#: ../src/empathy.c:608
+#: ../src/empathy.c:642
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. The error was:\n"
@@ -3005,8 +3022,8 @@ msgid "Select the accounts you want to import:"
 msgstr "Pasirinkite pageidaujamas importuoti paskyras:"
 
 #: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:625
+#: ../src/empathy-new-chatroom-dialog.c:626
 msgid "Yes"
 msgstr "Taip"
 
@@ -3066,7 +3083,7 @@ msgstr "Jūsų naujoji paskyra dar neįrašyta."
 
 #: ../src/empathy-accounts-dialog.c:345
 #: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1159
+#: ../src/empathy-call-window.c:1330
 msgid "Connecting…"
 msgstr "Jungiamasi…"
 
@@ -3171,12 +3188,12 @@ msgid "People nearby"
 msgstr "Žmonės netoliese"
 
 #: ../src/empathy-av.c:118
-#: ../src/empathy-call.c:127
+#: ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr "– Empathy garso/vaizdo transliavimo klientas"
 
 #: ../src/empathy-av.c:134
-#: ../src/empathy-call.c:152
+#: ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy garso/vaizdo transliavimo klientas"
 
@@ -3219,53 +3236,41 @@ msgstr "IÅ¡sami informacija"
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1667
+#: ../src/empathy-call-window.c:1939
 #, c-format
 msgid "Call with %s"
 msgstr "Skambinti su %s"
 
 #: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:1911
+#: ../src/empathy-call-window.c:2183
 msgid "The IP address as seen by the machine"
 msgstr "Kompiuterio matomas IP adresas"
 
 #: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:1913
+#: ../src/empathy-call-window.c:2185
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Interneto serverio matomas IP adresas"
 
 #: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:1915
+#: ../src/empathy-call-window.c:2187
 msgid "The IP address of the peer as seen by the other side"
 msgstr "Kitos pusÄ—s matomas lygiarangio IP adresas"
 
 #: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:1917
+#: ../src/empathy-call-window.c:2189
 msgid "The IP address of a relay server"
 msgstr "Perdavimo serverio IP adresas"
 
 #: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:1919
+#: ../src/empathy-call-window.c:2191
 msgid "The IP address of the multicast group"
 msgstr "Daugiaadresio perdavimo grupÄ—s IP adresas"
 
 #: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "Nežinoma"
-
 #: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "Nežinoma"
-
 #: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "Nežinoma"
-
 #: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+msgctxt "codec"
 msgid "Unknown"
 msgstr "Nežinoma"
 
@@ -3276,66 +3281,66 @@ msgid "Connected — %d:%02dm"
 msgstr "Prisijunta – %d:%02dm"
 
 #: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2654
+#: ../src/empathy-call-window.c:2960
 msgid "Technical Details"
 msgstr "TechninÄ— informacija"
 
 #: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2692
+#: ../src/empathy-call-window.c:2998
 #, c-format
 msgid "%s's software does not understand any of the audio formats supported by your computer"
 msgstr "Adresato %s programinė įranga nepalaiko jokių jūsų kompiuterio palaikomų formatų"
 
 #: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2697
+#: ../src/empathy-call-window.c:3003
 #, c-format
 msgid "%s's software does not understand any of the video formats supported by your computer"
 msgstr "Adresato %s programinė įranga nepalaiko jokių jūsų kompiuterio palaikomų vaizdo įrašų formatų"
 
 #: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2703
+#: ../src/empathy-call-window.c:3009
 #, c-format
 msgid "Can't establish a connection to %s. One of you might be on a network that does not allow direct connections."
 msgstr "Nepavyko užmegzti ryšio su %s. Gali būti, kad vienas iš jūsų yra tinkle, nepriiman�iame tiesioginių prisijungimų."
 
 #: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2709
+#: ../src/empathy-call-window.c:3015
 msgid "There was a failure on the network"
 msgstr "Tinkle yra triktis"
 
 #: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2713
+#: ../src/empathy-call-window.c:3019
 msgid "The audio formats necessary for this call are not installed on your computer"
 msgstr "Jūsų kompiuteryje neįdiegti garso įrašų formatai, reikalingi šiam skambu�iui"
 
 #: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2716
+#: ../src/empathy-call-window.c:3022
 msgid "The video formats necessary for this call are not installed on your computer"
 msgstr "Jūsų kompiuteryje neįdiegti vaizdo įrašų formatai, reikalingi šiam skambu�iui"
 
 #: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2728
+#: ../src/empathy-call-window.c:3034
 #, c-format
 msgid "Something unexpected happened in a Telepathy component. Please <a href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' window in the Help menu."
 msgstr "Telepathy komponente atsitiko kažkas nenumatyta. <a href=\"%s\">Praneškite apie šią klaidą</a> ir pridėkite žurnalus, kuriuos surinkote meniu Pagalba „Derinimo“ lange."
 
 #: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2737
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure in the call engine"
 msgstr "Skambinimo posistemÄ—je yra triktis"
 
 #: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2740
+#: ../src/empathy-call-window.c:3046
 msgid "The end of the stream was reached"
 msgstr "Pasiekta srauto pabaiga"
 
 #: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2780
+#: ../src/empathy-call-window.c:3086
 msgid "Can't establish audio stream"
 msgstr "Nepavyko sukurti garso srauto"
 
 #: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2790
+#: ../src/empathy-call-window.c:3096
 msgid "Can't establish video stream"
 msgstr "Nepavyko sukurti vaizdo srauto"
 
@@ -3351,7 +3356,6 @@ msgid "Decoding Codec:"
 msgstr "Dekodavimo kodekas:"
 
 #: ../src/empathy-call-window.ui.h:4
-#| msgid "_Disable"
 msgid "Disable camera"
 msgstr "IÅ¡jungti kamerÄ…"
 
@@ -3398,12 +3402,10 @@ msgid "Send Audio"
 msgstr "Siųsti garsą"
 
 #: ../src/empathy-call-window.ui.h:14
-#| msgid "Send _Video"
 msgid "Send Video"
 msgstr "Siųsti vaizdą"
 
 #: ../src/empathy-call-window.ui.h:15
-#| msgid "Dialpad"
 msgid "Show dialpad"
 msgstr "Rodyti skambinimo skydelį"
 
@@ -3425,22 +3427,19 @@ msgid "Toggle audio transmission"
 msgstr "Įjungti garso transliavimą"
 
 #: ../src/empathy-call-window.ui.h:20
-#| msgid "Toggle audio transmission"
 msgid "Toggle video transmission"
 msgstr "Perjungti vaizdo transliavimÄ…"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2287
-#: ../src/empathy-call-window.c:2288
-#: ../src/empathy-call-window.c:2289
-#: ../src/empathy-call-window.c:2290
+#: ../src/empathy-call-window.c:2590
+#: ../src/empathy-call-window.c:2591
+#: ../src/empathy-call-window.c:2592
+#: ../src/empathy-call-window.c:2593
 msgid "Unknown"
 msgstr "Nežinoma"
 
 #: ../src/empathy-call-window.ui.h:23
-#| msgctxt "menu item"
-#| msgid "_Video Call"
 msgid "Video call"
 msgstr "Vaizdo skambutis"
 
@@ -3450,7 +3449,6 @@ msgid "_Call"
 msgstr "_Skambutis"
 
 #: ../src/empathy-call-window.ui.h:25
-#| msgid "Camera On"
 msgid "_Camera"
 msgstr "_Kamera"
 
@@ -3616,6 +3614,7 @@ msgid "Incoming video call"
 msgstr "Gaunamas vaizdinis skambutis"
 
 #: ../src/empathy-event-manager.c:521
+#: ../src/empathy-call-window.c:1563
 msgid "Incoming call"
 msgstr "Skambutis jums"
 
@@ -3632,6 +3631,7 @@ msgstr "%s jums skambina, ar atsiliepsite?"
 #: ../src/empathy-event-manager.c:529
 #: ../src/empathy-event-manager.c:730
 #: ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1569
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Skambutis jums nuo %s"
@@ -3651,6 +3651,7 @@ msgstr "_Atsakyti vaizdu"
 
 #: ../src/empathy-event-manager.c:730
 #: ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1569
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Gaunamas vaizdinis skambutis iš %s"
@@ -3693,17 +3694,17 @@ msgstr "Jūs kvie�iami prisijungti prie %s"
 msgid "Incoming file transfer from %s"
 msgstr "Failo atsiuntimas iš %s"
 
-#: ../src/empathy-event-manager.c:1134
-#: ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1145
+#: ../src/empathy-main-window.c:378
 msgid "Password required"
 msgstr "Reikalingas slaptažodis"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1210
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s pageidauja leidimo matyti, kada esate prisijungÄ™"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1214
 #, c-format
 msgid ""
 "\n"
@@ -3806,6 +3807,10 @@ msgstr "Tikrinamas „%s“ vientisumas"
 msgid "Hashing \"%s\""
 msgstr "Kuriama „%s“ maiša"
 
+#: ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "%"
+
 #: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "Failas"
@@ -3843,51 +3848,51 @@ msgstr "Protokolas"
 msgid "Source"
 msgstr "Å altinis"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-main-window.c:395
 msgid "Provide Password"
 msgstr "Nurodykite slaptažodį"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-main-window.c:401
 msgid "Disconnect"
 msgstr "Atsijungti"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-main-window.c:642
 msgid "No match found"
 msgstr "Nerasta atitikmenų"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-main-window.c:803
 msgid "Reconnect"
 msgstr "Prisijungti iš naujo"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-main-window.c:809
 msgid "Edit Account"
 msgstr "Taisyti paskyrÄ…"
 
-#: ../src/empathy-main-window.c:789
+#: ../src/empathy-main-window.c:815
 msgid "Close"
 msgstr "Užverti"
 
 #. Translators: this string will be something like:
 #. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#: ../src/empathy-main-window.c:954
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Pakelti %s (%s)..."
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-main-window.c:1001
 msgid "Top up account credit"
 msgstr "Pakelti paskyros kreditÄ…"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-main-window.c:1072
 msgid "Top Up..."
 msgstr "Pakelti..."
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-main-window.c:1815
 msgid "Contact"
 msgstr "Adresatas"
 
-#: ../src/empathy-main-window.c:2119
+#: ../src/empathy-main-window.c:2190
 msgid "Contact List"
 msgstr "Adresatų sąrašas"
 
@@ -3981,17 +3986,17 @@ msgstr "_Kambarys"
 msgid "_Search for Contacts…"
 msgstr "_Ieškoti adresatų…"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Pokalbių kambarys"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "Nariai"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:623
 #, c-format
 msgid ""
 "%s\n"
@@ -4004,16 +4009,16 @@ msgstr ""
 "Reikia slaptažodžio: %s\n"
 "Nariai: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:625
+#: ../src/empathy-new-chatroom-dialog.c:626
 msgid "No"
 msgstr "Ne"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:654
 msgid "Could not start room listing"
 msgstr "Nepavyko paleisti kambarių sąrašo"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:664
 msgid "Could not stop room listing"
 msgstr "Nepavyko sustabdyti kambarių rodymo"
 
@@ -4142,119 +4147,123 @@ msgid "Display incoming events in the notification area"
 msgstr "Rodyti gaunamus įvykius pranešimų srityje"
 
 #: ../src/empathy-preferences.ui.h:9
+msgid "Echo cancellation helps to make your voice sound clearer to the other person, but may cause problems on some computers. If you or the other person hear strange noises or glitches during calls, try turning echo cancellation off and restarting the call."
+msgstr "Aido panaikinimas padeda padaryti jūsų balsą aiškesnį kitam asmeniui, bet gali sukelti problemų kai kuriuose kompiuteriuose. Jei jūs arba kitas asmuo girdi keistus triukšmus ar nesklandumus skambu�io metu, bandykite išjungti aido panaikinimą ir skambinti iš naujo."
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "Įjungti pranešimus, kai prisijungia adresatas"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "Įjungti pranešimus, kai atsijungia adresatas"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Įjungti pranešimus, kai _pokalbio langas nesuaktyvintas"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "Įjungti šių kalbų rašybos tikrinimą:"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "Bendra"
 
-#: ../src/empathy-preferences.ui.h:14
-msgid "Input level"
-msgstr "Įvesties lygis"
-
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input volume"
-msgstr "Įvesties garsumas"
+msgid "Input level:"
+msgstr "Įvesties lygis:"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "Įvesties garsumas:"
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "VietovÄ—s Å¡altiniai:"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "Vesti pokalbių žurnalus"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "Pranešimai"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Groti garsus įvykiams"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "Privatumas"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:23
 msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published.  GPS coordinates will be accurate to 1 decimal place."
 msgstr "Sumažinus vietovės rodymo tikslumą, bus rodomas tik jūsų miestas, sritis ir šalis. GPS koordinatės bus rodomos vieno skai�iaus po kablelio tikslumu."
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "Rodyti Å¡_ypsenelÄ—s kaip paveikslÄ—lius"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "Rodyti adresatų _sąrašą kambariuose"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "Garsai"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "Rašybos tikrinimas"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
 msgid "The list of languages reflects only the languages for which you have a dictionary installed."
 msgstr "Šiame kalbų sąraše yra tik tos kalbos, kurių žodynus turite įdiegę."
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "Temos"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "Variantas:"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "_Automatiškai prisijungti paleidimo metu"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Mobilusis telefonas"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "Į_jungti burbulinius pranešimus"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "Į_jungti garsinius pranešimus"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Tinklas (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "_Atverti naujus pokalbius atskiruose languose"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "_Rodyti vietovÄ™ mano adresatams"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "_Sumažinti vietovės tikslumą"
 
@@ -4320,7 +4329,7 @@ msgstr "Adresatų žemėlapio rodinys"
 
 #: ../src/empathy-debug-window.c:1228
 msgid "Save"
-msgstr "Irašyti"
+msgstr "Įrašyti"
 
 #: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
@@ -4379,40 +4388,44 @@ msgstr "Lygis"
 msgid "The selected connection manager does not support the remote debugging extension."
 msgstr "Pasirinktoji ryšių valdyklė nepalaiko nuotolinio derinimo plėtinio."
 
+#: ../src/empathy-invite-participant-dialog.c:179
 #: ../src/empathy-invite-participant-dialog.c:205
-#: ../src/empathy-invite-participant-dialog.c:231
 msgid "Invite Participant"
 msgstr "Pakviesti dalyvį"
 
-#: ../src/empathy-invite-participant-dialog.c:206
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Pasirinkite į pokalbį pakviestiną adresatą:"
 
-#: ../src/empathy-invite-participant-dialog.c:227
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "Pakviesti"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:184
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "Nerodyti jokių dialogų, atlikti norimas užduotis (pvz., importuoti)"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:188
 msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "Nerodyti jokių dialogų, nebent yra tik „Žmonės netoliese“ tipo paskyros"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:192
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "Iš pradžių pasirinkti duotąją paskyrą (pvz., gabble/jabber/foo_40pavyzdys_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:194
 msgid "<account-id>"
 msgstr "<paskyros-id>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:197
+msgid "Show account assistant"
+msgstr "Rodyti paskyros padÄ—jÄ—jÄ…"
+
+#: ../src/empathy-accounts.c:203
 msgid "- Empathy Accounts"
 msgstr "– Empathy paskyros"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:242
 msgid "Empathy Accounts"
 msgstr "Empathy paskyros"
 
@@ -4421,7 +4434,6 @@ msgid "Show a particular service"
 msgstr "Rodyti tam tikrÄ… tarnybÄ…"
 
 #: ../src/empathy-debugger.c:75
-#| msgid "Empathy Debugger"
 msgid "- Empathy Debugger"
 msgstr "- Empathy derintuvÄ—"
 
@@ -4438,11 +4450,13 @@ msgid "Respond"
 msgstr "Atsakyti"
 
 #: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1573
 msgid "Reject"
 msgstr "Atmesti"
 
 #: ../src/empathy-notifications-approver.c:222
 #: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1574
 msgid "Answer"
 msgstr "Atsiliepti"
 
@@ -4460,6 +4474,9 @@ msgstr "Atsisakyti"
 msgid "Accept"
 msgstr "Priimti"
 
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
 #: ../src/empathy-notifications-approver.c:260
 msgid "Provide"
 msgstr "Teikia"
@@ -4471,26 +4488,25 @@ msgstr "%s ką tik jums skambino, bet tuo metu kalbėjote su kažkuo kitu."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1031
-#: ../src/empathy-call-window.c:1054
+#: ../src/empathy-call-window.c:1183
+#: ../src/empathy-call-window.c:1206
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2583
+#: ../src/empathy-call-window.c:2889
 msgid "On hold"
 msgstr "Laukia"
 
-#: ../src/empathy-call-window.c:2586
+#: ../src/empathy-call-window.c:2892
 msgid "Mute"
 msgstr "Nutildyti"
 
-#: ../src/empathy-call-window.c:2588
-#| msgid "Location"
+#: ../src/empathy-call-window.c:2894
 msgid "Duration"
 msgstr "TrukmÄ—"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2591
+#: ../src/empathy-call-window.c:2897
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
@@ -4499,6 +4515,28 @@ msgstr "%s — %d:%02dm"
 msgid "_Match case"
 msgstr "Skirti raidžių _registrą"
 
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Empathy perkėlė butterfly žurnalus"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Ar Empathy perkėlė butterfly žurnalus."
+#~ msgctxt "encoding video codec"
+
+#~ msgid "Unknown"
+#~ msgstr "Nežinoma"
+#~ msgctxt "encoding audio codec"
+
+#~ msgid "Unknown"
+#~ msgstr "Nežinoma"
+#~ msgctxt "decoding video codec"
+
+#~ msgid "Unknown"
+#~ msgstr "Nežinoma"
+#~ msgctxt "decoding audio codec"
+
+#~ msgid "Unknown"
+#~ msgstr "Nežinoma"
+
 #~ msgid "Find Next"
 #~ msgstr "Ieškoti kito"
 
diff --git a/po/lv.po b/po/lv.po
index 82253bf25..949d3c0b1 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -13,8 +13,8 @@ msgstr ""
 "Project-Id-Version: lv\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
 "cgi?product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-07-04 16:52+0000\n"
-"PO-Revision-Date: 2011-07-10 20:58+0300\n"
+"POT-Creation-Date: 2011-09-18 16:18+0000\n"
+"PO-Revision-Date: 2011-09-18 21:14+0300\n"
 "Last-Translator: RÅ«dofls Mazurs <rudolfs.mazurs@gmail.com>\n"
 "Language-Team: Latvian <lata-l10n@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
-"X-Generator: Lokalize 1.1\n"
+"X-Generator: Lokalize 1.2\n"
+"Language: lv\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
@@ -47,6 +48,22 @@ msgid "Always open a separate chat window for new chats."
 msgstr "Vienmēr atvērt jaunu tērzēšanas logu jaun�m sarakstēm."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr "Zvana skaļums"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr "Zvana skaļums, izteikts procentos."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Camera device"
+msgstr "Kameras ierīce"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "Kameras novietojums"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -54,51 +71,54 @@ msgstr ""
 "Rakstzīme, ko pievienot pēc iesaukas, lietojot Tab iesauku pabeigšanai grupu "
 "tērzēšan�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "Tērzēšanas loga tēma"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-#| msgid "Chat window theme"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Chat window theme variant"
 msgstr "Tērzēšanas loga tēmas variants"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "Valodu saraksts, ko izmantot pareizrakstības p�rbaudei (piemēram: en, fr, "
 "nl)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "Kompakts kontaktu saraksts"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "Vajadzētu izmantot savienojumu p�rvaldniekus"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "Kontaktu saraksta k�rtošanas kritērijs"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Noklusēt� kamera, ko izmantot video zvaniem, piem. /dev/video0."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
 msgstr "Noklusēt� mape, no kuras izvēlēties lietot�ja attēlu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr "Izslēgt izlecošos paziņojumus, kad esmu proj�m"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr "Atslēgt skaņu, kad esmu proj�m"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
 msgstr "R�dīt ien�košos notikumus statusa lauk�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -106,242 +126,248 @@ msgstr ""
 "R�dīt ien�košos notikumus statusa lauk�. Ja nepatiess, lietot�jam tos r�dīt "
 "nekavējoties."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+msgid "Echo cancellation support"
+msgstr "Atbalss atcelšanas atbalsts"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr "Empathy drīkst publicēt lietot�ja atrašan�s vietu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy drīkst izmantot GPS, lai uzminētu atrašan�s vietu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy drīkst izmantot mobilo tīklu, lai uzminētu atrašan�s vietu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy drīkst izmantot tīklu, lai uzminētu atrašan�s vietu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr "Empathy noklusēt� lejupiel�des mape"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
 msgstr "Empathy ir p�rnesusi butterfly žurn�lus"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr "Kad dators ir dīkst�vē, autom�tiski mainīt statusu uz 'Proj�m'"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy vajadzētu autom�tiski savienoties pēc palaišanas"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy vajadzētu samazin�t atrašan�s vietas precizit�ti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy vajadzētu izmantot kontakta attēlu k� tērzēšanas loga ikonu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr "Ieslēgt WebKit izstr�des rīkus"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "Ieslēgt izlecošos paziņojumus jauniem ziņojumiem"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "Ieslēgt pareizrakstības p�rbaudi"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "Slēpt galveno logu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "Slēpt galveno logu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "Iesaukas pabeigšanas rakstzīme"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "Atvērt jaunas sarakstes atsevišķos logos"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "Ceļš uz lietojamo Adium tēmu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "Ceļš uz Adium tēmu, ja t�du izmanto šaj� tērzēšan�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Atskaņot skaņu ien�košajiem ziņojumiem"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "Atskaņot skaņu jaun�m sarun�m"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Atskaņot skaņu izejošajiem ziņojumiem"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "Atskaņot skaņu, kad kontakts ien�k"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "Atskaņot skaņu, kad kontakts iziet"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "Atskaņot skaņu, kad mēs ieejam"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "Atskaņot skaņu, kad mēs izejam"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "R�dīt izlecošo paziņojumu, ja tērzēšanas logs nav fokusēts"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "R�dīt paziņojumu izlecošaj� log�, kad ien�k kontakts"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "R�dīt paziņojumu izlecošaj� log�, kad iziet kontakts"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-#| msgid "Show offline contacts"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr "Novietojums, k�d� j�būt kameras priekšskatījumam zvana laik�."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Show Balance in contact list"
 msgstr "R�dīt bilanci kontaktu sarakst�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "R�dīt attēlus"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "R�dīt kontaktu sarakstu istab�s"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr "R�dīt nor�di par galven� loga aizvēršanu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr "R�dīt nesaistes kontaktus"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
 msgstr "R�dīt protokolus"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "Pareizrakstības p�rbaudes valodas"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr "Noklusēt� mape, kur� saglab�t saņemtos failus."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Pēdēj� mape, no kuras tika ņemts lietot�ja attēls."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
 msgstr "Tērzēšanas loga s�nu rūts novietojums"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "Tērzēšanas loga s�nu paneļa saglab�tais novietojums (pikseļos)"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Tēma, kuru izmantot, lai attēlotu sarunas tērzēšanas logos."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-#| msgid "The theme that is used to display the conversation in chat windows."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr "Tēmas variants, kuru izmantot, lai attēlotu sarunas tērzēšanas logos."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Lietot grafiskos smaidiņus"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "Lietot skaņas paziņojumus"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "Lietot tēmu tērzēšanas istab�s"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Vai Empathy drīkst publicēt lietot�ja atrašan�s vietu viņa kontaktiem."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Vai Empathy drīkst izmantot GPS, lai uzminētu atrašan�s vietu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
 "Vai Empathy drīkst izmantot mobilo tīklu, lai uzminētu atrašan�s vietu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Vai Empathy drīkst izmantot tīklu, lai uzminētu atrašan�s vietu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "Vai Empathy ir p�rnesusi butterfly žurn�lus."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr ""
 "Vai Empathy pēc palaišanas vajadzētu autom�tiski pieslēgties jūsu kontiem."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
 "Vai Empathy vajadzētu mainīt statusu uz 'proj�m', ja lietot�js nedarbojas ar "
 "datoru."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 "Vai Empathy vajadzētu samazin�t atrašan�s vietas precizit�ti (priv�tumam)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 "Vai Empathy vajadzētu izmantot kontakta attēlu k� tērzēšanas loga ikonu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Vai WebKit izstr�des rīkiem, piemēram, Web Inspector, vajadzētu būt "
 "ieslēgtiem."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
@@ -349,61 +375,65 @@ msgstr ""
 "Vai vajadzētu izmantot savienojumu p�rvaldnieku, lai autom�tiski atvienotos/"
 "savienotos."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "Vai p�rbaudīt uzrakstīto v�rdu piederību izvēlētaj�m valod�m."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "Vai sarun�s smaidiņus p�rveidot par grafiskiem attēliem."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Vai aktivēt Pulseaudio atbalss atcelšanas filtru."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "Vai atskaņot skaņu, lai paziņotu, ka kontakts ir pieteicies tīkl�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "Vai atskaņot skaņu, lai paziņotu, ka kontakts ir izg�jis no tīkla."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "Vai atskaņot skaņu, lai paziņotu par notikumiem."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Vai atskaņot skaņu, lai paziņotu par ien�košajiem ziņojumiem."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Vai atskaņot skaņu, lai paziņotu par jaun�m sarun�m."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Vai atskaņot skaņu, lai paziņotu par izejošajiem ziņojumiem."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "Vai atskaņot skaņu, piesakoties tīkl�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Vai atskaņot skaņu, izejot no tīkla."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr "Vai atskaņot skaņas paziņojumu, kad esmu prom vai aizņemts."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "Vai r�dīt izlecošo paziņojumu, kad kontakts iziet."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "Vai r�dīt izlecošo paziņojumu, kad kontakts par�d�s tiešsaistē."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -411,41 +441,40 @@ msgstr ""
 "Vai r�dīt izlecošo paziņojumu, saņemot jaunu ziņojumu, kad tērzēšanas logs "
 "jau ir atvērts, bet nav fokusēts."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "Vai r�dīt izlecošo paziņojumu, kad saņem jaunu ziņojumu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-#| msgid "Whether to show protocols for contacts in the contact list."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show account balances in the contact list."
 msgstr "Vai r�dīt kontu bilanci kontaktu sarakst�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "Vai r�dīt kontaktu attēlus kontaktu sarakst� un tērzēšanas logos."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "Vai r�dīt kontaktu sarakst� kontaktus, kuri ir nesaistē."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
 msgstr "Vai r�dīt izlecošos paziņojumus, kad esmu prom vai aizņemts."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "Vai r�dīt protokolus kontaktu sarakst� un tērzēšanas logos."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Vai r�dīt kontaktu sarakstu tērzēšanas istab�s."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "Vai r�dīt kontaktu sarakstu kompaktaj� režīm�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -453,11 +482,11 @@ msgstr ""
 "Vai r�dīt ziņojuma dialogu par galven� loga aizvēršanu ar 'x' pogu "
 "virsraksta josl�."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "Vai izmantot tēmu tērzēšanas istab�s."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -481,33 +510,31 @@ msgstr "Ziņojumapmaiņas un IP balss p�rraides konti"
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Faila p�rsūtīšana pabeigta, bet fails ir boj�ts"
 
-#: ../libempathy/empathy-ft-handler.c:1113
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
 msgstr "Kontakts neatbalsta failu sūtīšanu"
 
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is not a regular file"
 msgstr "Izvēlētais fails nav norm�ls fails"
 
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1176
 msgid "The selected file is empty"
 msgstr "Izvēlētais fails ir tukšs"
 
-#: ../libempathy/empathy-message.c:413 ../src/empathy-call-observer.c:132
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
 #, c-format
 msgid "Missed call from %s"
 msgstr "Neatbildēts zvans no %s"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:417
+#: ../libempathy/empathy-message.c:419
 #, c-format
-#| msgid "Call with %s"
 msgid "Called %s"
 msgstr "Zvanīja %s"
 
-#: ../libempathy/empathy-message.c:420
+#: ../libempathy/empathy-message.c:422
 #, c-format
-#| msgid "Missed call from %s"
 msgid "Call from %s"
 msgstr "Zvans no %s"
 
@@ -539,145 +566,144 @@ msgstr "Notika kļūda, mēģinot p�rsūtīt failu"
 msgid "The other participant is unable to transfer the file"
 msgstr "Otrs dalībnieks nevar p�rsūtīt failu"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
 msgid "Unknown reason"
 msgstr "Nezin�ms iemesls"
 
-#: ../libempathy/empathy-utils.c:212
+#: ../libempathy/empathy-utils.c:222
 msgid "Available"
 msgstr "Pieejams"
 
-#: ../libempathy/empathy-utils.c:214
+#: ../libempathy/empathy-utils.c:224
 msgid "Busy"
 msgstr "Aizņemts"
 
-#: ../libempathy/empathy-utils.c:217
+#: ../libempathy/empathy-utils.c:227
 msgid "Away"
 msgstr "Proj�m"
 
-#: ../libempathy/empathy-utils.c:219
+#: ../libempathy/empathy-utils.c:229
 msgid "Invisible"
 msgstr "Neredzams"
 
-#: ../libempathy/empathy-utils.c:221
+#: ../libempathy/empathy-utils.c:231
 msgid "Offline"
 msgstr "Nesaistē"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:224
-#| msgid "Unknown"
+#: ../libempathy/empathy-utils.c:234
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Nezin�ms"
 
-#: ../libempathy/empathy-utils.c:264
+#: ../libempathy/empathy-utils.c:274
 msgid "No reason specified"
 msgstr "Iemesls netika nor�dīts"
 
-#: ../libempathy/empathy-utils.c:266 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
 msgid "Status is set to offline"
 msgstr "Statuss ir \"nesaistē\""
 
-#: ../libempathy/empathy-utils.c:268 ../libempathy/empathy-utils.c:302
-#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "Tīkla kļūda"
 
-#: ../libempathy/empathy-utils.c:270 ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
 msgid "Authentication failed"
 msgstr "Autentifik�cija neizdev�s"
 
-#: ../libempathy/empathy-utils.c:272 ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
 msgid "Encryption error"
 msgstr "Šifrēšanas kļūda"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:284
 msgid "Name in use"
 msgstr "V�rds jau ir aizņemts"
 
-#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:308
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
 msgid "Certificate not provided"
 msgstr "Nav sertifik�ta"
 
-#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
 msgid "Certificate untrusted"
 msgstr "Neuzticams sertifik�ts"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
 msgid "Certificate expired"
 msgstr "Sertifik�ts izbeidzies"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
 msgid "Certificate not activated"
 msgstr "Sertifik�ts nav aktivizēts"
 
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
 msgid "Certificate hostname mismatch"
 msgstr "Sertifik�tu servera nosaukumu nesakritība"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate fingerprint mismatch"
 msgstr "Sertifik�ta digit�lo nospiedumu nesakritība"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate self-signed"
 msgstr "Sertifik�ts ir pašparakstīts"
 
-#: ../libempathy/empathy-utils.c:290
+#: ../libempathy/empathy-utils.c:300
 msgid "Certificate error"
 msgstr "Sertifik�ta kļūda"
 
-#: ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:334
 msgid "Encryption is not available"
 msgstr "Šifrēšana nav pieejama"
 
-#: ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:336
 msgid "Certificate is invalid"
 msgstr "Sertifik�ts nav derīgs"
 
-#: ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:338
 msgid "Connection has been refused"
 msgstr "Savienojums tika atteikts"
 
-#: ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:340
 msgid "Connection can't be established"
 msgstr "Nevar izveidot savienojumu"
 
-#: ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:342
 msgid "Connection has been lost"
 msgstr "Savienojums p�rtrūka"
 
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:344
 msgid "This resource is already connected to the server"
 msgstr "Å is resurs jau ir savienots ar serveri"
 
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:346
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Savienojums tika aizvietots ar jaunu savienojumu, kurš izmanto to pašu "
 "resursu"
 
-#: ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:349
 msgid "The account already exists on the server"
 msgstr "Uz servera š�ds konts jau ir"
 
-#: ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:351
 msgid "Server is currently too busy to handle the connection"
 msgstr "Serveris ir p�r�k aizņemts, lai apstr�d�tu savienojumu"
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:353
 msgid "Certificate has been revoked"
 msgstr "Sertifik�ts tika atsaukts"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:355
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Sertifik�ts izmanto nedrošu šifrēšanas algoritmu vai arī ir kriptogr�fiski "
 "v�jš"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:358
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -685,20 +711,20 @@ msgstr ""
 "Servera sertifik�ta garums vai sertifik�ta ķēdes dziļums p�rsniedz "
 "ierobežojumus, ko nosaka kriptogr�fijas bibliotēka"
 
-#: ../libempathy/empathy-utils.c:509
+#: ../libempathy/empathy-utils.c:519
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "Tuvum� esošie cilvēki"
 
-#: ../libempathy/empathy-utils.c:514
+#: ../libempathy/empathy-utils.c:524
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:543
+#: ../libempathy/empathy-utils.c:553
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:544
+#: ../libempathy/empathy-utils.c:554
 msgid "Facebook Chat"
 msgstr "Facebook tērzēšana"
 
@@ -754,71 +780,81 @@ msgstr[2] "Pirms %d mēnešiem"
 msgid "in the future"
 msgstr "n�kotnē"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:539
-#| msgid "Accounts"
+#: ../libempathy-gtk/empathy-account-chooser.c:540
 msgid "All accounts"
 msgstr "Visi konti"
 
-#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "Konts"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "Parole"
 
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Serveris"
 
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Ports"
 
-#: ../libempathy-gtk/empathy-account-widget.c:756
-#: ../libempathy-gtk/empathy-account-widget.c:813
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1154
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "Mani tīmekļa konti"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "Konts %s tika rediģēts caur \"Mani tīmekļa konti\"."
+msgid "The account %s is edited via %s."
+msgstr "Konts %s tika rediģēts ar %s."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1160
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "Kontu %s nevar rediģēt, izmantojot Empathy."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1180
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
 msgstr "Palaist \"Mani tīmekļa konti\""
 
-#: ../libempathy-gtk/empathy-account-widget.c:1518
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "Rediģēt %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Lietot�jv�rds:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1836
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "_Pielietot"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1866
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
 msgstr "_Pieteikties"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "Uz servera š�ds konts jau ir"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1943
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "Izveidot jaunu kontu uz servera"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2135
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "A_tcelt"
 
@@ -827,19 +863,19 @@ msgstr "A_tcelt"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2413
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s uz %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2439
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "%s konts"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2443
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "Jauns konts"
 
@@ -851,6 +887,7 @@ msgstr "<b>Piemērs:</b> MansEkr�naV�rds"
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -960,76 +997,84 @@ msgstr "K�ds ir jūsu ICQ UIN?"
 msgid "What is your ICQ password?"
 msgstr "K�da ir jūsu ICQ parole?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:184
-#: ../libempathy-gtk/empathy-account-widget-sip.c:217
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "Auto"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:187
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:193
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:222
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "Reģistrēties"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:227
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "Opcijas"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "Nekas"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Character set:"
 msgstr "Rakstzīmju kopa:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"Vairums IRC serveru nepieprasa paroli; ja neesat p�rliecin�ts, neievadiet "
+"paroli."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Network"
 msgstr "TÄ«kls"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Network:"
 msgstr "TÄ«kls:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Iesauka:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "Parole:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "Iziešanas ziņojums:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "Īstais v�rds:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Servers"
 msgstr "Serveris"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "What is your IRC nickname?"
 msgstr "K�ds ir jūsu IRC ekr�na v�rds?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Kurš IRC tīkls?"
 
@@ -1212,14 +1257,18 @@ msgid "Transport:"
 msgstr "Transports:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Šo kontu izmantot, _lai zvanītu iekšzemes un mobilajiem t�lruņiem"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "K�da ir jūsu SIP konta parole?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "K�ds ir jūsu SIP lietot�ja ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "_Lietot�jv�rds:"
 
@@ -1243,36 +1292,36 @@ msgstr "Yahoo! I_D:"
 msgid "_Room List locale:"
 msgstr "_Istabu saraksta lok�le:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:474
-#: ../libempathy-gtk/empathy-avatar-chooser.c:559
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "Neizdev�s p�rveidot attēlu"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:475
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "Jūsu sistēma neatbalsta nevienu no akceptētajiem attēla form�tiem"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:822
-msgid "Couldn't save pixbuf to png"
-msgstr "Neizdev�s saglab�t pixbuf uz png"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+msgid "Couldn't save picture to file"
+msgstr "Neizdev�s saglab�t bildi fail�"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "Izvēlieties savu attēlu"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:942
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
 msgstr "Uzņemt bildi..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:945
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "Nav attēla"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "Attēli"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1009
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "Visi faili"
 
@@ -1280,66 +1329,61 @@ msgstr "Visi faili"
 msgid "Click to enlarge"
 msgstr "Klikšķiniet, lai palielin�tu"
 
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:58
-#| msgid "There was an error while creating the account."
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Gadīj�s kļūda, s�kot zvanu"
 
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact doesn't support calls"
 msgstr "Nor�dītais kontakts neatbalsta zvanus"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
-#| msgid "The selected contact is offline."
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is offline"
 msgstr "Nor�dītais kontakts ir nesaistē"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
-#| msgid "The selected contact is offline."
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "The specified contact is not valid"
 msgstr "Nor�dītais kontakts ir nav derīgs"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
-#| msgid "Topic not supported on this conversation"
+#: ../libempathy-gtk/empathy-call-utils.c:57
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Šis protokols neatbalsta �rk�rtas zvanus"
 
-#: ../libempathy-gtk/empathy-chat.c:697
+#: ../libempathy-gtk/empathy-chat.c:702
 msgid "Failed to open private chat"
 msgstr "Neizdev�s izveidot priv�tu tērzēšanas istabu"
 
-#: ../libempathy-gtk/empathy-chat.c:758
+#: ../libempathy-gtk/empathy-chat.c:763
 msgid "Topic not supported on this conversation"
 msgstr "Šai sarunai temats nav atbalstīts"
 
-#: ../libempathy-gtk/empathy-chat.c:764
+#: ../libempathy-gtk/empathy-chat.c:769
 msgid "You are not allowed to change the topic"
 msgstr "Jums nav tiesību mainīt tematu"
 
-#: ../libempathy-gtk/empathy-chat.c:968
+#: ../libempathy-gtk/empathy-chat.c:973
 #, c-format
-#| msgid "invalid contact"
 msgid "“%s� is not a valid contact ID"
 msgstr "“%s� nav derīgs kontakta ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1025
+#: ../libempathy-gtk/empathy-chat.c:1058
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: attīrīt visus ziņojumus no šīs sarunas"
 
-#: ../libempathy-gtk/empathy-chat.c:1028
+#: ../libempathy-gtk/empathy-chat.c:1061
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <temats>: uzlikt tematu Å¡ai sarunai"
 
-#: ../libempathy-gtk/empathy-chat.c:1031
+#: ../libempathy-gtk/empathy-chat.c:1064
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <istabas ID>: pievienoties jaunai tērzēšanas istabai"
 
-#: ../libempathy-gtk/empathy-chat.c:1034
+#: ../libempathy-gtk/empathy-chat.c:1067
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <istabas ID>: pievienoties jaunai tērzēšanas istabai"
 
-#: ../libempathy-gtk/empathy-chat.c:1038
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1347,23 +1391,23 @@ msgstr ""
 "/part [<istabas ID>] [<iemesls>]: pamest tērzēšanas istabu, pēc noklusēšanas "
 "t� ir pašreizēj�"
 
-#: ../libempathy-gtk/empathy-chat.c:1042
+#: ../libempathy-gtk/empathy-chat.c:1075
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <kontakta ID> [<ziņojums>]: atvērt priv�to tērzēšanu"
 
-#: ../libempathy-gtk/empathy-chat.c:1045
+#: ../libempathy-gtk/empathy-chat.c:1078
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <kontakta ID> <ziņojums>: atvērt priv�to tērzēšanu"
 
-#: ../libempathy-gtk/empathy-chat.c:1048
+#: ../libempathy-gtk/empathy-chat.c:1081
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <iesauka>: mainīt jūsu iesauku uz šī servera"
 
-#: ../libempathy-gtk/empathy-chat.c:1051
+#: ../libempathy-gtk/empathy-chat.c:1084
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <darbība>: nosūtīt darbības ziņojumu šaj� sarun�"
 
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1373,11 +1417,11 @@ msgstr ""
 "ziņojumu, kurš s�kas ar '/'. Piemēram: \"/say /join tiek izmantots, lai "
 "pievienotos jaunai tērzēšanas istabai\""
 
-#: ../libempathy-gtk/empathy-chat.c:1059
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <contact ID>: r�dīt inform�ciju par kontaktu"
 
-#: ../libempathy-gtk/empathy-chat.c:1062
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1385,115 +1429,113 @@ msgstr ""
 "/help [<komanda>]: r�dīt visas atbalstīt�s komandas. Ja dota <komanda>, "
 "par�dīt t�s lietošanu."
 
-#: ../libempathy-gtk/empathy-chat.c:1072
+#: ../libempathy-gtk/empathy-chat.c:1112
 #, c-format
 msgid "Usage: %s"
 msgstr "Lietojums: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1111
+#: ../libempathy-gtk/empathy-chat.c:1157
 msgid "Unknown command"
 msgstr "Nezin�ma komanda"
 
-#: ../libempathy-gtk/empathy-chat.c:1237
+#: ../libempathy-gtk/empathy-chat.c:1283
 msgid "Unknown command; see /help for the available commands"
 msgstr "Nezin�ma komanda; /help var par�dīt pieejam�s komandas"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1407
-#| msgid "Insufficient free space to save file"
+#: ../libempathy-gtk/empathy-chat.c:1453
 msgid "insufficient balance to send message"
 msgstr "nepietiekama bilance, lai nosūtītu ziņojumu"
 
-#: ../libempathy-gtk/empathy-chat.c:1409
+#: ../libempathy-gtk/empathy-chat.c:1455
 msgid "not capable"
 msgstr "nav spējīgs"
 
-#: ../libempathy-gtk/empathy-chat.c:1416
+#: ../libempathy-gtk/empathy-chat.c:1462
 msgid "offline"
 msgstr "nesaistē"
 
-#: ../libempathy-gtk/empathy-chat.c:1419
+#: ../libempathy-gtk/empathy-chat.c:1465
 msgid "invalid contact"
 msgstr "nederīgs kontakts"
 
-#: ../libempathy-gtk/empathy-chat.c:1422
+#: ../libempathy-gtk/empathy-chat.c:1468
 msgid "permission denied"
 msgstr "atļauja liegta"
 
-#: ../libempathy-gtk/empathy-chat.c:1425
+#: ../libempathy-gtk/empathy-chat.c:1471
 msgid "too long message"
 msgstr "p�r�k garš ziņojums"
 
-#: ../libempathy-gtk/empathy-chat.c:1428
+#: ../libempathy-gtk/empathy-chat.c:1474
 msgid "not implemented"
 msgstr "nav realizēts"
 
-#: ../libempathy-gtk/empathy-chat.c:1432
+#: ../libempathy-gtk/empathy-chat.c:1478
 msgid "unknown"
 msgstr "nezin�ms"
 
-#: ../libempathy-gtk/empathy-chat.c:1438
+#: ../libempathy-gtk/empathy-chat.c:1484
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Kļūda, sūtot ziņojumu '%s': %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1442
+#: ../libempathy-gtk/empathy-chat.c:1488
 #, c-format
-#| msgid "Error sending message '%s': %s"
 msgid "Error sending message: %s"
 msgstr "Kļūda, sūtot ziņojumu: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1503 ../src/empathy-chat-window.c:760
+#: ../libempathy-gtk/empathy-chat.c:1549 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Temats:"
 
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1561
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Temats ir: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1517
+#: ../libempathy-gtk/empathy-chat.c:1563
 msgid "No topic defined"
 msgstr "Temats nav nor�dīts"
 
-#: ../libempathy-gtk/empathy-chat.c:2024
+#: ../libempathy-gtk/empathy-chat.c:2072
 msgid "(No Suggestions)"
 msgstr "(Nav ieteikumu)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2092
+#: ../libempathy-gtk/empathy-chat.c:2140
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Pievienot '%s' v�rdnīcai"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2129
+#: ../libempathy-gtk/empathy-chat.c:2177
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Pievienot '%s' v�rdnīcai '%s'"
 
-#: ../libempathy-gtk/empathy-chat.c:2186
+#: ../libempathy-gtk/empathy-chat.c:2247
 msgid "Insert Smiley"
 msgstr "Ievietot smaidiņu"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2204
-#: ../libempathy-gtk/empathy-ui-utils.c:1756
+#: ../libempathy-gtk/empathy-chat.c:2265
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "_Sūtīt"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2239
+#: ../libempathy-gtk/empathy-chat.c:2319
 msgid "_Spelling Suggestions"
 msgstr "_Pareizrakstības ieteikumi"
 
-#: ../libempathy-gtk/empathy-chat.c:2328
+#: ../libempathy-gtk/empathy-chat.c:2408
 msgid "Failed to retrieve recent logs"
 msgstr "Neizdev�s iegūt pēdējos ierakstus"
 
-#: ../libempathy-gtk/empathy-chat.c:2465
+#: ../libempathy-gtk/empathy-chat.c:2545
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s ir izg�jis"
@@ -1501,12 +1543,12 @@ msgstr "%s ir izg�jis"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2472
+#: ../libempathy-gtk/empathy-chat.c:2552
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s ņēma un izspēra %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2475
+#: ../libempathy-gtk/empathy-chat.c:2555
 #, c-format
 msgid "%s was kicked"
 msgstr "%s tika izsperts"
@@ -1514,17 +1556,17 @@ msgstr "%s tika izsperts"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2483
+#: ../libempathy-gtk/empathy-chat.c:2563
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s ņēma un izraidīja %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2486
+#: ../libempathy-gtk/empathy-chat.c:2566
 #, c-format
 msgid "%s was banned"
 msgstr "%s tika izraidīts"
 
-#: ../libempathy-gtk/empathy-chat.c:2490
+#: ../libempathy-gtk/empathy-chat.c:2570
 #, c-format
 msgid "%s has left the room"
 msgstr "%s pameta istabu"
@@ -1534,71 +1576,73 @@ msgstr "%s pameta istabu"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2499
+#: ../libempathy-gtk/empathy-chat.c:2579
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2524
+#: ../libempathy-gtk/empathy-chat.c:2604
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s pievienoj�s istabai"
 
-#: ../libempathy-gtk/empathy-chat.c:2549
+#: ../libempathy-gtk/empathy-chat.c:2629
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s tagad saucas %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2688
-#: ../src/empathy-streamed-media-window.c:1935
-#: ../src/empathy-event-manager.c:1241 ../src/empathy-call-window.c:1869
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2768
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1391
+#: ../src/empathy-call-window.c:1441 ../src/empathy-call-window.c:2479
 msgid "Disconnected"
 msgstr "Atvienots"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3332
+#: ../libempathy-gtk/empathy-chat.c:3415
 msgid "Would you like to store this password?"
 msgstr "Vai vēlaties saglab�t šo paroli?"
 
-#: ../libempathy-gtk/empathy-chat.c:3338
+#: ../libempathy-gtk/empathy-chat.c:3421
 msgid "Remember"
 msgstr "Atcerēties"
 
-#: ../libempathy-gtk/empathy-chat.c:3348
+#: ../libempathy-gtk/empathy-chat.c:3431
 msgid "Not now"
 msgstr "Ne tagad"
 
-#: ../libempathy-gtk/empathy-chat.c:3392
+#: ../libempathy-gtk/empathy-chat.c:3475
 msgid "Retry"
 msgstr "Mēģin�t vēlreiz"
 
-#: ../libempathy-gtk/empathy-chat.c:3396
+#: ../libempathy-gtk/empathy-chat.c:3479
 msgid "Wrong password; please try again:"
 msgstr "Nepareiza parole; mēģiniet vēlreiz:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3526
+#: ../libempathy-gtk/empathy-chat.c:3609
 msgid "This room is protected by a password:"
 msgstr "Šī istaba ir aizsarg�ta ar paroli:"
 
-#: ../libempathy-gtk/empathy-chat.c:3553
+#: ../libempathy-gtk/empathy-chat.c:3636
 msgid "Join"
 msgstr "Pievienoties"
 
-#: ../libempathy-gtk/empathy-chat.c:3755 ../src/empathy-event-manager.c:1262
-#: ../src/empathy-call-window.c:2125
+#: ../libempathy-gtk/empathy-chat.c:3838 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "Savienots"
 
-#: ../libempathy-gtk/empathy-chat.c:3810
+#: ../libempathy-gtk/empathy-chat.c:3893
 msgid "Conversation"
 msgstr "Saruna"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3815
+#: ../libempathy-gtk/empathy-chat.c:3898
 #, c-format
-#| msgid "%s (%s)"
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
@@ -1622,15 +1666,15 @@ msgstr "Atļauja liegta"
 msgid "Could not block contact"
 msgstr "Neizdev�s bloķēt kontaktu"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:772
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
 msgid "Edit Blocked Contacts"
 msgstr "Rediģēt bloķētos kontaktus"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:521
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1495
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
@@ -1638,19 +1682,25 @@ msgid "Account:"
 msgstr "Konts:"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
-#| msgid "_Blocked Contacts"
 msgid "Blocked Contacts"
 msgstr "BloÄ·Ä“tie kontakti"
 
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Izņemt"
+
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:1410
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Kopēt saites adresi"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:1417
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Atvērt saiti"
 
@@ -1681,18 +1731,18 @@ msgid "Block %s?"
 msgstr "BloÄ·Ä“t %s?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Vai tieš�m vēlaties bloķēt '%s' iespēju ar jums sazin�ties?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:274
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
 msgid "_Block"
 msgstr "_BloÄ·Ä“t"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:283
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Ziņot par šo kontaktu k� par aizskarošu"
@@ -1719,38 +1769,38 @@ msgstr "Negrupēts"
 msgid "Favorite People"
 msgstr "Īpašie cilvēki"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1983
-#: ../libempathy-gtk/empathy-individual-view.c:2375
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Vai tieš�m vēlaties izņemt grupu '%s'?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1985
-#: ../libempathy-gtk/empathy-individual-view.c:2378
+#: ../libempathy-gtk/empathy-contact-list-view.c:1988
+#: ../libempathy-gtk/empathy-individual-view.c:2379
 msgid "Removing group"
 msgstr "Izņem grupu"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2034
-#: ../libempathy-gtk/empathy-contact-list-view.c:2111
-#: ../libempathy-gtk/empathy-individual-view.c:2433
-#: ../libempathy-gtk/empathy-individual-view.c:2636
+#: ../libempathy-gtk/empathy-contact-list-view.c:2037
+#: ../libempathy-gtk/empathy-contact-list-view.c:2114
+#: ../libempathy-gtk/empathy-individual-view.c:2434
+#: ../libempathy-gtk/empathy-individual-view.c:2637
 msgid "_Remove"
 msgstr "_Izņemt"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2064
-#: ../libempathy-gtk/empathy-individual-view.c:2500
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
+#: ../libempathy-gtk/empathy-individual-view.c:2501
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Vai tieš�m vēlaties izņemt kontaktu '%s'?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2066
-#: ../libempathy-gtk/empathy-individual-view.c:2521
+#: ../libempathy-gtk/empathy-contact-list-view.c:2069
+#: ../libempathy-gtk/empathy-individual-view.c:2522
 msgid "Removing contact"
 msgstr "Izņem kontaktu"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "_Pievienot kontaktu..."
 
@@ -1759,48 +1809,48 @@ msgid "_Block Contact"
 msgstr "_BloÄ·Ä“t kontaktu"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:547
-#: ../src/empathy-main-window.ui.h:16
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "_Tērzēt"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:638
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Zvans"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:682
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Video zvans"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:725
-#: ../src/empathy-main-window.ui.h:27
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "Ie_priekšēj�s sarunas"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:766
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "Sūtīt failu"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:808
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
 msgstr "Dalīties ar manu darbvirsmu"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1890
-#: ../libempathy-gtk/empathy-individual-menu.c:843
-#: ../libempathy-gtk/empathy-individual-widget.c:1386
+#: ../libempathy-gtk/empathy-contact-widget.c:1886
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "Iecienītais"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:871
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "Infor_m�cija"
 
@@ -1810,33 +1860,41 @@ msgid "_Edit"
 msgstr "R_ediģēt"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1058
-#: ../src/empathy-chat-window.c:1010
+#: ../libempathy-gtk/empathy-individual-menu.c:1283
+#: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "Aicina jūs uz šo istabu"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1104
+#: ../libempathy-gtk/empathy-individual-menu.c:1329
 msgid "_Invite to Chat Room"
 msgstr "Uza_icin�t uz tērzēšanas istabu"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:514
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
 msgid "Search contacts"
 msgstr "Meklēt kontaktos"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:544
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
 msgid "Search: "
 msgstr "Meklēt:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:602
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
 msgid "_Add Contact"
 msgstr "Pievienot kont_aktu"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:620
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
 msgid "No contacts found"
 msgstr "Kontakti nav atrasti"
 
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr "Ziņojums, ar kuru iepazīstin�t ar sevi:"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
+msgstr "Lūdzu, ļaujiet man redzēt, kad esat tiešsaistē. Paldies!"
+
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "Izvēlēties kontaktu"
@@ -1871,12 +1929,10 @@ msgstr "Dzimšanas diena:"
 #. * with their IM client.
 #.
 #: ../libempathy-gtk/empathy-contact-widget.c:346
-#| msgid "_Last Name:"
 msgid "Last seen:"
 msgstr "Pēdējo reizi redzēts:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:348
-#| msgid "Connected"
 msgid "Connected from:"
 msgstr "Savienojies no:"
 
@@ -1884,162 +1940,160 @@ msgstr "Savienojies no:"
 #. * and should bin this.
 #.
 #: ../libempathy-gtk/empathy-contact-widget.c:353
-#| msgid "Quit message:"
 msgid "Away message:"
 msgstr "Ziņa, kad proj�m:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:606
-#| msgid "Ca_ncel"
 msgid "Channels:"
 msgstr "Kan�li:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
 msgstr "Valsts ISO kods:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Country:"
 msgstr "Valsts:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "State:"
 msgstr "St�voklis:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "City:"
 msgstr "Pilsēta:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Area:"
 msgstr "Reģions:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
 msgstr "Pasta indekss:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Street:"
 msgstr "Iela:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
 msgstr "Ä’ka:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Floor:"
 msgstr "St�vs:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Room:"
 msgstr "Istaba:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Text:"
 msgstr "Teksts:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:517
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Description:"
 msgstr "Apraksts:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:519
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:521
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
 msgstr "Precizit�tes līmenis:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:523
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr "Kļūda:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
 msgstr "Vertik�l� kļūda (metros):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:527
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
 msgstr "Horizont�l� kļūda (metros):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:529
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr "Ä€trums:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:531
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Bearing:"
 msgstr "Peilējums:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:533
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
 msgstr "K�pšanas �trums:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:535
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
 msgstr "Pēdējo reizi atjaunin�ts:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:537
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
 msgstr "Garums:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:945
-#: ../libempathy-gtk/empathy-individual-widget.c:539
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
 msgstr "Platums:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:947
-#: ../libempathy-gtk/empathy-individual-widget.c:541
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
 msgstr "Augstums:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1000
-#: ../libempathy-gtk/empathy-contact-widget.c:1015
-#: ../libempathy-gtk/empathy-individual-widget.c:629
-#: ../libempathy-gtk/empathy-individual-widget.c:644
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "Vieta"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1017
-#: ../libempathy-gtk/empathy-individual-widget.c:646
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1069
-#: ../libempathy-gtk/empathy-individual-widget.c:695
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1151
-#: ../libempathy-gtk/empathy-individual-widget.c:931
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
 msgid "Save Avatar"
 msgstr "Saglab�t attēlu"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1207
-#: ../libempathy-gtk/empathy-individual-widget.c:989
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
 msgid "Unable to save avatar"
 msgstr "Nevar saglab�t attēlu"
 
@@ -2049,7 +2103,7 @@ msgstr "<b>Vieta</b> (datums)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1321
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr "Pseidonīms:"
 
@@ -2069,7 +2123,7 @@ msgstr "Kontakta inform�cija"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1525
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "Identifikators:"
 
@@ -2108,18 +2162,18 @@ msgid "Select"
 msgstr "Izvēlēties"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1835
+#: ../src/empathy-main-window.c:1807
 msgid "Group"
 msgstr "Grupa"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:257
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Sekojošais subjekts tiks bloķēts:"
 msgstr[1] "Sekojošie subjekti tiks bloķēti:"
 msgstr[2] "Sekojošie subjekti tiks bloķēti:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:264
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Sekojošo subjektu nevar bloķēt:"
@@ -2146,34 +2200,59 @@ msgstr "Kontakti, kuri ir izvēlēti kreisaj� sarakst� tiks sasaistīti"
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:137
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "Izvēlieties kontu, ko izmantot zvanu veikšanai"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "Zvans"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+msgid "Mobile"
+msgstr "Mobilais"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "Darbs"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "M�jas"
+
 #. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:593
-#: ../libempathy-gtk/empathy-new-message-dialog.c:248
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:919
+#: ../libempathy-gtk/empathy-individual-menu.c:1141
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "R_ediģēt"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:945
+#: ../libempathy-gtk/empathy-individual-menu.c:1167
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "_Saistīt kontaktus..."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2340
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 msgid "Delete and _Block"
 msgstr "Dzēst un _bloķēt"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2509
+#: ../libempathy-gtk/empathy-individual-view.c:2510
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2182,7 +2261,7 @@ msgstr ""
 "Vai tieš�m vēlaties izņemt saistīto kontaktu '%s'? Ņemiet vēr�, ka tas "
 "izņems visus kontaktus, kuri veido šo saistīto kontaktu."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1672
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2266,141 +2345,141 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "A_tsaistīt"
 
-#: ../libempathy-gtk/empathy-log-window.c:450
+#: ../libempathy-gtk/empathy-log-window.c:634
 msgid "History"
 msgstr "VÄ“sture"
 
-#: ../libempathy-gtk/empathy-log-window.c:502
+#: ../libempathy-gtk/empathy-log-window.c:689
 msgid "Show"
 msgstr "R�dīt"
 
-#: ../libempathy-gtk/empathy-log-window.c:524
+#: ../libempathy-gtk/empathy-log-window.c:711
 msgid "Search"
 msgstr "Meklēt"
 
-#: ../libempathy-gtk/empathy-log-window.c:938
+#: ../libempathy-gtk/empathy-log-window.c:1159
 #, c-format
-#| msgid "Call with %s"
 msgid "Chat in %s"
 msgstr "Tērzēšana %s istab�"
 
-#: ../libempathy-gtk/empathy-log-window.c:940
+#: ../libempathy-gtk/empathy-log-window.c:1161
 #, c-format
-#| msgid "Call with %s"
 msgid "Chat with %s"
 msgstr "Tērzēšana ar %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:990
-#: ../libempathy-gtk/empathy-log-window.c:1153
-#| msgid "%A %B %d %Y"
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1110
+#: ../libempathy-gtk/empathy-log-window.c:1300
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1116
+#: ../libempathy-gtk/empathy-log-window.c:1306
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1172
-#: ../libempathy-gtk/empathy-log-window.c:1174
-#: ../src/empathy-ft-manager.c:1026
-msgid "%"
-msgstr "%"
-
-#: ../libempathy-gtk/empathy-log-window.c:1181
+#: ../libempathy-gtk/empathy-log-window.c:1382
+#, c-format
+#| msgid "%s second"
+#| msgid_plural "%d seconds"
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s sekunde"
+msgstr[1] "%s sekundes"
+msgstr[2] "%s sekunžu"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+#| msgid "%s minute"
+#| msgid_plural "%d minutes"
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s minūte"
+msgstr[1] "%s minūtes"
+msgstr[2] "%s minūšu"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Zvans ilga %s, beidz�s %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1513
+#: ../libempathy-gtk/empathy-log-window.c:1729
 msgid "Today"
 msgstr "Å odien"
 
-#: ../libempathy-gtk/empathy-log-window.c:1517
-#| msgid "Western"
+#: ../libempathy-gtk/empathy-log-window.c:1733
 msgid "Yesterday"
 msgstr "Vakar"
 
-#: ../libempathy-gtk/empathy-log-window.c:1533
-#| msgid "%A %B %d %Y"
-msgctxt ""
-"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1614
-#: ../libempathy-gtk/empathy-log-window.c:3066
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3425
 msgid "Anytime"
 msgstr "Jebkad"
 
-#: ../libempathy-gtk/empathy-log-window.c:1692
-#: ../libempathy-gtk/empathy-log-window.c:2041
-#| msgid "None"
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2353
 msgid "Anyone"
 msgstr "Jebkurš"
 
-#: ../libempathy-gtk/empathy-log-window.c:2322
+#: ../libempathy-gtk/empathy-log-window.c:2666
 msgid "Who"
 msgstr "Kas"
 
-#: ../libempathy-gtk/empathy-log-window.c:2526
+#: ../libempathy-gtk/empathy-log-window.c:2870
 msgid "When"
 msgstr "Kad"
 
-#: ../libempathy-gtk/empathy-log-window.c:2642
+#: ../libempathy-gtk/empathy-log-window.c:2986
 msgid "Anything"
 msgstr "Jebkas"
 
-#: ../libempathy-gtk/empathy-log-window.c:2644
-#| msgid "Set status"
+#: ../libempathy-gtk/empathy-log-window.c:2988
 msgid "Text chats"
 msgstr "Teksta tērzēšana"
 
-#: ../libempathy-gtk/empathy-log-window.c:2646
-#| msgid "Call"
+#: ../libempathy-gtk/empathy-log-window.c:2990
+#: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "Zvani"
 
-#: ../libempathy-gtk/empathy-log-window.c:2651
-#| msgid "Incoming call"
+#: ../libempathy-gtk/empathy-log-window.c:2995
 msgid "Incoming calls"
 msgstr "Ien�košie zvani"
 
-#: ../libempathy-gtk/empathy-log-window.c:2652
-#| msgid "Outgoing voice call"
+#: ../libempathy-gtk/empathy-log-window.c:2996
 msgid "Outgoing calls"
 msgstr "Izejošie zvani"
 
-#: ../libempathy-gtk/empathy-log-window.c:2653
-#| msgid "Missed call from %s"
+#: ../libempathy-gtk/empathy-log-window.c:2997
 msgid "Missed calls"
 msgstr "Neatbildētie zvani"
 
-#: ../libempathy-gtk/empathy-log-window.c:2674
-#| msgid "Chat"
+#: ../libempathy-gtk/empathy-log-window.c:3019
 msgid "What"
 msgstr "Kas"
 
-#: ../libempathy-gtk/empathy-log-window.c:3369
-#| msgid "Are you sure you want to block '%s' from contacting you again?"
+#: ../libempathy-gtk/empathy-log-window.c:3728
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Vai tieš�m vēlaties dzēst visu iepriekšējo sarunu žurn�lus?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3373
-#| msgid "C_lear"
+#: ../libempathy-gtk/empathy-log-window.c:3732
 msgid "Clear All"
 msgstr "Attīrīt visu"
 
-#: ../libempathy-gtk/empathy-log-window.c:3380
+#: ../libempathy-gtk/empathy-log-window.c:3739
 msgid "Delete from:"
 msgstr "Dzēst no:"
 
@@ -2408,13 +2487,6 @@ msgstr "Dzēst no:"
 msgid "<span size=\"x-large\">Loading...</span>"
 msgstr "<span size=\"x-large\">Iel�dē...</span>"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1340
-msgid "Call"
-msgstr "Zvans"
-
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
 #: ../src/empathy-chat-window.ui.h:3
 msgid "Chat"
@@ -2429,18 +2501,18 @@ msgid "Profile"
 msgstr "Profils"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:22
 #: ../src/empathy-streamed-media-window.ui.h:20
 msgid "Video"
 msgstr "Video"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:20
 msgid "_Edit"
 msgstr "R_ediģēt"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-#| msgid "File"
 msgid "_File"
 msgstr "_Fails"
 
@@ -2453,27 +2525,27 @@ msgid "Contact ID:"
 msgstr "Kontakta ID:"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:258
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
 msgid "C_hat"
 msgstr "_Tērzēt"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:277
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
 msgstr "Jauna saruna"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:216
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
 msgid "Send _Video"
 msgstr "Sūtīt _video"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:224
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
 msgid "C_all"
 msgstr "Zv_anīt"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:234
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "New Call"
 msgstr "Zvans"
 
@@ -2533,24 +2605,24 @@ msgid "New %s account"
 msgstr "Jauns %s konts"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "Meklēt n�kamo"
+msgid "Find:"
+msgstr "Meklēt:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "Meklēt iepriekšējo"
+msgid "Mat_ch case"
+msgstr "Reģis_trjutīgs"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Find:"
-msgstr "Meklēt:"
+msgid "Phrase not found"
+msgstr "Fr�ze nav atrasta"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "Atbilst reģistrs"
+msgid "_Next"
+msgstr "_N�kamais"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "Phrase not found"
-msgstr "Fr�ze nav atrasta"
+msgid "_Previous"
+msgstr "Ie_priekšējais"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2596,37 +2668,28 @@ msgstr "Balss zvans beidzies"
 msgid "Edit Custom Messages"
 msgstr "Labot piel�gotos ziņojumus"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
-#: ../src/empathy-chatrooms-window.ui.h:3
-#| msgid "_Remove"
-msgid "Remove"
-msgstr "Izņemt"
-
-#: ../libempathy-gtk/empathy-theme-adium.c:1118
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
 #, c-format
-#| msgid "Message received"
 msgid "Message edited at %s"
 msgstr "Ziņojums rediģēts %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1937
-#| msgid "N_ormal Size"
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
 msgid "Normal"
 msgstr "Norm�ls"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:75
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "Klasisks"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:76
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "Vienk�ršs"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:77
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "TÄ«rs"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:78
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "Zils"
 
@@ -2702,19 +2765,19 @@ msgstr "Atcerēties šo izvēli turpm�kajiem savienojumiem"
 msgid "Certificate Details"
 msgstr "Sertifik�ta detaļas"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1653
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
 msgstr "Nevar atvērt URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1748
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
 msgstr "Izvēlieties failu"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1820
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
 msgid "Insufficient free space to save file"
 msgstr "Nepietiek brīv�s vietas, lai saglab�tu failu"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1828
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2723,7 +2786,7 @@ msgstr ""
 "Ir nepieciešami %s brīvas vietas, lai saglab�tu šo failu, bet ir pieejami "
 "tikai %s. Lūdzu, izvēlieties citu vietu."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Ien�košais fails no %s"
@@ -2911,23 +2974,23 @@ msgstr "Nav kļūdas paziņojuma"
 msgid "Instant Message (Empathy)"
 msgstr "Tūlītējs ziņojums (Empathy)"
 
-#: ../src/empathy.c:309
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "Nepieslēgties autom�tiski"
 
-#: ../src/empathy.c:313
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Pēc palaišanas ner�dīt kontaktu sarakstu vai k�dus citus dialogus"
 
-#: ../src/empathy.c:321
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr "- Empathy TZ klients"
 
-#: ../src/empathy.c:500
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
 msgstr "Kļūda, sazinoties ar konta p�rvaldnieku"
 
-#: ../src/empathy.c:502
+#: ../src/empathy.c:639
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3156,7 +3219,8 @@ msgid "Your new account has not been saved yet."
 msgstr "Jaunais konts vēl nav saglab�ts."
 
 #: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:797 ../src/empathy-call-window.c:780
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1175
 msgid "Connecting…"
 msgstr "Savienojas..."
 
@@ -3225,7 +3289,6 @@ msgstr ""
 "Vai tieš�m vēlaties turpin�t?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
-#| msgid "_Add…"
 msgid "Add…"
 msgstr "Pievienot..."
 
@@ -3265,125 +3328,116 @@ msgstr "Empathy autentifik�cijas klients"
 msgid "People nearby"
 msgstr "Tuvum� esošie cilvēki"
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:120
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathy audio/video klients"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:138
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy audio/video klients"
 
-#: ../src/empathy-streamed-media-window.c:478 ../src/empathy-call-window.c:472
+#: ../src/empathy-streamed-media-window.c:431
 msgid "Contrast"
 msgstr "Kontrasts"
 
-#: ../src/empathy-streamed-media-window.c:481 ../src/empathy-call-window.c:475
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Brightness"
 msgstr "Spilgtums"
 
-#: ../src/empathy-streamed-media-window.c:484 ../src/empathy-call-window.c:478
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:589 ../src/empathy-call-window.c:583
+#: ../src/empathy-streamed-media-window.c:542
 msgid "Volume"
 msgstr "Skaļums"
 
-#: ../src/empathy-streamed-media-window.c:1153
-#: ../src/empathy-call-window.c:1127
+#: ../src/empathy-streamed-media-window.c:1110
 msgid "_Sidebar"
 msgstr "_S�njosla"
 
-#: ../src/empathy-streamed-media-window.c:1173
-#: ../src/empathy-call-window.c:1149
+#: ../src/empathy-streamed-media-window.c:1130
 msgid "Audio input"
 msgstr "Audio ievade"
 
-#: ../src/empathy-streamed-media-window.c:1177
-#: ../src/empathy-call-window.c:1153
+#: ../src/empathy-streamed-media-window.c:1134
 msgid "Video input"
 msgstr "Video ievade"
 
-#: ../src/empathy-streamed-media-window.c:1181
-#: ../src/empathy-call-window.c:1157
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Dialpad"
 msgstr "Ciparnīca"
 
-#: ../src/empathy-streamed-media-window.c:1192
-#: ../src/empathy-call-window.c:1167
+#: ../src/empathy-streamed-media-window.c:1151
 msgid "Details"
 msgstr "Sīk�ka inform�cija"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1261
-#: ../src/empathy-call-window.c:1239
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1782
 #, c-format
 msgid "Call with %s"
 msgstr "Zvans ar %s"
 
-#: ../src/empathy-streamed-media-window.c:1494
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:2026
 msgid "The IP address as seen by the machine"
 msgstr "IP adrese, kuru redz dators"
 
-#: ../src/empathy-streamed-media-window.c:1496
-#: ../src/empathy-call-window.c:1461
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:2028
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP adrese, kuru redz serveris Internet�"
 
-#: ../src/empathy-streamed-media-window.c:1498
-#: ../src/empathy-call-window.c:1463
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:2030
 msgid "The IP address of the peer as seen by the other side"
 msgstr "IP adrese, kuru redz biedrs otr� gal�"
 
-#: ../src/empathy-streamed-media-window.c:1500
-#: ../src/empathy-call-window.c:1465
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:2032
 msgid "The IP address of a relay server"
 msgstr "Translēšanas servera IP adrese"
 
-#: ../src/empathy-streamed-media-window.c:1502
-#: ../src/empathy-call-window.c:1467
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:2034
 msgid "The IP address of the multicast group"
 msgstr "Multiraides grupas IP adreses"
 
-#: ../src/empathy-streamed-media-window.c:1884
-#| msgid "Unknown"
+#: ../src/empathy-streamed-media-window.c:1843
 msgctxt "encoding video codec"
 msgid "Unknown"
 msgstr "Nezin�ms"
 
-#: ../src/empathy-streamed-media-window.c:1887
-#| msgid "Unknown"
+#: ../src/empathy-streamed-media-window.c:1846
 msgctxt "encoding audio codec"
 msgid "Unknown"
 msgstr "Nezin�ms"
 
-#: ../src/empathy-streamed-media-window.c:1890
-#| msgid "Unknown"
+#: ../src/empathy-streamed-media-window.c:1849
 msgctxt "decoding video codec"
 msgid "Unknown"
 msgstr "Nezin�ms"
 
-#: ../src/empathy-streamed-media-window.c:1893
-#| msgid "Unknown"
+#: ../src/empathy-streamed-media-window.c:1852
 msgctxt "decoding audio codec"
 msgid "Unknown"
 msgstr "Nezin�ms"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2185
+#: ../src/empathy-streamed-media-window.c:2144
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Savienojies — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2246
-#: ../src/empathy-call-window.c:2187
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2798
 msgid "Technical Details"
 msgstr "Tehnisk� inform�cija"
 
-#: ../src/empathy-streamed-media-window.c:2284
-#: ../src/empathy-call-window.c:2225
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2836
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3392,8 +3446,8 @@ msgstr ""
 "Programmatūra, ko lieto %s, nesaprot nevienu no jūsu sistēmas atbalstītajiem "
 "audio form�tiem"
 
-#: ../src/empathy-streamed-media-window.c:2289
-#: ../src/empathy-call-window.c:2230
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2841
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3402,8 +3456,8 @@ msgstr ""
 "Programmatūra, ko lieto %s, nesaprot nevienu no jūsu sistēmas atbalstītajiem "
 "video form�tiem"
 
-#: ../src/empathy-streamed-media-window.c:2295
-#: ../src/empathy-call-window.c:2236
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2847
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3412,25 +3466,25 @@ msgstr ""
 "Nevar izveidot savienojumu ar %s. Iespējams, ka viens no jums atrodas tīkl�, "
 "kur� nav atļauti tiešie savienojumi."
 
-#: ../src/empathy-streamed-media-window.c:2301
-#: ../src/empathy-call-window.c:2242
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2853
 msgid "There was a failure on the network"
 msgstr "Gadīj�s tīkla kļūme"
 
-#: ../src/empathy-streamed-media-window.c:2305
-#: ../src/empathy-call-window.c:2246
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2857
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "Šim zvanam vajadzīgie audio form�ti nav instalēti jūsu dator�"
 
-#: ../src/empathy-streamed-media-window.c:2308
-#: ../src/empathy-call-window.c:2249
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2860
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "Šim zvanam vajadzīgie video form�ti nav instalēti jūsu dator�"
 
-#: ../src/empathy-streamed-media-window.c:2318
-#: ../src/empathy-call-window.c:2261
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2872
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3441,137 +3495,121 @@ msgstr ""
 "\">ziņojiet par šo kļūdu</a>, pievienojot ierakstus no 'Atkļūdot' loga "
 "Palīdzības izvēlnē."
 
-#: ../src/empathy-streamed-media-window.c:2326
-#: ../src/empathy-call-window.c:2270
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2881
 msgid "There was a failure in the call engine"
 msgstr "Zvanu dzinī gadīj�s kļūme"
 
-#: ../src/empathy-streamed-media-window.c:2329
-#: ../src/empathy-call-window.c:2273
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2884
 msgid "The end of the stream was reached"
 msgstr "Tika sasniegtas plūsmas beigas"
 
-#: ../src/empathy-streamed-media-window.c:2369
-#: ../src/empathy-call-window.c:2313
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2924
 msgid "Can't establish audio stream"
 msgstr "Nevar izveidot audio plūsmu"
 
-#: ../src/empathy-streamed-media-window.c:2379
-#: ../src/empathy-call-window.c:2323
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2934
 msgid "Can't establish video stream"
 msgstr "Nevar izveidot video plūsmu"
 
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
 #: ../src/empathy-streamed-media-window.ui.h:1
 msgid "Audio"
 msgstr "Audio"
 
-#: ../src/empathy-call-window.ui.h:2
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Zvanīt kontaktam vēlreiz"
-
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Izslēgt kameru"
-
-#: ../src/empathy-call-window.ui.h:4
-#: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Ieslēgt kameru"
-
-#: ../src/empathy-call-window.ui.h:5
 #: ../src/empathy-streamed-media-window.ui.h:5
 msgid "Decoding Codec:"
 msgstr "Atkodēšanas kodeks:"
 
-#: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Atslēgt kameru un p�rst�t sūtīt video"
-
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Ieslēgt kameru un sūtīt video"
+#: ../src/empathy-call-window.ui.h:4
+msgid "Disable camera"
+msgstr "Atslēgt kameru"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Ieslēgt kameru, bet nesūtīt video"
+#: ../src/empathy-call-window.ui.h:5
+msgid "Display the dialpad"
+msgstr "R�dīt ciparnīcu"
 
-#: ../src/empathy-call-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:6
 #: ../src/empathy-streamed-media-window.ui.h:9
 msgid "Encoding Codec:"
 msgstr "Iekodēšanas kodeks:"
 
-#: ../src/empathy-call-window.ui.h:10
+#: ../src/empathy-call-window.ui.h:7
 #: ../src/empathy-streamed-media-window.ui.h:10
 msgid "Hang up"
 msgstr "Nolikt klausuli"
 
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:8
 #: ../src/empathy-streamed-media-window.ui.h:11
 msgid "Hang up current call"
 msgstr "Beigt Å¡o zvanu"
 
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:9
 #: ../src/empathy-streamed-media-window.ui.h:12
 msgid "Local Candidate:"
 msgstr "Lok�lais kandid�ts:"
 
-#: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Priekšskatījums"
+#: ../src/empathy-call-window.ui.h:10
+msgid "Maximise me"
+msgstr "Maksimizēt mani"
 
-#: ../src/empathy-call-window.ui.h:14
-#: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Zvanīt atkal"
+#: ../src/empathy-call-window.ui.h:11
+msgid "Minimise me"
+msgstr "Minimizēt mani"
 
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:12
 #: ../src/empathy-streamed-media-window.ui.h:15
 msgid "Remote Candidate:"
 msgstr "Att�lin�tais kandid�ts:"
 
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:13
 #: ../src/empathy-streamed-media-window.ui.h:16
 msgid "Send Audio"
 msgstr "Sūtīt audio"
 
+#: ../src/empathy-call-window.ui.h:14
+msgid "Send Video"
+msgstr "Sūtīt video"
+
+#: ../src/empathy-call-window.ui.h:15
+msgid "Show dialpad"
+msgstr "R�dīt ciparnīcu"
+
+#: ../src/empathy-call-window.ui.h:16
+msgid "Start a video call"
+msgstr "S�kt video zvanu"
+
 #: ../src/empathy-call-window.ui.h:17
+msgid "Start an audio call"
+msgstr "S�kt audio zvanu"
+
+#: ../src/empathy-call-window.ui.h:18
+msgid "Swap camera"
+msgstr "Mainīt kameru"
+
+#: ../src/empathy-call-window.ui.h:19
 #: ../src/empathy-streamed-media-window.ui.h:17
 msgid "Toggle audio transmission"
 msgstr "P�rslēgt audio p�rraidi"
 
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:20
+msgid "Toggle video transmission"
+msgstr "P�rslēgt video p�rraidi"
+
+#: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:1824 ../src/empathy-call-window.c:1825
-#: ../src/empathy-call-window.c:1826 ../src/empathy-call-window.c:1827
+#: ../src/empathy-call-window.c:2431 ../src/empathy-call-window.c:2432
+#: ../src/empathy-call-window.c:2433 ../src/empathy-call-window.c:2434
 msgid "Unknown"
 msgstr "Nezin�ms"
 
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ideo"
-
-#: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Izslēgt video"
-
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Ieslēgt video"
-
 #: ../src/empathy-call-window.ui.h:23
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Video priekšskatījums"
+msgid "Video call"
+msgstr "Video zvans"
 
 #: ../src/empathy-call-window.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:24
@@ -3579,16 +3617,39 @@ msgid "_Call"
 msgstr "_Zvanīt"
 
 #: ../src/empathy-call-window.ui.h:25
-#| msgid "Dialpad"
-msgid "_Dialpad"
-msgstr "_Ciparnīca"
+msgid "_Camera"
+msgstr "_Kamera"
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:18
+msgid "_Contents"
+msgstr "_Saturs"
 
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-main-window.ui.h:30
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
+msgid "_Debug"
+msgstr "_Atkļūdot"
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:22
+msgid "_Help"
+msgstr "_Palīdzība"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Microphone"
+msgstr "_Mikrofons"
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "_Settings"
+msgstr "Ie_statījumi"
+
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_Skats"
 
-#: ../src/empathy-chat-window.c:480 ../src/empathy-chat-window.c:500
+#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3596,7 +3657,7 @@ msgstr[0] "%s (%d nelasīts)"
 msgstr[1] "%s (%d nelasīti)"
 msgstr[2] "%s (%d nelasīti)"
 
-#: ../src/empathy-chat-window.c:492
+#: ../src/empathy-chat-window.c:493
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3604,7 +3665,7 @@ msgstr[0] "%s (un %u cits)"
 msgstr[1] "%s (un %u citi)"
 msgstr[2] "%s (un %u citi)"
 
-#: ../src/empathy-chat-window.c:508
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3612,7 +3673,7 @@ msgstr[0] "%s (%d nelasīts no citiem)"
 msgstr[1] "%s (%d nelasīti no citiem)"
 msgstr[2] "%s (%d nelasīti no citiem)"
 
-#: ../src/empathy-chat-window.c:517
+#: ../src/empathy-chat-window.c:518
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3620,20 +3681,19 @@ msgstr[0] "%s (%d nelasīts no visiem)"
 msgstr[1] "%s (%d nelasīti no visiem)"
 msgstr[2] "%s (%d nelasīti no visiem)"
 
-#: ../src/empathy-chat-window.c:732
+#: ../src/empathy-chat-window.c:733
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:742
+#: ../src/empathy-chat-window.c:743
 #, c-format
-#| msgid "Typing a message."
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "Sūta %d ziņojumu"
 msgstr[1] "Sūta %d ziņojumus"
 msgstr[2] "Sūta %d ziņojumu"
 
-#: ../src/empathy-chat-window.c:764
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
 msgstr "Raksta ziņojumu."
 
@@ -3665,10 +3725,6 @@ msgstr "P�_rvietot cilni pa labi"
 msgid "Notify for All Messages"
 msgstr "Ziņot par visiem ziņojumiem"
 
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:18
-msgid "_Contents"
-msgstr "_Saturs"
-
 #: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "_Saruna"
@@ -3681,10 +3737,6 @@ msgstr "At_dalīt cilni"
 msgid "_Favorite Chat Room"
 msgstr "_Iecienīt� tērzēšanas istaba"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:22
-msgid "_Help"
-msgstr "_Palīdzība"
-
 #: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "_N�kam� cilne"
@@ -3721,95 +3773,96 @@ msgstr "Autom�tiski savienoties"
 msgid "Manage Favorite Rooms"
 msgstr "P�rvaldīt iecienīt�s istabas"
 
-#: ../src/empathy-event-manager.c:522
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming video call"
 msgstr "Ien�košais video zvans"
 
-#: ../src/empathy-event-manager.c:522
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1408
 msgid "Incoming call"
 msgstr "Ien�košais zvans"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:525
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s pied�v� video zvanu. Vai vēlaties atbildēt?"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s jums zvana. Vai vēlaties atbildēt?"
 
-#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
-#: ../src/empathy-event-manager.c:764
+#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1414
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Ien�košais zvans no %s"
 
-#: ../src/empathy-event-manager.c:555
+#: ../src/empathy-event-manager.c:554
 msgid "_Reject"
 msgstr "No_raidīt"
 
-#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
 msgid "_Answer"
 msgstr "_Atbildēt"
 
-#: ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:570
 msgid "_Answer with video"
 msgstr "_Atbildēt ar video"
 
-#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
+#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1414
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Ien�košais video zvans no %s"
 
-#: ../src/empathy-event-manager.c:837
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
 msgstr "Istabas ielūgums"
 
-#: ../src/empathy-event-manager.c:839
+#: ../src/empathy-event-manager.c:838
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Ielūgums pievienoties %s"
 
-#: ../src/empathy-event-manager.c:846
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s jūs ielūdz pievienoties %s"
 
-#: ../src/empathy-event-manager.c:854
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
 msgstr "Norai_dīt"
 
-#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Pievienoties"
 
-#: ../src/empathy-event-manager.c:886
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s jūs ielūdza pievienoties %s"
 
-#: ../src/empathy-event-manager.c:892
+#: ../src/empathy-event-manager.c:891
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Jūs ielūdza pievienoties %s"
 
-#: ../src/empathy-event-manager.c:943
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Pien�k fails no %s"
 
-#: ../src/empathy-event-manager.c:1135 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
 msgid "Password required"
 msgstr "Nepieciešama parole"
 
-#: ../src/empathy-event-manager.c:1191
+#: ../src/empathy-event-manager.c:1190
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s vēlas saņemt atļauju redzēt tavu tiešsaistes statusu"
 
-#: ../src/empathy-event-manager.c:1195
+#: ../src/empathy-event-manager.c:1194
 #, c-format
 msgid ""
 "\n"
@@ -3909,6 +3962,10 @@ msgstr "P�rbauda \"%s\" integrit�ti"
 msgid "Hashing \"%s\""
 msgstr "Jauc \"%s\""
 
+#: ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "%"
+
 #: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "Fails"
@@ -3987,111 +4044,104 @@ msgid "Top up account credit"
 msgstr "Uzpildīt konta kredītu"
 
 #. top up button
-#: ../src/empathy-main-window.c:1050
+#: ../src/empathy-main-window.c:1046
 msgid "Top Up..."
 msgstr "Uzpildīt ..."
 
-#: ../src/empathy-main-window.c:1817
+#: ../src/empathy-main-window.c:1789
 msgid "Contact"
 msgstr "Kontakts"
 
-#: ../src/empathy-main-window.c:2169
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "Kontaktu saraksts"
 
-#: ../src/empathy-main-window.c:2287
-msgid "Show and edit accounts"
-msgstr "R�dīt un labot kontus"
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "Kontakti uz _kartes"
 
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-main-window-menubar.ui.h:2
 msgid "Credit Balance"
 msgstr "Kredīta bilance"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "Mek_lēt kontaktu sarakst�"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "Pievienoties _iecienītaj�m"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "P�rvaldīt iecienīt�s"
 
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "N_orm�ls izmērs"
 
-#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "Jauns _zvans..."
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "Norm�ls izmērs ar _attēliem"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "_Iestatījumi"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "_R�dīt protokolus"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "K�rtot pēc _v�rda"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "K�rtot pēc _statusa"
 
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Konti"
 
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "_BloÄ·Ä“tie kontakti"
 
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "_Kompakts izmērs"
 
-#: ../src/empathy-main-window.ui.h:19
-msgid "_Debug"
-msgstr "_Atkļūdot"
-
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "_Failu p�rsūtīšana"
 
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "_Pievienoties..."
 
-#: ../src/empathy-main-window.ui.h:24 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "Jau_na saruna..."
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "Nesaistes k_ontakti"
 
-#: ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "_Personīg� inform�cija"
 
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "_Istaba"
 
-#: ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-main-window-menubar.ui.h:29
 msgid "_Search for Contacts…"
 msgstr "_Meklēt kontaktu..."
 
@@ -4161,85 +4211,79 @@ msgstr "Istabu saraksts"
 msgid "_Room:"
 msgstr "_Istaba:"
 
-#: ../src/empathy-preferences.c:156
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr "Ziņojums saņemts"
 
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr "Ziņojums nosūtīts"
 
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
 msgstr "Jauna saruna"
 
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
 msgstr "Kontakts par�d�s tiešsaistē"
 
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
 msgstr "Kontakts devies nesaistē"
 
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
 msgstr "Konts savienots"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
 msgstr "Konts atvienots"
 
-#: ../src/empathy-preferences.c:459
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr "Valoda"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:709
-#, fuzzy
-#| msgid "Client:"
+#: ../src/empathy-preferences.c:734
 msgid "Juliet"
-msgstr "Klients:"
+msgstr "Spīdola"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:716
-#, fuzzy
-#| msgid "Room"
+#: ../src/empathy-preferences.c:741
 msgid "Romeo"
-msgstr "Istaba"
+msgstr "L��plēsis"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:722
+#: ../src/empathy-preferences.c:747
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
-msgstr ""
+msgstr "L��plēsi, mainies uz augšu, ne šis ir tavs darbs!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:750
 msgid "Deny thy father and refuse thy name;"
-msgstr ""
+msgstr "Tev liel�ks darbs: priekš tautas dzīvot, ne mirt!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:728
+#: ../src/empathy-preferences.c:753
 msgid "Or if thou wilt not, be but sworn my love"
-msgstr ""
+msgstr "Tauta tik p�rvarama, kad krīti tu!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:731
+#: ../src/empathy-preferences.c:756
 msgid "And I'll no longer be a Capulet."
-msgstr ""
+msgstr "Ar viltu tie kaitina tevi uz cīņu!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:759
 msgid "Shall I hear more, or shall I speak at this?"
-msgstr ""
+msgstr "Mainoties uz augšu, tu likteni p�rspēsi!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:737
-#, fuzzy
-#| msgid "%s has disconnected"
+#: ../src/empathy-preferences.c:762
 msgid "Juliet has disconnected"
-msgstr "%s ir izg�jis"
+msgstr "Spīdola izg�ja"
 
-#: ../src/empathy-preferences.c:1135
+#: ../src/empathy-preferences.c:1166
 msgid "Preferences"
 msgstr "Iestatījumi"
 
@@ -4247,67 +4291,87 @@ msgstr "Iestatījumi"
 msgid "Appearance"
 msgstr "Izskats"
 
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
 msgstr "Uzvedība"
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
 msgid "Chat Th_eme:"
 msgstr "Tērzēšanas t_ēma:"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
 msgid "Disable notifications when _away or busy"
 msgstr "Atslēgt paziņojumus, kad prom vai _aizņemts"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
 msgid "Disable sounds when _away or busy"
 msgstr "Atslēgt skaņu, kad prom vai _aizņemts"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "R�dīt ien�košos notikumus paziņojumu lauk�"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"Atbalss atcelšana palīdz padarīt balss skaņu skaidr�ku otrai personai, bet "
+"var radīt problēmas uz dažiem datoriem. Ja jūs vai k�ds cits zvana laik� "
+"dzird dīvainas skaņas vai citas problēmas, pamēģiniet izslēgt atbalss "
+"atcelšanu un p�rstartējiet zvanu."
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "Ieslēgt paziņojumus, kad kontakts par�d�s tiešsaistē"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "Ieslēgt paziņojumus, kad kontakts dodas nesaistē"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Ieslēgt paziņojumus, kad _tērzēšana nav fokusēta"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "Ieslēgt pareizrakstības p�rbaudi valodai:"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "Visp�rīgi"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input level:"
+msgstr "Ievades līmenis:"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "Ievades skaļums:"
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "Vietas avoti:"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "Reģistrēt sarunas"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "Paziņojumi"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Atskaņot skaņu pie notikumiem"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "Priv�tums"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -4317,71 +4381,70 @@ msgstr ""
 "štats un valsts netiks publicēts. GPS koordin�tes būs precīzas līdz vienai "
 "zīmei aiz komata."
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "R�dīt _smaidiņus k� bildes "
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "R�dīt kontaktu _sarakstu istab�s"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "Skaņas"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "Pareizrakstības p�rbaude"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "Valodu saraksts r�da tikai t�s valodas, kur�m ir instalētas v�rdnīcas."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "TÄ“mas"
 
-#: ../src/empathy-preferences.ui.h:25
-#| msgid "Bearing:"
+#: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "Variants:"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "_Autom�tiski savienoties palaižoties "
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Mobilais t�lrunis"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "I_eslēgt burbuļpaziņojumus"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "I_eslēgt skaņas paziņojumus"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_TÄ«kls (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "Atvērt jaunas sarakstes atsevišķos l_ogos"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "_Par�dīt kontaktiem atrašan�s vietu"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "Samazin�t atrašan�s vietas p_recizit�ti"
 
@@ -4393,67 +4456,115 @@ msgstr "Statuss"
 msgid "_Quit"
 msgstr "_Iziet"
 
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "Zvanīt kontaktam vēlreiz"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "Izslēgt kameru"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "Ieslēgt kameru"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "Atslēgt kameru un p�rst�t sūtīt video"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "Ieslēgt kameru un sūtīt video"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "Ieslēgt kameru, bet nesūtīt video"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "Priekšskatījums"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "Zvanīt atkal"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "V_ideo"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "Izslēgt video"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "Ieslēgt video"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "Video priekšskatījums"
+
 #: ../src/empathy-map-view.c:448
 msgid "Contact Map View"
 msgstr "Kontaktu kartes skats"
 
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
 msgid "Save"
 msgstr "Saglab�t"
 
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
 msgstr "Atkļūdošanas logs"
 
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
 msgstr "Pauze"
 
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
 msgstr "LÄ«menis "
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
 msgid "Debug"
 msgstr "Atkļūdošanas"
 
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
 msgid "Info"
 msgstr "Inform�cijas"
 
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
 msgid "Message"
 msgstr "Paziņojuma"
 
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
 msgid "Warning"
 msgstr "Brīdin�juma"
 
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
 msgid "Critical"
 msgstr "Kritiskais"
 
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
 msgid "Error"
 msgstr "Kļūdas"
 
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
 msgid "Time"
 msgstr "Laiks"
 
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
 msgid "Domain"
 msgstr "Domēns"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
 msgstr "Kategorija"
 
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "LÄ«menis"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4461,16 +4572,16 @@ msgstr ""
 "Izvēlētais savienojumu p�rvaldnieks neatbalsta att�lin�to atkļūdošanas "
 "paplašin�jumu."
 
-#: ../src/empathy-invite-participant-dialog.c:429
-#: ../src/empathy-invite-participant-dialog.c:477
+#: ../src/empathy-invite-participant-dialog.c:179
+#: ../src/empathy-invite-participant-dialog.c:205
 msgid "Invite Participant"
 msgstr "Ielūgt dalībnieku"
 
-#: ../src/empathy-invite-participant-dialog.c:430
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Izvēlieties kontaktu, ko aicin�t uz sarunu:"
 
-#: ../src/empathy-invite-participant-dialog.c:473
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "Uzaicin�t"
 
@@ -4503,7 +4614,15 @@ msgstr " - Empathy konti"
 msgid "Empathy Accounts"
 msgstr "Empathy konti"
 
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr "R�dīt noteiktu servisu"
+
+#: ../src/empathy-debugger.c:75
+msgid "- Empathy Debugger"
+msgstr "- Empathy atkļūdot�js"
+
+#: ../src/empathy-debugger.c:114
 msgid "Empathy Debugger"
 msgstr "Empathy atkļūdot�js"
 
@@ -4516,11 +4635,13 @@ msgid "Respond"
 msgstr "Atbildēt"
 
 #: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1418
 msgid "Reject"
 msgstr "Noraidīt"
 
 #: ../src/empathy-notifications-approver.c:222
 #: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1419
 msgid "Answer"
 msgstr "Atbildēt"
 
@@ -4538,38 +4659,63 @@ msgstr "Noraidīt"
 msgid "Accept"
 msgstr "Pieņemt"
 
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
 #: ../src/empathy-notifications-approver.c:260
-#| msgid "Preview"
 msgid "Provide"
 msgstr "Pied�v�t"
 
-#: ../src/empathy-call-observer.c:135
+#: ../src/empathy-call-observer.c:134
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s tikko mēģin�ja piezvanīt, bet jūs jau piedalīj�ties cit� sarun�."
 
-#: ../src/empathy-call-window.c:1246
-#, c-format
-#| msgid "Call with %s"
-msgid "Call with %d participants"
-msgstr "Zvans ar %d dalībniekiem"
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1047 ../src/empathy-call-window.c:1070
+msgid "i"
+msgstr "i"
+
+#: ../src/empathy-call-window.c:2727
+msgid "On hold"
+msgstr "Aizturēts"
+
+#: ../src/empathy-call-window.c:2730
+msgid "Mute"
+msgstr "Apklusin�t"
+
+#: ../src/empathy-call-window.c:2732
+msgid "Duration"
+msgstr "Ilgums"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2124
+#: ../src/empathy-call-window.c:2735
 #, c-format
-#| msgid "Connected — %d:%02dm"
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:2125
-msgid "On hold"
-msgstr "Aizturēts"
-
 #: ../libempathy-gtk/empathy-search-bar.c:243
-#| msgid "Match case"
 msgid "_Match case"
 msgstr "_Reģistru sakritība"
 
+#~ msgid "Find Next"
+#~ msgstr "Meklēt n�kamo"
+
+#~ msgid "Find Previous"
+#~ msgstr "Meklēt iepriekšējo"
+
+#~| msgid "Dialpad"
+#~ msgid "_Dialpad"
+#~ msgstr "_Ciparnīca"
+
+#~ msgid "Show and edit accounts"
+#~ msgstr "R�dīt un labot kontus"
+
+#~| msgid "Call with %s"
+#~ msgid "Call with %d participants"
+#~ msgstr "Zvans ar %d dalībniekiem"
+
 #~ msgid "All"
 #~ msgstr "Visi"
 
diff --git a/po/nb.po b/po/nb.po
index 4b3606ab7..fcba04325 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy 3.1.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-31 21:23+0200\n"
-"PO-Revision-Date: 2011-08-31 21:24+0200\n"
+"POT-Creation-Date: 2011-10-13 15:29+0200\n"
+"PO-Revision-Date: 2011-10-13 15:30+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: no\n"
@@ -90,26 +90,30 @@ msgid "Contact list sort criterion"
 msgstr "Sorteringskriterier for kontaktliste"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "D-Bus objektsti for siste konto valgt for å bli med i et rom."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr "Forvalgt kameraenhet til bruk for videosamtaler. F.eks. /dev/video0."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Default directory to select an avatar image from"
 msgstr "Forvalgt mappe for personbilde"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable popup notifications when away"
 msgstr "Slå av varsling når du er borte"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Disable sounds when away"
 msgstr "Slå av lyder når du er borte"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Display incoming events in the status area"
 msgstr "Vis innkommende hendelser i statusområdet"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -117,34 +121,30 @@ msgstr ""
 "Vis innkommende hendelser i statusområdet. Hvis denne er «false» vises disse "
 "til bruker med det samme."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Echo cancellation support"
 msgstr "Støtte for utlikning av ekko"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can publish the user's location"
 msgstr "Empathy kan publisere brukers plassering"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy kan bruke GPS til å gjette plassering"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy kan bruke mobilnettverk til å gjette plassering"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy kan bruke nettverket til å gjette plassering"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy default download folder"
 msgstr "Forvalgt nedlastingsmappe for Empathy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "Empathy har migrert logger fra butterfly"
-
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy skal sette bortestatus automatisk ved inaktivitet"
@@ -183,150 +183,150 @@ msgid "Hide the main window."
 msgstr "Skjul hovedvinduet."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+msgid "Last account selected in Join Room dialog"
+msgstr "Siste konto valgt i dialogen «Bli med i rom»"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Nick completed character"
 msgstr "Tegn for fullføring av kallenavn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Open new chats in separate windows"
 msgstr "Ã…pne nye samtaler i egne vinduer"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use"
 msgstr "Sti til Adium-tema som skal brukes"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "Sti til Adium-tema skal brukes hvis tema for prat er Adium."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for incoming messages"
 msgstr "Spill av lyd når meldinger kommer inn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for new conversations"
 msgstr "Spill av lyd ved nye samtaler"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound for outgoing messages"
 msgstr "Spill av lyd for utgående meldinger"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs in"
 msgstr "Spill av lyd når kontakter logger inn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when a contact logs out"
 msgstr "Spill av lyd når kontakter logger ut"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log in"
 msgstr "Spill av lyd når du logger inn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Play a sound when we log out"
 msgstr "Spill av lyd når du logger ut"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Vis varsling når prat ikke er fokusert"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs in"
 msgstr "Vis varsling når en kontakt logger inn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "Pop up notifications when a contact logs out"
 msgstr "Vis varsling når en kontakt logger ut"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Position the camera preview should be during a call."
 msgstr "Posisjon for kameraforhåndsvisning under en samtale."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show Balance in contact list"
 msgstr "Vis saldo i kontaktliste"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show avatars"
 msgstr "Vis personbilder"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show contact list in rooms"
 msgstr "Vis kontaktliste i rom"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show hint about closing the main window"
 msgstr "Vis hint om lukking av hovedvinduet"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show offline contacts"
 msgstr "Vis frakoblede kontakter"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Show protocols"
 msgstr "Vis protokoller"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Spell checking languages"
 msgstr "Stavekontrollspråk"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The default folder to save file transfers in."
 msgstr "Forvalgt mappe for lagring av filoverføringer."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Den forrige mappen et personbilde ble valgt fra."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The position for the chat window side pane"
 msgstr "Posisjon for pratevinduets sidelinje"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "Lagret posisjon (i pikselr) for pratevinduets sideområde."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Temaet som brukes til å vise samtaler."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr "Temavariant som brukes til å vise samtale i pratevinduer."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use graphical smileys"
 msgstr "Vis smilefjes grafisk"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use notification sounds"
 msgstr "Bruk varslingslyder"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Use theme for chat rooms"
 msgstr "Bruk tema for samtalerom"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Om Empathy kan publisere brukers plassering til kontakter."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Om Empathy kan bruke GPS for å gjette plassering."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Om Empathy kan bruke mobilnettverk for å gjette plassering."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Om Empathy kan bruke nettverket for å gjette plassering."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Om Empathy har migrert logger for butterfly."
-
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Om Empathy skal logge inn til dine kontoer automatisk ved oppstart."
@@ -494,19 +494,19 @@ msgstr "HÃ¥ndter meldings- og VoIP-kontoer"
 msgid "Messaging and VoIP Accounts"
 msgstr "Meldings- og VoIP-kontoer"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:838
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Filoverføring fullført, men filen ble korrupt"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1124
 msgid "File transfer not supported by remote contact"
 msgstr "Filoverføring støttes ikke av ekstern kontakt"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1180
 msgid "The selected file is not a regular file"
 msgstr "Valgt fil er ikke en vanlig fil"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1189
 msgid "The selected file is empty"
 msgstr "Valgt fil er tom"
 
@@ -526,170 +526,170 @@ msgstr "Samtale med %s"
 msgid "Call from %s"
 msgstr "Samtale fra %s"
 
-#: ../libempathy/empathy-tp-file.c:268
+#: ../libempathy/empathy-tp-file.c:258
 msgid "Socket type not supported"
 msgstr "Type plugg er ikke støttet"
 
-#: ../libempathy/empathy-tp-file.c:387
+#: ../libempathy/empathy-tp-file.c:377
 msgid "No reason was specified"
 msgstr "Ingen årsak oppgitt"
 
-#: ../libempathy/empathy-tp-file.c:390
+#: ../libempathy/empathy-tp-file.c:380
 msgid "The change in state was requested"
 msgstr "Tilstandsendring ble etterspurt"
 
-#: ../libempathy/empathy-tp-file.c:393
+#: ../libempathy/empathy-tp-file.c:383
 msgid "You canceled the file transfer"
 msgstr "Du avbrøt filoverføringen"
 
-#: ../libempathy/empathy-tp-file.c:396
+#: ../libempathy/empathy-tp-file.c:386
 msgid "The other participant canceled the file transfer"
 msgstr "Avsender avbrøt filoverføringen"
 
-#: ../libempathy/empathy-tp-file.c:399
+#: ../libempathy/empathy-tp-file.c:389
 msgid "Error while trying to transfer the file"
 msgstr "Feil under overføring av filen"
 
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-tp-file.c:392
 msgid "The other participant is unable to transfer the file"
 msgstr "Avsender kan ikke overføre filen"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-tp-file.c:395 ../libempathy/empathy-utils.c:312
 msgid "Unknown reason"
 msgstr "Ukjent årsak"
 
-#: ../libempathy/empathy-utils.c:222
+#: ../libempathy/empathy-utils.c:232
 msgid "Available"
 msgstr "Tilgjengelig"
 
-#: ../libempathy/empathy-utils.c:224
+#: ../libempathy/empathy-utils.c:234
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../libempathy/empathy-utils.c:227
+#: ../libempathy/empathy-utils.c:237
 msgid "Away"
 msgstr "Borte"
 
-#: ../libempathy/empathy-utils.c:229
+#: ../libempathy/empathy-utils.c:239
 msgid "Invisible"
 msgstr "Usynlig"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:241
 msgid "Offline"
 msgstr "Frakoblet"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:244
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:284
 msgid "No reason specified"
 msgstr "Ingen årsak oppgitt"
 
-#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
 msgid "Status is set to offline"
 msgstr "Status er satt til frakoblet"
 
-#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
 #: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "Nettverksfeil"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
 msgid "Authentication failed"
 msgstr "Autentiseringen feilet"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
 msgid "Encryption error"
 msgstr "Krypteringsfeil"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:294
 msgid "Name in use"
 msgstr "Navn i bruk"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate not provided"
 msgstr "Sertifikat ikke oppgitt"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate untrusted"
 msgstr "Stoler ikke på sertifikat"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
 msgid "Certificate expired"
 msgstr "Sertifikat utgått"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
 msgid "Certificate not activated"
 msgstr "Sertifikat ikke aktivert"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
 msgid "Certificate hostname mismatch"
 msgstr "Feil vertsnavn i forhold til sertifikat"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
 msgid "Certificate fingerprint mismatch"
 msgstr "Fingeravtrykk stemmer ikke for sertifikat"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
 msgid "Certificate self-signed"
 msgstr "Selvsignert sertifikat"
 
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate error"
 msgstr "Sertifikatsfeil"
 
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:344
 msgid "Encryption is not available"
 msgstr "Kryptering er ikke tilgjengelig"
 
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:346
 msgid "Certificate is invalid"
 msgstr "Sertifikatet ikke ugyldig"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:348
 msgid "Connection has been refused"
 msgstr "Tilkobling nektes"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:350
 msgid "Connection can't be established"
 msgstr "Tilkobling kan ikke etableres"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:352
 msgid "Connection has been lost"
 msgstr "Tilkobling mistet"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:354
 msgid "This resource is already connected to the server"
 msgstr "Denne ressursen er allerede koblet til tjeneren"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:356
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Tilkoblingen er erstattet med en ny tilkobling som bruker samme ressurs"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:359
 msgid "The account already exists on the server"
 msgstr "Kontoen eksisterer allerede på tjeneren"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:361
 msgid "Server is currently too busy to handle the connection"
 msgstr "Tjeneren er for opptatt til å håndtere tilkoblingen"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:363
 msgid "Certificate has been revoked"
 msgstr "Sertifikatet er trukket tilbake"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:365
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Sertifikatet bruker en usikker cipher-algoritme eller er kryptografisk svakt"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:368
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -697,20 +697,20 @@ msgstr ""
 "Lengden på tjenersertifikatet eller dybden på sertifikatkjeden på tjeneren "
 "oversteg grensen som settes av kryptografibiblioteket"
 
-#: ../libempathy/empathy-utils.c:519
+#: ../libempathy/empathy-utils.c:529
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "Personer i nærheten"
 
-#: ../libempathy/empathy-utils.c:524
+#: ../libempathy/empathy-utils.c:534
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:553
+#: ../libempathy/empathy-utils.c:563
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:554
+#: ../libempathy/empathy-utils.c:564
 msgid "Facebook Chat"
 msgstr "Facebook-prat"
 
@@ -760,7 +760,7 @@ msgstr[1] "%d måneder siden"
 msgid "in the future"
 msgstr "i fremtiden"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:539
+#: ../libempathy-gtk/empathy-account-chooser.c:540
 msgid "All accounts"
 msgstr "Alle kontoer"
 
@@ -789,42 +789,52 @@ msgstr "Port"
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1167
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "Mine nettkontoer"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1209
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "Konto %s er redigert via Mine nettkontoer."
+msgid "The account %s is edited via %s."
+msgstr "Konto %s er redigert via %s."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1173
+#: ../libempathy-gtk/empathy-account-widget.c:1215
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "Konto %s kan ikke redigeres i Empathy."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1193
+#: ../libempathy-gtk/empathy-account-widget.c:1234
 msgid "Launch My Web Accounts"
 msgstr "Start Mine nettkontoer"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1533
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1242
+#, c-format
+msgid "Edit %s"
+msgstr "Rediger %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1592
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Brukernavn:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1851
+#: ../libempathy-gtk/empathy-account-widget.c:1910
 msgid "A_pply"
 msgstr "_Bruk"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1881
+#: ../libempathy-gtk/empathy-account-widget.c:1940
 msgid "L_og in"
 msgstr "L_ogg inn"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1955
+#: ../libempathy-gtk/empathy-account-widget.c:2014
 msgid "This account already exists on the server"
 msgstr "Denne kontoen eksisterer allerede på tjeneren"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1958
+#: ../libempathy-gtk/empathy-account-widget.c:2017
 msgid "Create a new account on the server"
 msgstr "Lag en ny konto på tjeneren"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2150
+#: ../libempathy-gtk/empathy-account-widget.c:2209
 msgid "Ca_ncel"
 msgstr "A_vbryt"
 
@@ -833,19 +843,19 @@ msgstr "A_vbryt"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2428
+#: ../libempathy-gtk/empathy-account-widget.c:2487
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s av %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2454
+#: ../libempathy-gtk/empathy-account-widget.c:2513
 #, c-format
 msgid "%s Account"
 msgstr "%s-konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2458
+#: ../libempathy-gtk/empathy-account-widget.c:2517
 msgid "New account"
 msgstr "Ny konto"
 
@@ -1262,36 +1272,36 @@ msgstr "Yahoo!-I_D:"
 msgid "_Room List locale:"
 msgstr "Locale for _romliste:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:470
-#: ../libempathy-gtk/empathy-avatar-chooser.c:555
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "Kunne ikke konvertere bilde"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "Ingen av de godkjente bildeformatene støttes av ditt system"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:818
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
 msgid "Couldn't save picture to file"
 msgstr "Kunne ikke lagre bilde til fil"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:934
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "Velg personbilde"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
 msgstr "Ta et bilde …"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:941
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "Ingen bilde"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "Bilder"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "Alle filer"
 
@@ -1320,40 +1330,40 @@ msgstr "Valgt kontakt er ugyldig"
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Nødsamtaler er ikke støttet på denne protokollen"
 
-#: ../libempathy-gtk/empathy-chat.c:702
+#: ../libempathy-gtk/empathy-chat.c:704
 msgid "Failed to open private chat"
 msgstr "Klarte ikke å åpne privat prat"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:765
 msgid "Topic not supported on this conversation"
 msgstr "Emne er ikke støttet for denne samtalen"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:771
 msgid "You are not allowed to change the topic"
 msgstr "Du har ikke lov til å bytte emne"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:975
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "«%s» er ikke en gyldig kontakt-ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1030
+#: ../libempathy-gtk/empathy-chat.c:1070
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: tøm alle meldinger fra aktiv samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1033
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <emne>: sett emne for aktiv samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1076
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ID for praterom>: bli med i et nytt praterom"
 
-#: ../libempathy-gtk/empathy-chat.c:1039
+#: ../libempathy-gtk/empathy-chat.c:1079
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <prateroms-ID>: bli med i et nytt praterom"
 
-#: ../libempathy-gtk/empathy-chat.c:1043
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1361,23 +1371,23 @@ msgstr ""
 "/part [<praterom-ID>] [<Ã¥rsak>]: forlat praterommet, forvalg er det aktive "
 "rommet"
 
-#: ../libempathy-gtk/empathy-chat.c:1047
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <kontakt-ID> [<melding>]: åpne en privat samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1050
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <kontakt-ID> <melding>: åpne en privat samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1053
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <kallenavn>: bytt kallenavn på denne tjeneren"
 
-#: ../libempathy-gtk/empathy-chat.c:1056
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <melding>: send en HANDLINGS-melding til aktiv samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1059
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1387,11 +1397,11 @@ msgstr ""
 "sende en melding som starter med tegnet «/». For eksempel: «/say /join "
 "brukes til å bli med i et nytt praterom»"
 
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <kontakt-ID>: vis informasjon om en kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1399,113 +1409,113 @@ msgstr ""
 "/help [<kommando>]: vis alle støttede kommandoer. Vis hjelp for <kommando> "
 "hvis den er definert."
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1126
 #, c-format
 msgid "Usage: %s"
 msgstr "Bruk: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1116
+#: ../libempathy-gtk/empathy-chat.c:1171
 msgid "Unknown command"
 msgstr "Ukjent kommando"
 
-#: ../libempathy-gtk/empathy-chat.c:1242
+#: ../libempathy-gtk/empathy-chat.c:1297
 msgid "Unknown command; see /help for the available commands"
 msgstr "Ukjent kommando; se /help for tilgjengelige kommandoer"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1412
+#: ../libempathy-gtk/empathy-chat.c:1467
 msgid "insufficient balance to send message"
 msgstr "ikke nok kreditt til å sende melding"
 
-#: ../libempathy-gtk/empathy-chat.c:1414
+#: ../libempathy-gtk/empathy-chat.c:1469
 msgid "not capable"
 msgstr "ikke kapabel"
 
-#: ../libempathy-gtk/empathy-chat.c:1421
+#: ../libempathy-gtk/empathy-chat.c:1476
 msgid "offline"
 msgstr "frakoblet"
 
-#: ../libempathy-gtk/empathy-chat.c:1424
+#: ../libempathy-gtk/empathy-chat.c:1479
 msgid "invalid contact"
 msgstr "ugyldig kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1427
+#: ../libempathy-gtk/empathy-chat.c:1482
 msgid "permission denied"
 msgstr "tilgang nektet"
 
-#: ../libempathy-gtk/empathy-chat.c:1430
+#: ../libempathy-gtk/empathy-chat.c:1485
 msgid "too long message"
 msgstr "meldingen er for lang"
 
-#: ../libempathy-gtk/empathy-chat.c:1433
+#: ../libempathy-gtk/empathy-chat.c:1488
 msgid "not implemented"
 msgstr "ikke implementert"
 
-#: ../libempathy-gtk/empathy-chat.c:1437
+#: ../libempathy-gtk/empathy-chat.c:1492
 msgid "unknown"
 msgstr "ukjent"
 
-#: ../libempathy-gtk/empathy-chat.c:1443
+#: ../libempathy-gtk/empathy-chat.c:1498
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Feil ved sending av melding «%s»: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1447
+#: ../libempathy-gtk/empathy-chat.c:1502
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Feil ved sending av melding: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1508 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1563 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Emne:"
 
-#: ../libempathy-gtk/empathy-chat.c:1520
+#: ../libempathy-gtk/empathy-chat.c:1575
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Emnet er satt til: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1577
 msgid "No topic defined"
 msgstr "Emne ikke definert"
 
-#: ../libempathy-gtk/empathy-chat.c:2031
+#: ../libempathy-gtk/empathy-chat.c:2086
 msgid "(No Suggestions)"
 msgstr "(Ingen forslag)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2099
+#: ../libempathy-gtk/empathy-chat.c:2154
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Legg til «%s» i ordboken"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2136
+#: ../libempathy-gtk/empathy-chat.c:2191
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Legg til «%s» i ordbok for %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2206
+#: ../libempathy-gtk/empathy-chat.c:2261
 msgid "Insert Smiley"
 msgstr "Sett inn smilefjes"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2224
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2279
+#: ../libempathy-gtk/empathy-ui-utils.c:1840
 msgid "_Send"
 msgstr "_Send"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2278
+#: ../libempathy-gtk/empathy-chat.c:2333
 msgid "_Spelling Suggestions"
 msgstr "_Staveforslag"
 
-#: ../libempathy-gtk/empathy-chat.c:2367
+#: ../libempathy-gtk/empathy-chat.c:2422
 msgid "Failed to retrieve recent logs"
 msgstr "Klarte ikke å hente siste logger"
 
-#: ../libempathy-gtk/empathy-chat.c:2504
+#: ../libempathy-gtk/empathy-chat.c:2559
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s har koblet fra"
@@ -1513,12 +1523,12 @@ msgstr "%s har koblet fra"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2511
+#: ../libempathy-gtk/empathy-chat.c:2566
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s ble sparket av %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2514
+#: ../libempathy-gtk/empathy-chat.c:2569
 #, c-format
 msgid "%s was kicked"
 msgstr "%s ble sparket"
@@ -1526,17 +1536,17 @@ msgstr "%s ble sparket"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2522
+#: ../libempathy-gtk/empathy-chat.c:2577
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s ble bannlyst av %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2525
+#: ../libempathy-gtk/empathy-chat.c:2580
 #, c-format
 msgid "%s was banned"
 msgstr "%s ble bannlyst"
 
-#: ../libempathy-gtk/empathy-chat.c:2529
+#: ../libempathy-gtk/empathy-chat.c:2584
 #, c-format
 msgid "%s has left the room"
 msgstr "%s har forlatt rommet"
@@ -1546,93 +1556,97 @@ msgstr "%s har forlatt rommet"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2538
+#: ../libempathy-gtk/empathy-chat.c:2593
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2618
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s har blitt med i rommet"
 
-#: ../libempathy-gtk/empathy-chat.c:2588
+#: ../libempathy-gtk/empathy-chat.c:2643
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s er nå kjent som %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2727
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2796
 #: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:2355
+#: ../src/empathy-event-manager.c:1260 ../src/empathy-call-window.c:1546
+#: ../src/empathy-call-window.c:1596 ../src/empathy-call-window.c:2641
 msgid "Disconnected"
 msgstr "Koblet fra"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3374
+#: ../libempathy-gtk/empathy-chat.c:3440
 msgid "Would you like to store this password?"
 msgstr "Vil du lagre dette passordet?"
 
-#: ../libempathy-gtk/empathy-chat.c:3380
+#: ../libempathy-gtk/empathy-chat.c:3446
 msgid "Remember"
 msgstr "Husk"
 
-#: ../libempathy-gtk/empathy-chat.c:3390
+#: ../libempathy-gtk/empathy-chat.c:3456
 msgid "Not now"
 msgstr "Ikke nå"
 
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3500
 msgid "Retry"
 msgstr "Prøv igjen"
 
-#: ../libempathy-gtk/empathy-chat.c:3438
+#: ../libempathy-gtk/empathy-chat.c:3504
 msgid "Wrong password; please try again:"
 msgstr "Feil passord; vennligst prøv igjen:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3568
+#: ../libempathy-gtk/empathy-chat.c:3634
 msgid "This room is protected by a password:"
 msgstr "Dette rommet er beskyttet med et passord:"
 
-#: ../libempathy-gtk/empathy-chat.c:3595
+#: ../libempathy-gtk/empathy-chat.c:3661
 msgid "Join"
 msgstr "Bli med"
 
-#: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:3863 ../src/empathy-event-manager.c:1281
 msgid "Connected"
 msgstr "Koblet til"
 
-#: ../libempathy-gtk/empathy-chat.c:3852
+#: ../libempathy-gtk/empathy-chat.c:3918
 msgid "Conversation"
 msgstr "Samtale"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3857
+#: ../libempathy-gtk/empathy-chat.c:3923
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
 msgid "Unknown or invalid identifier"
 msgstr "Ukjent eller ugyldig identifikator"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
 msgid "Contact blocking temporarily unavailable"
 msgstr "Blokkering av kontakter midlertidig utilgjengelig"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
 msgid "Contact blocking unavailable"
 msgstr "Blokkering av kontakter er ikke tilgjengelig"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:436
 msgid "Permission Denied"
 msgstr "Tilgang nektet"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:440
 msgid "Could not block contact"
 msgstr "Kunne ikke blokkere kontakt"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:783
 msgid "Edit Blocked Contacts"
 msgstr "Rediger blokkerte kontakter"
 
@@ -1640,7 +1654,7 @@ msgstr "Rediger blokkerte kontakter"
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:512
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1485
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
@@ -1734,33 +1748,33 @@ msgstr "Ikke gruppert"
 msgid "Favorite People"
 msgstr "Favorittpersoner"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
+#: ../libempathy-gtk/empathy-contact-list-view.c:1985
+#: ../libempathy-gtk/empathy-individual-view.c:2375
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Vil du virkelig fjerne gruppen «%s»?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
+#: ../libempathy-gtk/empathy-contact-list-view.c:1987
+#: ../libempathy-gtk/empathy-individual-view.c:2378
 msgid "Removing group"
 msgstr "Fjerner gruppe"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
+#: ../libempathy-gtk/empathy-contact-list-view.c:2036
+#: ../libempathy-gtk/empathy-contact-list-view.c:2113
+#: ../libempathy-gtk/empathy-individual-view.c:2433
+#: ../libempathy-gtk/empathy-individual-view.c:2636
 msgid "_Remove"
 msgstr "Fje_rn"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
+#: ../libempathy-gtk/empathy-contact-list-view.c:2066
+#: ../libempathy-gtk/empathy-individual-view.c:2500
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Vil du virkelig fjerne kontakten «%s»?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
+#: ../libempathy-gtk/empathy-contact-list-view.c:2068
+#: ../libempathy-gtk/empathy-individual-view.c:2521
 msgid "Removing contact"
 msgstr "Fjerner kontakt"
 
@@ -1808,9 +1822,9 @@ msgid "Share My Desktop"
 msgstr "Del mitt skrivebord"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
+#: ../libempathy-gtk/empathy-contact-widget.c:1887
 #: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1373
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "Favoritt"
 
@@ -1825,13 +1839,13 @@ msgid "_Edit"
 msgstr "R_ediger"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1283
+#: ../libempathy-gtk/empathy-individual-menu.c:1284
 #: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "Inviterer deg til dette rommet"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1329
+#: ../libempathy-gtk/empathy-individual-menu.c:1330
 msgid "_Invite to Chat Room"
 msgstr "_Inviter til praterom"
 
@@ -1860,10 +1874,6 @@ msgstr "Melding der du introduserer deg selv:"
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Vennligst la meg så når du er tilkoblet. Takk!"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "Velg en kontakt"
-
 #: ../libempathy-gtk/empathy-contact-widget.c:336
 #: ../libempathy-gtk/empathy-individual-widget.c:153
 msgid "Full name:"
@@ -2036,7 +2046,7 @@ msgstr "Høyde:"
 #: ../libempathy-gtk/empathy-contact-widget.c:1011
 #: ../libempathy-gtk/empathy-individual-widget.c:607
 #: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "Sted"
 
@@ -2088,7 +2098,7 @@ msgstr "Kontaktdetaljer"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1515
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "Identifikator:"
 
@@ -2127,7 +2137,7 @@ msgid "Select"
 msgstr "Velg"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../src/empathy-main-window.c:1833
 msgid "Group"
 msgstr "Gruppe"
 
@@ -2199,23 +2209,23 @@ msgstr "Hjemme"
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1141
+#: ../libempathy-gtk/empathy-individual-menu.c:1142
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "R_ediger"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1167
+#: ../libempathy-gtk/empathy-individual-menu.c:1168
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "Koble kontakter …"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-view.c:2340
 msgid "Delete and _Block"
 msgstr "Slett og _blokker"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2509
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2224,7 +2234,7 @@ msgstr ""
 "Vil du virkelig fjerne lenket kontakt «%s»? Merk at dette vil fjerne alle "
 "kontaktene den lenkede kontakten består av."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1662
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2307,128 +2317,135 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "_Fjern kobling"
 
-#: ../libempathy-gtk/empathy-log-window.c:633
+#: ../libempathy-gtk/empathy-log-window.c:634
 msgid "History"
 msgstr "Historikk"
 
-#: ../libempathy-gtk/empathy-log-window.c:685
+#: ../libempathy-gtk/empathy-log-window.c:689
 msgid "Show"
 msgstr "Vis"
 
-#: ../libempathy-gtk/empathy-log-window.c:707
+#: ../libempathy-gtk/empathy-log-window.c:711
 msgid "Search"
 msgstr "Søk"
 
-#: ../libempathy-gtk/empathy-log-window.c:1155
+#: ../libempathy-gtk/empathy-log-window.c:1159
 #, c-format
 msgid "Chat in %s"
 msgstr "Prat i %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1157
+#: ../libempathy-gtk/empathy-log-window.c:1161
 #, c-format
 msgid "Chat with %s"
 msgstr "Prat med %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1207
-#: ../libempathy-gtk/empathy-log-window.c:1354
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1296
+#: ../libempathy-gtk/empathy-log-window.c:1300
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1302
+#: ../libempathy-gtk/empathy-log-window.c:1306
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
-#: ../libempathy-gtk/empathy-log-window.c:1375
-#: ../src/empathy-ft-manager.c:1026
-msgid "%"
-msgstr "%"
-
 #: ../libempathy-gtk/empathy-log-window.c:1382
 #, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s sekund"
+msgstr[1] "%s sekunder"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s minutt"
+msgstr[1] "%s minutter"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
+#, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Samtalen tok %s, avsluttet %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1714
+#: ../libempathy-gtk/empathy-log-window.c:1729
 msgid "Today"
 msgstr "I dag"
 
-#: ../libempathy-gtk/empathy-log-window.c:1718
+#: ../libempathy-gtk/empathy-log-window.c:1733
 msgid "Yesterday"
 msgstr "I går"
 
-#: ../libempathy-gtk/empathy-log-window.c:1734
-msgctxt ""
-"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1815
-#: ../libempathy-gtk/empathy-log-window.c:3396
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3444
 msgid "Anytime"
 msgstr "NÃ¥r som helst"
 
-#: ../libempathy-gtk/empathy-log-window.c:1895
-#: ../libempathy-gtk/empathy-log-window.c:2325
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2372
 msgid "Anyone"
 msgstr "Hvem som helst"
 
-#: ../libempathy-gtk/empathy-log-window.c:2637
+#: ../libempathy-gtk/empathy-log-window.c:2685
 msgid "Who"
 msgstr "Hvem"
 
-#: ../libempathy-gtk/empathy-log-window.c:2841
+#: ../libempathy-gtk/empathy-log-window.c:2889
 msgid "When"
 msgstr "NÃ¥r"
 
-#: ../libempathy-gtk/empathy-log-window.c:2957
+#: ../libempathy-gtk/empathy-log-window.c:3005
 msgid "Anything"
 msgstr "Hva som helst"
 
-#: ../libempathy-gtk/empathy-log-window.c:2959
+#: ../libempathy-gtk/empathy-log-window.c:3007
 msgid "Text chats"
 msgstr "Tekstsamtaler"
 
-#: ../libempathy-gtk/empathy-log-window.c:2961
+#: ../libempathy-gtk/empathy-log-window.c:3009
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "Samtaler"
 
-#: ../libempathy-gtk/empathy-log-window.c:2966
+#: ../libempathy-gtk/empathy-log-window.c:3014
 msgid "Incoming calls"
 msgstr "Innkommende samtaler"
 
-#: ../libempathy-gtk/empathy-log-window.c:2967
+#: ../libempathy-gtk/empathy-log-window.c:3015
 msgid "Outgoing calls"
 msgstr "Utgående samtaler"
 
-#: ../libempathy-gtk/empathy-log-window.c:2968
+#: ../libempathy-gtk/empathy-log-window.c:3016
 msgid "Missed calls"
 msgstr "Tapte samtaler"
 
-#: ../libempathy-gtk/empathy-log-window.c:2990
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "What"
 msgstr "Hva"
 
-#: ../libempathy-gtk/empathy-log-window.c:3699
+#: ../libempathy-gtk/empathy-log-window.c:3747
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Er du sikker på at du vil slette alle logger av tidligere samtaler?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3703
+#: ../libempathy-gtk/empathy-log-window.c:3751
 msgid "Clear All"
 msgstr "Tøm alle"
 
-#: ../libempathy-gtk/empathy-log-window.c:3710
+#: ../libempathy-gtk/empathy-log-window.c:3758
 msgid "Delete from:"
 msgstr "Slett fra:"
 
@@ -2617,12 +2634,12 @@ msgstr "Samtale avsluttet"
 msgid "Edit Custom Messages"
 msgstr "Rediger egendefinerte meldinger"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1030
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
 #, c-format
 msgid "Message edited at %s"
 msgstr "Melding redigert %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1720
+#: ../libempathy-gtk/empathy-theme-adium.c:1740
 msgid "Normal"
 msgstr "Normal"
 
@@ -2719,15 +2736,15 @@ msgstr "Sertifikatdetaljer"
 msgid "Unable to open URI"
 msgstr "Kan ikke åpne URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1832
 msgid "Select a file"
 msgstr "Velg en fil"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1904
 msgid "Insufficient free space to save file"
 msgstr "Ikke nok ledig plass til å lagre filen"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1912
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2736,7 +2753,7 @@ msgstr ""
 "%s ledig plass kreves for å lagre denne filen, men kun %s er tilgjengelig. "
 "Vennligst velg en annen lokasjon."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1956
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Innkommende fil fra %s"
@@ -2908,39 +2925,31 @@ msgstr "Vestlig"
 msgid "Vietnamese"
 msgstr "Vietnamesisk"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "Valgt kontakt kan ikke motta filer."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "Valgt kontakt er koblet fra."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:203
 msgid "No error message"
 msgstr "Ingen feilmelding"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:276
 msgid "Instant Message (Empathy)"
 msgstr "Lynmelding (Empathy)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:434
 msgid "Don't connect on startup"
 msgstr "Ikke koble til ved oppstart"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:438
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Ikke vis kontaktlisten eller andre dialoger ved oppstart"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:453
 msgid "- Empathy IM Client"
 msgstr "- Empathy lynmeldingsprogram"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:640
 msgid "Error contacting the Account Manager"
 msgstr "Feil ved forsøk på å kontakte kontohåndtering"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:642
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3093,8 +3102,8 @@ msgid "Select the accounts you want to import:"
 msgstr "Velg kontoer du vil importere:"
 
 #: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:625
+#: ../src/empathy-new-chatroom-dialog.c:626
 msgid "Yes"
 msgstr "Ja"
 
@@ -3170,7 +3179,7 @@ msgstr "Din nye konto er ikke lagret ennå."
 
 #: ../src/empathy-accounts-dialog.c:345
 #: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1164
+#: ../src/empathy-call-window.c:1330
 msgid "Connecting…"
 msgstr "Kobler til …"
 
@@ -3278,11 +3287,11 @@ msgstr "Empathy autentiseringsklient"
 msgid "People nearby"
 msgstr "Personer i nærheten"
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:127
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathy lyd-/bildeklient"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:152
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy lyd-/bildeklient"
 
@@ -3325,53 +3334,41 @@ msgstr "Detaljer"
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1672
+#: ../src/empathy-call-window.c:1939
 #, c-format
 msgid "Call with %s"
 msgstr "Samtale med %s"
 
 #: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:1916
+#: ../src/empathy-call-window.c:2183
 msgid "The IP address as seen by the machine"
 msgstr "IP-adresse som sett av maskinen"
 
 #: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:1918
+#: ../src/empathy-call-window.c:2185
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP-adresse som sett av en tjener på internett"
 
 #: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:1920
+#: ../src/empathy-call-window.c:2187
 msgid "The IP address of the peer as seen by the other side"
 msgstr "IP-adresse for peer som sett av andre siden"
 
 #: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:1922
+#: ../src/empathy-call-window.c:2189
 msgid "The IP address of a relay server"
 msgstr "IP-adresse for en relay-tjener"
 
 #: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:1924
+#: ../src/empathy-call-window.c:2191
 msgid "The IP address of the multicast group"
 msgstr "IP-adresse for multicast-gruppe"
 
 #: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "Ukjent"
-
 #: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "Ukjent"
-
 #: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "Ukjent"
-
 #: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+msgctxt "codec"
 msgid "Unknown"
 msgstr "Ukjent"
 
@@ -3382,12 +3379,12 @@ msgid "Connected — %d:%02dm"
 msgstr "Koblet til - %d:%02dm"
 
 #: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2674
+#: ../src/empathy-call-window.c:2960
 msgid "Technical Details"
 msgstr "Tekniske detaljer"
 
 #: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2712
+#: ../src/empathy-call-window.c:2998
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3397,7 +3394,7 @@ msgstr ""
 "datamaskin"
 
 #: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2717
+#: ../src/empathy-call-window.c:3003
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3407,7 +3404,7 @@ msgstr ""
 "datamaskin"
 
 #: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2723
+#: ../src/empathy-call-window.c:3009
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3417,12 +3414,12 @@ msgstr ""
 "ikke tillater direkte tilkoblinger."
 
 #: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2729
+#: ../src/empathy-call-window.c:3015
 msgid "There was a failure on the network"
 msgstr "Det oppsto en feil på nettverket"
 
 #: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2733
+#: ../src/empathy-call-window.c:3019
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
@@ -3430,7 +3427,7 @@ msgstr ""
 "datamaskin"
 
 #: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2736
+#: ../src/empathy-call-window.c:3022
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
@@ -3438,7 +3435,7 @@ msgstr ""
 "datamaskin"
 
 #: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2748
+#: ../src/empathy-call-window.c:3034
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3450,22 +3447,22 @@ msgstr ""
 "«Feilsøking»-vinduet i Hjelp-menyen."
 
 #: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2757
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure in the call engine"
 msgstr "Det oppsto en feil i samtalemotoren"
 
 #: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2760
+#: ../src/empathy-call-window.c:3046
 msgid "The end of the stream was reached"
 msgstr "Slutt på strømmen ble nådd"
 
 #: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2800
+#: ../src/empathy-call-window.c:3086
 msgid "Can't establish audio stream"
 msgstr "Kan ikke etablere lydstrøm"
 
 #: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2810
+#: ../src/empathy-call-window.c:3096
 msgid "Can't establish video stream"
 msgstr "Kan ikke etablere videostrøm"
 
@@ -3556,8 +3553,8 @@ msgstr "Slå av/på overføring av video"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2307 ../src/empathy-call-window.c:2308
-#: ../src/empathy-call-window.c:2309 ../src/empathy-call-window.c:2310
+#: ../src/empathy-call-window.c:2590 ../src/empathy-call-window.c:2591
+#: ../src/empathy-call-window.c:2592 ../src/empathy-call-window.c:2593
 msgid "Unknown"
 msgstr "Ukjent"
 
@@ -3726,7 +3723,7 @@ msgstr "HÃ¥ndter favorittrom"
 msgid "Incoming video call"
 msgstr "Innkommende videosamtale"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1563
 msgid "Incoming call"
 msgstr "Innkommende samtale"
 
@@ -3741,7 +3738,7 @@ msgid "%s is calling you. Do you want to answer?"
 msgstr "%s ringer deg. Vil du svare?"
 
 #: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1569
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Innkommende samtale fra %s"
@@ -3759,6 +3756,7 @@ msgid "_Answer with video"
 msgstr "Sv_ar med video"
 
 #: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1569
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Innkommende videosamtale fra %s"
@@ -3801,16 +3799,16 @@ msgstr "Du har blitt invitert til å bli med i %s"
 msgid "Incoming file transfer from %s"
 msgstr "Innkommende filoverføring fra %s"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1145 ../src/empathy-main-window.c:378
 msgid "Password required"
 msgstr "Passord kreves"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1210
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s ønsker rettigheter til å se når du er tilkoblet"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1214
 #, c-format
 msgid ""
 "\n"
@@ -3910,6 +3908,10 @@ msgstr "Sjekker integriteten for «%s»"
 msgid "Hashing \"%s\""
 msgstr "Hasher «%s»"
 
+#: ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "%"
+
 #: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "Fil"
@@ -3949,51 +3951,51 @@ msgstr "Protokoll"
 msgid "Source"
 msgstr "Kilde"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-main-window.c:395
 msgid "Provide Password"
 msgstr "Oppgi passord"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-main-window.c:401
 msgid "Disconnect"
 msgstr "Koble fra"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-main-window.c:642
 msgid "No match found"
 msgstr "Ingen treff funnet"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-main-window.c:803
 msgid "Reconnect"
 msgstr "Koble til på nytt"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-main-window.c:809
 msgid "Edit Account"
 msgstr "Rediger konto"
 
-#: ../src/empathy-main-window.c:789
+#: ../src/empathy-main-window.c:815
 msgid "Close"
 msgstr "Lukk"
 
 #. Translators: this string will be something like:
 #. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#: ../src/empathy-main-window.c:954
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Fyll opp %s (%s) …"
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-main-window.c:1001
 msgid "Top up account credit"
 msgstr "Fyll opp kreditt for konto"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-main-window.c:1072
 msgid "Top Up..."
 msgstr "Fyll opp …"
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-main-window.c:1815
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../src/empathy-main-window.c:2119
+#: ../src/empathy-main-window.c:2190
 msgid "Contact List"
 msgstr "Kontaktliste"
 
@@ -4086,17 +4088,17 @@ msgstr "_Rom"
 msgid "_Search for Contacts…"
 msgstr "_Søk etter kontakter …"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Samtalerom"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "Medlemmer"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:623
 #, c-format
 msgid ""
 "%s\n"
@@ -4109,16 +4111,16 @@ msgstr ""
 "Passord kreves: %s\n"
 "Medlemmer: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:625
+#: ../src/empathy-new-chatroom-dialog.c:626
 msgid "No"
 msgstr "Nei"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:654
 msgid "Could not start room listing"
 msgstr "Kunne ikke starte romliste"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:664
 msgid "Could not stop room listing"
 msgstr "Kune ikke stoppe romliste"
 
@@ -4225,7 +4227,7 @@ msgstr "Shall I hear more, or shall I speak at this?"
 msgid "Juliet has disconnected"
 msgstr "Juliet har koblet fra"
 
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1175
 msgid "Preferences"
 msgstr "Brukervalg"
 
@@ -4254,54 +4256,66 @@ msgid "Display incoming events in the notification area"
 msgstr "Vis innkommende hendelser i varslingsområdet"
 
 #: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"Utlikning av ekko kan hjelpe å gjøre lyd for tale klarere for den andre "
+"personene, men kan forårsake problemer på noen datamaskiner. Hvis du eller "
+"den andre personen hører rare lyder eller feil under samtaler kan du prøve å "
+"slå av utlikning av ekko og starte samtalen på nytt."
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "Slå på varsling når en kontakt kobler seg til"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "Slå på varsling når en kontakt kobler seg fra"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Aktiver varsling når _prat ikke er fokusert"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "Slå på stavekontroll for språk:"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "Generelt"
 
-#: ../src/empathy-preferences.ui.h:14
-msgid "Input level"
-msgstr "Inngangsnivå"
-
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input volume"
-msgstr "Volum for inngang"
+msgid "Input level:"
+msgstr "Inngangsnivå:"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "Volum for inngang:"
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "Kilder for steder:"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "Logg samtaler"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "Varsling"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Spill av lyd for hendelser"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "Personvern"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -4310,71 +4324,71 @@ msgstr ""
 "Redusert nøyaktighet for plassering betyr at kun by, område og land vil "
 "publisert. GPS-koordinater vil ha nøyaktighet lik en desimalplass."
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "Vis _smilefjes som bilder"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "Vis kontakt_liste i rom"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "Lyder"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "Stavekontroll"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 "Listen med språk viser bare de språkene det er installert ordliste for."
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "Temaer"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "Variant:"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "Koble til _automatisk ved oppstart"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Mobiltelefon"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "_Aktiver varsling med bobler"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "_Aktiver varsling med lyder"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Nettverk (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "_Ã…pne nye samtaler i egne vinduer"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "_Publiser plassering til mine kontakter"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "_Reduser nøyaktighet for plassering"
 
@@ -4501,44 +4515,48 @@ msgid ""
 msgstr ""
 "Valgt tilkoblingshåndterer støtter ikke utvidelse for ekstern feilsøking."
 
+#: ../src/empathy-invite-participant-dialog.c:179
 #: ../src/empathy-invite-participant-dialog.c:205
-#: ../src/empathy-invite-participant-dialog.c:231
 msgid "Invite Participant"
 msgstr "Inviter deltaker"
 
-#: ../src/empathy-invite-participant-dialog.c:206
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Velg en kontakt å invitere til samtalen:"
 
-#: ../src/empathy-invite-participant-dialog.c:227
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "Inviter"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:184
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "Ikke vis noen dialoger. Utfør arbeid (f.eks import) og avslutt"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:188
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "Ikke vis noen dialoger med mindre det kun finnes «Personer i nærheten»-"
 "kontoer"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:192
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Velg en gitt konto ved oppstart (f.eks. gabble/jabber/foo_40eksempel_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:194
 msgid "<account-id>"
 msgstr "<konto-id>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:197
+msgid "Show account assistant"
+msgstr "Vis kontoassistent"
+
+#: ../src/empathy-accounts.c:203
 msgid "- Empathy Accounts"
 msgstr "- Empathy-kontoer"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:242
 msgid "Empathy Accounts"
 msgstr "Empathy-kontoer"
 
@@ -4563,11 +4581,13 @@ msgid "Respond"
 msgstr "Svar"
 
 #: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1573
 msgid "Reject"
 msgstr "Avvis"
 
 #: ../src/empathy-notifications-approver.c:222
 #: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1574
 msgid "Answer"
 msgstr "Svar"
 
@@ -4585,6 +4605,9 @@ msgstr "Avslå"
 msgid "Accept"
 msgstr "Godta"
 
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
 #: ../src/empathy-notifications-approver.c:260
 msgid "Provide"
 msgstr "Oppgi"
@@ -4596,24 +4619,24 @@ msgstr "%s prøvde å ringe deg, men du var i en annen samtale."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1036 ../src/empathy-call-window.c:1059
+#: ../src/empathy-call-window.c:1183 ../src/empathy-call-window.c:1206
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2603
+#: ../src/empathy-call-window.c:2889
 msgid "On hold"
 msgstr "PÃ¥ vent"
 
-#: ../src/empathy-call-window.c:2606
+#: ../src/empathy-call-window.c:2892
 msgid "Mute"
 msgstr "Demp"
 
-#: ../src/empathy-call-window.c:2608
+#: ../src/empathy-call-window.c:2894
 msgid "Duration"
 msgstr "Varighet"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2611
+#: ../src/empathy-call-window.c:2897
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s – %d:%02dm"
diff --git a/po/nl.po b/po/nl.po
index 1f94d622b..7bfe9992c 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -12,6 +12,7 @@
 # room                      - groepsgesprek, chat
 # roster                    - contactenlijst
 # voice call                - spraakoproep
+# incoming		    - binnenkomend, inkomend
 #
 # Luk Claes <luk.claes@ugent.be>, 2005.
 # Vincent van Adrighem <V.vanAdrighem@dirck.mine.nu>, 2003.
@@ -24,9 +25,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-22 22:12+0200\n"
-"PO-Revision-Date: 2011-08-22 22:15+0200\n"
-"Last-Translator: Wouter Bolsterlee <wbolster@gnome.org>\n"
+"POT-Creation-Date: 2011-09-21 23:37+0200\n"
+"PO-Revision-Date: 2011-09-17 09:39+0200\n"
+"Last-Translator: Hannie Dumoleyn <hannie@ubuntu-nl.org>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
@@ -38,7 +39,7 @@ msgstr ""
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Chatten op Google Talk, Facebook, MSN en veel andere chat-diensten"
+msgstr "Chatten op Google Talk, Facebook, MSN en vele andere chatdiensten"
 
 #: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
@@ -69,6 +70,10 @@ msgid "Camera device"
 msgstr "Camera"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "Camerapositie"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -76,57 +81,57 @@ msgstr ""
 "Te gebruiken achtervoegsel bij auto-aanvullen (tab) van bijnaam in "
 "groepschat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "Thema voor chatvensters"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Chat window theme variant"
 msgstr "Themavariant voor chatvensters"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "Door komma's gescheiden lijst van talen die door de spellingcontrole "
 "gebruikt kunnen worden (bijv. ‘en, fr, nl’)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "Compacte contactenlijst"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "Er moeten verbindingsbeheerprogramma's gebruikt worden"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "Sorteercriterium contactenlijst"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr ""
 "De camera die standaard gebruikt moet worden bij videogesprekken, bijv. /dev/"
 "video0."
 
 # avatar? :s  (Wouter Bolsterlee)
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
 msgstr "Standaardmap voor het kiezen van gebruikersafbeeldingen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr "Notificatieberichten uitschakelen indien afwezig"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr "Geluid uitschakelen indien afwezig"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
 msgstr "Inkomende gebeurtenissen in het statusgebied weergeven"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -134,246 +139,251 @@ msgstr ""
 "Toon inkomende gebeurtenissen in het mededelingengebied. Toon deze direct "
 "aan de gebruiker als dit niet is ingesteld."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Echo cancellation support"
 msgstr "Ondersteuning voor echo-onderdrukking"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr "Empathy mag de locatie van de gebruiker bekend maken"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy mag GPS gebruiken om de locatie te bepalen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy mag het mobiele netwerk gebruiken om de locatie te bepalen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy mag via het netwerk proberen om de locatie te bepalen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr "Standaard downloadmap voor Empathy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
 msgstr "Empathy heeft butterfly-logs gemigreerd"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy automatisch op 'afwezig' instellen bij inactiviteit"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy automatisch laten verbinden bij starten"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy moet de nauwkeurigheid van de locatie beperken"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "De gebruikersafbeelding gebruiken als pictogram van het chatvenster"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr "WebKit-ontwikkelhulpprogramma's inschakelen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "Notificatieberichten tonen voor nieuwe berichten"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "Spellingcontrole inschakelen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "Hoofdvenster verbergen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "Het hoofdvenster verbergen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "Achtervoegsel auto-afmaken"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "Nieuwe chats in aparte vensters openen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "Pad van het te gebruiken Adium-thema"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
 "Pad van het te gebruiken Adium-thema als het thema voor chatten Adium is."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Geluid afspelen bij nieuwe berichten"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "Geluid afspelen bij nieuwe gesprekken"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Geluid afspelen bij uitgaande berichten"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "Geluid afspelen wanneer contactpersonen zich aanmelden"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "Geluid afspelen wanneer contactpersonen zich afmelden"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "Geluid afspelen bij aanmelden"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "Geluid afspelen bij afmelden"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Notificatieberichten tonen als het chatvenster geen focus heeft"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "Notificatiebericht tonen wanneer een contact zich aanmeldt"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "Notificatiebericht tonen wanneer een contact zich afmeldt"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+# Dit is een kromme Engelse zin. Ik probeer er iets van te maken.
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr "Positie van het camerabeeld tijdens een gesprek."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Show Balance in contact list"
 msgstr "Saldo in contactenlijst tonen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "Gebruikersafbeeldingen tonen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "Contactenlijst in chatruimtes tonen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr "Tip tonen bij het sluiten van het hoofdvenster"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr "Offline-contacten tonen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
 msgstr "Protocollen tonen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "Talen voor de spellingcontrole"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr "De standaardmap waar ontvangen bestanden opgeslagen worden."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
 msgstr "De laatst gebruikte map voor gebruikersafbeeldingen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
 msgstr "De positie van het chatvenster-zijpaneel"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "De opgeslagen positie (in pixels) van het chatvenster-zijpaneel."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Het thema dat gebruikt wordt voor het tonen van chats in chatvensters."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr ""
 "De themavariant die gebruikt wordt voor het tonen van chats in chatvensters."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Smileys grafisch tonen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "Waarschuwingsgeluiden gebruiken"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "Thema voor chatruimtes gebruiken"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr ""
 "Of Empathy de locatie van de gebruiker aan de contacten mag bekend maken."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Of Empathy gps mag gebruiken om de locatie te bepalen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Of Empathy het mobiele netwerk mag gebruiken om de locatie te bepalen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Of Empathy het netwerk mag gebruiken om de locatie te bepalen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "Of Empathy butterfly-logs gemigreerd heeft."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Of Empathy u automatisch moet aanmelden bij opstarten."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
 "Of Empathy automatisch op 'afwezig' ingesteld moet worden wanneer de "
 "gebruiker niets doet."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 "Of Empathy de nauwkeurigheid van de locatie moet beperken vanwege de privacy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 "Of Empathy gebruikersafbeeldingen moet gebruiken als pictogram voor de "
 "chatvensters."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Of WebKit-ontwikkelhulpprogramma's, zoals de Web Inspector, ingeschakeld "
 "moeten worden."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
@@ -382,75 +392,75 @@ msgstr ""
 "verbinding te maken of de verbinding te verbreken."
 
 # Bah, wat een lelijke vertaling (Wouter Bolsterlee)
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr ""
 "Of ingetypte woorden gecontroleerd moeten worden met de talen die u op "
 "spelling wilt controleren."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "Of smileys in gesprekken grafisch moeten worden getoond."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr ""
 "Bepaalt of het echo-onderdrukkingsfilter van Pulseaudio moet worden "
 "ingeschakeld."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "Of er geluid afgespeeld moet worden als een contact zich aanmeldt."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "Of er geluid afgespeeld moet worden als een contact zich afmeldt."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "Of er geluid afgespeeld moet worden om gebeurtenissen te melden."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Of er geluid afgespeeld moet worden bij binnenkomende berichten."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr ""
 "Of er geluid afgespeeld moet worden om u op de hoogte te stellen van nieuwe "
 "gesprekken."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Of er geluid afgespeeld moet worden bij uitgaande berichten."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "Of er geluid afgespeeld moet worden bij aanmelden bij een netwerk."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Of er geluid afgespeeld moet worden bij afmelden bij een netwerk."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr "Of er geluid afgespeeld moet worden indien afwezig of bezig."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr ""
 "Of er een notificatiebericht getoond moet worden wanneer een contact zich "
 "afmeldt."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr ""
 "Of er een notificatiebericht getoond moet worden wanneer een contact zich "
 "aanmeldt."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -458,49 +468,49 @@ msgstr ""
 "Of er een notificatiebericht getoond moet worden bij het ontvangen van een "
 "bericht, ook als de chat geopend is, maar geen focus heeft."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr ""
 "Of er een notificatiebericht getoond moet worden bij het ontvangen van een "
 "bericht."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show account balances in the contact list."
 msgstr "Of saldi getoond moeten worden in de contactenlijst."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 "Of gebruikersafbeeldingen van contactpersonen getoond moeten worden in de "
 "contactenlijst en chatvensters."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr ""
 "Of contactpersonen die offline zijn in de contactenlijst moeten worden "
 "getoond."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
 msgstr ""
 "Of er een notificatiebericht getoond moet worden indien afwezig of bezig."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr ""
 "Of er protocollen moeten worden getoond voor contactpersonen in de "
 "contactenlijst."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Of de contactenlijst in chatruimtes getoond moet worden."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "Of de contactenlijst in compacte modus moet worden getoond."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -508,11 +518,11 @@ msgstr ""
 "Of het dialoogvenster over het sluiten van het hoofdvenster met de knop ‘x’ "
 "in de titelbalk getoond moet worden."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "Of een thema gebruikt moet worden voor chatruimtes."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -592,141 +602,141 @@ msgstr "Fout bij versturen van bestand"
 msgid "The other participant is unable to transfer the file"
 msgstr "De andere deelnemer kan het bestand niet versturen"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
 msgid "Unknown reason"
 msgstr "Reden onbekend"
 
-#: ../libempathy/empathy-utils.c:222
+#: ../libempathy/empathy-utils.c:232
 msgid "Available"
 msgstr "Beschikbaar"
 
-#: ../libempathy/empathy-utils.c:224
+#: ../libempathy/empathy-utils.c:234
 msgid "Busy"
 msgstr "Bezet"
 
-#: ../libempathy/empathy-utils.c:227
+#: ../libempathy/empathy-utils.c:237
 msgid "Away"
 msgstr "Afwezig"
 
-#: ../libempathy/empathy-utils.c:229
+#: ../libempathy/empathy-utils.c:239
 msgid "Invisible"
 msgstr "Onzichtbaar"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:241
 msgid "Offline"
 msgstr "Offline"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:244
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:284
 msgid "No reason specified"
 msgstr "Geen reden opgegeven"
 
-#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
 msgid "Status is set to offline"
 msgstr "Status is ingesteld op offline"
 
-#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
 #: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "Netwerkprobleem"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
 msgid "Authentication failed"
 msgstr "Authenticatie is mislukt"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
 msgid "Encryption error"
 msgstr "Versleutelingsfout"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:294
 msgid "Name in use"
 msgstr "Naam in gebruik"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate not provided"
 msgstr "Geen certificaat gegeven"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate untrusted"
 msgstr "Onbetrouwbaar certificaat"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
 msgid "Certificate expired"
 msgstr "Verlopen certificaat"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
 msgid "Certificate not activated"
 msgstr "Certificaat nog niet geldig"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
 msgid "Certificate hostname mismatch"
 msgstr "Certificaat is niet voor deze server"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
 msgid "Certificate fingerprint mismatch"
 msgstr "Vingerafdruk van certificaat klopt niet"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
 msgid "Certificate self-signed"
 msgstr "Zelfondertekend certificaat"
 
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate error"
 msgstr "Certificaatfout"
 
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:344
 msgid "Encryption is not available"
 msgstr "Encryptie is niet beschikbaar"
 
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:346
 msgid "Certificate is invalid"
 msgstr "Certificaat is ongeldig"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:348
 msgid "Connection has been refused"
 msgstr "Verbinding geweigerd"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:350
 msgid "Connection can't be established"
 msgstr "Er kan geen verbinding gemaakt worden"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:352
 msgid "Connection has been lost"
 msgstr "Verbinding verbroken"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:354
 msgid "This resource is already connected to the server"
 msgstr "Er is al een verbinding met de server"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:356
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Verbinding is vervangen door een nieuwe verbinding met dezelfde gegevens"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:359
 msgid "The account already exists on the server"
 msgstr "Dit account bestaat al op de server"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:361
 msgid "Server is currently too busy to handle the connection"
 msgstr "De server is te druk om de verbinding af te handelen"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:363
 msgid "Certificate has been revoked"
 msgstr "Certificaat is ingetrokken"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:365
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "Het certificaat gebuikt een zwak algoritme, of is slecht beveiligd"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:368
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -734,20 +744,20 @@ msgstr ""
 "De lengte van het server-certificaat of de diepte van de certificaat-chain "
 "overschrijdt de grenzen, opgelegd door de cryptografische bibliotheek"
 
-#: ../libempathy/empathy-utils.c:519
+#: ../libempathy/empathy-utils.c:529
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "Mensen in uw omgeving"
 
-#: ../libempathy/empathy-utils.c:524
+#: ../libempathy/empathy-utils.c:534
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:553
+#: ../libempathy/empathy-utils.c:563
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:554
+#: ../libempathy/empathy-utils.c:564
 msgid "Facebook Chat"
 msgstr "Facebook-chat"
 
@@ -797,71 +807,81 @@ msgstr[1] "%d maanden geleden"
 msgid "in the future"
 msgstr "in de toekomst"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:539
+#: ../libempathy-gtk/empathy-account-chooser.c:540
 msgid "All accounts"
 msgstr "Alle Accounts"
 
-#: ../libempathy-gtk/empathy-account-widget.c:693
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "Account"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Poort"
 
-#: ../libempathy-gtk/empathy-account-widget.c:768
-#: ../libempathy-gtk/empathy-account-widget.c:825
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1166
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "Mijn webaccounts"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "Account %s wordt bewerkt via Mijn webaccounts."
+msgid "The account %s is edited via %s."
+msgstr "Account %s wordt bewerkt via %s."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1172
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "Account %s kan niet worden bewerkt in Empathy."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
 msgstr "Mijn webaccounts starten"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1532
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "%s bewerken"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Gebruikersnaam:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1850
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "Toe_passen"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1880
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
 msgstr "_Aanmelden"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1954
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "Deze account bestaat al op de server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1957
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "Nieuwe account aanmaken op de server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2149
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "_Annuleren"
 
@@ -870,19 +890,19 @@ msgstr "_Annuleren"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2427
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s op %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2453
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "%s account"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2457
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "Nieuwe account"
 
@@ -1004,36 +1024,36 @@ msgstr "Wat is uw ICQ-identificatienummer?"
 msgid "What is your ICQ password?"
 msgstr "Wat is uw ICQ-wachtwoord?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:184
-#: ../libempathy-gtk/empathy-account-widget-sip.c:217
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "Auto"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:187
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:193
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:222
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "Registreren"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:227
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "Opties"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "Geen"
 
@@ -1099,7 +1119,7 @@ msgstr "Encr_yptie vereist (TLS/SSL)"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
 msgid "I_gnore SSL certificate errors"
-msgstr "Ne_geer SSL-certificaat foutmeldingen"
+msgstr "Ne_geer SSL-certificaat-foutmeldingen"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Override server settings"
@@ -1180,7 +1200,7 @@ msgstr "E-_mailadres:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "Nic_kname:"
-msgstr "_Bijnaam"
+msgstr "_Bijnaam:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
 msgid "_First Name:"
@@ -1264,14 +1284,19 @@ msgid "Transport:"
 msgstr "Transport:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr ""
+"Gebruik dit account om te bellen naar _vaste lijnen en mobiele telefoons"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "Wat is uw wachtwoord voor uw SIP-account?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Wat is uw SIP-aanmeld-ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "Gebr_uikersnaam:"
 
@@ -1295,37 +1320,37 @@ msgstr "Yahoo!-I_D:"
 msgid "_Room List locale:"
 msgstr "Taalinstelling voor lijst van chat_ruimtes:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:470
-#: ../libempathy-gtk/empathy-avatar-chooser.c:555
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "Kon afbeelding niet converteren"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr ""
 "Geen van de toegestane afbeeldingsformaten wordt op uw systeem ondersteund"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:818
-msgid "Couldn't save pixbuf to png"
-msgstr "Kon pixbuf naar png niet opslaan"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+msgid "Couldn't save picture to file"
+msgstr "Kon foto niet naar bestand opslaan"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:934
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "Kies uw gebruikersafbeelding"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
 msgstr "Maak een foto…"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:941
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "Geen afbeelding"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "Afbeeldingen"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "Alle bestanden"
 
@@ -1354,40 +1379,40 @@ msgstr "Het opgegeven contact is ongeldig"
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Noodoproepen worden niet ondersteund bij dit protocol"
 
-#: ../libempathy-gtk/empathy-chat.c:702
+#: ../libempathy-gtk/empathy-chat.c:704
 msgid "Failed to open private chat"
 msgstr "Openen van privé-chat is mislukt"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:765
 msgid "Topic not supported on this conversation"
 msgstr "Onderwerp niet ondersteund bij dit gesprek"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:771
 msgid "You are not allowed to change the topic"
 msgstr "U mag het onderwerp niet wijzigen"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:975
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "‘%s’ is geen geldig contact-ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1030
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: alle berichten van de huidige conversatie wissen"
 
-#: ../libempathy-gtk/empathy-chat.c:1033
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topic>: bepaal het onderwerp van de huidige conversatie"
 
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <chat room ID>: een nieuwe chatruimte binnengaan"
 
-#: ../libempathy-gtk/empathy-chat.c:1039
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <chat room ID>: een nieuwe chatruimte binnengaan"
 
-#: ../libempathy-gtk/empathy-chat.c:1043
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1395,23 +1420,23 @@ msgstr ""
 "/part [<chat room ID>] [<reason>]: de chatruimte verlaten, standaard de "
 "huidige"
 
-#: ../libempathy-gtk/empathy-chat.c:1047
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <contact ID> [<message>]: een privé-gesprek beginnen"
 
-#: ../libempathy-gtk/empathy-chat.c:1050
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <contact ID> <message>: een privé-gesprek beginnen"
 
-#: ../libempathy-gtk/empathy-chat.c:1053
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nickname>: wijzig uw bijnaam op de huidige server"
 
-#: ../libempathy-gtk/empathy-chat.c:1056
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <message>: stuur een ACTIE-bericht naar de huidige conversatie"
 
-#: ../libempathy-gtk/empathy-chat.c:1059
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1421,11 +1446,11 @@ msgstr ""
 "gebruikt om een bericht beginnend met een '/' te versturen. Bijvoorbeeld: \"/"
 "say /join wordt gebruikt om een nieuwe chatruimte binnen te gaan\""
 
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <contact ID>: informatie over een contact weergeven"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1433,113 +1458,113 @@ msgstr ""
 "/help [<command>]: toon alle bestaande opdrachten. Als <command> bestaat, "
 "wordt de uitleg ervan weergegeven."
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1114
 #, c-format
 msgid "Usage: %s"
 msgstr "Gebruik: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1116
+#: ../libempathy-gtk/empathy-chat.c:1159
 msgid "Unknown command"
 msgstr "Onbekende opdracht"
 
-#: ../libempathy-gtk/empathy-chat.c:1242
+#: ../libempathy-gtk/empathy-chat.c:1285
 msgid "Unknown command; see /help for the available commands"
 msgstr "Onbekende opdracht; zie /help voor de beschikbare opdrachten"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1412
+#: ../libempathy-gtk/empathy-chat.c:1455
 msgid "insufficient balance to send message"
 msgstr "Onvoldoende saldo om een bericht te versturen"
 
-#: ../libempathy-gtk/empathy-chat.c:1414
+#: ../libempathy-gtk/empathy-chat.c:1457
 msgid "not capable"
 msgstr "kan niet"
 
-#: ../libempathy-gtk/empathy-chat.c:1421
+#: ../libempathy-gtk/empathy-chat.c:1464
 msgid "offline"
 msgstr "offline"
 
-#: ../libempathy-gtk/empathy-chat.c:1424
+#: ../libempathy-gtk/empathy-chat.c:1467
 msgid "invalid contact"
 msgstr "ongeldig contact"
 
-#: ../libempathy-gtk/empathy-chat.c:1427
+#: ../libempathy-gtk/empathy-chat.c:1470
 msgid "permission denied"
 msgstr "toestemming geweigerd"
 
-#: ../libempathy-gtk/empathy-chat.c:1430
+#: ../libempathy-gtk/empathy-chat.c:1473
 msgid "too long message"
 msgstr "bericht te lang"
 
-#: ../libempathy-gtk/empathy-chat.c:1433
+#: ../libempathy-gtk/empathy-chat.c:1476
 msgid "not implemented"
 msgstr "niet geïmplementeerd"
 
-#: ../libempathy-gtk/empathy-chat.c:1437
+#: ../libempathy-gtk/empathy-chat.c:1480
 msgid "unknown"
 msgstr "onbekend"
 
-#: ../libempathy-gtk/empathy-chat.c:1443
+#: ../libempathy-gtk/empathy-chat.c:1486
 #, c-format
 msgid "Error sending message '%s': %s"
-msgstr "Fout bij versturen van bericht '%s': %s"
+msgstr "Fout bij versturen van bericht ‘%s’: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1447
+#: ../libempathy-gtk/empathy-chat.c:1490
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Fout bij versturen van bericht: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1508 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Onderwerp:"
 
-#: ../libempathy-gtk/empathy-chat.c:1520
+#: ../libempathy-gtk/empathy-chat.c:1563
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Onderwerp ingesteld: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "No topic defined"
 msgstr "Geen onderwerp"
 
-#: ../libempathy-gtk/empathy-chat.c:2031
+#: ../libempathy-gtk/empathy-chat.c:2074
 msgid "(No Suggestions)"
 msgstr "(Geen suggesties)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2099
+#: ../libempathy-gtk/empathy-chat.c:2142
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "‘%s’ toevoegen aan woordenboek"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2136
+#: ../libempathy-gtk/empathy-chat.c:2179
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "‘%s’ toevoegen aan woordenboek %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2206
+#: ../libempathy-gtk/empathy-chat.c:2249
 msgid "Insert Smiley"
 msgstr "Smiley invoegen"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2224
-#: ../libempathy-gtk/empathy-ui-utils.c:1819
+#: ../libempathy-gtk/empathy-chat.c:2267
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "_Sturen"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2278
+#: ../libempathy-gtk/empathy-chat.c:2321
 msgid "_Spelling Suggestions"
 msgstr "_Spellingsuggesties"
 
-#: ../libempathy-gtk/empathy-chat.c:2367
+#: ../libempathy-gtk/empathy-chat.c:2410
 msgid "Failed to retrieve recent logs"
 msgstr "Terughalen van recente logs is mislukt"
 
-#: ../libempathy-gtk/empathy-chat.c:2504
+#: ../libempathy-gtk/empathy-chat.c:2547
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s heeft de verbinding verbroken"
@@ -1547,12 +1572,12 @@ msgstr "%s heeft de verbinding verbroken"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2511
+#: ../libempathy-gtk/empathy-chat.c:2554
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s werd door %2$s verwijderd"
 
-#: ../libempathy-gtk/empathy-chat.c:2514
+#: ../libempathy-gtk/empathy-chat.c:2557
 #, c-format
 msgid "%s was kicked"
 msgstr "%s werd verwijderd"
@@ -1560,17 +1585,17 @@ msgstr "%s werd verwijderd"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2522
+#: ../libempathy-gtk/empathy-chat.c:2565
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s werd verbannen door %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2525
+#: ../libempathy-gtk/empathy-chat.c:2568
 #, c-format
 msgid "%s was banned"
 msgstr "%s werd verbannen"
 
-#: ../libempathy-gtk/empathy-chat.c:2529
+#: ../libempathy-gtk/empathy-chat.c:2572
 #, c-format
 msgid "%s has left the room"
 msgstr "%s heeft de chatruimte verlaten"
@@ -1580,68 +1605,72 @@ msgstr "%s heeft de chatruimte verlaten"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2538
+#: ../libempathy-gtk/empathy-chat.c:2581
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2606
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s is de chatruimte binnengekomen"
 
-#: ../libempathy-gtk/empathy-chat.c:2588
+#: ../libempathy-gtk/empathy-chat.c:2631
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s is nu bekend als %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2727
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2784
 #: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:2328
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
+#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
 msgid "Disconnected"
 msgstr "Verbinding verbroken"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3374
+#: ../libempathy-gtk/empathy-chat.c:3428
 msgid "Would you like to store this password?"
 msgstr "Wilt u dit wachtwoord opslaan?"
 
-#: ../libempathy-gtk/empathy-chat.c:3380
+#: ../libempathy-gtk/empathy-chat.c:3434
 msgid "Remember"
 msgstr "Onthouden"
 
-#: ../libempathy-gtk/empathy-chat.c:3390
+#: ../libempathy-gtk/empathy-chat.c:3444
 msgid "Not now"
 msgstr "Niet nu"
 
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3488
 msgid "Retry"
 msgstr "Opnieuw proberen"
 
-#: ../libempathy-gtk/empathy-chat.c:3438
+#: ../libempathy-gtk/empathy-chat.c:3492
 msgid "Wrong password; please try again:"
 msgstr "Verkeerd wachtwoord; probeer het opnieuw:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3568
+#: ../libempathy-gtk/empathy-chat.c:3622
 msgid "This room is protected by a password:"
 msgstr "Deze ruimte is met een wachtwoord beveiligd:"
 
-#: ../libempathy-gtk/empathy-chat.c:3595
+#: ../libempathy-gtk/empathy-chat.c:3649
 msgid "Join"
-msgstr "_Binnengaan"
+msgstr "Binnengaan"
 
-#: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "Verbonden"
 
-#: ../libempathy-gtk/empathy-chat.c:3852
+#: ../libempathy-gtk/empathy-chat.c:3906
 msgid "Conversation"
 msgstr "Gesprek"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3857
+#: ../libempathy-gtk/empathy-chat.c:3911
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1674,7 +1703,7 @@ msgstr "Geblokkeerde contacten bewerken"
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:512
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1485
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
@@ -1799,58 +1828,58 @@ msgid "Removing contact"
 msgstr "Contact wordt verwijderd"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:14
 msgid "_Add Contact…"
-msgstr "Cont_actpersoon toevoegen..."
+msgstr "Cont_act toevoegen..."
 
 #: ../libempathy-gtk/empathy-contact-menu.c:300
 msgid "_Block Contact"
 msgstr "Contact _blokkeren"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:551
-#: ../src/empathy-main-window.ui.h:16
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "_Chatten"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:642
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Audiogesprek"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:687
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Videogesprek"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:740
-#: ../src/empathy-main-window.ui.h:27
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "_Eerdere gesprekken"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:781
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "Bestand versturen"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:823
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
 msgstr "Mijn bureaublad delen"
 
 # hmmmm (Wouter Bolsterlee)
 #: ../libempathy-gtk/empathy-contact-menu.c:525
 #: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:858
-#: ../libempathy-gtk/empathy-individual-widget.c:1373
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "Favoriet"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:886
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "Infor_matie"
 
@@ -1860,15 +1889,15 @@ msgid "_Edit"
 msgstr "Be_werken"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1076
+#: ../libempathy-gtk/empathy-individual-menu.c:1284
 #: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
-msgstr "In deze ruimte uitnodigen"
+msgstr "Nodigt u uit naar deze ruimte"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1122
+#: ../libempathy-gtk/empathy-individual-menu.c:1330
 msgid "_Invite to Chat Room"
-msgstr "U_itnodigen naar gespreksruimte"
+msgstr "_Uitnodigen naar gespreksruimte"
 
 #. Title
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:505
@@ -2072,7 +2101,7 @@ msgstr "Hoogte:"
 #: ../libempathy-gtk/empathy-contact-widget.c:1011
 #: ../libempathy-gtk/empathy-individual-widget.c:607
 #: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "Locatie"
 
@@ -2111,7 +2140,7 @@ msgstr "Alias:"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
 msgid "Client Information"
-msgstr "Informatie client"
+msgstr "Clientinformatie"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:5
 msgid "Client:"
@@ -2125,7 +2154,7 @@ msgstr "Gegevens contact"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1515
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "Identificatie:"
 
@@ -2200,25 +2229,50 @@ msgstr "Contactpersonen aan de linkerzijde zullen met elkaar worden verbonden."
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:141
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "Het te gebruiken account om de oproep te plaatsen selecteren"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "Oproep"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+msgid "Mobile"
+msgstr "Mobiel"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "Werk"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "THUIS"
+
 #. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:597
+#: ../libempathy-gtk/empathy-individual-menu.c:804
 #: ../libempathy-gtk/empathy-new-message-dialog.c:215
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:934
+#: ../libempathy-gtk/empathy-individual-menu.c:1142
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "Be_werken"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:960
+#: ../libempathy-gtk/empathy-individual-menu.c:1168
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "Contacten _verbinden…"
@@ -2236,7 +2290,7 @@ msgstr ""
 "Wilt u echt het meta-contact ‘%s’ verwijderen? Dit zal tevens alle contacten "
 "die bij dit meta-contact horen verwijderen."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1662
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2320,128 +2374,135 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "_Verbinding verbreken"
 
-#: ../libempathy-gtk/empathy-log-window.c:633
+#: ../libempathy-gtk/empathy-log-window.c:634
 msgid "History"
 msgstr "Geschiedenis"
 
-#: ../libempathy-gtk/empathy-log-window.c:685
+#: ../libempathy-gtk/empathy-log-window.c:689
 msgid "Show"
 msgstr "Tonen"
 
-#: ../libempathy-gtk/empathy-log-window.c:707
+#: ../libempathy-gtk/empathy-log-window.c:711
 msgid "Search"
 msgstr "Zoeken"
 
-#: ../libempathy-gtk/empathy-log-window.c:1155
+#: ../libempathy-gtk/empathy-log-window.c:1159
 #, c-format
 msgid "Chat in %s"
 msgstr "Chatten in %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1157
+#: ../libempathy-gtk/empathy-log-window.c:1161
 #, c-format
 msgid "Chat with %s"
 msgstr "Chatten met %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1207
-#: ../libempathy-gtk/empathy-log-window.c:1354
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
-msgstr "%A %d %B %Y"
+msgstr "%A, %d %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1296
+#: ../libempathy-gtk/empathy-log-window.c:1300
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1302
+#: ../libempathy-gtk/empathy-log-window.c:1306
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
-#: ../libempathy-gtk/empathy-log-window.c:1375
-#: ../src/empathy-ft-manager.c:1026
-msgid "%"
-msgstr "%"
-
 #: ../libempathy-gtk/empathy-log-window.c:1382
 #, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s seconde"
+msgstr[1] "%s seconden"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s minuut"
+msgstr[1] "%s minuten"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
+#, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Gesprek duurde %s, eindigde om %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1714
+#: ../libempathy-gtk/empathy-log-window.c:1729
 msgid "Today"
 msgstr "Vandaag"
 
-#: ../libempathy-gtk/empathy-log-window.c:1718
+#: ../libempathy-gtk/empathy-log-window.c:1733
 msgid "Yesterday"
-msgstr "gisteren"
+msgstr "Gisteren"
 
-#: ../libempathy-gtk/empathy-log-window.c:1734
-msgctxt ""
-"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
 msgid "%e %B %Y"
 msgstr "%d %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1815
-#: ../libempathy-gtk/empathy-log-window.c:3396
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3444
 msgid "Anytime"
 msgstr "Altijd"
 
-#: ../libempathy-gtk/empathy-log-window.c:1895
-#: ../libempathy-gtk/empathy-log-window.c:2325
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2372
 msgid "Anyone"
 msgstr "Iedereen"
 
-#: ../libempathy-gtk/empathy-log-window.c:2637
+#: ../libempathy-gtk/empathy-log-window.c:2685
 msgid "Who"
 msgstr "Wie"
 
-#: ../libempathy-gtk/empathy-log-window.c:2841
+#: ../libempathy-gtk/empathy-log-window.c:2889
 msgid "When"
 msgstr "Wanneer"
 
-#: ../libempathy-gtk/empathy-log-window.c:2957
+#: ../libempathy-gtk/empathy-log-window.c:3005
 msgid "Anything"
 msgstr "Alles"
 
-#: ../libempathy-gtk/empathy-log-window.c:2959
+#: ../libempathy-gtk/empathy-log-window.c:3007
 msgid "Text chats"
 msgstr "Tekstchats"
 
-#: ../libempathy-gtk/empathy-log-window.c:2961
+#: ../libempathy-gtk/empathy-log-window.c:3009
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "Gesprekken"
 
-#: ../libempathy-gtk/empathy-log-window.c:2966
+#: ../libempathy-gtk/empathy-log-window.c:3014
 msgid "Incoming calls"
 msgstr "Binnenkomende gesprekken"
 
-#: ../libempathy-gtk/empathy-log-window.c:2967
+#: ../libempathy-gtk/empathy-log-window.c:3015
 msgid "Outgoing calls"
 msgstr "Uitgaande gesprekken"
 
-#: ../libempathy-gtk/empathy-log-window.c:2968
+#: ../libempathy-gtk/empathy-log-window.c:3016
 msgid "Missed calls"
 msgstr "Gemiste oproepen"
 
-#: ../libempathy-gtk/empathy-log-window.c:2990
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "What"
 msgstr "Wat"
 
-#: ../libempathy-gtk/empathy-log-window.c:3699
+#: ../libempathy-gtk/empathy-log-window.c:3747
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Weet u zeker dat u alle logs van vorige gesprekken wilt verwijderen?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3703
+#: ../libempathy-gtk/empathy-log-window.c:3751
 msgid "Clear All"
 msgstr "Alles wissen"
 
-#: ../libempathy-gtk/empathy-log-window.c:3710
+#: ../libempathy-gtk/empathy-log-window.c:3758
 msgid "Delete from:"
 msgstr "Verwijderen uit:"
 
@@ -2449,14 +2510,6 @@ msgstr "Verwijderen uit:"
 msgid "<span size=\"x-large\">Loading...</span>"
 msgstr "<span size=\"x-large\">Bezig met laden...</span>"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call"
-msgstr "Oproep"
-
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
 #: ../src/empathy-chat-window.ui.h:3
 msgid "Chat"
@@ -2478,7 +2531,7 @@ msgstr "Video"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
 #: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window-menubar.ui.h:20
 msgid "_Edit"
 msgstr "Be_werken"
 
@@ -2575,24 +2628,24 @@ msgid "New %s account"
 msgstr "Nieuw %s-account"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "Volgende zoeken"
+msgid "Find:"
+msgstr "Zoeken:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "Vorige zoeken"
+msgid "Mat_ch case"
+msgstr "_Hoofdlettergevoelig"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Find:"
-msgstr "Zoeken:"
+msgid "Phrase not found"
+msgstr "Zoekopdracht niet gevonden"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "Identieke hoofdletters/kleine letters"
+msgid "_Next"
+msgstr "V_olgende"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "Phrase not found"
-msgstr "Zoekopdracht niet gevonden"
+msgid "_Previous"
+msgstr "Vo_rige"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2638,12 +2691,12 @@ msgstr "Spraakoproep beëindigd"
 msgid "Edit Custom Messages"
 msgstr "Aangepaste berichten bewerken"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1030
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
 #, c-format
 msgid "Message edited at %s"
 msgstr "Bericht bijgewerkt op %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1720
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
 msgid "Normal"
 msgstr "Normaal"
 
@@ -2666,7 +2719,7 @@ msgstr "Blauw"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:150
 msgid "The identity provided by the chat server cannot be verified."
-msgstr "De identiteit van de chat-server kan niet bevestigd worden."
+msgstr "De identiteit van de chatserver kan niet bevestigd worden."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:157
 msgid "The certificate is not signed by a Certification Authority."
@@ -2678,7 +2731,7 @@ msgstr "Het certificaat is verlopen."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:164
 msgid "The certificate hasn't yet been activated."
-msgstr "Het cerificaat is nog niet geactiveerd."
+msgstr "Het certificaat is nog niet geactiveerd."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:167
 msgid "The certificate does not have the expected fingerprint."
@@ -2690,7 +2743,7 @@ msgstr "De hostnaam in het certificaat komt niet overeen met de servernaam."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:174
 msgid "The certificate is self-signed."
-msgstr "Het certifificaat is zelf-ondertekend."
+msgstr "Het certificaat is zelf-ondertekend."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:177
 msgid ""
@@ -2737,19 +2790,19 @@ msgstr "Onthoud deze instelling voor toekomstige verbindingen"
 msgid "Certificate Details"
 msgstr "Certificaatdetails"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1715
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
 msgstr "Kan URI niet openen"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1811
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
 msgstr "Bestand selecteren"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1883
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
 msgid "Insufficient free space to save file"
 msgstr "Onvoldoende vrije schijfruimte om het bestand op te slaan"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1891
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2758,7 +2811,7 @@ msgstr ""
 "Er is %s vrije schijfruimte vereist om dit bestand op te slaan, maar er is "
 "slechts %s beschikbaar. Kies een andere locatie."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1935
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Binnenkomend bestand van %s"
@@ -2946,24 +2999,24 @@ msgstr "Geen foutmelding"
 msgid "Instant Message (Empathy)"
 msgstr "Instant Message (Empathy)"
 
-#: ../src/empathy.c:354
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "Niet verbinden bij opstarten"
 
-#: ../src/empathy.c:358
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr ""
 "De contactenlijst en andere dialoogvensters niet weergeven bij opstarten"
 
-#: ../src/empathy.c:373
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr "- Empathy chatprogramma"
 
-#: ../src/empathy.c:560
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
 msgstr "Er is een fout opgetreden bij het contact opnemen met accountbeheer"
 
-#: ../src/empathy.c:562
+#: ../src/empathy.c:639
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3064,11 +3117,11 @@ msgstr "Er is een fout opgetreden bij het importeren van de accounts."
 
 #: ../src/empathy-account-assistant.c:170
 msgid "There was an error while parsing the account details."
-msgstr "Er is een fout opgetreden bij het ontleden van de account-details."
+msgstr "Er is een fout opgetreden bij het ontleden van de accountdetails."
 
 #: ../src/empathy-account-assistant.c:173
 msgid "There was an error while creating the account."
-msgstr "Er is een fout opgetreden bij het aanmaken van de account."
+msgstr "Er is een fout opgetreden bij het aanmaken van het account."
 
 #: ../src/empathy-account-assistant.c:175
 msgid "There was an error."
@@ -3110,11 +3163,11 @@ msgstr "Wat voor een chataccount wilt u aanmaken?"
 
 #: ../src/empathy-account-assistant.c:490
 msgid "Do you want to create other chat accounts?"
-msgstr "Wilt u nog andere chat-accounts aanmaken?"
+msgstr "Wilt u nog andere chataccounts aanmaken?"
 
 #: ../src/empathy-account-assistant.c:497
 msgid "Enter the details for the new account"
-msgstr "Voer de details voor de nieuwe account in"
+msgstr "Voer de details voor het nieuwe account in"
 
 #: ../src/empathy-account-assistant.c:612
 msgid ""
@@ -3229,7 +3282,7 @@ msgstr "Uw nieuwe account is nog niet opgeslagen."
 
 #: ../src/empathy-accounts-dialog.c:345
 #: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1152
+#: ../src/empathy-call-window.c:1216
 msgid "Connecting…"
 msgstr "Verbinden…"
 
@@ -3283,7 +3336,7 @@ msgstr ""
 #. Menu items: to enabled/disable the account
 #: ../src/empathy-accounts-dialog.c:1643
 msgid "_Enable"
-msgstr "_Inschakelen"
+msgstr "Inscha_kelen"
 
 #: ../src/empathy-accounts-dialog.c:1644
 msgid "_Disable"
@@ -3323,7 +3376,7 @@ msgstr ""
 
 #: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Import…"
-msgstr "_Importeren…"
+msgstr "I_mporteren…"
 
 #: ../src/empathy-auth-client.c:249
 msgid " - Empathy authentication client"
@@ -3337,11 +3390,11 @@ msgstr "Empathy authenticatieclient"
 msgid "People nearby"
 msgstr "Mensen in de buurt"
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:127
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathy audio/video-client"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:152
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy audio/video-client"
 
@@ -3384,33 +3437,33 @@ msgstr "Details"
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1660
+#: ../src/empathy-call-window.c:1825
 #, c-format
 msgid "Call with %s"
 msgstr "Bellen met %s"
 
 #: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:1904
+#: ../src/empathy-call-window.c:2069
 msgid "The IP address as seen by the machine"
 msgstr "Het IP-adres zoals gezien door het systeem"
 
 #: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:1906
+#: ../src/empathy-call-window.c:2071
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Het IP-adres zoals gezien door een server op het internet"
 
 #: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:1908
+#: ../src/empathy-call-window.c:2073
 msgid "The IP address of the peer as seen by the other side"
 msgstr "Het IP-adres zoals gezien door de andere zijde"
 
 #: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:1910
+#: ../src/empathy-call-window.c:2075
 msgid "The IP address of a relay server"
 msgstr "Het IP-adres van een relay-server"
 
 #: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:1912
+#: ../src/empathy-call-window.c:2077
 msgid "The IP address of the multicast group"
 msgstr "Het IP-adres van de multicast groep"
 
@@ -3441,12 +3494,12 @@ msgid "Connected — %d:%02dm"
 msgstr "Verbonden — %d:%02dm"
 
 #: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2647
+#: ../src/empathy-call-window.c:2846
 msgid "Technical Details"
 msgstr "Technische details"
 
 #: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2685
+#: ../src/empathy-call-window.c:2884
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3456,7 +3509,7 @@ msgstr ""
 "worden ondersteund"
 
 #: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2690
+#: ../src/empathy-call-window.c:2889
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3466,22 +3519,22 @@ msgstr ""
 "worden ondersteund"
 
 #: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2696
+#: ../src/empathy-call-window.c:2895
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
 "does not allow direct connections."
 msgstr ""
-"Kan geen verbinding maken met %s. Eén van u zit mogelijk op een netwerk dat "
+"Kan geen verbinding maken met %s. Een van u zit mogelijk op een netwerk dat "
 "geen directe verbindingen toestaat."
 
 #: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2702
+#: ../src/empathy-call-window.c:2901
 msgid "There was a failure on the network"
 msgstr "Er is een netwerkstoring opgetreden"
 
 #: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2706
+#: ../src/empathy-call-window.c:2905
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
@@ -3489,7 +3542,7 @@ msgstr ""
 "computer"
 
 #: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2709
+#: ../src/empathy-call-window.c:2908
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
@@ -3497,7 +3550,7 @@ msgstr ""
 "computer"
 
 #: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2721
+#: ../src/empathy-call-window.c:2920
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3509,22 +3562,22 @@ msgstr ""
 "‘Foutopsporing’ in het menu Hulp."
 
 #: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2730
+#: ../src/empathy-call-window.c:2929
 msgid "There was a failure in the call engine"
 msgstr "Er is een fout in de call-engine opgetreden"
 
 #: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2733
+#: ../src/empathy-call-window.c:2932
 msgid "The end of the stream was reached"
 msgstr "Het einde van de stream is bereikt"
 
 #: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2773
+#: ../src/empathy-call-window.c:2972
 msgid "Can't establish audio stream"
 msgstr "Kan geen audiostream tot stand brengen"
 
 #: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2783
+#: ../src/empathy-call-window.c:2982
 msgid "Can't establish video stream"
 msgstr "Kan geen videostream tot stand brengen"
 
@@ -3564,7 +3617,7 @@ msgstr "Huidige gesprek beëindigen"
 #: ../src/empathy-call-window.ui.h:9
 #: ../src/empathy-streamed-media-window.ui.h:12
 msgid "Local Candidate:"
-msgstr "Lokale kandidaat"
+msgstr "Lokale kandidaat:"
 
 #: ../src/empathy-call-window.ui.h:10
 msgid "Maximise me"
@@ -3577,7 +3630,7 @@ msgstr "Minimaliseren"
 #: ../src/empathy-call-window.ui.h:12
 #: ../src/empathy-streamed-media-window.ui.h:15
 msgid "Remote Candidate:"
-msgstr "Kandidaat op afstand"
+msgstr "Kandidaat op afstand:"
 
 #: ../src/empathy-call-window.ui.h:13
 #: ../src/empathy-streamed-media-window.ui.h:16
@@ -3615,8 +3668,8 @@ msgstr "Schakel videotransmissie in/uit"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2280 ../src/empathy-call-window.c:2281
-#: ../src/empathy-call-window.c:2282 ../src/empathy-call-window.c:2283
+#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
+#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
 msgid "Unknown"
 msgstr "Onbekend"
 
@@ -3634,16 +3687,17 @@ msgid "_Camera"
 msgstr "_Camera"
 
 #: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window-menubar.ui.h:18
 msgid "_Contents"
 msgstr "In_houd"
 
-#: ../src/empathy-call-window.ui.h:27 ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
 msgid "_Debug"
 msgstr "_Foutopsporing"
 
 #: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window-menubar.ui.h:22
 msgid "_Help"
 msgstr "_Hulp"
 
@@ -3655,7 +3709,8 @@ msgstr "_Microfoon"
 msgid "_Settings"
 msgstr "_Instellingen"
 
-#: ../src/empathy-call-window.ui.h:32 ../src/empathy-main-window.ui.h:30
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "Beel_d"
@@ -3745,7 +3800,7 @@ msgstr "_Favoriete chatruimte"
 
 #: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
-msgstr "Vo_lgend tabblad"
+msgstr "V_olgend tabblad"
 
 #: ../src/empathy-chat-window.ui.h:16
 msgid "_Previous Tab"
@@ -3761,7 +3816,7 @@ msgstr "_Tabbladen"
 
 #: ../src/empathy-chat-window.ui.h:19
 msgid "_Undo Close Tab"
-msgstr "Sluiten van tabblad _Ongedaan maken"
+msgstr "Sluiten van tabblad _ongedaan maken"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3781,9 +3836,9 @@ msgstr "Favoriete chatruimtes beheren"
 
 #: ../src/empathy-event-manager.c:521
 msgid "Incoming video call"
-msgstr "Inkomende video-oproep"
+msgstr "Binnenkomende video-oproep"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
 msgid "Incoming call"
 msgstr "Binnenkomende oproep"
 
@@ -3798,7 +3853,7 @@ msgid "%s is calling you. Do you want to answer?"
 msgstr "U wordt gebeld door %s. Wilt u opnemen?"
 
 #: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Binnenkomende oproep van %s"
@@ -3816,9 +3871,10 @@ msgid "_Answer with video"
 msgstr "Met video be_antwoorden"
 
 #: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming video call from %s"
-msgstr "Inkomende video-oproep van %s"
+msgstr "Binnenkomende video-oproep van %s"
 
 #: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
@@ -3967,6 +4023,10 @@ msgstr "Integriteit van ‘%s’ controleren"
 msgid "Hashing \"%s\""
 msgstr "Controlebestand van ‘%s’ maken"
 
+#: ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "%"
+
 #: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "Bestand"
@@ -4054,99 +4114,96 @@ msgstr "Aanvullen…"
 msgid "Contact"
 msgstr "Contact"
 
-#: ../src/empathy-main-window.c:2118
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "Contactenlijst"
 
-#: ../src/empathy-main-window.c:2237
-msgid "Show and edit accounts"
-msgstr "Accounts tonen en bewerken"
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "Contacten op een _kaart"
 
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-main-window-menubar.ui.h:2
 msgid "Credit Balance"
 msgstr "Batig saldo"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:3
 msgid "Find in Contact _List"
-msgstr "Zoeken in contacten_lijst"
+msgstr "Zoeken in _contactenlijst"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "_Bladwijzers openen"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "Bladwijzers beheren"
 
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "N_ormale grootte"
 
-#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "Nieuwe _oproep…"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "Normale grootte met _afbeeldingen"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "_Voorkeuren"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "P_rotocollen tonen"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "Op _naam sorteren"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "Op _status sorteren"
 
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Accounts"
 
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "Ge_blokkeerde contacten"
 
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "_Compact formaat"
 
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "_Bestandsoverdrachten"
 
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "_Binnengaan…"
 
-#: ../src/empathy-main-window.ui.h:24 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "_Nieuw gesprek…"
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "_Offlinecontacten"
 
-#: ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "_Persoonlijke gegevens"
 
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "_Ruimte"
 
-#: ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-main-window-menubar.ui.h:29
 msgid "_Search for Contacts…"
 msgstr "Contacten _zoeken…"
 
@@ -4184,7 +4241,7 @@ msgstr "Kan aanwezigen in chatruimte niet bepalen"
 
 #: ../src/empathy-new-chatroom-dialog.c:594
 msgid "Could not stop room listing"
-msgstr "Kan bepalen aanwezigen in chatruimte niet voorkomen"
+msgstr "Ophalen van aanwezigen kan niet worden beëindigd"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "Couldn't load room list"
@@ -4317,54 +4374,66 @@ msgid "Display incoming events in the notification area"
 msgstr "Geef binnenkomende meldingen weer in het mededelingengebied"
 
 #: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"Door echo-onderdrukking komt uw stem helderder over bij anderen, maar het "
+"kan op sommige computers problemen veroorzaken. Als u, of de andere persoon, "
+"vreemde geluiden of klikken hoort tijdens het gesprek, probeer dan echo-"
+"onderdrukking uit te zetten en het gesprek opnieuw te starten."
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "Notificatieberichten tonen wanneer een contact online komt"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "Notificatieberichten tonen wanneer een contact offline gaat"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Notificatieberichten tonen wanneer de _chat geen focus heeft"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "Spelling controleren voor de volgende talen:"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "Algemeen"
 
-#: ../src/empathy-preferences.ui.h:14
-msgid "Input level"
-msgstr "Invoerniveau"
-
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input volume"
-msgstr "Invoervolume"
+msgid "Input level:"
+msgstr "Invoerniveau:"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "Invoervolume:"
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "Locatiebronnen:"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "Gesprekken opslaan"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "Notificatieberichten"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Geluid afspelen voor gebeurtenissen"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "Privacy"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -4374,23 +4443,23 @@ msgstr ""
 "provincie en land bekend gemaakt zullen worden. GPS-coördinaten zullen tot 1 "
 "decimaal nauwkeurig zijn."
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "_Smileys als afbeeldingen tonen"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "Contactenlijst in chatruimtes _tonen"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "Geluiden"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "Spellingcontrole"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
@@ -4398,48 +4467,48 @@ msgstr ""
 "De lijst met talen toont alleen de talen waarvoor u een woordenboek heeft "
 "geïnstalleerd."
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "Thema's"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "Variant:"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "_Automatisch verbinden bij opstarten"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Mobiele telefoon"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
-msgstr "Ballon-notificatieberichten _inschakelen"
+msgstr "Ballon-notificatieberichten inscha_kelen"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "_Geluidswaarschuwingen inschakelen"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Netwerk (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "_Nieuwe chats in eigen vensters openen"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "_Locatie aan mijn contacten bekendmaken"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "_Nauwkeurigheid van locatie beperken"
 
@@ -4485,7 +4554,7 @@ msgstr "Opnieuw bellen"
 
 #: ../src/empathy-streamed-media-window.ui.h:19
 msgid "V_ideo"
-msgstr "V_ideo"
+msgstr "Vi_deo"
 
 #: ../src/empathy-streamed-media-window.ui.h:21
 msgid "Video Off"
@@ -4564,19 +4633,19 @@ msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr ""
-"De geselecteerde verbindingsbeheerder heeft geen ondersteuning voor de "
-"plugin voor foutopsporing op afstand."
+"Het geselecteerde verbindingsbeheerprogramma heeft geen ondersteuning voor "
+"de plug-in voor foutopsporing op afstand."
 
+#: ../src/empathy-invite-participant-dialog.c:179
 #: ../src/empathy-invite-participant-dialog.c:205
-#: ../src/empathy-invite-participant-dialog.c:231
 msgid "Invite Participant"
 msgstr "Deelnemer uitnodigen"
 
-#: ../src/empathy-invite-participant-dialog.c:206
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Een contact uitnodigen om deel te nemen aan het gesprek:"
 
-#: ../src/empathy-invite-participant-dialog.c:227
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "Uitnodigen"
 
@@ -4629,14 +4698,16 @@ msgstr "- Chatprogramma Empathy"
 
 #: ../src/empathy-notifications-approver.c:203
 msgid "Respond"
-msgstr "Antwoord"
+msgstr "Beantwoorden"
 
 #: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1459
 msgid "Reject"
 msgstr "Weigeren"
 
 #: ../src/empathy-notifications-approver.c:222
 #: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1460
 msgid "Answer"
 msgstr "Antwoord"
 
@@ -4654,6 +4725,9 @@ msgstr "Afslaan"
 msgid "Accept"
 msgstr "Accepteren"
 
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
 #: ../src/empathy-notifications-approver.c:260
 msgid "Provide"
 msgstr "Voorzien"
@@ -4666,24 +4740,24 @@ msgstr ""
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1026 ../src/empathy-call-window.c:1049
+#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2576
+#: ../src/empathy-call-window.c:2775
 msgid "On hold"
 msgstr "In de wacht"
 
-#: ../src/empathy-call-window.c:2579
+#: ../src/empathy-call-window.c:2778
 msgid "Mute"
 msgstr "Dempen"
 
-#: ../src/empathy-call-window.c:2581
+#: ../src/empathy-call-window.c:2780
 msgid "Duration"
 msgstr "Duur"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2584
+#: ../src/empathy-call-window.c:2783
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
@@ -4692,6 +4766,15 @@ msgstr "%s — %d:%02dm"
 msgid "_Match case"
 msgstr "_Hoofdlettergevoelig"
 
+#~ msgid "Find Next"
+#~ msgstr "Volgende zoeken"
+
+#~ msgid "Find Previous"
+#~ msgstr "Vorige zoeken"
+
+#~ msgid "Show and edit accounts"
+#~ msgstr "Accounts tonen en bewerken"
+
 #~ msgid "_Dialpad"
 #~ msgstr "Kiestoetsen"
 
diff --git a/po/pa.po b/po/pa.po
index 65b2d349c..be7087f8e 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: empathy.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-08-15 13:23+0000\n"
-"PO-Revision-Date: 2011-08-18 06:43+0530\n"
+"POT-Creation-Date: 2011-09-15 13:17+0000\n"
+"PO-Revision-Date: 2011-09-18 08:55+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.net>\n"
 "MIME-Version: 1.0\n"
@@ -44,7 +44,6 @@ msgid "Always open a separate chat window for new chats."
 msgstr "ਨਵੀਆਂ ਗੱਲਾਂ ਲਈ ਹਮੇਸ਼ਾ ਇੱਕ ਵੱਖਰੀ ਗੱਲਬਾਤ ਵਿੰਡੋ ਵਰਤੋਂ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-#| msgid "Call from %s"
 msgid "Call volume"
 msgstr "ਕਾਲ ਆਵਾਜ਼"
 
@@ -53,63 +52,66 @@ msgid "Call volume, as a percentage."
 msgstr "ਕਾਲ ਆਵਾਜ਼, ਫੀਸਦੀ ਵਜੋਂ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-#| msgid "Camera On"
 msgid "Camera device"
 msgstr "ਕੈਮਰਾ ਜੰਤਰ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "ਕੈਮਰਾ ਸਥਿਤੀ"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 "ਨਾਂ ਦੇ ਬਾਅਦ ਵਿੱਚ ਜੋੜਨ ਲਈ ਅੱਖਰ, ਜਦੋਂ ਗਰ�ੱਪ ਗੱਲਬਾਤ ਵਿੱਚ ਨਾਂ ਪੂਰਾ ਕਰਨਾ ਹੋਵੇ (ਟੈਬ)"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "ਗੱਲਬਾਤ ਵਿੰਡੋ ਥੀਮ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Chat window theme variant"
 msgstr "ਗੱਲਬਾਤ ਵਿੰਡੋ ਥੀਮ ਬਦਲ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr "ਸਪੈਲ ਚੈਕਰ ਭਾਸ਼ਾਵਾਂ ਦੀ ਕਾਮਿਆਂ ਨਾਲ ਅੱਡ ਕੀਤੀ ਲਿਸਟ (ਜਿਵੇਂ pa,en,)।"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "ਸੰਖੇਪ ਸੰਪਰਕ ਲਿਸਟ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "ਕ�ਨੈਕਸ਼ਨ ਮੈਨੇਜਰ ਵਰਤਿਆ ਜਾਣਾ ਚਾਹੀਦਾ ਹੈ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "ਸੰਪਰਕ ਲਿਸਟ ਲੜੀਬੱਧ ਢੰਗ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr "ਵਿਡੀਓ ਕਾਲ ਵਿੱਚ ਵਰਤਣ ਲਈ ਡਿਫਾਲਟ ਕੈਮਰਾ ਜੰਤਰ, ਜਿਵੇਂ /dev/video0"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
 msgstr "ਅਵਤਾਰ ਚਿੱਤਰ ਚ�ਣਨ ਵਾਸਤੇ ਡਿਫਾਲਟ ਡਾਇਰੈਕਟਰੀ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr "ਦੂਰ ਹੋਵੋ ਤਾਂ ਪੋਪਅੱਪ ਸੂਚਨਾ ਬੰਦ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr "ਦੂਰ ਹੋਵੋ ਤਾਂ ਸਾਊਂਡ ਆਯੋਗ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
 msgstr "ਹਾਲਤ ਖੇਤਰ 'ਚ ਆ ਰਹੇ ਈਵੈਂਟ ਵੇਖਾਓ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -117,300 +119,304 @@ msgstr ""
 "ਹਾਲਤ ਖੇਤਰ 'ਚ ਆ ਰਹੇ ਈਵੈਂਟ ਲਈ ਜਾਣਕਾਰੀ ਵੇਖਾਉ। ਜੇ ਸੈੱਟ ਨਾ ਕੀਤਾ ਤਾਂ ਉਹ ਯੂਜ਼ਰ ਨੂੰ "
 "ਤ�ਰੰਤ ਦਿਉ।"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Echo cancellation support"
 msgstr "ਈਚੋ ਰੱਦ ਕਰਨ ਸਹਿਯੋਗ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr "ਇੰਪੈਥੀ ਯੂਜ਼ਰ ਦਾ ਟਿਕਾਣਾ ਦੇ ਸਕਦਾ ਹੈ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨ�ਮਾਨ ਲਗਾਉਣ ਲਈ GPS ਵਰਤ ਸਕਦਾ ਹੈ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨ�ਮਾਨ ਲਗਾਉਣ ਲਈ ਸੈਲੂਲਰ ਨੈੱਟਵਰਕ ਵਰਤ ਸਕਦਾ ਹੈ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr "ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨ�ਮਾਨ ਲਗਾਉਣ ਲਈ ਨੈੱਟਵਰਕ ਵਰਤ ਸਕਦਾ ਹੈ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr "ਇੰਪੈਥੀ ਡਿਫਾਲਟ ਡਾਊਨਲੋਡ ਫੋਲਡਰ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
 msgstr "ਇੰਪੈਥੀ ਨੇ ਬਟਰਫਲਾਈ ਲਾਗ ਮਾਈਗਰੇਟ ਕੀਤਾ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr "ਇੰਪੈਥੀ ਵੇਹਲੇ ਹੋਣ ਉੱਤੇ ਆਟੋਮੈਟਿਕ-ਦੂਰ ਕਰੇ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "ਇੰਪੈਥੀ ਸ਼�ਰੂ ਸਮੇਂ ਆਟੋਮੈਟਿਕ ਕ�ਨੈਕਟ ਹੋਵੇ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦੀ ਸ਼�ੱਧਤਾ ਘਟਾਵੇ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "ਇੰਪੈਥੀ ਗੱਲਬਾਤ ਵਿੰਡੋ ਆਈਕਾਨ ਵਜੋਂ ਸੰਪਰਕ ਦੇ ਅਵਤਾਰ ਨੂੰ ਵਰਤੇ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr "ਵੈਬਕਿੱਟ ਡਿਵੈਲਪਰ ਟੂਲ ਚਾਲੂ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "ਨਵੇਂ ਸ�ਨੇਹਿਆਂ ਲਈ ਪੋਪਅੱਪ ਸੂਚਨਾ ਚਾਲੂ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "ਸ਼ਬਦ-ਜੋੜ ਯੋਗ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "ਮ�ੱਖ ਵਿੰਡੋ ਓਹਲੇ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "ਮ�ੱਖ ਵਿੰਡੋ ਓਹਲੇ ਕਰੋ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "ਨਾਂ ਪੂਰਾ ਅੱਖਰ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "ਨਵੀਆਂ ਗੱਲਬਾਤਾਂ ਵੱਖ ਵੱਖ ਵਿੰਡੋ ਵਿੱਚ ਖੋਲ�ਹੋ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "ਵਰਤਣ ਵਾਸਤੇ ਅਡੀਓਮ ਥੀਮ ਲਈ ਪਾਥ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "ਅਡੀਓਮ ਥੀਮ ਲਈ ਪਾਥ, ਜੋ ਕਿ ਵਰਤਣਾ ਹੈ, ਜਦੋਂ ਗੱਲਬਾਤ ਲਈ ਅਡੀਓਮ ਥੀਮ ਚ�ਣਿਆ ਹੋਵੇ।"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "ਆ ਰਹੇ ਸ�ਨੇਹਿਆਂ ਲਈ ਇੱਕ ਧ�ਨੀ ਚਲਾਓ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "ਨਵੀਆਂ ਗੱਲਾਂਬਾਤਾਂ ਲਈ ਧ�ਨੀ ਚਲਾਓ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "ਬਾਹਰ ਜਾ ਰਹੇ ਸ�ਨੇਹਿਆਂ ਲਈ ਆਵਾਜ਼ ਚਲਾਓ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "ਜਦੋਂ ਸੰਪਰਕ ਲਾਗਇਨ ਕਰੇ ਤਾਂ ਧ�ਨੀ ਚਲਾਓ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "ਜਦੋਂ ਸੰਪਰਕ ਲਾਗ-ਆਉਟ ਕਰੇ ਤਾਂ ਧ�ਨੀ ਚਲਾਓ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "ਜਦੋਂ ਅਸੀਂ ਲਾਗਇਨ ਕਰੀ� ਤਾਂ ਧ�ਨੀ ਚਲਾਓ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "ਜਦੋਂ ਅਸੀਂ ਲਾਗ-ਆਉਟ ਕਰਨਾ ਹੋਵੇ ਤਾਂ ਧ�ਨੀ ਚਲਾਓ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "ਜੇ ਗੱਲਬਾਤ ਫੋਕਸ ਨਾ ਹੋਵੇ ਤਾਂ ਸੂਚਨਾ ਪੋਪਅੱਪ ਸੂਚਨਾ ਦਿਓ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "ਜੇ ਸੰਪਰਕ ਲਾਗ ਇਨ ਕਰੇ ਤਾਂ ਸੂਚਨਾ ਪੋਪਅੱਪ ਸੂਚਨਾ ਦਿਓ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "ਜੇ ਸੰਪਰਕ ਲਾਗ ਆਉਟ ਕਰੇ ਤਾਂ ਸੂਚਨਾ ਪੋਪਅੱਪ ਸੂਚਨਾ ਦਿਓ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr "ਕਾਲ ਦੇ ਦੌਰਾਨ �ਲਕ ਵੇਖਾਉਣ ਲਈ ਕੈਮਰੇ ਦੀ ਸਥਿਤੀ ਹੈ।"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Show Balance in contact list"
 msgstr "ਸੰਪਰਕ ਲਿਸਟ ਵਿੱਚ ਸੰਤ�ਲਨ ਵੇਖੋ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "ਅਵਤਾਰ ਵੇਖੋ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "ਰੂਮ ਵਿੱਚ ਸੰਪਰਕ ਲਿਸਟ ਵੇਖੋ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr "ਮ�ੱਖ ਵਿੰਡੋ ਬੰਦ ਕਰਨ ਦੌਰਾਨ ਸੰਕੇਤ ਵੇਖੋ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr "ਆਫਲਾਈਨ ਸੰਪਰਕ ਵੇਖੋ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
 msgstr "ਪਰੋਟੋਕਾਲ ਵੇਖੋ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "ਸ਼ਬਦ-ਜੋੜ ਭਾਸ਼ਾਵਾਂ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr "ਫਾਇਲ ਸੰਚਾਰ ਸੰਭਾਲਣ ਲਈ ਡਿਫਾਲਟ ਫੋਲਡਰ ਹੈ।"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
 msgstr "ਆਖਰੀ ਡਾਇਰੈਕਟਰੀ, ਜਿੱਥੇ ਅਵਤਾਰ ਚਿੱਤਰ ਚ�ਣਿਆ ਗਿਆ ਸੀ।"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
 msgstr "ਗੱਲਬਾਤ ਵਿੰਡੋ ਬਾਹੀ ਦੀ ਸਥਿਤੀ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "ਗੱਲਬਾਤ ਵਿੰਡੋ ਬਾਹੀ ਦੀ ਸੰਭਾਲੀ ਸਥਿਤੀ (ਪਿਕਸਲ 'ਚ)।"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "ਥੀਮ, ਜੋ ਕਿ ਗੱਲਬਾਤ ਵਿੰਡੋ ਵਿੱਚ ਗੱਲਾਂ ਵੇਖਾਉਣ ਲਈ ਵਰਤਿਆ ਜਾਵੇ।"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr "ਥੀਮ ਬਦਲ, ਜੋ ਕਿ ਗੱਲਬਾਤ ਵਿੰਡੋ ਵਿੱਚ ਗੱਲਾਂ ਵੇਖਾਉਣ ਲਈ ਵਰਤਿਆ ਜਾਵੇ।"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "ਗਰਾਫਿਕਸ ਚਿਹਰੇ ਵਰਤੋਂ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "ਸਾਊਂਡ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵਰਤੋਂ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "ਗੱਲਬਾਤ ਰੂਮ ਲਈ ਥੀਮ ਵਰਤੋਂ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "ਕੀ ਇੰਪੈਥੀ ਯੂਜ਼ਰ ਦੇ ਟਿਕਾਣਿਆਂ ਬਾਰੇ ਜਾਣਕਾਰੀ ਉਸ ਦੇ ਸੰਪਰਕਾਂ ਨਾਲ ਦੇਵੇ।"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "ਕੀ ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨ�ਮਾਨ ਲਗਾਉਣ ਲਈ GPS ਵਰਤੇ।"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "ਕੀ ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨ�ਮਾਨ ਲਗਾਉਣ ਲਈ ਸੈਲੂਲਰ ਨੈੱਟਵਰਕ ਵਰਤੇ।"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "ਕੀ ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨ�ਮਾਨ ਲਾਉਣ ਲਈ ਨੈੱਟਵਰਕ ਵਰਤ ਸਕਦਾ ਹੈ।"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "ਕੀ ਇੰਪੈਥੀ ਬਟਰਫਲਾਈ ਲਾਗ ਕਰ ਚ�ੱਕਿਆ ਹੈ।"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "ਕੀ ਇੰਪੈਥੀ ਸ਼�ਰੂ ਸਮੇਂ ਆਟੋਮੈਟਿਕ ਹੀ ਤ�ਹਾਡੇ ਅਕਾਊਂਟਾਂ ਵਿੱਚ ਲਾਗ ਇਨ ਕਰੇ।"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr "ਜੇ ਯੂਜ਼ਰ ਕ�� ਨਾ ਕਰੇ ਤਾਂ ਕੀ ਇੰਪੈਥੀ ਆਟੋਮੈਟਿਕ ਹੀ ਦੂਰ ਸੈੱਟ ਕਰੇ।"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "ਕੀ ਇੰਪੈਥੀ ਪਰਾਈਵੇਸੀ ਕਾਰਨਾਂ ਕਰਕੇ ਟਿਕਾਣੇ ਦੀ ਸ਼�ੱਧਤਾ ਘਟਾਵੇ।"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "ਕੀ ਇੰਪੈਥੀ ਗੱਲਬਾਤ ਵਿੰਡੋ ਆਈਕਾਨ ਵਜੋਂ ਸੰਪਰਕ ਦੇ ਅਵਤਾਰ ਨੂੰ ਵਰਤੇ।"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "ਕੀ ਵੈੱਬਕਿੱਟ ਡਿਵੈਲਪਰ ਟੂਲ, ਜਿਵੇਂ ਕਿ ਵੈੱਬ ਇੰਸਪੈਕਟਰ ਆਦਿ ਯੋਗ ਕਰਨੇ ਹਨ।"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr "ਕੀ ਕ�ਨੈਕ�ਵਿਟੀ ਮੈਨੇਜਰ ਆਟੋਮੈਟਿਕ ਡਿਸ-ਕ�ਨੈਕਟ/ਮ�ੜ-ਕ�ਨਕੈਟ ਲਈ ਵਰਤਿਆ ਜਾਵੇ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "ਕੀ ਜਦੋਂ ਤ�ਸੀਂ ਲਿਖੋ ਤਾਂ ਸ਼ਬਦਾਂ ਨੂੰ ਭਾਸ਼ਾ ਲਈ ਚੈੱਕ ਕੀਤਾ ਜਾਵੇ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "ਕੀ ਸਮਾਈਲੀ ਨੂੰ ਗੱਲਬਾਤ ਵਿੱਚ ਗਰਾਫਿਕਲ ਚਿੱਤਰਾਂ ਵਿੱਚ ਬਦਲਿਆ ਜਾਵੇ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr "ਕੀ ਪਲੱਸਆਡੀਓ ਦਾ ਈਚੋ ਰੱਦ ਕਰਨ ਫਿਲਟਰ ਚਾਲੂ ਕਰਨਾ ਹੈ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "ਕੀ ਨੈੱਟਵਰਕ ਉੱਤੇ ਸੰਪਰਕ ਦੇ ਲਾਗ ਇਨ ਕਰਨ ਸਮੇਂ ਸੂਚਨਾ ਲਈ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "ਕੀ ਨੈੱਟਵਰਕ ਉੱਤੇ ਸੰਪਰਕ ਦੇ ਲਾਗ ਆਫ਼ ਕਰਨ ਸਮੇਂ ਸੂਚਨਾ ਲਈ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "ਕੀ ਈਵੈਂਟਾਂ ਲਈ ਸੂਚਨਾ ਵਾਸਤੇ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "ਕੀ ਆ ਰਹੇ ਸ�ਨੇਹਿਆਂ ਲਈ ਸੂਚਨਾ ਵਾਸਤੇ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "ਕੀ ਨਵੀਆਂ ਗੱਲਾਬਾਤਾਂ ਦੀ ਸੂਚਨਾ ਲਈ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "ਕੀ ਬਾਹਰ ਜਾ ਰਹੇ ਸ�ਨੇਹਿਆਂ ਲਈ ਸੂਚਨਾ ਵਾਸਤੇ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "ਕੀ ਨੈੱਟਵਰਕ ਉੱਤੇ ਲਾਗ ਇਨ ਕਰਨ ਦੌਰਾਨ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "ਕੀ ਨੈੱਟਵਰਕ ਤੋਂ ਲਾਗ ਆਫ਼ ਕਰਨ ਦੌਰਾਨ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr "ਜਦੋਂ ਦੂਰ ਜਾਂ ਰ�ੱ�ੇ ਹੋਵੇ ਤਾਂ ਕੀ ਸਾਊਂਡ ਸੂਚਨਾਵਾਂ ਚਲਾਉਣੀਆਂ ਹਨ।"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾ� ਜਾਣ, ਜਦੋਂ ਸੰਪਰਕ ਆਫਲਾਈਨ ਹੋਵੇ।"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾ� ਜਾਣ, ਜਦੋਂ ਸੰਪਰਕ ਆਨਲਾਈਨ ਹੋਵੇ।"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -419,40 +425,40 @@ msgstr ""
 "ਪਹਿਲਾਂ ਖ�ੱਲ�ਹੀ ਹੋਵੇ, ਪਰ "
 "ਫੋਕਸ ਨਾ ਹੋਵੇ।"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਇਆ ਜਾਵੇ, ਜਦੋਂ ਨਵਾਂ ਸ�ਨੇਹਾ ਮਿਲੇ।"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show account balances in the contact list."
 msgstr "ਕੀ ਸੰਪਰਕ ਲਿਸਟ ਵਿੱਚ ਅਕਾਊਂਟ ਬਕਾਇਆ ਵੇਖਾਉਣਾ ਹੈ।"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "ਕੀ ਸੰਪਰਕ ਲਿਸਟ ਅਤੇ ਗੱਲਬਾਤ ਵਿੰਡੋਜ਼ ਵਿੱਚ ਸੰਪਰਕਾਂ ਲਈ ਅਵਤਾਰ ਵੇਖਾ� ਜਾਣ।"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "ਕੀ ਸੰਪਰਕ, ਜੋ ਕਿ ਆਫਲਾਈਨ ਹਨ, ਸੰਪਰਕ ਲਿਸਟ ਵਿੱਚ ਵੇਖਾ� ਜਾਣ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
 msgstr "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾ� ਜਾਣ, ਜਦੋਂ ਦੂਰ ਰ�ੱ�ੇ ਹੋਵੋ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "ਕੀ ਸੰਪਰਕ ਲਿਸਟ ਵਿੱਚ ਸੰਪਰਕਾਂ ਲਈ ਪਰੋਟੋਕਾਲ ਵੇਖਾ� ਜਾਣ।"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr "ਕੀ ਗਲੱਬਾਤ ਰੂਮ ਵਿੱਚ ਸੰਪਰਕ ਲਿਸਟ ਵੇਖਣੀ ਹੈ।"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "ਕੀ ਸੰਪਰਕ ਲਿਸਟ ਨੂੰ ਸੰਖੇਪ ਮੋਡ ਵਿੱਚ ਵੇਖਣਾ ਹੈ।"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -460,11 +466,11 @@ msgstr ""
 "ਕੀ ਟਾਈਟਲ ਬਾਰ ਵਿੱਚ 'x' ਬਟਨ ਦਬਾਉਣ ਨਾਲ ਮ�ੱਖ ਵਿੰਡੋ ਬੰਦ ਕਰਨ ਬਾਰੇ ਸ�ਨੇਹਾ ਡਾਈਲਾਗ "
 "ਵੇਖਾਇਆ ਜਾਵੇ।"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "ਕੀ ਗੱਲਬਾਤ ਰੂਮ ਲਈ ਥੀਮ ਵਰਤਣਾ ਹੈ।"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -489,30 +495,30 @@ msgstr "ਸ�ਨੇਹੇ ਅਤੇ VoIP ਅਕਾਊਂਟ"
 msgid "File transfer completed, but the file was corrupted"
 msgstr "ਫਾਇਲ ਸੰਚਾਰ ਪੂਰਾ ਹੋਇਆ, ਪਰ ਫਾਇਲ ਖ਼ਰਾਬ ਸੀ"
 
-#: ../libempathy/empathy-ft-handler.c:1113
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
 msgstr "ਰਿਮੋਟ ਸੰਪਰਕ ਵਲੋਂ ਫਾਇਲ ਟਰਾਂਸਫਰ ਸਹਾਇਕ ਨਹੀਂ"
 
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is not a regular file"
 msgstr "ਚ�ਣੀ ਫਾਇਲ ਨਿਯਮਤ ਫਾਇਲ ਨਹੀਂ ਹੈ"
 
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1176
 msgid "The selected file is empty"
 msgstr "ਚ�ਣੀ ਫਾਇਲ ਖਾਲੀ ਹੈ"
 
-#: ../libempathy/empathy-message.c:413 ../src/empathy-call-observer.c:132
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
 #, c-format
 msgid "Missed call from %s"
 msgstr "%s ਤੋਂ ਮਿਸ ਹੋਈ ਕਾਲ "
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:417
+#: ../libempathy/empathy-message.c:419
 #, c-format
 msgid "Called %s"
 msgstr "%s ਨੂੰ ਕਾਲ ਕੀਤੀ"
 
-#: ../libempathy/empathy-message.c:420
+#: ../libempathy/empathy-message.c:422
 #, c-format
 msgid "Call from %s"
 msgstr "%s ਤੋਂ ਕਾਲ ਆਈ"
@@ -545,141 +551,141 @@ msgstr "ਫਾਇਲ ਸੰਚਾਰ ਦੀ ਕੋਸ਼ਿਸ਼ ਦੌਰਾà¨
 msgid "The other participant is unable to transfer the file"
 msgstr "ਹੋਰ ਯੋਗਦਾਨੀ ਫਾਇਲ ਸੰਚਾਰ ਲਈ ਫੇਲ�ਹ ਹੈ"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
 msgid "Unknown reason"
 msgstr "ਅਣਜਾਣ ਕਾਰਨ"
 
-#: ../libempathy/empathy-utils.c:212
+#: ../libempathy/empathy-utils.c:222
 msgid "Available"
 msgstr "ਉਪਲੱਬਧ"
 
-#: ../libempathy/empathy-utils.c:214
+#: ../libempathy/empathy-utils.c:224
 msgid "Busy"
 msgstr "ਰ��ੇ"
 
-#: ../libempathy/empathy-utils.c:217
+#: ../libempathy/empathy-utils.c:227
 msgid "Away"
 msgstr "ਦੂਰ"
 
-#: ../libempathy/empathy-utils.c:219
+#: ../libempathy/empathy-utils.c:229
 msgid "Invisible"
 msgstr "ਅਦਿੱਖ"
 
-#: ../libempathy/empathy-utils.c:221
+#: ../libempathy/empathy-utils.c:231
 msgid "Offline"
 msgstr "ਆਫਲਾਈਨ"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:224
+#: ../libempathy/empathy-utils.c:234
 msgctxt "presence"
 msgid "Unknown"
 msgstr "ਅਣਜਾਣ"
 
-#: ../libempathy/empathy-utils.c:264
+#: ../libempathy/empathy-utils.c:274
 msgid "No reason specified"
 msgstr "ਕੋਈ ਕਾਰਨ ਨਹੀਂ ਦਿੱਤਾ"
 
-#: ../libempathy/empathy-utils.c:266 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
 msgid "Status is set to offline"
 msgstr "ਹਾਲਤ ਆਫਲਾਈਨ ਸੈੱਟ ਕੀਤਾ"
 
-#: ../libempathy/empathy-utils.c:268 ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
 #: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "ਨੈੱਟਵਰਕ ਗਲਤੀ"
 
-#: ../libempathy/empathy-utils.c:270 ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
 msgid "Authentication failed"
 msgstr "ਪਰਮਾਣਕਿਤਾ ਫੇਲ�ਹ ਹੈ"
 
-#: ../libempathy/empathy-utils.c:272 ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
 msgid "Encryption error"
 msgstr "ਇੰਕ�ਰਿਪਸ਼ਨ ਗਲਤੀ"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:284
 msgid "Name in use"
 msgstr "ਵਰਤਣ ਲਈ ਨਾਂ"
 
-#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:308
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
 msgid "Certificate not provided"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਦਿੱਤਾ"
 
-#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
 msgid "Certificate untrusted"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਬੇਭਰੋਸੇਯੋਗ"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
 msgid "Certificate expired"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਦੀ ਮਿਆਦ ਪ�ੱਗੀ"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
 msgid "Certificate not activated"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਸਰਗਰਮ ਨਹੀਂ ਹੈ"
 
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
 msgid "Certificate hostname mismatch"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਹੋਸਟ-ਨਾਂ ਨਹੀਂ ਮਿਲਦਾ"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate fingerprint mismatch"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਫਿੰਗਰ-ਪਰਿੰਟ ਮਿਲਦਾ ਨਹੀਂ"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate self-signed"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਖ�ਦ-ਦਸਤਖਤੀ ਹੈ"
 
-#: ../libempathy/empathy-utils.c:290
+#: ../libempathy/empathy-utils.c:300
 msgid "Certificate error"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਗਲਤੀ"
 
-#: ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:334
 msgid "Encryption is not available"
 msgstr "ਇੰਕ�ਰਿਪਸ਼ਨ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ"
 
-#: ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:336
 msgid "Certificate is invalid"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਗਲਤ ਹੈ"
 
-#: ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:338
 msgid "Connection has been refused"
 msgstr "ਕ�ਨੈਕਸ਼ਨ ਤੋਂ ਇਨਕਾਰ ਕੀਤਾ ਗਿਆ"
 
-#: ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:340
 msgid "Connection can't be established"
 msgstr "ਕ�ਨੈਕਸ਼ਨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
 
-#: ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:342
 msgid "Connection has been lost"
 msgstr "ਕ�ਨੈਕਸ਼ਨ ਖਤਮ ਹੋ ਗਿਆ"
 
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:344
 msgid "This resource is already connected to the server"
 msgstr "ਇਹ ਸਰੋਤ ਪਹਿਲਾਂ ਹੀ ਸਰਵਰ ਨਾਲ ਕ�ਨੈਕਟ ਹੈ"
 
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:346
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "ਉਸੇ ਸਰੋਤ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਕ�ਨੈਕਸ਼ਨ ਨੂੰ ਨਵੇਂ ਕ�ਨੈਕਸ਼ਨ ਨਾਲ ਬਦਲ ਦਿੱਤਾ ਗਿਆ ਹੈ"
 
-#: ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:349
 msgid "The account already exists on the server"
 msgstr "ਅਕਾਊਂਟ ਸਰਵਰ ਉੱਤੇ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ"
 
-#: ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:351
 msgid "Server is currently too busy to handle the connection"
 msgstr "ਸਰਵਰ ਇਸ ਵੇਲੇ �ਨਾ ਰ�ੱ�ਿਆ ਹੋਇਆ ਹੈ ਕਿ ਕ�ਨੈਕਸ਼ਨ ਸੰਭਾਲ ਨਹੀਂ ਸਕਦਾ"
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:353
 msgid "Certificate has been revoked"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਮਨਸੂਖ ਕੀਤਾ ਜਾ ਚ�ੱਕਾ ਹੈ"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:355
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "ਸਰਟੀਫਿਕੇਟ ਅਸ�ਰੱਖਿਅਤ ਸੀਫ਼ਰ �ਲਗੋਰਿਥਮ ਵਰਤਦਾ ਹੈ ਜਾਂ ਕਮਜ਼ੋਰ ਕ�ਰਿਪਟੋਗਰਾਫਿਕਲ ਵਰਤਦਾ ਹੈ"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:358
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -688,20 +694,20 @@ msgstr ""
 "ਲਾਇਬਰੇਰੀ ਵਲੋਂ ਰੱਖੀ "
 "ਗਈ ਲਿਮਟ ਤੋਂ ਵੱਧ ਗਈ ਹੈ।"
 
-#: ../libempathy/empathy-utils.c:509
+#: ../libempathy/empathy-utils.c:519
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "ਨੇੜਲੇ ਲੋਕ"
 
-#: ../libempathy/empathy-utils.c:514
+#: ../libempathy/empathy-utils.c:524
 msgid "Yahoo! Japan"
 msgstr "ਯਾਹੂ! ਜਾਪਾਨ"
 
-#: ../libempathy/empathy-utils.c:543
+#: ../libempathy/empathy-utils.c:553
 msgid "Google Talk"
 msgstr "ਗੂਗਲ ਟਾਕ"
 
-#: ../libempathy/empathy-utils.c:544
+#: ../libempathy/empathy-utils.c:554
 msgid "Facebook Chat"
 msgstr "ਫੇਸਬ�ੱਕ ਚੈਟ"
 
@@ -751,71 +757,81 @@ msgstr[1] "%d ਮਹੀਨੇ ਪਹਿਲਾਂ"
 msgid "in the future"
 msgstr "ਭਵਿੱਖ ਵਿੱਚ"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:539
+#: ../libempathy-gtk/empathy-account-chooser.c:540
 msgid "All accounts"
 msgstr "ਸਭ ਅਕਾਊਂਟ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:693
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "ਅਕਾਊਂਟ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "ਪਾਸਵਰਡ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "ਸਰਵਰ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "ਪੋਰਟ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:768
-#: ../libempathy-gtk/empathy-account-widget.c:825
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1166
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "ਮੇਰੇ ਵੈੱਬ ਅਕਾਊਂਟ"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "ਮੇਰੇ ਵੈੱਬ ਅਕਾਊਂਟ ਰਾਹੀਂ ਅਕਾਊਂਟ %s ਸੋਧਿਆ ਗਿਆ।"
+msgid "The account %s is edited via %s."
+msgstr "ਅਕਾਊਂਟ %s ਨੂੰ %s ਰਾਹੀਂ ਸੋਧਿਆ ਗਿਆ ਹੈ।"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1172
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "ਅਕਾਊਂਟ %s ਇੰਪੈਥੀ 'ਚ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
 msgstr "ਮੇਰੇ ਵੈੱਬ ਅਕਾਊਂਟ ਚਲਾਉ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1532
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "%s ਬਦਲੋ"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "ਯੂਜ਼ਰ ਨਾਂ:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1850
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "ਲਾਗੂ ਕਰੋ(_p)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1880
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
 msgstr "ਲਾਗਇਨ(_o)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1954
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "ਇਹ ਅਕਾਊਂਟ ਸਰਵਰ ਉੱਤੇ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1957
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "ਸਰਵਰ ਉੱਤੇ ਨਵਾਂ ਅਕਾਊਂਟ ਬਣਾਓ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2149
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "ਰੱਦ ਕਰੋ(_n)"
 
@@ -824,19 +840,19 @@ msgstr "ਰੱਦ ਕਰੋ(_n)"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2427
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%2$s ਉੱਤੇ %1$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2453
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "%s ਅਕਾਊਂਟ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2457
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "ਨਵਾਂ ਅਕਾਊਂਟ"
 
@@ -958,36 +974,36 @@ msgstr "ਤ�ਹਾਡਾ ICQ UIN ਕੀ ਹੈ?"
 msgid "What is your ICQ password?"
 msgstr "ਤ�ਹਾਡਾ ICQ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:184
-#: ../libempathy-gtk/empathy-account-widget-sip.c:217
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "ਆਟੋ"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:187
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:193
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:222
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "ਰਜਿਸਟਰ"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:227
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "ਚੋਣਾਂ"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
@@ -1001,8 +1017,8 @@ msgid ""
 "password."
 msgstr ""
 "ਬਹ�ਤੇ IRC ਸਰਵਰਾਂ ਲਈ ਪਾਸਵਰਡ ਨਹੀਂ ਚਾਹੀਦਾ ਹੈ, ਇਸ ਕਰਕੇ ਜੇ ਤ�ਹਾਨੂੰ ਪੱਕਾ ਪਤਾ ਨਾ "
-"ਹੋਵੇ ਤਾਂ ਪਾਸਵਰਡ ਨਾ "
-"ਦਿਉ।"
+"ਹੋਵੇ ਤਾਂ ਪਾਸਵਰਡ "
+"ਨਾ ਦਿਉ।"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Network"
@@ -1220,14 +1236,18 @@ msgid "Transport:"
 msgstr "ਟਰਾਂਸਪੋਰਟ:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "ਇਹ ਅਕਾਊਂਟ ਨੂੰ ਲੈਂਡਲਾਈਨ ਅਤੇ ਮੋਬਾਇਲ ਫੋਨ ਉੱਤੇ ਕਾਲ ਕਰਨ ਲਈ ਵਰਤੋਂ(_l)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "ਤ�ਹਾਡਾ SIP ਅਕਾਊਂਟ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "ਤ�ਹਾਡਾ SIP ਲਾਗਇਨ ID ਕੀ ਹੈ?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "ਯੂਜ਼ਰ ਨਾਂ(_U):"
 
@@ -1251,36 +1271,36 @@ msgstr "ਯਾਹੂ! I_D:"
 msgid "_Room List locale:"
 msgstr "ਰੂਮ ਲਿਸਟ ਭਾਸ਼ਾ(_R):"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:474
-#: ../libempathy-gtk/empathy-avatar-chooser.c:559
+#: ../libempathy-gtk/empathy-avatar-chooser.c:470
+#: ../libempathy-gtk/empathy-avatar-chooser.c:555
 msgid "Couldn't convert image"
 msgstr "ਚਿੱਤਰ ਨਾ ਬਦਲੋ"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:475
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
 msgid "None of the accepted image formats are supported on your system"
 msgstr "ਕੋਈ ਵੀ ਮਨਜ਼ੂਰਸ਼�ਦਾ ਚਿੱਤਰ ਫਾਰਮੈਟ ਤ�ਹਾਡੇ ਸਿਸਟਮ ਵਲੋਂ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:822
-msgid "Couldn't save pixbuf to png"
-msgstr "pixbuf ਨੂੰ png ਵਿੱਚ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:818
+msgid "Couldn't save picture to file"
+msgstr "ਤਸਵੀਰ ਨੂੰ ਫਾਇਲ ਵਿੱਚ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:934
 msgid "Select Your Avatar Image"
 msgstr "ਆਪਣਾ ਅਵਤਾਰ ਲੇਖ ਚ�ਣੋ"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:942
+#: ../libempathy-gtk/empathy-avatar-chooser.c:938
 msgid "Take a picture..."
 msgstr "ਤਸਵੀਰ ਲਵੋ..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:945
+#: ../libempathy-gtk/empathy-avatar-chooser.c:941
 msgid "No Image"
 msgstr "ਕੋਈ ਚਿੱਤਰ ਨਹੀਂ"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
 msgid "Images"
 msgstr "ਚਿੱਤਰ"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1009
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
 msgid "All Files"
 msgstr "ਸਭ ਫਾਇਲਾਂ"
 
@@ -1326,46 +1346,46 @@ msgstr "ਤà©�ਹਾਨੂੰ ਵਿਸ਼ਾ ਬਦਲਣ ਦਾ ਅਧਿਕà¨
 msgid "“%s� is not a valid contact ID"
 msgstr "“%s� ਇੱਕ ਠੀਕ ਸੰਪਰਕ ID ਨਹੀਂ ਹੈ"
 
-#: ../libempathy-gtk/empathy-chat.c:1030
+#: ../libempathy-gtk/empathy-chat.c:1058
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: ਮੌਜੂਦਾ ਗੱਲਬਾਤ ਤੋਂ ਸਭ ਸ�ਨੇਹੇ ਸਾਫ਼ ਕਰੋ"
 
-#: ../libempathy-gtk/empathy-chat.c:1033
+#: ../libempathy-gtk/empathy-chat.c:1061
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topic>: ਮੌਜੂਦਾ ਗੱਲਬਾਤ ਦਾ ਵਿਸ਼ਾ ਸੈੱਟ ਕਰੋ"
 
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1064
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <chat room ID>: ਨਵਾਂ ਗੱਲਬਾਤ ਰੂਮ ਜ�ਆਇੰਨ ਕਰੋ"
 
-#: ../libempathy-gtk/empathy-chat.c:1039
+#: ../libempathy-gtk/empathy-chat.c:1067
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <chat room ID>: ਨਵਾਂ ਗੱਲਬਾਤ ਰੂਮ ਜ�ਆਇੰਨ ਕਰੋ"
 
-#: ../libempathy-gtk/empathy-chat.c:1043
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr ""
 "/part [<chat room ID>] [<reason>]: ਚੈਟ ਰੂਮ ਛੱਡੋ, ਡਿਫਾਲਟ ਰੂਪ ਵਿੱਚ ਮੌਜੂਦਾ ਇੱਕ ਹੀ"
 
-#: ../libempathy-gtk/empathy-chat.c:1047
+#: ../libempathy-gtk/empathy-chat.c:1075
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <contact ID> [<message>]: ਪ�ਰਾਈਵੇਟ ਗੱਲਬਾਤ ਖੋਲ�ਹੋ"
 
-#: ../libempathy-gtk/empathy-chat.c:1050
+#: ../libempathy-gtk/empathy-chat.c:1078
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <contact ID> <message>: ਪ�ਰਾਈਵੇਟ ਗੱਲਬਾਤ ਕਰੋ"
 
-#: ../libempathy-gtk/empathy-chat.c:1053
+#: ../libempathy-gtk/empathy-chat.c:1081
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nickname>: ਮੌਜੂਦਾ ਸਰਵਰ ਉੱਤੇ ਆਪਣਾ ਨਾਂ ਬਦਲੋ"
 
-#: ../libempathy-gtk/empathy-chat.c:1056
+#: ../libempathy-gtk/empathy-chat.c:1084
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <message>:ਇੱਕ �ਕਸ਼ਨ ਸ�ਨੇਹਾ ਮੌਜੂਦਾ ਗੱਲਬਾਤ ਵਿੱਚ ਭੇਜੋ"
 
-#: ../libempathy-gtk/empathy-chat.c:1059
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1375,11 +1395,11 @@ msgstr ""
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <contact ID>: display information about a contact"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1387,113 +1407,113 @@ msgstr ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1112
 #, c-format
 msgid "Usage: %s"
 msgstr "ਵਰਤੋਂ: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1116
+#: ../libempathy-gtk/empathy-chat.c:1157
 msgid "Unknown command"
 msgstr "ਅਣਜਾਣ ਕਮਾਂਡ"
 
-#: ../libempathy-gtk/empathy-chat.c:1242
+#: ../libempathy-gtk/empathy-chat.c:1283
 msgid "Unknown command; see /help for the available commands"
 msgstr "ਅਣਜਾਣ ਕਮਾਂਡ; ਉਪਲੱਬਧ ਕਮਾਂਡ ਵਾਸਤੇ ਮੱਦਦ ਲਈ /help ਵਰਤੋਂ"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1412
+#: ../libempathy-gtk/empathy-chat.c:1453
 msgid "insufficient balance to send message"
 msgstr "ਸ�ਨੇਹਾ ਭੇਜਣ ਲਈ ਲੋੜੀਦਾ ਬਕਾਇਆ ਨਹੀਂ ਹੈ"
 
-#: ../libempathy-gtk/empathy-chat.c:1414
+#: ../libempathy-gtk/empathy-chat.c:1455
 msgid "not capable"
 msgstr "ਸਮਰੱਥਾ ਨਹੀਂ"
 
-#: ../libempathy-gtk/empathy-chat.c:1421
+#: ../libempathy-gtk/empathy-chat.c:1462
 msgid "offline"
 msgstr "ਆਫਲਾਈਨ"
 
-#: ../libempathy-gtk/empathy-chat.c:1424
+#: ../libempathy-gtk/empathy-chat.c:1465
 msgid "invalid contact"
 msgstr "ਗਲਤ ਸੰਪਰਕ"
 
-#: ../libempathy-gtk/empathy-chat.c:1427
+#: ../libempathy-gtk/empathy-chat.c:1468
 msgid "permission denied"
 msgstr "ਅਧਿਕਾਰ ਪਾਬੰਦੀ"
 
-#: ../libempathy-gtk/empathy-chat.c:1430
+#: ../libempathy-gtk/empathy-chat.c:1471
 msgid "too long message"
 msgstr "ਬਹ�ਤ ਲੰਮਾ ਸ�ਨੇਹਾ"
 
-#: ../libempathy-gtk/empathy-chat.c:1433
+#: ../libempathy-gtk/empathy-chat.c:1474
 msgid "not implemented"
 msgstr "ਸਥਾਪਤ ਨਹੀਂ"
 
-#: ../libempathy-gtk/empathy-chat.c:1437
+#: ../libempathy-gtk/empathy-chat.c:1478
 msgid "unknown"
 msgstr "ਅਣਜਾਣ"
 
-#: ../libempathy-gtk/empathy-chat.c:1443
+#: ../libempathy-gtk/empathy-chat.c:1484
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "ਸ�ਨੇਹਾ '%s' ਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1447
+#: ../libempathy-gtk/empathy-chat.c:1488
 #, c-format
 msgid "Error sending message: %s"
 msgstr "ਸ�ਨੇਹਾ ਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1508 ../src/empathy-chat-window.c:760
+#: ../libempathy-gtk/empathy-chat.c:1549 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "ਵਿਸ਼ਾ:"
 
-#: ../libempathy-gtk/empathy-chat.c:1520
+#: ../libempathy-gtk/empathy-chat.c:1561
 #, c-format
 msgid "Topic set to: %s"
 msgstr "ਵਿਸ਼ਾ ਨਹੀਂ ਕੀਤਾ: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1563
 msgid "No topic defined"
 msgstr "ਕੋਈ ਵਿਸ਼ਾ ਨਹੀਂ ਦਿੱਤਾ"
 
-#: ../libempathy-gtk/empathy-chat.c:2031
+#: ../libempathy-gtk/empathy-chat.c:2072
 msgid "(No Suggestions)"
 msgstr "(ਕੋਈ ਸ��ਾਅ ਨਹੀਂ)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2099
+#: ../libempathy-gtk/empathy-chat.c:2140
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "'%s' ਨੂੰ ਡਿਕਸ਼ਨਰੀ 'ਚ ਜੋੜੋ"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2136
+#: ../libempathy-gtk/empathy-chat.c:2177
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "'%s' ਨੂੰ %s ਡਿਕਸ਼ਨਰੀ 'ਚ ਜੋੜੋ"
 
-#: ../libempathy-gtk/empathy-chat.c:2206
+#: ../libempathy-gtk/empathy-chat.c:2247
 msgid "Insert Smiley"
 msgstr "ਚਿਹਰਾ ਸ਼ਾਮਲ ਕਰੋ"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2224
-#: ../libempathy-gtk/empathy-ui-utils.c:1757
+#: ../libempathy-gtk/empathy-chat.c:2265
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "ਭੇਜੋ(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2278
+#: ../libempathy-gtk/empathy-chat.c:2319
 msgid "_Spelling Suggestions"
 msgstr "ਸਪੈਲਿੰਗ ਸ��ਾਅ(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2367
+#: ../libempathy-gtk/empathy-chat.c:2408
 msgid "Failed to retrieve recent logs"
 msgstr "ਤਾਜ਼ਾ ਲਾਗ ਲੈਣ ਲਈ ਫੇਲ�ਹ"
 
-#: ../libempathy-gtk/empathy-chat.c:2504
+#: ../libempathy-gtk/empathy-chat.c:2545
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s ਡਿਸ-ਕ�ਨੈਕਟ ਹੋ ਗਿਆ ਹੈ"
@@ -1501,12 +1521,12 @@ msgstr "%s ਡਿਸ-ਕ�ਨੈਕਟ ਹੋ ਗਿਆ ਹੈ"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2511
+#: ../libempathy-gtk/empathy-chat.c:2552
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s ਨੇ %1$s ਨੂੰ ਕਿੱਕ ਮਾਰੀ"
 
-#: ../libempathy-gtk/empathy-chat.c:2514
+#: ../libempathy-gtk/empathy-chat.c:2555
 #, c-format
 msgid "%s was kicked"
 msgstr "%s ਨੂੰ ਕਿੱਕ ਮਾਰੀ"
@@ -1514,17 +1534,17 @@ msgstr "%s ਨੂੰ ਕਿੱਕ ਮਾਰੀ"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2522
+#: ../libempathy-gtk/empathy-chat.c:2563
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s ਵਲੋਂ %1$s ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਈ"
 
-#: ../libempathy-gtk/empathy-chat.c:2525
+#: ../libempathy-gtk/empathy-chat.c:2566
 #, c-format
 msgid "%s was banned"
 msgstr "%s ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਈ"
 
-#: ../libempathy-gtk/empathy-chat.c:2529
+#: ../libempathy-gtk/empathy-chat.c:2570
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ਨੇ ਰੂਮ ਛੱਡਿਆ"
@@ -1534,68 +1554,72 @@ msgstr "%s ਨੇ ਰੂਮ ਛੱਡਿਆ"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2538
+#: ../libempathy-gtk/empathy-chat.c:2579
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2604
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s ਰੂਮ ਵਿੱਚ ਦਾਖਲ ਹੋਇਆ"
 
-#: ../libempathy-gtk/empathy-chat.c:2588
+#: ../libempathy-gtk/empathy-chat.c:2629
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ਨੂੰ ਹ�ਣ %s ਵਜੋਂ ਜਾਣਿਆ ਜਾਵੇਗਾ"
 
-#: ../libempathy-gtk/empathy-chat.c:2727
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2768
 #: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1241 ../src/empathy-call-window.c:2264
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1391
+#: ../src/empathy-call-window.c:1441 ../src/empathy-call-window.c:2479
 msgid "Disconnected"
 msgstr "ਕ�ਨੈਕਸ਼ਨ ਖਤਮ"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3374
+#: ../libempathy-gtk/empathy-chat.c:3415
 msgid "Would you like to store this password?"
 msgstr "ਕੀ ਤ�ਸੀਂ ਇਹ ਪਾਸਵਰਡ ਸੰਭਾਲਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: ../libempathy-gtk/empathy-chat.c:3380
+#: ../libempathy-gtk/empathy-chat.c:3421
 msgid "Remember"
 msgstr "ਯਾਦ ਰੱਖੋ"
 
-#: ../libempathy-gtk/empathy-chat.c:3390
+#: ../libempathy-gtk/empathy-chat.c:3431
 msgid "Not now"
 msgstr "ਹ�ਣ ਨਹੀਂ"
 
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3475
 msgid "Retry"
 msgstr "ਮ�ੜ-ਕੋਸ਼ਿਸ਼"
 
-#: ../libempathy-gtk/empathy-chat.c:3438
+#: ../libempathy-gtk/empathy-chat.c:3479
 msgid "Wrong password; please try again:"
 msgstr "ਗਲਤ ਪਾਸਵਰਡ; ਮ�ੜ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3568
+#: ../libempathy-gtk/empathy-chat.c:3609
 msgid "This room is protected by a password:"
 msgstr "ਇਹ ਰੂਮ ਪਾਸਵਰਡ ਨਾਲ ਸ�ਰੱਖਿਅਤ ਹੈ:"
 
-#: ../libempathy-gtk/empathy-chat.c:3595
+#: ../libempathy-gtk/empathy-chat.c:3636
 msgid "Join"
 msgstr "ਦਾਖਲ"
 
-#: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1262
+#: ../libempathy-gtk/empathy-chat.c:3838 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "ਕ�ਨੈਕਟ ਕੀਤਾ"
 
-#: ../libempathy-gtk/empathy-chat.c:3852
+#: ../libempathy-gtk/empathy-chat.c:3893
 msgid "Conversation"
 msgstr "ਗੱਲਬਾਤ"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3857
+#: ../libempathy-gtk/empathy-chat.c:3898
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1620,15 +1644,15 @@ msgstr "ਅਧਿਕਾਰ ਪਾਬੰਦੀ"
 msgid "Could not block contact"
 msgstr "ਸੰਪਰਕ ਉੱਤੇ ਪਾਬੰਦੀ ਨਹੀਂ ਲਗਾਈ ਜਾ ਸਕੀ"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:772
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
 msgid "Edit Blocked Contacts"
 msgstr "ਪਾਬੰਦੀ ਲਗਾ� ਸੰਪਰਕ ਸੋਧੋ"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:521
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1495
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
@@ -1639,15 +1663,22 @@ msgstr "ਅਕਾਊਂਟ:"
 msgid "Blocked Contacts"
 msgstr "ਪਾਬੰਦੀਸ਼�ਦਾ ਸੰਪਰਕ"
 
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "ਹਟਾਓ"
+
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:1417
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "ਲਿੰਕ �ਡਰੈੱਸ ਕਾਪੀ ਕਰੋ(_C)"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:1424
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "ਲਿੰਕ ਖੋਲ�ਹੋ(_O)"
 
@@ -1678,19 +1709,19 @@ msgid "Block %s?"
 msgstr "%s ਉੱਤੇ ਪਾਬੰਦੀ?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr ""
 "ਕੀ ਤ�ਸੀਂ '%s' ਨੂੰ ਤ�ਹਾਡੇ ਨਾਲ ਫੇਰ ਸੰਪਰਕ ਕਰਨ ਉੱਤੇ ਪਾਬੰਦੀ ਲਗਾਉਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:274
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
 msgid "_Block"
 msgstr "ਪਾਬੰਦੀ ਲਗਾਓ(_B)"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:283
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "ਇਹ ਸੰਪਰਕ ਨੂੰ ਅਸ਼ਲੀਲ ਵਜੋਂ ਰਿਪੋਰਟ ਕਰੋ(_R)"
@@ -1716,38 +1747,38 @@ msgstr "ਬਿਨ-ਗਰ�ੱਪ"
 msgid "Favorite People"
 msgstr "ਪਸੰਦ ਦੇ ਲੋਕ"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1983
-#: ../libempathy-gtk/empathy-individual-view.c:2375
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "ਕੀ ਤ�ਸੀਂ ਗਰ�ੱਪ '%s' ਨੂੰ ਹਟਾਉਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1985
-#: ../libempathy-gtk/empathy-individual-view.c:2378
+#: ../libempathy-gtk/empathy-contact-list-view.c:1988
+#: ../libempathy-gtk/empathy-individual-view.c:2379
 msgid "Removing group"
 msgstr "ਗਰ�ੱਪ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2034
-#: ../libempathy-gtk/empathy-contact-list-view.c:2111
-#: ../libempathy-gtk/empathy-individual-view.c:2433
-#: ../libempathy-gtk/empathy-individual-view.c:2636
+#: ../libempathy-gtk/empathy-contact-list-view.c:2037
+#: ../libempathy-gtk/empathy-contact-list-view.c:2114
+#: ../libempathy-gtk/empathy-individual-view.c:2434
+#: ../libempathy-gtk/empathy-individual-view.c:2637
 msgid "_Remove"
 msgstr "ਹਟਾਓ(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2064
-#: ../libempathy-gtk/empathy-individual-view.c:2500
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
+#: ../libempathy-gtk/empathy-individual-view.c:2501
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "ਕੀ ਤ�ਸੀਂ ਸੰਪਰਕ '%s' ਨੂੰ ਹਟਾਉਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2066
-#: ../libempathy-gtk/empathy-individual-view.c:2521
+#: ../libempathy-gtk/empathy-contact-list-view.c:2069
+#: ../libempathy-gtk/empathy-individual-view.c:2522
 msgid "Removing contact"
 msgstr "ਸੰਪਰਕ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "ਸੰਪਰਕ ਸ਼ਾਮਲ(_A)..."
 
@@ -1756,48 +1787,48 @@ msgid "_Block Contact"
 msgstr "ਸੰਪਰਕ ਉੱਤੇ ਪਾਬੰਦੀ(_B)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:548
-#: ../src/empathy-main-window.ui.h:16
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "ਗੱਲਬਾਤ(_C)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:639
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "ਆਡੀਓ ਕਾਲ(_A)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:684
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "ਵਿਡੀਓ ਕਾਲ(_V)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:737
-#: ../src/empathy-main-window.ui.h:27
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "ਪਿਛਲੀ ਗੱਲਬਾਤ(_P)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:778
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "ਫਾਇਲ ਭੇਜੋ"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:820
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
 msgstr "ਮੇਰਾ ਡੈਸਕਟਾਪ ਸ਼ੇਅਰ ਕਰੋ"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1890
-#: ../libempathy-gtk/empathy-individual-menu.c:855
-#: ../libempathy-gtk/empathy-individual-widget.c:1386
+#: ../libempathy-gtk/empathy-contact-widget.c:1886
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "ਪਸੰਦ"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:883
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "ਜਾਣਕਾਰੀ(_m)"
 
@@ -1807,33 +1838,41 @@ msgid "_Edit"
 msgstr "ਸੋਧ(_E)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1070
-#: ../src/empathy-chat-window.c:1010
+#: ../libempathy-gtk/empathy-individual-menu.c:1283
+#: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "ਇਸ ਰੂਮ ਲਈ ਤ�ਹਾਨੂੰ ਸੱਦਾ"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1116
+#: ../libempathy-gtk/empathy-individual-menu.c:1329
 msgid "_Invite to Chat Room"
 msgstr "ਗੱਲਬਾਤ ਰੂਮ ਲਈ ਸੱਦਾ(_I)"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:514
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
 msgid "Search contacts"
 msgstr "ਸੰਪਰਕ ਖੋਜ"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:544
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
 msgid "Search: "
 msgstr "ਖੋਜ: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:602
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
 msgid "_Add Contact"
 msgstr "ਸੰਪਰਕ ਸ਼ਾਮਲ(_A)"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:620
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
 msgid "No contacts found"
 msgstr "ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ ਲੱਭਿਆ"
 
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr "ਤ�ਹਾਡੀ ਜਾਣ-ਪਛਾਣ ਕਰਵਾਉਣ ਵਾਲਾ ਸ�ਨੇਹਾ:"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
+msgstr "ਤ�ਹਾਨੂੰ ਆਨਲਾਈਨ ਹੋਣ ਦਿਉ ਜੀ। ਧੰਨਵਾਦ!"
+
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "ਸੰਪਰਕ ਚ�ਣੋ"
@@ -1886,153 +1925,153 @@ msgstr "ਦੂਰਾ ਸ�ਨੇਹਾ:"
 msgid "Channels:"
 msgstr "ਚੈਨਲ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
 msgstr "ਦੇਸ਼ ISO ਕੋਡ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Country:"
 msgstr "ਦੇਸ਼:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "State:"
 msgstr "ਹਾਲਤ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "City:"
 msgstr "ਸ਼ਹਿਰ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Area:"
 msgstr "�ਰੀਆ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
 msgstr "ਡਾਕ ਕੋਡ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Street:"
 msgstr "ਗਲੀ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
 msgstr "ਇਮਾਰਤ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Floor:"
 msgstr "ਮੰਜ਼ਲ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Room:"
 msgstr "ਘਰ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Text:"
 msgstr "ਟੈਕਸਟ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:517
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Description:"
 msgstr "ਵੇਰਵਾ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:519
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:521
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
 msgstr "ਸ਼�ੱਧਤਾ ਲੈਵਲ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:523
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr "ਗਲਤੀ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
 msgstr "ਵਰਟੀਕਲ ਗਲਤੀ (ਮੀਟਰ):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:527
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
 msgstr "ਹਰੀਜੱਟਲ ਗਲਤੀ (ਮੀਟਰ):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:529
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr "ਗਤੀ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:531
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Bearing:"
 msgstr "ਬੀਰਿੰਗ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:533
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
 msgstr "ਚੜ�ਹਨ ਗਤੀ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:535
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
 msgstr "ਆਖਰੀ ਅੱਪਡੇਟ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:537
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
 msgstr "ਲੰਬਕਾਰੀ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:945
-#: ../libempathy-gtk/empathy-individual-widget.c:539
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
 msgstr "ਵਿਥਕਾਰ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:947
-#: ../libempathy-gtk/empathy-individual-widget.c:541
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
 msgstr "ਉਚਾਈ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1000
-#: ../libempathy-gtk/empathy-contact-widget.c:1015
-#: ../libempathy-gtk/empathy-individual-widget.c:629
-#: ../libempathy-gtk/empathy-individual-widget.c:644
-#: ../src/empathy-preferences.ui.h:16
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "ਟਿਕਾਣਾ"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1017
-#: ../libempathy-gtk/empathy-individual-widget.c:646
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1069
-#: ../libempathy-gtk/empathy-individual-widget.c:695
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
 msgstr "%R UTC %e %B %Y ਨੂੰ"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1151
-#: ../libempathy-gtk/empathy-individual-widget.c:931
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
 msgid "Save Avatar"
 msgstr "ਅਵਤਾਰ ਸੰਭਾਲੋ"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1207
-#: ../libempathy-gtk/empathy-individual-widget.c:989
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
 msgid "Unable to save avatar"
 msgstr "ਅਵਤਾਰ ਸੰਭਾਲਣ ਲਈ ਅਸਮਰੱਥ"
 
@@ -2042,7 +2081,7 @@ msgstr "<b>ਟਿਕਾਣਾ</b> (date) ਨੂੰ\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1321
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr "ਉਪ-ਨਾਂ:"
 
@@ -2062,7 +2101,7 @@ msgstr "ਸੰਪਰਕ ਵੇਰਵਾ"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1525
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "ਪਛਾਣਕਰਤਾ:"
 
@@ -2102,17 +2141,17 @@ msgid "Select"
 msgstr "ਚ�ਣੋ"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1835
+#: ../src/empathy-main-window.c:1807
 msgid "Group"
 msgstr "ਗਰ�ੱਪ"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:257
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "ਅੱਗੇ ਦਿੱਤੀ ਪਛਾਣ ਉੱਤੇ ਪਾਬੰਦੀ ਲਗਾਈ ਜਾਵੇਗੀ:"
 msgstr[1] "ਅੱਗੇ ਦਿੱਤੀਆਂ ਪਛਾਣਾਂ ਉੱਤੇ ਪਾਬੰਦੀ ਲਗਾਈ ਜਾਵੇਗੀ:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:264
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "ਅੱਗੇ ਦਿੱਤੀ ਪਛਾਣ ਉੱਤੇ ਪਾਬੰਦੀ ਨਹੀਂ ਲੱਗ ਸਕਦੀ:"
@@ -2138,34 +2177,59 @@ msgstr "ਖੱਬੇ ਪਾਸੇ ਲਿਸਟ ਵਿੱਚੋਂ ਚà©�ਣੇ à
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:138
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "ਕਾਲ ਕਰਨ ਲਈ ਵਰਤਣ ਵਾਸਤੇ ਅਕਾਊਂਟ ਚ�ਣੋ"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "ਕਾਲ ਕਰੋ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+msgid "Mobile"
+msgstr "ਮੋਬਾਈਲ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "ਕੰਮ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "ਘਰ"
+
 #. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:594
-#: ../libempathy-gtk/empathy-new-message-dialog.c:248
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:931
+#: ../libempathy-gtk/empathy-individual-menu.c:1141
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "ਸੋਧ(_E)"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:957
+#: ../libempathy-gtk/empathy-individual-menu.c:1167
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "ਸੰਪਰਕ ਲਿੰਕ ਕਰੋ(_L)…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2340
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 msgid "Delete and _Block"
 msgstr "ਹਟਾਓ ਅਤੇ ਪਾਬੰਦੀ ਲਗਾਓ(_B)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2509
+#: ../libempathy-gtk/empathy-individual-view.c:2510
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2175,7 +2239,7 @@ msgstr ""
 "ਸੰਪਰਕ ਹਟਾ� "
 "ਜਾਣਗੇ, ਜੋ ਕਿ ਇਸ ਲਿੰਕ ਕੀਤੇ ਸੰਪਰਕ ਨੂੰ ਬਣਾਉਂਦੇ ਹਨ।"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1672
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2260,128 +2324,142 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "ਅਣ-ਲਿੰਕ ਕਰੋ(_U)"
 
-#: ../libempathy-gtk/empathy-log-window.c:458
+#: ../libempathy-gtk/empathy-log-window.c:634
 msgid "History"
 msgstr "ਅਤੀਤ"
 
-#: ../libempathy-gtk/empathy-log-window.c:510
+#: ../libempathy-gtk/empathy-log-window.c:689
 msgid "Show"
 msgstr "ਵੇਖਾਓ"
 
-#: ../libempathy-gtk/empathy-log-window.c:532
+#: ../libempathy-gtk/empathy-log-window.c:711
 msgid "Search"
 msgstr "ਖੋਜ"
 
-#: ../libempathy-gtk/empathy-log-window.c:946
+#: ../libempathy-gtk/empathy-log-window.c:1159
 #, c-format
 msgid "Chat in %s"
 msgstr "%s ਵਿੱਚ ਗੱਲਬਾਤ"
 
-#: ../libempathy-gtk/empathy-log-window.c:948
+#: ../libempathy-gtk/empathy-log-window.c:1161
 #, c-format
 msgid "Chat with %s"
 msgstr "%s ਨਾਲ ਗੱਲਬਾਤ"
 
-#: ../libempathy-gtk/empathy-log-window.c:998
-#: ../libempathy-gtk/empathy-log-window.c:1176
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1118
+#: ../libempathy-gtk/empathy-log-window.c:1300
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1124
+#: ../libempathy-gtk/empathy-log-window.c:1306
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1195
-#: ../libempathy-gtk/empathy-log-window.c:1197
-#: ../src/empathy-ft-manager.c:1026
-msgid "%"
-msgstr "%"
-
-#: ../libempathy-gtk/empathy-log-window.c:1204
+#: ../libempathy-gtk/empathy-log-window.c:1382
+#, c-format
+#| msgid "%d second ago"
+#| msgid_plural "%d seconds ago"
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s ਸਕਿੰਟ"
+msgstr[1] "%s ਸਕਿੰਟ"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+#| msgid "%d minute ago"
+#| msgid_plural "%d minutes ago"
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s ਮਿੰਟ"
+msgstr[1] "%s ਮਿੰਟ"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "%s ਨੂੰ ਕਾਲ ਲਈ, %s ਵਜੇ ਖਤਮ ਹੋਈ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1536
+#: ../libempathy-gtk/empathy-log-window.c:1729
 msgid "Today"
 msgstr "ਅੱਜ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1540
+#: ../libempathy-gtk/empathy-log-window.c:1733
 msgid "Yesterday"
 msgstr "ਕੱਲ�ਹ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1556
-msgctxt ""
-"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
+#| msgctxt ""
+#| "A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+#| msgid "%e %B %Y"
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1637
-#: ../libempathy-gtk/empathy-log-window.c:3203
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3425
 msgid "Anytime"
 msgstr "ਕਿਸੇ ਵੀ ਸਮੇਂ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1717
-#: ../libempathy-gtk/empathy-log-window.c:2154
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2353
 msgid "Anyone"
 msgstr "ਕੋਈ ਵੀ"
 
-#: ../libempathy-gtk/empathy-log-window.c:2451
+#: ../libempathy-gtk/empathy-log-window.c:2666
 msgid "Who"
 msgstr "ਕੌਣ"
 
-#: ../libempathy-gtk/empathy-log-window.c:2655
+#: ../libempathy-gtk/empathy-log-window.c:2870
 msgid "When"
 msgstr "ਕਦੋਂ"
 
-#: ../libempathy-gtk/empathy-log-window.c:2771
+#: ../libempathy-gtk/empathy-log-window.c:2986
 msgid "Anything"
 msgstr "ਕ�� ਵੀ"
 
-#: ../libempathy-gtk/empathy-log-window.c:2773
+#: ../libempathy-gtk/empathy-log-window.c:2988
 msgid "Text chats"
 msgstr "ਟੈਕਸਟ ਗੱਲਬਾਤ"
 
-#: ../libempathy-gtk/empathy-log-window.c:2775
+#: ../libempathy-gtk/empathy-log-window.c:2990
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "ਕਾਲਾਂ"
 
-#: ../libempathy-gtk/empathy-log-window.c:2780
+#: ../libempathy-gtk/empathy-log-window.c:2995
 msgid "Incoming calls"
 msgstr "ਆਉਣ ਕਾਲਾਂ"
 
-#: ../libempathy-gtk/empathy-log-window.c:2781
+#: ../libempathy-gtk/empathy-log-window.c:2996
 msgid "Outgoing calls"
 msgstr "ਜਾਣ ਕਾਲਾਂ"
 
-#: ../libempathy-gtk/empathy-log-window.c:2782
+#: ../libempathy-gtk/empathy-log-window.c:2997
 msgid "Missed calls"
 msgstr "ਖ�ੰ�ੀਆਂ ਕਾਲਾਂ"
 
-#: ../libempathy-gtk/empathy-log-window.c:2804
+#: ../libempathy-gtk/empathy-log-window.c:3019
 msgid "What"
 msgstr "ਕੀ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3506
+#: ../libempathy-gtk/empathy-log-window.c:3728
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "ਕੀ ਤ�ਸੀਂ ਪਿਛਲੀਆਂ ਗੱਲਾਬਾਤਾਂ ਤੋਂ ਸਭ ਲਾਗ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3510
+#: ../libempathy-gtk/empathy-log-window.c:3732
 msgid "Clear All"
 msgstr "ਸਭ ਸਾਫ਼ ਕਰੋ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3517
+#: ../libempathy-gtk/empathy-log-window.c:3739
 msgid "Delete from:"
 msgstr "ਇਸ ਤੋਂ ਹਟਾਓ:"
 
@@ -2389,14 +2467,6 @@ msgstr "ਇਸ ਤੋਂ ਹਟਾਓ:"
 msgid "<span size=\"x-large\">Loading...</span>"
 msgstr "<span size=\"x-large\">ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...</span>"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call"
-msgstr "ਕਾਲ ਕਰੋ"
-
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
 #: ../src/empathy-chat-window.ui.h:3
 msgid "Chat"
@@ -2418,7 +2488,7 @@ msgstr "ਵਿਡੀਓ"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
 #: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window-menubar.ui.h:20
 msgid "_Edit"
 msgstr "ਸੋਧ(_E)"
 
@@ -2435,27 +2505,27 @@ msgid "Contact ID:"
 msgstr "ਸੰਪਰਕ ID:"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:258
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
 msgid "C_hat"
 msgstr "ਗੱਲਬਾਤ(_h)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:277
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
 msgstr "ਨਵੀਂ ਗੱਲਬਾਤ"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:231
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
 msgid "Send _Video"
 msgstr "ਵਿਡੀਓ ਭੇਜੋ(_V)"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
 msgid "C_all"
 msgstr "ਕਾਲ(_a)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:252
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "New Call"
 msgstr "ਨਵੀਂ ਕਾਲ"
 
@@ -2515,24 +2585,24 @@ msgid "New %s account"
 msgstr "ਨਵਾਂ %s ਅਕਾਊਂਟ"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "ਅੱਗੇ ਲੱਭੋ"
+msgid "Find:"
+msgstr "ਲੱਭੋ:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "ਪਿੱਛੇ ਲੱਭੋ"
+msgid "Mat_ch case"
+msgstr "ਮਿਲਦੇ ਕੇਸ(_c)"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Find:"
-msgstr "ਲੱਭੋ:"
+msgid "Phrase not found"
+msgstr "ਸ਼ਬਦ ਨਹੀਂ ਲੱਭੇ"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "ਮਿਲਦੇ ਕੇਸ"
+msgid "_Next"
+msgstr "ਅੱਗੇ(_N)"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "Phrase not found"
-msgstr "ਸ਼ਬਦ ਨਹੀਂ ਲੱਭੇ"
+msgid "_Previous"
+msgstr "ਪਿੱਛੇ(_P)"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2578,34 +2648,28 @@ msgstr "ਆਵਾਜ਼ ਕਾਲ ਖਤਮ ਕੀਤੀ"
 msgid "Edit Custom Messages"
 msgstr "ਪਸੰਦੀਦਾ ਸ�ਨੇਹੇ ਸੋਧੋ"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
-#: ../src/empathy-chatrooms-window.ui.h:3
-msgid "Remove"
-msgstr "ਹਟਾਓ"
-
-#: ../libempathy-gtk/empathy-theme-adium.c:1121
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
 #, c-format
 msgid "Message edited at %s"
 msgstr "%s ਉੱਤੇ ਸ�ਨੇਹਾ ਸੋਧਿਆ ਗਿਆ"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1943
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
 msgid "Normal"
 msgstr "ਸਧਾਰਨ"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:75
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "ਕਲਾਸਿਕ"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:76
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "ਸਧਾਰਨ"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:77
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "ਸਾਫ਼"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:78
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "ਨੀਲਾ"
 
@@ -2680,19 +2744,19 @@ msgstr "ਭਵਿੱਖ ਦੇ ਕà©�ਨੈਕਸ਼ਨਾਂ ਲਈ ਇਹ ਚà
 msgid "Certificate Details"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਵੇਰਵਾ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1653
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
 msgstr "URI ਖੋਲ�ਹਣ ਲਈ ਅਸਮਰੱਥ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1749
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
 msgstr "ਫਾਇਲ ਚ�ਣੋ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1821
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
 msgid "Insufficient free space to save file"
 msgstr "ਫਾਇਲ ਸੰਭਾਲਣ ਲਈ ਲੋੜੀਦੀ ਥਾਂ ਨਹੀਂ ਹੈ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1829
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2702,7 +2766,7 @@ msgstr ""
 "ਟਿਕਾਣਾ ਚ�ਣੋ "
 "ਜੀ।"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1873
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid "Incoming file from %s"
 msgstr "%s ਵਲੋਂ ਫਾਇਲ ਆ ਰਹੀ ਹੈ"
@@ -2890,23 +2954,23 @@ msgstr "ਕੋਈ ਗਲਤੀ ਸ�ਨੇਹਾ ਨਹੀਂ"
 msgid "Instant Message (Empathy)"
 msgstr "ਤ�ਰੰਤ ਸ�ਨੇਹਾ (ਇੰਪੈਥੀ)"
 
-#: ../src/empathy.c:354
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "ਸ਼�ਰੂ ਸਮੇਂ ਕ�ਨੈਕਟ ਨਾ ਕਰੋ"
 
-#: ../src/empathy.c:358
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "ਸ਼�ਰੂ ਸਮੇਂ ਸੰਪਰਕ ਲਿਸਟ ਜਾਂ ਕੋਈ ਹੋਰ ਡਾਈਲਾਗ ਨਾ ਵੇਖਾਓ"
 
-#: ../src/empathy.c:373
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr "- ਇੰਪੈਥੀ ਤ�ਰੰਤ ਸ�ਨੇਹੇਦਾਰ ਕਲਾਇਟ"
 
-#: ../src/empathy.c:560
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
 msgstr "ਅਕਾਊਂਟ ਮੈਨੇਜਰ ਨਾਲ ਸੰਪਰਕ ਕਰਨ 'ਚ ਗਲਤੀ"
 
-#: ../src/empathy.c:562
+#: ../src/empathy.c:639
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3144,7 +3208,7 @@ msgstr "ਤà©�ਹਾਡਾ ਨਵਾਂ ਅਕਾਊਂਟ ਹਾਲੇ ਨਹà©
 
 #: ../src/empathy-accounts-dialog.c:345
 #: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1098
+#: ../src/empathy-call-window.c:1175
 msgid "Connecting…"
 msgstr "ਕ�ਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
@@ -3253,11 +3317,11 @@ msgstr "ਇੰਪੈਥੀ ਪਰਮਾਣਕਿਤਾ ਕਲਾਇਟ"
 msgid "People nearby"
 msgstr "ਨੇੜਲੇ ਲੋਕ"
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:127
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr "- ਇੰਪੈਥੀ ਆਡੀਓ/ਵਿਡੀਓ ਕਲਾਇਟ"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:152
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "ਇੰਪੈਥੀ ਆਡੀਓ/ਵਿਡੀਓ ਕਲਾਇਟ"
 
@@ -3300,33 +3364,33 @@ msgstr "ਵੇਰਵਾ"
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1599
+#: ../src/empathy-call-window.c:1782
 #, c-format
 msgid "Call with %s"
 msgstr "%s ਲਈ ਕਾਲ ਕਰੋ"
 
 #: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:1843
+#: ../src/empathy-call-window.c:2026
 msgid "The IP address as seen by the machine"
 msgstr "ਮਸ਼ੀਨ ਵਲੋਂ ਵੇਖਿਆ ਜਾਂਦਾ IP �ਡਰੈੱਸ"
 
 #: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:1845
+#: ../src/empathy-call-window.c:2028
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP �ਡਰੈੱਸ, ਜੋ ਕਿ ਇੰਟਰਨੈੱਟ ਉੱਤੇ ਸਰਵਰ ਵਲੋਂ ਵੇਖਿਆ ਜਾਂਦਾ ਹੈ"
 
 #: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:1847
+#: ../src/empathy-call-window.c:2030
 msgid "The IP address of the peer as seen by the other side"
 msgstr "ਪੀਅਰ ਦਾ IP �ਡਰੈੱਸ, ਜੋ ਦੂਜੇ ਪਾਸੇ ਵਿਖਾਈ ਦਿੰਦਾ ਹੈ"
 
 #: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:1849
+#: ../src/empathy-call-window.c:2032
 msgid "The IP address of a relay server"
 msgstr "ਰੀਲੇਅ ਸਰਵਰ ਦਾ IP �ਡਰੈੱਸ"
 
 #: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:1851
+#: ../src/empathy-call-window.c:2034
 msgid "The IP address of the multicast group"
 msgstr "ਮਲਟੀਕਾਸਟ ਗਰ�ੱਪ ਦਾ IP �ਡਰੈੱਸ"
 
@@ -3357,12 +3421,12 @@ msgid "Connected — %d:%02dm"
 msgstr "ਕ�ਨੈਕਟ ਹੈ -- %d:%02dm"
 
 #: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2583
+#: ../src/empathy-call-window.c:2798
 msgid "Technical Details"
 msgstr "ਤਕਨੀਕੀ ਵੇਰਵਾ"
 
 #: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2621
+#: ../src/empathy-call-window.c:2836
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3372,7 +3436,7 @@ msgstr ""
 "ਸਕਦਾ ਹੈ।"
 
 #: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2626
+#: ../src/empathy-call-window.c:2841
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3382,7 +3446,7 @@ msgstr ""
 "ਸਕਦਾ ਹੈ।"
 
 #: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2632
+#: ../src/empathy-call-window.c:2847
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3393,24 +3457,24 @@ msgstr ""
 "ਬਣਾਉਣ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
 
 #: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2638
+#: ../src/empathy-call-window.c:2853
 msgid "There was a failure on the network"
 msgstr "ਨੈੱਟਵਰਕ ਉੱਤੇ ਸਮੱਸਿਆ ਆਈ ਹੈ"
 
 #: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2642
+#: ../src/empathy-call-window.c:2857
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "ਇਹ ਕਾਲ ਲਈ ਲੋੜੀਦੇ ਆਡੀਓ ਫਾਰਮੈਟ ਤ�ਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਇੰਸਟਾਲ ਨਹੀਂ ਹਨ"
 
 #: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2645
+#: ../src/empathy-call-window.c:2860
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "ਇਹ ਕਾਲ ਲਈ ਲੋੜੀਦੇ ਵਿਡੀਓ ਫਾਰਮੈਟ ਤ�ਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਇੰਸਟਾਲ ਨਹੀਂ ਹਨ"
 
 #: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2657
+#: ../src/empathy-call-window.c:2872
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3422,22 +3486,22 @@ msgstr ""
 "ਮੇਨੂ ਵਿੱਚੋਂ 'ਡੀਬੱਗ' ਵਿੰਡੋ ਤੋਂ ਲੈ ਕੇ ਲਾਗ ਨੱਥੀ ਕਰੋ।"
 
 #: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2666
+#: ../src/empathy-call-window.c:2881
 msgid "There was a failure in the call engine"
 msgstr "ਕਾਲ ਇੰਜਣ ਵਿੱਚ ਕੋਈ ਸਮੱਸਿਆ ਆਈ ਹੈ"
 
 #: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2669
+#: ../src/empathy-call-window.c:2884
 msgid "The end of the stream was reached"
 msgstr "ਸਟਰੀਮ ਦਾ ਅੰਤ ਆ ਗਿਆ ਹੈ"
 
 #: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2709
+#: ../src/empathy-call-window.c:2924
 msgid "Can't establish audio stream"
 msgstr "ਆਡੀਓ ਸਟਰੀਮ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
 
 #: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2719
+#: ../src/empathy-call-window.c:2934
 msgid "Can't establish video stream"
 msgstr "ਵਿਡੀਓ ਸਟਰੀਮ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
 
@@ -3452,7 +3516,6 @@ msgid "Decoding Codec:"
 msgstr "ਡੀਕੋਡਿੰਗ Codec:"
 
 #: ../src/empathy-call-window.ui.h:4
-#| msgid "_Disable"
 msgid "Disable camera"
 msgstr "ਕੈਮਰਾ ਬੰਦ ਕਰੋ"
 
@@ -3499,12 +3562,10 @@ msgid "Send Audio"
 msgstr "ਆਡੀਓ ਭੇਜੋ"
 
 #: ../src/empathy-call-window.ui.h:14
-#| msgid "Send _Video"
 msgid "Send Video"
 msgstr "ਵਿਡੀਓ ਭੇਜੋ"
 
 #: ../src/empathy-call-window.ui.h:15
-#| msgid "Dialpad"
 msgid "Show dialpad"
 msgstr "ਡਾਇਲ-ਪੈਡ ਵੇਖੋ"
 
@@ -3526,20 +3587,17 @@ msgid "Toggle audio transmission"
 msgstr "ਆਡੀਓ ਟਰਾਂਸਮਿਸ਼ਨ ਬਦਲੋ"
 
 #: ../src/empathy-call-window.ui.h:20
-#| msgid "Toggle audio transmission"
 msgid "Toggle video transmission"
 msgstr "ਵਿਡੀਓ ਟਰਾਂਸਮਿਸ਼ਨ ਬਦਲੋ"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2219 ../src/empathy-call-window.c:2220
-#: ../src/empathy-call-window.c:2221 ../src/empathy-call-window.c:2222
+#: ../src/empathy-call-window.c:2431 ../src/empathy-call-window.c:2432
+#: ../src/empathy-call-window.c:2433 ../src/empathy-call-window.c:2434
 msgid "Unknown"
 msgstr "ਅਣਜਾਣ"
 
 #: ../src/empathy-call-window.ui.h:23
-#| msgctxt "menu item"
-#| msgid "_Video Call"
 msgid "Video call"
 msgstr "ਵਿਡੀਓ ਕਾਲ"
 
@@ -3549,21 +3607,21 @@ msgid "_Call"
 msgstr "ਕਾਲ ਕਰੋ(_C)"
 
 #: ../src/empathy-call-window.ui.h:25
-#| msgid "Camera On"
 msgid "_Camera"
 msgstr "ਕੈਮਰਾ(_C)"
 
 #: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window-menubar.ui.h:18
 msgid "_Contents"
 msgstr "ਸਮੱਗਰੀ(_C)"
 
-#: ../src/empathy-call-window.ui.h:27 ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
 msgid "_Debug"
 msgstr "ਡੀਬੱਗ(_D)"
 
 #: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window-menubar.ui.h:22
 msgid "_Help"
 msgstr "ਮੱਦਦ(_H)"
 
@@ -3572,55 +3630,55 @@ msgid "_Microphone"
 msgstr "ਮਾਈਕਰੋਫੋਨ(_M)"
 
 #: ../src/empathy-call-window.ui.h:31
-#| msgid "Settings"
 msgid "_Settings"
 msgstr "ਸੈਟਿੰਗ(_S)"
 
-#: ../src/empathy-call-window.ui.h:32 ../src/empathy-main-window.ui.h:30
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "ਵੇਖੋ(_V)"
 
-#: ../src/empathy-chat-window.c:480 ../src/empathy-chat-window.c:500
+#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d ਨਾ-ਪੜ�ਹੇ)"
 msgstr[1] "%s (%d ਨਾ-ਪੜ�ਹੇ)"
 
-#: ../src/empathy-chat-window.c:492
+#: ../src/empathy-chat-window.c:493
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (ਅਤੇ %u ਹੋਰ)"
 msgstr[1] "%s (ਅਤੇ %u ਹੋਰ)"
 
-#: ../src/empathy-chat-window.c:508
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (ਹੋਰਾਂ ਤੋਂ %d ਨਾ-ਪੜ�ਹੇ ਸ�ਨੇਹੇ)"
 msgstr[1] "%s (ਹੋਰਾਂ ਤੋਂ %d ਨਾ-ਪੜ�ਹੇ ਸ�ਨੇਹੇ)"
 
-#: ../src/empathy-chat-window.c:517
+#: ../src/empathy-chat-window.c:518
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (ਸਭ ਤੋਂ %d ਨਾ-ਪੜ�ਹੇ)"
 msgstr[1] "%s (ਸਭ ਤੋਂ %d ਨਾ-ਪੜ�ਹੇ)"
 
-#: ../src/empathy-chat-window.c:732
+#: ../src/empathy-chat-window.c:733
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:742
+#: ../src/empathy-chat-window.c:743
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "%d ਸ�ਨੇਹਾ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 msgstr[1] "%d ਸ�ਨੇਹੇ ਭੇਜੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../src/empathy-chat-window.c:764
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
 msgstr "ਸ�ਨੇਹਾ ਲਿਖਦਾ/ਲਿਖਦੀ ਹੈ।"
 
@@ -3700,96 +3758,97 @@ msgstr "ਆਟੋ-ਕ�ਨੈਕਟ"
 msgid "Manage Favorite Rooms"
 msgstr "ਪਸੰਦੀਦਾ ਰੂਮ ਪਰਬੰਧ"
 
-#: ../src/empathy-event-manager.c:522
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming video call"
 msgstr "ਆ ਰਹੀ ਵਿਡੀਓ ਕਾਲ"
 
-#: ../src/empathy-event-manager.c:522
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1408
 msgid "Incoming call"
 msgstr "ਆ ਰਹੀ ਕਾਲ"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:525
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s ਤ�ਹਾਨੂੰ ਵਿਡੀਓ ਕਾਲ ਕਰ ਰਿਹਾ ਹੈ, ਕੀ ਤ�ਸੀਂ ਜਵਾਬ ਦੇਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s ਤ�ਹਾਨੂੰ ਕਾਲ ਕਰ ਰਿਹਾ ਹੈ, ਕੀ ਤ�ਸੀਂ ਜਵਾਬ ਦੇਣਾ ਚਾਹ�ੰਦੇ ਹੋ?"
 
-#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
-#: ../src/empathy-event-manager.c:764
+#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1414
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s ਤੋਂ ਕਾਲ ਆ ਰਹੀ ਹੈ"
 
-#: ../src/empathy-event-manager.c:555
+#: ../src/empathy-event-manager.c:554
 msgid "_Reject"
 msgstr "ਰੱਦ ਕਰੋ(_R)"
 
-#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
 msgid "_Answer"
 msgstr "ਜਵਾਬ ਦਿਓ(_A)"
 
-#: ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:570
 msgid "_Answer with video"
 msgstr "ਵਿਡੀਓ ਨਾਲ ਜਵਾਬ(_A)"
 
-#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
+#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1414
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "%s ਤੋਂ ਵਿਡੀਓ ਕਾਲ ਆ ਰਹੀ ਹੈ"
 
-#: ../src/empathy-event-manager.c:837
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
 msgstr "ਰੂਮ ਸੱਦਾ"
 
-#: ../src/empathy-event-manager.c:839
+#: ../src/empathy-event-manager.c:838
 #, c-format
 msgid "Invitation to join %s"
 msgstr "%s ਜ�ਆਇੰਣ ਕਰਨ ਲਈ ਸੱਦਾ"
 
-#: ../src/empathy-event-manager.c:846
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s ਤ�ਹਾਨੂੰ %s ਜ�ਆਇੰਨ ਕਰਨ ਲਈ ਸੱਦ ਰਿਹਾ ਹੈ"
 
-#: ../src/empathy-event-manager.c:854
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
 msgstr "ਇਨਕਾਰ(_D)"
 
-#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "ਦਾਖਲ(_J)"
 
-#: ../src/empathy-event-manager.c:886
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s ਨੇ ਤ�ਹਾਨੂੰ %s ਦਾਖਲ ਹੋਣ ਲਈ ਸੱਦਿਆ"
 
-#: ../src/empathy-event-manager.c:892
+#: ../src/empathy-event-manager.c:891
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "ਤ�ਹਾਨੂੰ %s ਜ�ਆਇੰਨ ਕਰਨ ਲਈ ਸੱਦਾ ਆਇਆ ਹੈ"
 
-#: ../src/empathy-event-manager.c:943
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "%s ਤੋਂ ਆ ਰਿਹਾ ਫਾਇਲ ਸੰਚਾਰ"
 
-#: ../src/empathy-event-manager.c:1135 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
 msgid "Password required"
 msgstr "ਪਾਸਵਰਡ ਚਾਹੀਦਾ ਹੈ"
 
-#: ../src/empathy-event-manager.c:1191
+#: ../src/empathy-event-manager.c:1190
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr ""
 "%s ਤ�ਹਾਨੂੰ ਵੇਖਣ ਦਾ ਅਧਿਕਾਰ ਚਾਹ�ੰਦਾ/ਚਾਹ�ੰਦੀ ਹੈ, ਜਦੋਂ ਵੀ ਤ�ਸੀਂ ਆਨਲਾਈਨ ਹੋਵੋ"
 
-#: ../src/empathy-event-manager.c:1195
+#: ../src/empathy-event-manager.c:1194
 #, c-format
 msgid ""
 "\n"
@@ -3889,6 +3948,10 @@ msgstr "\"%s\" ਦੀ à¨�ਂਟੀਗਰੇਟੀ ਦੀ ਜਾਂਚ ਕੀਤà
 msgid "Hashing \"%s\""
 msgstr "\"%s\" ਹੈਸ਼ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
+#: ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "%"
+
 #: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "ਫਾਇਲ"
@@ -3967,107 +4030,104 @@ msgid "Top up account credit"
 msgstr "ਅਕਾਊਂਟ ਕਰੈਡਿਟ ਟਾਪਅੱਪ ਕਰੋ"
 
 #. top up button
-#: ../src/empathy-main-window.c:1050
+#: ../src/empathy-main-window.c:1046
 msgid "Top Up..."
 msgstr "ਟਾਪ ਅੱਪ..."
 
-#: ../src/empathy-main-window.c:1817
+#: ../src/empathy-main-window.c:1789
 msgid "Contact"
 msgstr "ਸੰਪਰਕ"
 
-#: ../src/empathy-main-window.c:2145
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "ਸੰਪਰਕ ਲਿਸਟ"
 
-#: ../src/empathy-main-window.c:2263
-msgid "Show and edit accounts"
-msgstr "ਅਕਾਊਂਟ ਵੇਖੋ ਅਤੇ ਸੋਧੋ"
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "ਨਕਸ਼ੇ ਉੱਤੇ ਸੰਪਰਕ(_M)"
 
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-main-window-menubar.ui.h:2
 msgid "Credit Balance"
 msgstr "ਕਰੈਡਿਟ ਬਕਾਇਆ"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "ਸੰਪਰਕ ਲਿਸਟ 'ਚ ਲੱਭੋ(_L)"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "ਪਸੰਦ ਵਿੱਚ ਦਾਖਲ(_F)"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "ਪਸੰਦ ਪਰਬੰਧ"
 
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "ਸਧਾਰਨ ਆਕਾਰ(_o)"
 
-#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "ਨਵੀਂ ਕਾਲ(_C)..."
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "ਅਵਤਾਰਾਂ ਨਾਲ ਸਧਾਰਨ ਆਕਾਰ(_A)"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "ਪਸੰਦ(_r)"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "ਪਰੋਟੋਕਾਲ ਵੇਖੋ(_r)"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "ਨਾਂ ਨਾਲ ਲੜੀਬੱਧ(_N)"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "ਹਾਲਤ ਨਾਲ ਲੜੀਬੱਧ(_S)"
 
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "ਅਕਾਊਂਟ(_A)"
 
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "ਪਾਬੰਦੀਸ਼�ਦਾ ਸੰਪਰਕ(_B)"
 
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "ਸੰਖੇਪ ਆਕਾਰ(_C)"
 
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ(_F)"
 
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "ਦਾਖਲ(_J)..."
 
-#: ../src/empathy-main-window.ui.h:24 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "ਨਵੀਂ ਗੱਲਬਾਤ..."
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "ਆਫਲਾਈਨ ਸੰਪਰਕ(_O)"
 
-#: ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "ਨਿੱਜੀ ਜਾਣਕਾਰੀ(_P)"
 
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "ਰੂਮ(_R)"
 
-#: ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-main-window-menubar.ui.h:29
 msgid "_Search for Contacts…"
 msgstr "ਸੰਪਰਕ ਲੱਭੋ(_S)…"
 
@@ -4137,79 +4197,79 @@ msgstr "ਰੂਮ ਲਿਸਟ"
 msgid "_Room:"
 msgstr "ਰੂਮ(_R):"
 
-#: ../src/empathy-preferences.c:172
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr "ਸ�ਨੇਹਾ ਮਿਲਿਆ"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr "ਸ�ਨੇਹਾ ਭੇਜਿਆ"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
 msgstr "ਨਵੀਂ ਗੱਲਬਾਤ"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
 msgstr "ਸੰਪਰਕ ਆਨਲਾਈਨ ਹੋਇਆ"
 
-#: ../src/empathy-preferences.c:176
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
 msgstr "ਸੰਪਰਕ ਬੰਦ ਕਰ ਗਿਆ"
 
-#: ../src/empathy-preferences.c:177
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
 msgstr "ਅਕਾਊਂਟ ਕ�ਨੈਕਟ ਕੀਤਾ"
 
-#: ../src/empathy-preferences.c:178
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
 msgstr "ਅਕਾਊਂਟ ਕ�ਨੈਕਸ਼ਨ ਬੰਦ ਹੋਇਆ"
 
-#: ../src/empathy-preferences.c:487
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr "ਭਾਸ਼ਾ"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:737
+#: ../src/empathy-preferences.c:734
 msgid "Juliet"
 msgstr "ਹੀਰ"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:741
 msgid "Romeo"
 msgstr "ਰਾਂ�ਾ"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:747
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "ਵੇ ਰਾਂ�ਿਆ, ਰਾਂ�ਿਆ, ਤੂੰ ਕਿੱਥੇ �ਂ ਧੀਦੋ ਰਾਂ�ਿਆਂ?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:750
 msgid "Deny thy father and refuse thy name;"
 msgstr "ਆਪਣੇ ਤਖਤ ਹਜ਼ਾਰੇ ਨੂੰ ਛੱਡ ਨੂੰ ਤੇਰੀਆਂ ਮੱ�ੀਆਂ ਚਾਰੀਆਂ;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:753
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "ਜਾਂ ਮੈਨੂੰ ਤੇਰੇ ਪਿਆਰ ਦੀ ਸੌਂਹ ਹੀਰੇ"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:756
 msgid "And I'll no longer be a Capulet."
 msgstr "ਅਤੇ ਮੈਂ ਹ�ਣ ਰਾਂ�ੇ ਬਿਨਾਂ ਨਹੀਂ ਜਿਊਂਣਾ"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:759
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "ਕੀ ਮੈਂ ਹੋ ਸ�ਣਾਂ ਜਾਂ ਮੈਂ ਇਸ ਬਾਰੇ ਗੱਲ ਕਰਾਂ?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:765
+#: ../src/empathy-preferences.c:762
 msgid "Juliet has disconnected"
-msgstr "ਜ�ਲੀਅਟ ਡਿਸ-ਕ�ਨੈਕਟ ਹੋ ਗਿਆ ਹੈ"
+msgstr "ਰਾਂ�ਾ ਡਿਸ-ਕ�ਨੈਕਟ ਹੋ ਗਿਆ ਹੈ"
 
-#: ../src/empathy-preferences.c:1171
+#: ../src/empathy-preferences.c:1166
 msgid "Preferences"
 msgstr "ਪਸੰਦ"
 
@@ -4238,54 +4298,67 @@ msgid "Display incoming events in the notification area"
 msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ ਖੇਤਰ ਵਿੱਚ ਆ ਰਹੇ ਈਵੈਂਟ ਵੇਖਾਓ"
 
 #: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"ਈਕੋ ਰੱਦ ਕਰਨ ਨਾਲ ਦੂਜੇ ਵਿਅਕਤੀ ਨੂੰ ਤ�ਹਾਡੀ ਆਵਾਜ਼ ਸਾਫ਼ ਸ�ਣਨ ਵਿੱਚ ਮੱਦਦ ਮਿਲਦੀ ਹੈ, ਪਰ "
+"ਕ�� ਕੰਪਿਊਟਰਾਂ "
+"ਉੱਤੇ ਸਮੱਸਿਆ ਆ ਸਕਦੀ ਹੈ। ਜੇ ਤ�ਹਾਨੂੰ ਜਾਂ ਹੋਰ ਵਿਅਕਤੀ ਨੂੰ ਅਜੀਬ ਜਿਹੀਆਂ ਆਵਾਜ਼ ਸ�ਣਨ "
+"ਜਾਂ ਕਾਲ ਦੇ ਦੌਰਾਨ "
+"ਰ�ਕਾਵਟ ਆ� ਤਾਂ ਈਕੋ ਰੱਦ ਕਰਨ ਨੂੰ ਬੰਦ ਕਰਕੇ ਕਾਲ ਮ�ੜ ਕਰਕੇ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।"
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "ਜਦੋਂ ਸੰਪਰਕ ਆਨਲਾਈਨ ਆਵੇ ਤਾਂ ਸੂਚਨਾ ਦਿਓ"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "ਜਦੋਂ ਸੰਪਰਕ ਆਫਲਾਈਨ ਜਾਵੇ ਤਾਂ ਸੂਚਨਾ ਦਿਓ"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "ਜਦੋਂ ਗੱਲਬਾਤ ਫੋਕਸ ਨਾ ਹੋਵੇ ਤਾਂ ਸੂਚਨਾ ਦਿਓ(_c)"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "ਭਾਸ਼ਾਵਾਂ ਲਈ ਸ਼ਬਦ-ਜੋੜ ਚੈੱਕ ਕਰਨਾ ਯੋਗ:"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "ਆਮ"
 
-#: ../src/empathy-preferences.ui.h:14
-msgid "Input level"
-msgstr "ਇੰਪ�ੱਟ ਲੈਵਲ"
-
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input volume"
-msgstr "ਇੰਪ�ੱਟ ਆਵਾਜ਼"
+msgid "Input level:"
+msgstr "ਇੰਪ�ੱਟ ਲੈਵਲ:"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "ਇੰਪ�ੱਟ ਆਵਾਜ਼:"
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "ਟਿਕਾਣਾ ਸਰੋਤ:"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "ਗੱਲਬਾਤ ਲਾਗ"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "ਘਟਨਾਵਾਂ ਲਈ ਸਾਊਂਡ ਚਲਾਓ"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "ਪਰਾਈਵੇਸੀ"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -4295,71 +4368,71 @@ msgstr ""
 "ਵੇਖਾਇਆ ਨਹੀਂ "
 "ਜਾਵੇਗਾ। GPS ਧ�ਰਾ ਮ�ੱਲ 1 ਦਸ਼ਮਲਵ ਥਾਂ ਨਾਲ ਸ਼�ੱਧ ਹੋਣਗੇ।"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "ਖ�ਸ਼ ਚਿੱਤਰਾਂ ਵਾਂਗ ਵੇਖੋ(_s)"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "ਰੂਮ ਵਿੱਚ ਸੰਪਰਕ ਲਿਸਟ ਵੇਖੋ(_l)"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "ਸਾਊਂਡ"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "ਸ਼ਬਦਜੋੜ ਜਾਂਚ"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 "ਭਾਸ਼ਾ ਦੀ ਲਿਸਟ ਵੇਖਾ ਰਿਹਾ ਹੈ, ਜਿੰਨ�ਹਾਂ ਲਈ ਤ�ਹਾਡੇ ਕੋਲ ਸ਼ਬਦ-ਕੋਸ਼ ਇੰਸਟਾਲ ਹੈ।"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "ਥੀਮ"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "ਬਦਲ:"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "ਸ਼�ਰੂ ਸਮੇਂ ਆਟੋਮੈਟਿਕ ਹੀ ਕ�ਨੈਕਟ ਕਰੋ(_A)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "ਸੈੱਲਫੋਨ(_C)"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "ਬ�ਲਬ�ਲਾ ਨੋਟੀਫਿਕੇਸ਼ਨ ਚਾਲੂ(_E)"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "ਸਾਊਂਡ ਨੋਟੀਫਿਕੇਸ਼ਨ ਚਾਲੂ(_E)"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "ਨੈੱਟਵਰਕ (IP, Wi-Fi)(_N) "
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "ਨਵੀਆਂ ਗੱਲਾਬਾਤਾਂ ਵੱਖ ਵੱਖ ਵਿੰਡੋ ਵਿੱਚ ਖੋਲ�ਹੋ(_O)"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "ਮੇਰੇ ਸੰਪਰਕਾਂ ਲਈ ਟਿਕਾਣਾ ਦੱਸੋ(_P)"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "ਟਿਕਾਣਾ ਸ਼�ੱਧਤਾ ਘਟਾਓ(_R)"
 
@@ -4485,16 +4558,16 @@ msgid ""
 "extension."
 msgstr "ਚ�ਣਿਆ ਕ�ਨੈਕਸ਼ਨ ਮੈਨੇਜਰ ਰਿਮੋਟ ਡੀਬੱਗ ਇਕਸਟੈਨਸ਼ਨ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
 
+#: ../src/empathy-invite-participant-dialog.c:179
 #: ../src/empathy-invite-participant-dialog.c:205
-#: ../src/empathy-invite-participant-dialog.c:231
 msgid "Invite Participant"
 msgstr "ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਸੱਦਾ"
 
-#: ../src/empathy-invite-participant-dialog.c:206
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "ਗੱਲਬਾਤ ਵਿੱਚ ਸੱਦਣ ਲਈ ਸੰਪਰਕ ਚ�ਣੋ:"
 
-#: ../src/empathy-invite-participant-dialog.c:227
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "ਸੱਦਾ"
 
@@ -4529,7 +4602,6 @@ msgid "Show a particular service"
 msgstr "ਇੱਕ ਖਾਸ ਸਰਵਿਸ ਵੇਖਾਓ"
 
 #: ../src/empathy-debugger.c:75
-#| msgid "Empathy Debugger"
 msgid "- Empathy Debugger"
 msgstr "- ਇੰਪੈਥੀ ਡੀਬੱਗਰ"
 
@@ -4546,11 +4618,13 @@ msgid "Respond"
 msgstr "ਜਵਾਬ"
 
 #: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1418
 msgid "Reject"
 msgstr "ਰੱਦ ਕਰੋ"
 
 #: ../src/empathy-notifications-approver.c:222
 #: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1419
 msgid "Answer"
 msgstr "ਜਵਾਬ ਦਿਓ"
 
@@ -4568,36 +4642,38 @@ msgstr "ਇਨਕਾਰ"
 msgid "Accept"
 msgstr "ਮਨਜ਼ੂਰ"
 
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
 #: ../src/empathy-notifications-approver.c:260
 msgid "Provide"
 msgstr "ਦਿਉ"
 
-#: ../src/empathy-call-observer.c:135
+#: ../src/empathy-call-observer.c:134
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s ਨੇ ਤ�ਹਾਨੂੰ ਕਾਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕੀਤੀ ਹੈ, ਪਰ ਤ�ਸੀਂ ਹੋਰ ਕਾਲ ਉੱਤੇ ਸੀ।"
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:986 ../src/empathy-call-window.c:1000
+#: ../src/empathy-call-window.c:1047 ../src/empathy-call-window.c:1070
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2512
+#: ../src/empathy-call-window.c:2727
 msgid "On hold"
 msgstr "ਹੋਲਡ ਹੈ"
 
-#: ../src/empathy-call-window.c:2515
+#: ../src/empathy-call-window.c:2730
 msgid "Mute"
 msgstr "ਚ�ੱਪ"
 
-#: ../src/empathy-call-window.c:2517
-#| msgid "Location"
+#: ../src/empathy-call-window.c:2732
 msgid "Duration"
 msgstr "ਅੰਤਰਾਲ"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2520
+#: ../src/empathy-call-window.c:2735
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
@@ -4606,6 +4682,15 @@ msgstr "%s — %d:%02dm"
 msgid "_Match case"
 msgstr "ਮਿਲਦਾ ਆਕਾਰ(_M)"
 
+#~ msgid "Find Next"
+#~ msgstr "ਅੱਗੇ ਲੱਭੋ"
+
+#~ msgid "Find Previous"
+#~ msgstr "ਪਿੱਛੇ ਲੱਭੋ"
+
+#~ msgid "Show and edit accounts"
+#~ msgstr "ਅਕਾਊਂਟ ਵੇਖੋ ਅਤੇ ਸੋਧੋ"
+
 #~| msgid "Dialpad"
 #~ msgid "_Dialpad"
 #~ msgstr "ਡਾਇਲ-ਪੈਡ(_D)"
@@ -5002,9 +5087,6 @@ msgstr "ਮਿਲਦਾ ਆਕਾਰ(_M)"
 #~ msgid "Sorry, I don't want you in my contact list anymore."
 #~ msgstr "ਅਫਸੋਸ ਹੈ, ਪਰ ਮੈਂ ਤ�ਹਾਨੂੰ ਆਪਣੀ ਸੰਪਰਕ ਸੂਚੀ ਵਿੱਚ ਨਹੀਂ ਰੱਖਣਾ ਚਾਹ�ੰਦਾ।"
 
-#~ msgid "Word"
-#~ msgstr "ਸ਼ਬਦ"
-
 #~ msgid "Suggestions for the word"
 #~ msgstr "ਸ਼ਬਦ ਲਈ ਸ��ਾਅ"
 
diff --git a/po/pl.po b/po/pl.po
index e2e9471b8..7d68caf00 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-20 12:41+0200\n"
-"PO-Revision-Date: 2011-04-20 12:42+0200\n"
+"POT-Creation-Date: 2011-09-15 15:31+0200\n"
+"PO-Revision-Date: 2011-09-15 15:32+0200\n"
 "Last-Translator: Piotr DrÄ…g <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <gnomepl@aviary.pl>\n"
 "Language: pl\n"
@@ -42,6 +42,22 @@ msgid "Always open a separate chat window for new chats."
 msgstr "Zawsze otwiera oddzielne okna dla nowych rozmów."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr "Głośność rozmowy"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr "Głośność rozmowy w procentach."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Camera device"
+msgstr "UrzÄ…dzenie kamery"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "Pozycja kamery"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -49,46 +65,55 @@ msgstr ""
 "Znak do dodania po automatycznym uzupełnieniu pseudonimu (klawiszem Tab) "
 "podczas rozmowy grupowej."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "Motyw okna rozmowy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+msgid "Chat window theme variant"
+msgstr "Wariant motywu okna rozmowy"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "Oddzielana przecinkami lista języków do sprawdzania pisowni (np. \"en, fr, pl"
 "\")."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "Zmniejszona lista kontaktów"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "Użycie menedżerów połączeń"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
-msgstr "Kryterium sortowania listy kontaktów"
+msgstr "Kryterium porządkowania listy kontaktów"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr ""
+"Domyślne urządzenie kamery do użycia w wideorozmowach, np. /dev/video0."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
 msgstr "Domyślny katalog, z którego są wybierane awatary"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr "Wyłączenie wyskakujących powiadomień podczas nieobecności"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr "Wyłączenie dźwięków podczas nieobecności"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
 msgstr "Wyświetlanie zdarzeń przychodzących w obszarze stanu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -96,230 +121,247 @@ msgstr ""
 "Wyświetlanie zdarzeń przychodzących w obszarze stanu. Jeśli zaznaczone, to "
 "będą natychmiast prezentowane użytkownikowi."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+msgid "Echo cancellation support"
+msgstr "Obsługa usuwania echa"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr "Publikowanie położenia użytkownika"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Używanie urządzenia GPS do odnajdowania położenia"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Używanie sieci komórkowej do odnajdowania położenia"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr "Używanie sieci do odnajdowania położenia"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr "Domyślny katalog pobierania programu Empathy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
 msgstr "Przeprowadzono migrację dzienników butterfly"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr "Automatyczne ustawienie nieobecności podczas bezczynności"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "Automatyczne Å‚Ä…czenie siÄ™ podczas uruchamiania"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Zmniejszenie dokładności położenia"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Używanie awatarów kontaktów jako ikony okna rozmowy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr "Włączenie narzędzi programistycznych WebKit"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "Włączenie wyskakujących powiadomień dla nowych wiadomości"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "WÅ‚Ä…czenie sprawdzania pisowni"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "Ukrycie głównego okna"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "Ukrycie głównego okna."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "Znak do dodania po uzupełnieniu pseudonimu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "Otwieranie nowych rozmów w oddzielnych oknach"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "Ścieżka używanego motywu Adium"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
 "Ścieżka używanego motywu Adium, jeśli dla pokoju rozmowy używany jest motyw "
 "Adium."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Odtworzenie dźwięku dla nadchodzących wiadomości"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "Odtworzenie dźwięku dla nowych rozmów"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Odtworzenie dźwięku dla wychodzącej wiadomości"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "Odtworzenie dźwięku, kiedy kontakt się zaloguje"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "Odtworzenie dźwięku, kiedy kontakt się wyloguje"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "Odtworzenie dźwięku, kiedy użytkownik się zaloguje"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "Odtworzenie dźwięku, kiedy użytkownik się wyloguje"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Wyskakujące powiadomienia, jeśli okno rozmowy nie jest aktywne"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "WyskakujÄ…ce powiadomienia, kiedy kontakt siÄ™ zaloguje"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "WyskakujÄ…ce powiadomienia, kiedy kontakt siÄ™ wyloguje"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr "Położenie podglądu kamery podczas rozmowy."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+msgid "Show Balance in contact list"
+msgstr "Wyświetlanie salda na liście kontaktów"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "Wyświetlanie awatarów"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "Wyświetlanie listy kontaktów w pokojach"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr "Wyświetlanie podpowiedzi o zamknięciu głównego okna"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr "Wyświetlanie kontaktów w trybie offline"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
 msgstr "Wyświetlanie protokołów"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "Języki sprawdzania pisowni"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr "Domyślny katalog zapisu przesyłanych plików."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Ostatni katalog, z którego był wybierany awatar."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
 msgstr "Położenie panelu bocznego okna rozmowy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "Przechowane położenie (w pikselach) panelu bocznego okna rozmowy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Motyw używany do wyświetlania rozmowy w oknach rozmowy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "Wariant motywu używany do wyświetlania rozmowy w oknach rozmowy."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Używanie graficznych emotikon"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "Używanie dźwięków powiadomień"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "Używanie motywu dla pokoi rozmowy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Określa, czy publikować położenie użytkownika jego kontaktom."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Określa, czy używać urządzenia GPS do odnajdowania położenia."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Określa, czy używać sieci komórkowej do odnajdowania położenia."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Określa, czy używać sieci do odnajdowania położenia."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "Określa, czy przeprowadzono migrację dzienników butterfly."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Określa, czy automatycznie logować się do kont podczas uruchamiania."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
 "Określa, czy automatycznie przechodzić do trybu nieobecności podczas "
 "bezczynności."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 "Określa, czy zmniejszać dokładność położenia w celu ochrony prywatności."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "Określa, czy używać awatarów kontaktów jako ikony okna rozmowy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Określa, czy włączyć narzędzia programistyczne WebKit, takie jak Web "
 "Inspector."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
@@ -327,73 +369,77 @@ msgstr ""
 "Określa, czy menedżery łączności powinny być używane do automatycznego "
 "rozłączenia/ponownego połączenia."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "Określa, czy sprawdzać słowa wprowadzane w podanych językach."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr ""
 "Określa, czy przekształcać emotikony w rozmowach do postaci graficznej."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Określa, czy włączyć filtr usuwania echa usługi PulseAudio."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr ""
 "Określa, czy odtwarzać dźwięk powiadamiający o zalogowaniu kontaktów do "
 "sieci."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
 "Określa, czy odtwarzać dźwięk powiadamiający o wylogowaniu kontaktów z sieci."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "Określa, czy odtwarzać dźwięk powiadamiający o zdarzeniach."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr ""
 "Określa, czy odtwarzać dźwięk powiadamiający o nadchodzących wiadomościach."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Określa, czy odtwarzać dźwięk powiadamiający o nowych rozmowach."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr ""
 "Określa, czy odtwarzać dźwięk powiadamiający o wychodzących wiadomościach."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "Określa, czy odtwarzać dźwięk podczas zalogowania do sieci."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Określa, czy odtwarzać dźwięk podczas wylogowania z sieci."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr ""
 "Określa, czy odtwarzać dźwięki powiadomień podczas nieobecności lub "
 "zajętości."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr ""
 "Określa, czy wyświetlać wyskakujące powiadomienia, kiedy kontakt przechodzi "
 "do trybu offline."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr ""
 "Określa, czy wyświetlać wyskakujące powiadomienia, kiedy kontakt przechodzi "
 "do trybu online."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -401,41 +447,45 @@ msgstr ""
 "Określa, czy wyświetlać wyskakujące powiadomienia podczas otrzymania nowej "
 "wiadomości, nawet jeśli okno rozmowy jest już otwarte, lecz nie jest aktywne."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr ""
 "Określa, czy wyświetlać wyskakujące powiadomienia podczas otrzymania nowej "
 "wiadomości."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+msgid "Whether to show account balances in the contact list."
+msgstr "Określa, czy wyświetlać saldo kont na liście kontaktów."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 "Określa, czy wyświetlać awatary dla kontaktów na liście i oknach rozmowy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "Określa, czy wyświetlać na liście kontakty w trybie offline."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
 msgstr ""
 "Określa, czy wyświetlać wyskakujące powiadomienia podczas nieobecności lub "
 "zajętości."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "Określa, czy wyświetlać protokoły dla kontaktów na liście."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Określa, czy wyświetlać listę kontaktów w pokojach rozmowy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "Określa, czy wyświetlać listę kontaktów w trybie zmniejszonym."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -443,19 +493,19 @@ msgstr ""
 "Określa, czy wyświetlać okno dialogowe podczas zamykania głównego okna "
 "przyciskiem \"x\" na pasku tytułowym."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "Określa, czy używać motywów dla pokoi rozmowy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
 "the contact list by state."
 msgstr ""
-"Określa, jakie kryterium używać podczas sortowania listy kontaktów. "
-"Domyślnie sortowane jest według nazwy kontaktów za pomocą wartości \"name\". "
-"Wartość \"state\" spowoduje sortowanie według stanu kontaktu."
+"Określa, jakie kryterium używać podczas porządkowania listy kontaktów. "
+"Domyślnie porządkowane jest według nazwy kontaktów za pomocą wartości \"name"
+"\". Wartość \"state\" spowoduje porządkowanie według stanu kontaktu."
 
 #: ../data/empathy-accounts.desktop.in.in.h:1
 msgid "Manage Messaging and VoIP accounts"
@@ -463,7 +513,7 @@ msgstr "ZarzÄ…dzanie kontami komunikatora i VoIP"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2271
+#: ../src/empathy-accounts-dialog.c:2324
 msgid "Messaging and VoIP Accounts"
 msgstr "Konta komunikatora i VoIP"
 
@@ -471,18 +521,34 @@ msgstr "Konta komunikatora i VoIP"
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Ukończono przesyłanie pliku, ale plik jest uszkodzony"
 
-#: ../libempathy/empathy-ft-handler.c:1113
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
 msgstr "Przesyłanie plików nie jest obsługiwane przez zdalnego użytkownika"
 
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is not a regular file"
 msgstr "Wybrany plik nie jest zwykłym plikiem"
 
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1176
 msgid "The selected file is empty"
 msgstr "Wybrany plik jest pusty"
 
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#, c-format
+msgid "Missed call from %s"
+msgstr "Nieodebrana rozmowa głosowa od użytkownika %s"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, c-format
+msgid "Called %s"
+msgstr "Rozmowa głosowa z użytkownikiem %s"
+
+#: ../libempathy/empathy-message.c:422
+#, c-format
+msgid "Call from %s"
+msgstr "Rozmowa głosowa od użytkownika %s"
+
 #: ../libempathy/empathy-tp-file.c:268
 msgid "Socket type not supported"
 msgstr "Typ gniazda nie jest obsługiwany"
@@ -511,150 +577,143 @@ msgstr "Błąd podczas próby przesłania pliku"
 msgid "The other participant is unable to transfer the file"
 msgstr "Druga strona nie może odebrać pliku"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:383
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
 msgid "Unknown reason"
 msgstr "Nieznany powód"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:222
 msgid "Available"
 msgstr "Dostępny"
 
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:224
 msgid "Busy"
 msgstr "Zajęty"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:227
 msgid "Away"
 msgstr "Nieobecny"
 
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:229
 msgid "Invisible"
 msgstr "Niewidoczny"
 
-#: ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-utils.c:231
 msgid "Offline"
 msgstr "Offline"
 
 #. translators: presence type is unknown
-#. translators: encoding video codec is unknown
-#. translators: encoding audio codec is unknown
-#. translators: decoding video codec is unknown
-#. translators: decoding audio codec is unknown
-#: ../libempathy/empathy-utils.c:316
-#: ../src/empathy-streamed-media-window.c:1905
-#: ../src/empathy-streamed-media-window.c:1907
-#: ../src/empathy-streamed-media-window.c:1909
-#: ../src/empathy-streamed-media-window.c:1911
-#: ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:234
+msgctxt "presence"
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:274
 msgid "No reason specified"
 msgstr "Nie podano powodu"
 
-#: ../libempathy/empathy-utils.c:357 ../libempathy/empathy-utils.c:413
+#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
 msgid "Status is set to offline"
 msgstr "Stan został zmieniony na offline"
 
-#: ../libempathy/empathy-utils.c:359 ../libempathy/empathy-utils.c:393
+#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "BÅ‚Ä…d sieci"
 
-#: ../libempathy/empathy-utils.c:361 ../libempathy/empathy-utils.c:395
+#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
 msgid "Authentication failed"
 msgstr "Uwierzytelnienie się nie powiodło"
 
-#: ../libempathy/empathy-utils.c:363 ../libempathy/empathy-utils.c:397
+#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
 msgid "Encryption error"
 msgstr "BÅ‚Ä…d szyfrowania"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:284
 msgid "Name in use"
 msgstr "Pseudonim jest już używany"
 
-#: ../libempathy/empathy-utils.c:367 ../libempathy/empathy-utils.c:399
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
 msgid "Certificate not provided"
 msgstr "Nie dostarczono certyfikatu"
 
-#: ../libempathy/empathy-utils.c:369 ../libempathy/empathy-utils.c:401
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
 msgid "Certificate untrusted"
 msgstr "Niezaufany certyfikat"
 
-#: ../libempathy/empathy-utils.c:371 ../libempathy/empathy-utils.c:403
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
 msgid "Certificate expired"
 msgstr "Certyfikat wygasł"
 
-#: ../libempathy/empathy-utils.c:373 ../libempathy/empathy-utils.c:405
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
 msgid "Certificate not activated"
 msgstr "Certyfikat nieaktywny"
 
-#: ../libempathy/empathy-utils.c:375 ../libempathy/empathy-utils.c:407
+#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
 msgid "Certificate hostname mismatch"
 msgstr "Nazwa komputera w certyfikacie nie zgadza siÄ™"
 
-#: ../libempathy/empathy-utils.c:377 ../libempathy/empathy-utils.c:409
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate fingerprint mismatch"
 msgstr "Odcisk palca certyfikatu nie zgadza siÄ™"
 
-#: ../libempathy/empathy-utils.c:379 ../libempathy/empathy-utils.c:411
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate self-signed"
 msgstr "Certyfikat został samodzielnie podpisany"
 
-#: ../libempathy/empathy-utils.c:381
+#: ../libempathy/empathy-utils.c:300
 msgid "Certificate error"
 msgstr "BÅ‚Ä…d certyfikatu"
 
-#: ../libempathy/empathy-utils.c:415
+#: ../libempathy/empathy-utils.c:334
 msgid "Encryption is not available"
 msgstr "Szyfrowanie nie jest dostępne"
 
-#: ../libempathy/empathy-utils.c:417
+#: ../libempathy/empathy-utils.c:336
 msgid "Certificate is invalid"
 msgstr "Certyfikat jest nieprawidłowy"
 
-#: ../libempathy/empathy-utils.c:419
+#: ../libempathy/empathy-utils.c:338
 msgid "Connection has been refused"
 msgstr "Połączenie zostało odrzucone"
 
-#: ../libempathy/empathy-utils.c:421
+#: ../libempathy/empathy-utils.c:340
 msgid "Connection can't be established"
 msgstr "Nie można ustanowić połączenia"
 
-#: ../libempathy/empathy-utils.c:423
+#: ../libempathy/empathy-utils.c:342
 msgid "Connection has been lost"
 msgstr "Połączenie zostało utracone"
 
-#: ../libempathy/empathy-utils.c:425
+#: ../libempathy/empathy-utils.c:344
 msgid "This resource is already connected to the server"
 msgstr "Ten zasób jest już połączony z serwerem"
 
-#: ../libempathy/empathy-utils.c:427
+#: ../libempathy/empathy-utils.c:346
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Połączenie zostało zastąpione nowym połączeniem używając tego samego zasobu"
 
-#: ../libempathy/empathy-utils.c:430
+#: ../libempathy/empathy-utils.c:349
 msgid "The account already exists on the server"
 msgstr "Konto już istnieje na serwerze"
 
-#: ../libempathy/empathy-utils.c:432
+#: ../libempathy/empathy-utils.c:351
 msgid "Server is currently too busy to handle the connection"
 msgstr "Serwer jest obecnie zbyt zajęty, aby obsłużyć połączenie"
 
-#: ../libempathy/empathy-utils.c:434
+#: ../libempathy/empathy-utils.c:353
 msgid "Certificate has been revoked"
 msgstr "Certyfikat został unieważniony"
 
-#: ../libempathy/empathy-utils.c:436
+#: ../libempathy/empathy-utils.c:355
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Certyfikat używa niebezpiecznego algorytmu szyfrowania lub jest "
 "kryptograficznie słaby"
 
-#: ../libempathy/empathy-utils.c:439
+#: ../libempathy/empathy-utils.c:358
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -662,24 +721,24 @@ msgstr ""
 "Długość certyfikatu serwera lub głębokość łańcucha certyfikatu serwera "
 "przekracza ograniczenie wymuszane przez bibliotekÄ™ kryptograficznÄ…"
 
-#: ../libempathy/empathy-utils.c:602
+#: ../libempathy/empathy-utils.c:519
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "Osoby w pobliżu"
 
-#: ../libempathy/empathy-utils.c:607
+#: ../libempathy/empathy-utils.c:524
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japonia"
 
-#: ../libempathy/empathy-utils.c:636
+#: ../libempathy/empathy-utils.c:553
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:637
+#: ../libempathy/empathy-utils.c:554
 msgid "Facebook Chat"
 msgstr "Facebook Chat"
 
-#: ../libempathy/empathy-time.c:137
+#: ../libempathy/empathy-time.c:88
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
@@ -687,7 +746,7 @@ msgstr[0] "%d sekundÄ™ temu"
 msgstr[1] "%d sekundy temu"
 msgstr[2] "%d sekund temu"
 
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:93
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -695,7 +754,7 @@ msgstr[0] "%d minutÄ™ temu"
 msgstr[1] "%d minuty temu"
 msgstr[2] "%d minut temu"
 
-#: ../libempathy/empathy-time.c:147
+#: ../libempathy/empathy-time.c:98
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -703,7 +762,7 @@ msgstr[0] "%d godzinÄ™ temu"
 msgstr[1] "%d godziny temu"
 msgstr[2] "%d godzin temu"
 
-#: ../libempathy/empathy-time.c:152
+#: ../libempathy/empathy-time.c:103
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -711,7 +770,7 @@ msgstr[0] "%d dzień temu"
 msgstr[1] "%d dni temu"
 msgstr[2] "%d dni temu"
 
-#: ../libempathy/empathy-time.c:157
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -719,7 +778,7 @@ msgstr[0] "%d tydzień temu"
 msgstr[1] "%d tygodnie temu"
 msgstr[2] "%d tygodni temu"
 
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:113
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -727,93 +786,85 @@ msgstr[0] "%d miesiÄ…c temu"
 msgstr[1] "%d miesiÄ…ce temu"
 msgstr[2] "%d miesięcy emu"
 
-#: ../libempathy/empathy-time.c:167
+#: ../libempathy/empathy-time.c:136
 msgid "in the future"
 msgstr "w przyszłości"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:491
-msgid "All"
-msgstr "Wszystkie"
+#: ../libempathy-gtk/empathy-account-chooser.c:540
+msgid "All accounts"
+msgstr "Wszystkie konta"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../libempathy-gtk/empathy-log-window.c:643
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "Konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "Hasło"
 
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Serwer"
 
-#: ../libempathy-gtk/empathy-account-widget.c:685
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:757
-#: ../libempathy-gtk/empathy-account-widget.c:814
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1166
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "Moje konta internetowe"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "Konto %s modyfikowane w opcji Moje konta internetowe."
+msgid "The account %s is edited via %s."
+msgstr "Konto %s jest modyfikowane przez %s."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1172
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "Konta %s nie można modyfikować w programie Empathy."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
 msgstr "Uruchom Moje konta internetowe"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1530
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "Modyfikuj %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Nazwa użytkownika:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1897
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "Za_stosuj"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1927
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
 msgstr "Zal_oguj siÄ™"
 
-#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1993
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:520
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1481
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "Konto:"
-
-#. translators: this is the label of a checkbox used to enable/disable IM
-#. * accounts
-#: ../libempathy-gtk/empathy-account-widget.c:2006
-msgid "_Enabled"
-msgstr "_WÅ‚Ä…czone"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2071
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "To konto już istnieje na serwerze"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2074
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "Utworzenie nowego konta na serwerze"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2266
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "A_nuluj"
 
@@ -822,19 +873,19 @@ msgstr "A_nuluj"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2563
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s na %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2589
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "Konto %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2593
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "Nowe konto"
 
@@ -846,6 +897,7 @@ msgstr "<b>Przykład:</b> MojaNazwaUżytkownika"
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -859,7 +911,7 @@ msgstr "Zaawansowane"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "Pass_word:"
 msgstr "_Hasło:"
@@ -869,7 +921,7 @@ msgstr "_Hasło:"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
 msgid "Remember Password"
 msgstr "Zapamiętaj hasło"
 
@@ -879,7 +931,7 @@ msgstr "Zapamiętaj hasło"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 #: ../libempathy-gtk/empathy-password-dialog.c:311
 msgid "Remember password"
@@ -955,76 +1007,84 @@ msgstr "UIN ICQ:"
 msgid "What is your ICQ password?"
 msgstr "Hasło ICQ:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:183
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "Automatycznie"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:221
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "Rejestrator"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:226
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "Opcje"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "Brak"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Character set:"
 msgstr "Zestaw znaków:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"Większość serwerów IRC nie wymaga hasła, więc w razie niepewności nie należy "
+"go podawać."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Network"
 msgstr "Sieć"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Network:"
 msgstr "Sieć:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Pseudonim:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "Hasło:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "Komunikat podczas zakończenia:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "ImiÄ™ i nazwisko:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Servers"
 msgstr "Serwery"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "What is your IRC nickname?"
 msgstr "Pseudonim IRC:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Sieć IRC:"
 
@@ -1159,58 +1219,67 @@ msgid "Discover the STUN server automatically"
 msgstr "Automatyczne wykrywanie serwera STUN"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "Ignore TLS Errors"
+msgstr "Ignorowanie błędów TLS"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Interval (seconds)"
 msgstr "Czas między aktualizacjami (w sekundach)"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
 msgid "Keep-Alive Options"
 msgstr "Opcje \"Keep-Alive\""
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
 msgid "Loose Routing"
 msgstr "Swobodne trasowanie"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Mechanism:"
 msgstr "Mechanizm:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
 msgid "Miscellaneous Options"
 msgstr "Różne opcje"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 msgid "NAT Traversal Options"
 msgstr "Opcje przechodzenia NAT"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 msgid "Port:"
 msgstr "Port:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 msgid "Proxy Options"
 msgstr "Opcje pośrednika"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "STUN Server:"
 msgstr "Serwer STUN:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.c:347
 msgid "Server:"
 msgstr "Serwer"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid "Transport:"
 msgstr "Transport:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Użycie tego konta do połączeń na telefony _stacjonarne i komórkowe"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "Hasło konta SIP:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Identyfikator loginu SIP:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "Nazwa _użytkownika:"
 
@@ -1234,29 +1303,37 @@ msgstr "Id_entyfikator Yahoo!:"
 msgid "_Room List locale:"
 msgstr "_Ustawienia językowe listy pokoi:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:448
-#: ../libempathy-gtk/empathy-avatar-chooser.c:524
+#: ../libempathy-gtk/empathy-avatar-chooser.c:470
+#: ../libempathy-gtk/empathy-avatar-chooser.c:555
 msgid "Couldn't convert image"
 msgstr "Nie można przekonwertować obrazu"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
 msgid "None of the accepted image formats are supported on your system"
 msgstr ""
 "Żaden z akceptowanych formatów obrazu nie jest obsługiwany przez ten system"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:930
+#: ../libempathy-gtk/empathy-avatar-chooser.c:818
+msgid "Couldn't save picture to file"
+msgstr "Nie można zapisać obrazu do pliku"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:934
 msgid "Select Your Avatar Image"
 msgstr "Wybór obrazu awatara"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+msgid "Take a picture..."
+msgstr "Zrób zdjęcie..."
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:941
 msgid "No Image"
 msgstr "Brak obrazu"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:995
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
 msgid "Images"
 msgstr "Obrazy"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:999
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
 msgid "All Files"
 msgstr "Wszystkie pliki"
 
@@ -1264,35 +1341,61 @@ msgstr "Wszystkie pliki"
 msgid "Click to enlarge"
 msgstr "Kliknięcie powiększy"
 
-#: ../libempathy-gtk/empathy-chat.c:652
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
+msgid "There was an error starting the call"
+msgstr "Wystąpił błąd podczas rozpoczynania rozmowy głosowej"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact doesn't support calls"
+msgstr "Podany kontakt nie obsługuje rozmów głosowych"
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is offline"
+msgstr "Wybrany kontakt jest w trybie offline"
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "The specified contact is not valid"
+msgstr "Wybrany kontakt nie jest prawidłowy"
+
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "Emergency calls are not supported on this protocol"
+msgstr "Rozmowy alarmowe nie są obsługiwane przez ten protokół"
+
+#: ../libempathy-gtk/empathy-chat.c:702
 msgid "Failed to open private chat"
 msgstr "Otwarcie prywatnej rozmowy się nie powiodło"
 
-#: ../libempathy-gtk/empathy-chat.c:717
+#: ../libempathy-gtk/empathy-chat.c:763
 msgid "Topic not supported on this conversation"
 msgstr "Temat nie jest obsługiwany w czasie tej rozmowy"
 
-#: ../libempathy-gtk/empathy-chat.c:723
+#: ../libempathy-gtk/empathy-chat.c:769
 msgid "You are not allowed to change the topic"
 msgstr "Brak uprawnienia do zmiany tematu"
 
-#: ../libempathy-gtk/empathy-chat.c:930
+#: ../libempathy-gtk/empathy-chat.c:973
+#, c-format
+msgid "“%s� is not a valid contact ID"
+msgstr "\"%s\" nie jest prawidłowym identyfikatorem kontaktu"
+
+#: ../libempathy-gtk/empathy-chat.c:1058
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: usuwa wszystkie wiadomości z bieżącej rozmowy"
 
-#: ../libempathy-gtk/empathy-chat.c:933
+#: ../libempathy-gtk/empathy-chat.c:1061
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <temat>: ustawia temat bieżącej rozmowy"
 
-#: ../libempathy-gtk/empathy-chat.c:936
+#: ../libempathy-gtk/empathy-chat.c:1064
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <identyfikator pokoju rozmów>: dołącza do nowego pokoju rozmów"
 
-#: ../libempathy-gtk/empathy-chat.c:939
+#: ../libempathy-gtk/empathy-chat.c:1067
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <identyfikator pokoju rozmów>: dołącza do nowego pokoju rozmów"
 
-#: ../libempathy-gtk/empathy-chat.c:944
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1300,24 +1403,24 @@ msgstr ""
 "/part [<identyfikator pokoju rozmów>] [<przyczyna>]: opuszcza pokój rozmów, "
 "domyślnie bieżący"
 
-#: ../libempathy-gtk/empathy-chat.c:949
+#: ../libempathy-gtk/empathy-chat.c:1075
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr ""
 "/query <identyfikator kontaktu> [<wiadomość>]: otwiera prywatną rozmowę"
 
-#: ../libempathy-gtk/empathy-chat.c:952
+#: ../libempathy-gtk/empathy-chat.c:1078
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <identyfikator kontaktu> <wiadomość>: otwiera prywatną rozmowę"
 
-#: ../libempathy-gtk/empathy-chat.c:955
+#: ../libempathy-gtk/empathy-chat.c:1081
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <pseudonim>: zmienia pseudonim na bieżącym serwerze"
 
-#: ../libempathy-gtk/empathy-chat.c:958
+#: ../libempathy-gtk/empathy-chat.c:1084
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <wiadomość>: wysyła wiadomość DZIA�ANIA do bieżącej rozmowy"
 
-#: ../libempathy-gtk/empathy-chat.c:961
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1327,7 +1430,11 @@ msgstr ""
 "wysyłania wiadomości zaczynającej się od znaku \"/\". Na przykład: \"/say /"
 "join jest używane do dołączenia do nowego pokoju rozmowy\""
 
-#: ../libempathy-gtk/empathy-chat.c:966
+#: ../libempathy-gtk/empathy-chat.c:1092
+msgid "/whois <contact ID>: display information about a contact"
+msgstr "/whois <identyfikator kontaktu>: wyświetla informacje o kontakcie"
+
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1335,98 +1442,113 @@ msgstr ""
 "/help [<polecenie>]: wyświetla wszystkie obsługiwane polecenia. Jeśli podano "
 "<polecenie>, zostanie wyświetlone jej użycie."
 
-#: ../libempathy-gtk/empathy-chat.c:976
+#: ../libempathy-gtk/empathy-chat.c:1112
 #, c-format
 msgid "Usage: %s"
 msgstr "Użycie: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1015
+#: ../libempathy-gtk/empathy-chat.c:1157
 msgid "Unknown command"
 msgstr "Nieznane polecenie"
 
-#: ../libempathy-gtk/empathy-chat.c:1141
+#: ../libempathy-gtk/empathy-chat.c:1283
 msgid "Unknown command; see /help for the available commands"
 msgstr "Nieznane polecenie. opcja /help wyświetli dostępne polecenia"
 
-#: ../libempathy-gtk/empathy-chat.c:1278
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1453
+msgid "insufficient balance to send message"
+msgstr "niewystarczające saldo, aby wysłać wiadomość"
+
+#: ../libempathy-gtk/empathy-chat.c:1455
+msgid "not capable"
+msgstr "brak możliwości"
+
+#: ../libempathy-gtk/empathy-chat.c:1462
 msgid "offline"
 msgstr "offline"
 
-#: ../libempathy-gtk/empathy-chat.c:1281
+#: ../libempathy-gtk/empathy-chat.c:1465
 msgid "invalid contact"
 msgstr "nieprawidłowy kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1284
+#: ../libempathy-gtk/empathy-chat.c:1468
 msgid "permission denied"
 msgstr "brak dostępu"
 
-#: ../libempathy-gtk/empathy-chat.c:1287
+#: ../libempathy-gtk/empathy-chat.c:1471
 msgid "too long message"
 msgstr "za długa wiadomość"
 
-#: ../libempathy-gtk/empathy-chat.c:1290
+#: ../libempathy-gtk/empathy-chat.c:1474
 msgid "not implemented"
 msgstr "niezaimplementowane"
 
-#: ../libempathy-gtk/empathy-chat.c:1294
+#: ../libempathy-gtk/empathy-chat.c:1478
 msgid "unknown"
 msgstr "nieznany"
 
-#: ../libempathy-gtk/empathy-chat.c:1298
+#: ../libempathy-gtk/empathy-chat.c:1484
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Błąd podczas wysyłania wiadomości \"%s\": %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1359 ../src/empathy-chat-window.c:717
+#: ../libempathy-gtk/empathy-chat.c:1488
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Błąd podczas wysyłania wiadomości: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1549 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Temat:"
 
-#: ../libempathy-gtk/empathy-chat.c:1371
+#: ../libempathy-gtk/empathy-chat.c:1561
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Temat ustawiony na: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1373
+#: ../libempathy-gtk/empathy-chat.c:1563
 msgid "No topic defined"
 msgstr "Temat nie został określony"
 
-#: ../libempathy-gtk/empathy-chat.c:1872
+#: ../libempathy-gtk/empathy-chat.c:2072
 msgid "(No Suggestions)"
 msgstr "(brak podpowiedzi)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1940
+#: ../libempathy-gtk/empathy-chat.c:2140
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Dodaj \"%s\" do słownika"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1977
+#: ../libempathy-gtk/empathy-chat.c:2177
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Dodaj \"%s\" do słownika %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2034
+#: ../libempathy-gtk/empathy-chat.c:2247
 msgid "Insert Smiley"
 msgstr "Wstaw emotikonÄ™"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2052
-#: ../libempathy-gtk/empathy-ui-utils.c:1808
+#: ../libempathy-gtk/empathy-chat.c:2265
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "_Wyślij"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2087
+#: ../libempathy-gtk/empathy-chat.c:2319
 msgid "_Spelling Suggestions"
 msgstr "Podpowiedzi pi_sowni"
 
-#: ../libempathy-gtk/empathy-chat.c:2176
+#: ../libempathy-gtk/empathy-chat.c:2408
 msgid "Failed to retrieve recent logs"
 msgstr "Pobranie ostatnich dzienników się nie powiodło"
 
-#: ../libempathy-gtk/empathy-chat.c:2287
+#: ../libempathy-gtk/empathy-chat.c:2545
 #, c-format
 msgid "%s has disconnected"
 msgstr "Użytkownik %s został rozłączony"
@@ -1434,12 +1556,12 @@ msgstr "Użytkownik %s został rozłączony"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2294
+#: ../libempathy-gtk/empathy-chat.c:2552
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "Użytkownik %1$s został wyrzucony przez użytkownika %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2297
+#: ../libempathy-gtk/empathy-chat.c:2555
 #, c-format
 msgid "%s was kicked"
 msgstr "Użytkownik %s został wyrzucony"
@@ -1447,17 +1569,17 @@ msgstr "Użytkownik %s został wyrzucony"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2305
+#: ../libempathy-gtk/empathy-chat.c:2563
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "Użytkownik %1$s został zablokowany przez użytkownika %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2308
+#: ../libempathy-gtk/empathy-chat.c:2566
 #, c-format
 msgid "%s was banned"
 msgstr "Użytkownik %s został zablokowany"
 
-#: ../libempathy-gtk/empathy-chat.c:2312
+#: ../libempathy-gtk/empathy-chat.c:2570
 #, c-format
 msgid "%s has left the room"
 msgstr "Użytkownik %s opuścił pokój"
@@ -1467,105 +1589,137 @@ msgstr "Użytkownik %s opuścił pokój"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2321
+#: ../libempathy-gtk/empathy-chat.c:2579
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2346
+#: ../libempathy-gtk/empathy-chat.c:2604
 #, c-format
 msgid "%s has joined the room"
 msgstr "Użytkownik %s dołączył do pokoju"
 
-#: ../libempathy-gtk/empathy-chat.c:2371
+#: ../libempathy-gtk/empathy-chat.c:2629
 #, c-format
 msgid "%s is now known as %s"
 msgstr "Użytkownik %s jest teraz znany jako %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2510
-#: ../src/empathy-streamed-media-window.c:1953
-#: ../src/empathy-event-manager.c:1126
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2768
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1391
+#: ../src/empathy-call-window.c:1441 ../src/empathy-call-window.c:2479
 msgid "Disconnected"
 msgstr "Rozłączony"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3140
+#: ../libempathy-gtk/empathy-chat.c:3415
 msgid "Would you like to store this password?"
 msgstr "Zachować hasło?"
 
-#: ../libempathy-gtk/empathy-chat.c:3146
+#: ../libempathy-gtk/empathy-chat.c:3421
 msgid "Remember"
 msgstr "Zapamiętaj"
 
-#: ../libempathy-gtk/empathy-chat.c:3156
+#: ../libempathy-gtk/empathy-chat.c:3431
 msgid "Not now"
 msgstr "Nie teraz"
 
-#: ../libempathy-gtk/empathy-chat.c:3200
+#: ../libempathy-gtk/empathy-chat.c:3475
 msgid "Retry"
 msgstr "Ponów"
 
-#: ../libempathy-gtk/empathy-chat.c:3204
+#: ../libempathy-gtk/empathy-chat.c:3479
 msgid "Wrong password; please try again:"
 msgstr "Błędne hasło. Proszę spróbować ponownie:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3321
+#: ../libempathy-gtk/empathy-chat.c:3609
 msgid "This room is protected by a password:"
 msgstr "Ten pokój jest chroniony hasłem:"
 
-#: ../libempathy-gtk/empathy-chat.c:3348
+#: ../libempathy-gtk/empathy-chat.c:3636
 msgid "Join"
 msgstr "Dołącz"
 
-#: ../libempathy-gtk/empathy-chat.c:3518 ../src/empathy-event-manager.c:1147
+#: ../libempathy-gtk/empathy-chat.c:3838 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "Połączony"
 
-#: ../libempathy-gtk/empathy-chat.c:3571
-#: ../libempathy-gtk/empathy-log-window.c:650
+#: ../libempathy-gtk/empathy-chat.c:3893
 msgid "Conversation"
 msgstr "Rozmowa"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:422
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:3898
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (SMS)"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
 msgid "Unknown or invalid identifier"
 msgstr "Nieznany lub nieprawidłowy identyfikator"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
 msgid "Contact blocking temporarily unavailable"
 msgstr "Blokowanie kontaktów jest tymczasowo niedostępne"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
 msgid "Contact blocking unavailable"
 msgstr "Blokowanie kontaktów jest niedostępne"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
 msgid "Permission Denied"
 msgstr "Brak dostępu"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
 msgid "Could not block contact"
 msgstr "Nie można zablokować kontaktu"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:701
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
 msgid "Edit Blocked Contacts"
 msgstr "Modyfikacja zablokowanych kontaktów"
 
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Account:"
+msgstr "Konto:"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "Zablokowane kontakty"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Usuń"
+
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:794
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "S_kopiuj adres odnośnika"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:801
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Otwórz odnośnik"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:420
+#: ../libempathy-gtk/empathy-chat-text-view.c:415
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
@@ -1584,24 +1738,24 @@ msgid "New Contact"
 msgstr "Nowy kontakt"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:199
+#: ../libempathy-gtk/empathy-individual-dialogs.c:200
 #, c-format
 msgid "Block %s?"
 msgstr "Zablokować użytkownika %s?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:247
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Na pewno zablokować użytkownika \"%s\"?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
 msgid "_Block"
 msgstr "Za_blokuj"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:278
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "Zgł_oś ten kontakt jako obraźliwy"
@@ -1628,303 +1782,333 @@ msgstr "Nie w grupach"
 msgid "Favorite People"
 msgstr "Ulubione osoby"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1987
-#: ../libempathy-gtk/empathy-individual-view.c:2343
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Na pewno usunąć grupę \"%s\"?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1989
-#: ../libempathy-gtk/empathy-individual-view.c:2346
+#: ../libempathy-gtk/empathy-contact-list-view.c:1988
+#: ../libempathy-gtk/empathy-individual-view.c:2379
 msgid "Removing group"
 msgstr "Usuwanie grupy"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2038
-#: ../libempathy-gtk/empathy-contact-list-view.c:2115
-#: ../libempathy-gtk/empathy-individual-view.c:2401
-#: ../libempathy-gtk/empathy-individual-view.c:2594
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../libempathy-gtk/empathy-contact-list-view.c:2037
+#: ../libempathy-gtk/empathy-contact-list-view.c:2114
+#: ../libempathy-gtk/empathy-individual-view.c:2434
+#: ../libempathy-gtk/empathy-individual-view.c:2637
 msgid "_Remove"
 msgstr "_Usuń"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2068
-#: ../libempathy-gtk/empathy-individual-view.c:2465
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
+#: ../libempathy-gtk/empathy-individual-view.c:2501
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Na pewno usunąć kontakt \"%s\"?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2070
-#: ../libempathy-gtk/empathy-individual-view.c:2486
+#: ../libempathy-gtk/empathy-contact-list-view.c:2069
+#: ../libempathy-gtk/empathy-individual-view.c:2522
 msgid "Removing contact"
 msgstr "Usuwanie kontaktu"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:219
-#: ../src/empathy-main-window.ui.h:13
+#: ../libempathy-gtk/empathy-contact-menu.c:220
+#: ../src/empathy-main-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "_Dodaj kontakt…"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:299
+#: ../libempathy-gtk/empathy-contact-menu.c:300
 msgid "_Block Contact"
 msgstr "Za_blokuj kontakt"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:328
-#: ../libempathy-gtk/empathy-individual-menu.c:517
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:329
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "_Rozmowa"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:359
-#: ../libempathy-gtk/empathy-individual-menu.c:560
+#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "Rozmow_a głosowa"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:390
-#: ../libempathy-gtk/empathy-individual-menu.c:602
+#: ../libempathy-gtk/empathy-contact-menu.c:394
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Wideorozmowa"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:436
-#: ../libempathy-gtk/empathy-individual-menu.c:645
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:440
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "_Poprzednie rozmowy"
 
 # to jest w menu
-#: ../libempathy-gtk/empathy-contact-menu.c:458
-#: ../libempathy-gtk/empathy-individual-menu.c:686
+#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "Wyślij plik"
 
 # to jest w menu
-#: ../libempathy-gtk/empathy-contact-menu.c:481
-#: ../libempathy-gtk/empathy-individual-menu.c:728
+#: ../libempathy-gtk/empathy-contact-menu.c:485
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
 msgstr "Współdziel pulpit"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:521
-#: ../libempathy-gtk/empathy-contact-widget.c:1763
-#: ../libempathy-gtk/empathy-individual-menu.c:763
+#: ../libempathy-gtk/empathy-contact-menu.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:1886
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
 #: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "Ulubione"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:550
-#: ../libempathy-gtk/empathy-individual-menu.c:791
+#: ../libempathy-gtk/empathy-contact-menu.c:554
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "Infor_macje"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:596
+#: ../libempathy-gtk/empathy-contact-menu.c:600
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "_Modyfikuj"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:650
-#: ../libempathy-gtk/empathy-individual-menu.c:972
-#: ../src/empathy-chat-window.c:935
+#: ../libempathy-gtk/empathy-contact-menu.c:654
+#: ../libempathy-gtk/empathy-individual-menu.c:1283
+#: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "Zapraszanie do tego pokoju"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:681
-#: ../libempathy-gtk/empathy-individual-menu.c:1019
+#: ../libempathy-gtk/empathy-contact-menu.c:685
+#: ../libempathy-gtk/empathy-individual-menu.c:1329
 msgid "_Invite to Chat Room"
 msgstr "_ZaproÅ› do pokoju rozmowy"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:513
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
 msgid "Search contacts"
 msgstr "Wyszukiwanie kontaktów"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:543
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
 msgid "Search: "
 msgstr "Wyszukaj:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:601
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
 msgid "_Add Contact"
 msgstr "_Dodaj kontakt"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:619
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
 msgid "No contacts found"
 msgstr "Nie odnaleziono kontaktów"
 
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr "Wiadomość z powitaniem:"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
+msgstr "Daj znać, jak pojawisz się w sieci. Dzięki."
+
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "Wybór kontaktu"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:295
+#: ../libempathy-gtk/empathy-contact-widget.c:336
 #: ../libempathy-gtk/empathy-individual-widget.c:153
 msgid "Full name:"
 msgstr "ImiÄ™ i nazwisko:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:296
+#: ../libempathy-gtk/empathy-contact-widget.c:337
 #: ../libempathy-gtk/empathy-individual-widget.c:154
 msgid "Phone number:"
 msgstr "Numer telefonu:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:297
+#: ../libempathy-gtk/empathy-contact-widget.c:338
 #: ../libempathy-gtk/empathy-individual-widget.c:155
 msgid "E-mail address:"
 msgstr "Adres e-mail:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:298
+#: ../libempathy-gtk/empathy-contact-widget.c:339
 #: ../libempathy-gtk/empathy-individual-widget.c:156
 msgid "Website:"
 msgstr "Witryna WWW:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:299
+#: ../libempathy-gtk/empathy-contact-widget.c:340
 #: ../libempathy-gtk/empathy-individual-widget.c:157
 msgid "Birthday:"
 msgstr "Urodziny:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:346
+msgid "Last seen:"
+msgstr "Ostatnio widziany:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:348
+msgid "Connected from:"
+msgstr "Połączony z:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:353
+msgid "Away message:"
+msgstr "Wiadomość podczas nieobecności:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+msgid "Channels:"
+msgstr "Kanały:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
 msgstr "Kod ISO kraju:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Country:"
 msgstr "Kraj:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "State:"
 msgstr "Stan/województwo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:768
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "City:"
 msgstr "Miasto:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:770
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Area:"
 msgstr "Obszar:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:772
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
 msgstr "Kod pocztowy:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:774
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Street:"
 msgstr "Ulica:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:776
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
 msgstr "Budynek:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:778
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Floor:"
 msgstr "Piętro:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:780
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Room:"
 msgstr "Pokój:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:782
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Text:"
 msgstr "Tekst:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:784
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:786
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
 msgstr "Adres URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
 msgstr "Poziom dokładności:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:790
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr "BÅ‚Ä…d:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:792
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
 msgstr "BÅ‚Ä…d w pionie (metry):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:794
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
 msgstr "BÅ‚Ä…d w poziomie (metry):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr "Prędkość:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Bearing:"
 msgstr "Kierunek:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:800
-#: ../libempathy-gtk/empathy-individual-widget.c:526
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
 msgstr "Prędkość wznoszenia:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:802
-#: ../libempathy-gtk/empathy-individual-widget.c:528
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
 msgstr "Ostatnia aktualizacja:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:804
-#: ../libempathy-gtk/empathy-individual-widget.c:530
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
 msgstr "Długość geograficzna:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:806
-#: ../libempathy-gtk/empathy-individual-widget.c:532
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
 msgstr "Szerokość geograficzna:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:808
-#: ../libempathy-gtk/empathy-individual-widget.c:534
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
 msgstr "Wysokość n.p.m.:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:871
-#: ../libempathy-gtk/empathy-contact-widget.c:888
-#: ../libempathy-gtk/empathy-individual-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:633
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "Położenie"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:890
-#: ../libempathy-gtk/empathy-individual-widget.c:635
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:942
-#: ../libempathy-gtk/empathy-individual-widget.c:684
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e %B %Y o %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1024
-#: ../libempathy-gtk/empathy-individual-widget.c:919
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
 msgid "Save Avatar"
 msgstr "Zapisanie awatara"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1080
-#: ../libempathy-gtk/empathy-individual-widget.c:977
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
 msgid "Unable to save avatar"
 msgstr "Nie można zapisać awatara"
 
@@ -1934,7 +2118,7 @@ msgstr "<b>Położenie</b> w dniu\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1307
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr "Alias:"
 
@@ -1954,7 +2138,7 @@ msgstr "Szczegóły kontaktu"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "Identyfikator:"
 
@@ -1971,11 +2155,11 @@ msgstr "System operacyjny:"
 msgid "Version:"
 msgstr "Wersja:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:332
+#: ../libempathy-gtk/empathy-groups-widget.c:333
 msgid "Groups"
 msgstr "Grupy"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:344
+#: ../libempathy-gtk/empathy-groups-widget.c:345
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -1983,28 +2167,28 @@ msgstr ""
 "Proszę wybrać grupy, w których ma się pojawić ten kontakt. Można wybrać "
 "więcej niż jedną grupę lub nie wybierać żadnej."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:363
+#: ../libempathy-gtk/empathy-groups-widget.c:364
 msgid "_Add Group"
 msgstr "Dod_aj grupÄ™"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:398
+#: ../libempathy-gtk/empathy-groups-widget.c:399
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Wybór"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1436
+#: ../libempathy-gtk/empathy-groups-widget.c:409
+#: ../src/empathy-main-window.c:1807
 msgid "Group"
 msgstr "Grupa"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Następująca osoba zostanie zablokowana:"
 msgstr[1] "Następujące osoby zostaną zablokowane:"
 msgstr[2] "Następujące osoby zostaną zablokowane:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:259
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Następująca osoba nie może zostać zablokowana:"
@@ -2012,47 +2196,78 @@ msgstr[1] "Następujące osoby nie mogą zostać zablokowane:"
 msgstr[2] "Następujące osoby nie mogą zostać zablokowane:"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
 msgstr "Połączone kontakty"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:354
+#: ../libempathy-gtk/empathy-individual-linker.c:370
 msgid "Select contacts to link"
 msgstr "Wybór kontaktów do połączenia"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:428
+#: ../libempathy-gtk/empathy-individual-linker.c:444
 msgid "New contact preview"
 msgstr "PodglÄ…d nowego kontaktu"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:472
+#: ../libempathy-gtk/empathy-individual-linker.c:488
 msgid "Contacts selected in the list on the left will be linked together."
 msgstr "Kontakty zaznaczone na liście po lewej stronie zostaną połączone."
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:131
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:839
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "Wybór konta do umieszczenia tej rozmowy głosowej"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "Rozmowa głosowa"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+msgid "Mobile"
+msgstr "Komórka"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "Praca"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "Dom"
+
+#. add an SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+msgid "_SMS"
+msgstr "_SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1141
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Modyfikuj"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:865
+#: ../libempathy-gtk/empathy-individual-menu.c:1167
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "_Połącz kontakty…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2308
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 msgid "Delete and _Block"
 msgstr "Usuń i za_blokuj"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2474
+#: ../libempathy-gtk/empathy-individual-view.c:2510
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2061,7 +2276,7 @@ msgstr ""
 "Na pewno usunąć metakontakt \"%s\"? Wszystkie kontakty tworzące metakontakt "
 "zostaną usunięte."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2145,65 +2360,203 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "_Rozłącz"
 
-#: ../libempathy-gtk/empathy-log-window.c:660
-msgid "Date"
-msgstr "Data"
+#: ../libempathy-gtk/empathy-log-window.c:634
+msgid "History"
+msgstr "Historia"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
-msgstr "Rozmowy"
+#: ../libempathy-gtk/empathy-log-window.c:689
+msgid "Show"
+msgstr "Wyświetlenie"
+
+#: ../libempathy-gtk/empathy-log-window.c:711
+msgid "Search"
+msgstr "Wyszukiwanie"
+
+#: ../libempathy-gtk/empathy-log-window.c:1159
+#, c-format
+msgid "Chat in %s"
+msgstr "Rozmowa w %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1161
+#, c-format
+msgid "Chat with %s"
+msgstr "Rozmowa z użytkownikiem %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%A %e %B %Y, %X"
+
+#. Translators: this is an emote: '* Danielle waves'
+#: ../libempathy-gtk/empathy-log-window.c:1300
+#, c-format
+msgid "<i>* %s %s</i>"
+msgstr "<i>* %s %s</i>"
+
+#. Translators: this is a message: 'Danielle: hello'
+#. * The string in bold is the sender's name
+#: ../libempathy-gtk/empathy-log-window.c:1306
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1382
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s sekunda"
+msgstr[1] "%s sekundy"
+msgstr[2] "%s sekund"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s minuta"
+msgstr[1] "%s minuty"
+msgstr[2] "%s minut"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "Rozmowa głosowa miała miejsce %s, została zakończona %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1729
+msgid "Today"
+msgstr "Dzisiaj"
+
+#: ../libempathy-gtk/empathy-log-window.c:1733
+msgid "Yesterday"
+msgstr "Wczoraj"
+
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
+msgid "%e %B %Y"
+msgstr "%e %B %Y"
+
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3425
+msgid "Anytime"
+msgstr "Zawsze"
+
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2353
+msgid "Anyone"
+msgstr "Wszyscy"
+
+#: ../libempathy-gtk/empathy-log-window.c:2666
+msgid "Who"
+msgstr "Kto"
+
+#: ../libempathy-gtk/empathy-log-window.c:2870
+msgid "When"
+msgstr "Kiedy"
+
+#: ../libempathy-gtk/empathy-log-window.c:2986
+msgid "Anything"
+msgstr "Wszystko"
+
+#: ../libempathy-gtk/empathy-log-window.c:2988
+msgid "Text chats"
+msgstr "Rozmowy tekstowe"
+
+#: ../libempathy-gtk/empathy-log-window.c:2990
+#: ../src/empathy-preferences.ui.h:4
+msgid "Calls"
+msgstr "Rozmowy głosowe"
+
+#: ../libempathy-gtk/empathy-log-window.c:2995
+msgid "Incoming calls"
+msgstr "Przychodzące rozmowy głosowe"
+
+#: ../libempathy-gtk/empathy-log-window.c:2996
+msgid "Outgoing calls"
+msgstr "Wychodzące rozmowy głosowe"
+
+#: ../libempathy-gtk/empathy-log-window.c:2997
+msgid "Missed calls"
+msgstr "Nieodebrane rozmowy głosowe"
+
+#: ../libempathy-gtk/empathy-log-window.c:3019
+msgid "What"
+msgstr "Co"
+
+#: ../libempathy-gtk/empathy-log-window.c:3728
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr "Na pewno usunąć wszystkie dzienniki poprzednich rozmów?"
+
+#: ../libempathy-gtk/empathy-log-window.c:3732
+msgid "Clear All"
+msgstr "Wyczyść wszystko"
+
+#: ../libempathy-gtk/empathy-log-window.c:3739
+msgid "Delete from:"
+msgstr "Usunięcie od:"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Wczytywanie...</span>"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "Znajdź następny"
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Chat"
+msgstr "Rozmowa"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "Znajdź poprzedni"
+msgid "Delete All History..."
+msgstr "Usuń całą historię..."
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr "Poprzednie rozmowy"
+msgid "Profile"
+msgstr "Profil"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Video"
+msgstr "Wideo"
 
-#. Tab Label
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "Wyszukiwanie"
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:20
+msgid "_Edit"
+msgstr "_Edycja"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "_File"
+msgstr "_Plik"
 
-#. Searching *for* something
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "Wy_szukaj:"
+msgid "page 2"
+msgstr "strona 2"
 
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
 msgid "Contact ID:"
 msgstr "Identyfikator kontaktu:"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:171
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
 msgid "C_hat"
 msgstr "_Rozmowa"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:181
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
 msgstr "Nowa rozmowa"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:253
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
 msgid "Send _Video"
 msgstr "Wyślij obraz _wideo"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:261
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
 msgid "C_all"
 msgstr "_Rozmowa głosowa"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:271
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "New Call"
 msgstr "Nowa rozmowa głosowa"
 
@@ -2222,34 +2575,34 @@ msgstr ""
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Message…"
 msgstr "Własna wiadomość…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messages…"
 msgstr "Zmodyfikuj własne wiadomości…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
 msgstr "Kliknięcie usunie ten stan z ulubionych"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
 msgstr "Kliknięcie doda ten stan do ulubionych"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
 msgstr "Ustaw stan"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:946
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
 msgid "Set your presence and current status"
 msgstr "Ustawienie obecności i obecnego stanu"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1134
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
 msgid "Custom messages…"
 msgstr "Własne wiadomości…"
 
@@ -2262,18 +2615,26 @@ msgstr "Własne wiadomości…"
 msgid "New %s account"
 msgstr "Nowe konto %s"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "Wyszukiwanie:"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "Rozróżnianie wielkości liter"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Mat_ch case"
+msgstr "_Rozróżnianie wielkości liter"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
 msgid "Phrase not found"
 msgstr "Nie odnaleziono napisu"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "_Next"
+msgstr "_Następne"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+msgid "_Previous"
+msgstr "_Poprzednie"
+
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
 msgstr "Otrzymano wiadomość tekstową"
@@ -2314,35 +2675,32 @@ msgstr "Wychodząca rozmowa głosowa"
 msgid "Voice call ended"
 msgstr "Rozmowa głosowa zakończona"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "Wprowadzenie własnej wiadomości"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
 msgstr "Modyfikowanie własnej wiadomości"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr "Zapisz _nową wiadomość stanu"
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#, c-format
+msgid "Message edited at %s"
+msgstr "Zmodyfikowano wiadomość o %s"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Status Messages"
-msgstr "Zapisane wiadomości stanu"
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
+msgid "Normal"
+msgstr "Zwykły"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "Klasyczny"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "Prosty"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "Czysty"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "Niebieski"
 
@@ -2419,19 +2777,19 @@ msgstr "Zapamiętanie tego wyboru dla przyszłych połączeń"
 msgid "Certificate Details"
 msgstr "Szczegóły certyfikatu"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1705
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
 msgstr "Nie można otworzyć adresu URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1800
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
 msgstr "Wybór pliku"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
 msgid "Insufficient free space to save file"
 msgstr "Brak wolnego miejsca, aby zapisać plik"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2440,7 +2798,7 @@ msgstr ""
 "Wymagane jest %s wolnego miejsca, aby zapisać ten plik, ale dostępne jest "
 "tylko %s. Proszę wybrać inne położenie."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1924
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Plik przychodzący od użytkownika %s"
@@ -2628,23 +2986,23 @@ msgstr "Brak komunikatu błędu"
 msgid "Instant Message (Empathy)"
 msgstr "Wiadomość (Empathy)"
 
-#: ../src/empathy.c:308
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "Bez Å‚Ä…czenia podczas uruchamiania"
 
-#: ../src/empathy.c:312
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Bez wyświetlania listy kontaktów lub innych okien podczas uruchamiania"
 
-#: ../src/empathy.c:320
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr " - komunikator Empathy"
 
-#: ../src/empathy.c:499
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
 msgstr "Błąd podczas nawiązywania połączenia z menedżerem kont"
 
-#: ../src/empathy.c:501
+#: ../src/empathy.c:639
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2795,8 +3153,8 @@ msgid "Select the accounts you want to import:"
 msgstr "Proszę wybrać konta do zaimportowania:"
 
 #: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "Yes"
 msgstr "Tak"
 
@@ -2870,34 +3228,35 @@ msgstr "Modyfikacje konta %s nie zostały zapisane."
 msgid "Your new account has not been saved yet."
 msgstr "Nowe konto nie zostało jeszcze zapisane."
 
-#: ../src/empathy-accounts-dialog.c:286
-#: ../src/empathy-streamed-media-window.c:809
+#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1175
 msgid "Connecting…"
 msgstr "�ączenie…"
 
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:386
 #, c-format
 msgid "Offline — %s"
 msgstr "Offline — %s"
 
-#: ../src/empathy-accounts-dialog.c:339
+#: ../src/empathy-accounts-dialog.c:398
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Rozłączony — %s"
 
-#: ../src/empathy-accounts-dialog.c:350
+#: ../src/empathy-accounts-dialog.c:409
 msgid "Offline — No Network Connection"
 msgstr "Offline — brak połączenia z siecią"
 
-#: ../src/empathy-accounts-dialog.c:357
+#: ../src/empathy-accounts-dialog.c:416
 msgid "Unknown Status"
 msgstr "Nieznany stan"
 
-#: ../src/empathy-accounts-dialog.c:369
+#: ../src/empathy-accounts-dialog.c:428
 msgid "Offline — Account Disabled"
 msgstr "Offline — konto jest wyłączone"
 
-#: ../src/empathy-accounts-dialog.c:772
+#: ../src/empathy-accounts-dialog.c:831
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2905,16 +3264,16 @@ msgstr ""
 "Za chwilÄ™ nastÄ…pi utworzenie nowego konta, co\n"
 "spowoduje utratę zmian. Na pewno kontynuować?"
 
-#: ../src/empathy-accounts-dialog.c:1133
+#: ../src/empathy-accounts-dialog.c:1192
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Na pewno usunąć \"%s\" z komputera?"
 
-#: ../src/empathy-accounts-dialog.c:1137
+#: ../src/empathy-accounts-dialog.c:1196
 msgid "This will not remove your account on the server."
 msgstr "Nie usunie to konta na serwerze."
 
-#: ../src/empathy-accounts-dialog.c:1375
+#: ../src/empathy-accounts-dialog.c:1432
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2923,15 +3282,15 @@ msgstr ""
 "utratę zmian. Na pewno kontynuować?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1593
+#: ../src/empathy-accounts-dialog.c:1643
 msgid "_Enable"
 msgstr "_WÅ‚Ä…czone"
 
-#: ../src/empathy-accounts-dialog.c:1594
+#: ../src/empathy-accounts-dialog.c:1644
 msgid "_Disable"
 msgstr "Wyłą_czone"
 
-#: ../src/empathy-accounts-dialog.c:2115
+#: ../src/empathy-accounts-dialog.c:2154
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2940,18 +3299,22 @@ msgstr ""
 "utratę zmian. Na pewno kontynuować?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Dodaj…"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
 msgid "Loading account information"
 msgstr "Wczytywanie informacji o koncie"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "No protocol installed"
 msgstr "Brak zainstalowanych protokołów"
 
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Protocol:"
 msgstr "Protokół:"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -2959,19 +3322,15 @@ msgstr ""
 "Aby dodać nowe konto należy najpierw zainstalować moduł obsługi dla każdego "
 "wymaganego protokołu."
 
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add…"
-msgstr "_Dodaj…"
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Import…"
 msgstr "_Zaimportuj…"
 
-#: ../src/empathy-auth-client.c:250
+#: ../src/empathy-auth-client.c:249
 msgid " - Empathy authentication client"
 msgstr " - klient uwierzytelniania komunikatora Empathy"
 
-#: ../src/empathy-auth-client.c:266
+#: ../src/empathy-auth-client.c:265
 msgid "Empathy authentication client"
 msgstr "Klient uwierzytelniania komunikatora Empathy"
 
@@ -2979,94 +3338,116 @@ msgstr "Klient uwierzytelniania komunikatora Empathy"
 msgid "People nearby"
 msgstr "Osoby w pobliżu"
 
-#: ../src/empathy-av.c:118
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr "- klient dźwięku/wideo komunikatora Empathy"
 
-#: ../src/empathy-av.c:134
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "Klient dźwięku/wideo komunikatora Empathy"
 
-#: ../src/empathy-streamed-media-window.c:479
+#: ../src/empathy-streamed-media-window.c:431
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: ../src/empathy-streamed-media-window.c:482
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Brightness"
 msgstr "Jasność"
 
-#: ../src/empathy-streamed-media-window.c:485
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:590
+#: ../src/empathy-streamed-media-window.c:542
 msgid "Volume"
 msgstr "Głośność"
 
-#: ../src/empathy-streamed-media-window.c:1166
+#: ../src/empathy-streamed-media-window.c:1110
 msgid "_Sidebar"
 msgstr "_Panel"
 
-#: ../src/empathy-streamed-media-window.c:1186
+#: ../src/empathy-streamed-media-window.c:1130
 msgid "Audio input"
 msgstr "Wejście dźwięku"
 
-#: ../src/empathy-streamed-media-window.c:1190
+#: ../src/empathy-streamed-media-window.c:1134
 msgid "Video input"
 msgstr "Wejście obrazu"
 
-#: ../src/empathy-streamed-media-window.c:1194
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Dialpad"
 msgstr "Panel wybierania"
 
-#: ../src/empathy-streamed-media-window.c:1205
+#: ../src/empathy-streamed-media-window.c:1151
 msgid "Details"
 msgstr "Szczegóły"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1274
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1782
 #, c-format
 msgid "Call with %s"
 msgstr "Rozmowa głosowa z użytkownikiem %s"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-streamed-media-window.c:1353
-msgid "Call"
-msgstr "Rozmowa głosowa"
-
-#: ../src/empathy-streamed-media-window.c:1507
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:2026
 msgid "The IP address as seen by the machine"
 msgstr "Adres IP widziany przez komputer"
 
-#: ../src/empathy-streamed-media-window.c:1509
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:2028
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Adres IP widziany przez serwer w Internecie"
 
-#: ../src/empathy-streamed-media-window.c:1511
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:2030
 msgid "The IP address of the peer as seen by the other side"
 msgstr "Adres IP elementu widziany przez drugÄ… stronÄ™"
 
-#: ../src/empathy-streamed-media-window.c:1513
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:2032
 msgid "The IP address of a relay server"
 msgstr "Adres IP serwera odpowiedzi"
 
-#: ../src/empathy-streamed-media-window.c:1515
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:2034
 msgid "The IP address of the multicast group"
 msgstr "Adres IP grupy multikastowej"
 
+#: ../src/empathy-streamed-media-window.c:1843
+msgctxt "encoding video codec"
+msgid "Unknown"
+msgstr "Nieznany"
+
+#: ../src/empathy-streamed-media-window.c:1846
+msgctxt "encoding audio codec"
+msgid "Unknown"
+msgstr "Nieznany"
+
+#: ../src/empathy-streamed-media-window.c:1849
+msgctxt "decoding video codec"
+msgid "Unknown"
+msgstr "Nieznany"
+
+#: ../src/empathy-streamed-media-window.c:1852
+msgctxt "decoding audio codec"
+msgid "Unknown"
+msgstr "Nieznany"
+
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2270
+#: ../src/empathy-streamed-media-window.c:2144
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Połączony — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2331
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2798
 msgid "Technical Details"
 msgstr "Szczegóły techniczne"
 
-#: ../src/empathy-streamed-media-window.c:2369
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2836
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3075,7 +3456,8 @@ msgstr ""
 "Oprogramowanie użytkownika %s nie obsługuje żadnego formatu dźwięku "
 "używanego przez ten komputer"
 
-#: ../src/empathy-streamed-media-window.c:2374
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2841
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3084,7 +3466,8 @@ msgstr ""
 "Oprogramowanie użytkownika %s nie obsługuje żadnego formatu wideo używanego "
 "przez ten komputer"
 
-#: ../src/empathy-streamed-media-window.c:2380
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2847
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3093,23 +3476,27 @@ msgstr ""
 "Nie można nawiązać połączenia z użytkownikiem %s. Jeden z uczestników może "
 "się znajdować w sieci, która nie pozwala na bezpośrednie połączenia."
 
-#: ../src/empathy-streamed-media-window.c:2386
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2853
 msgid "There was a failure on the network"
 msgstr "Wystąpił błąd sieci"
 
-#: ../src/empathy-streamed-media-window.c:2390
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2857
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Formaty dźwięku wymagane dla tej rozmowy nie są zainstalowane na komputerze"
 
-#: ../src/empathy-streamed-media-window.c:2393
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2860
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Formaty wideo wymagane dla tej rozmowy nie sÄ… zainstalowane na komputerze"
 
-#: ../src/empathy-streamed-media-window.c:2403
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2872
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3120,119 +3507,161 @@ msgstr ""
 "\">zgłosić ten błąd</a> i dołączyć dzienniki uzyskane z okna \"Debugowanie\" "
 "w menu Pomoc."
 
-#: ../src/empathy-streamed-media-window.c:2411
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2881
 msgid "There was a failure in the call engine"
 msgstr "Wystąpił błąd mechanizmu rozmowy"
 
-#: ../src/empathy-streamed-media-window.c:2414
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2884
 msgid "The end of the stream was reached"
 msgstr "Osiągnięto koniec strumienia"
 
-#: ../src/empathy-streamed-media-window.c:2454
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2924
 msgid "Can't establish audio stream"
 msgstr "Nie można utworzyć strumienia dźwięku"
 
-#: ../src/empathy-streamed-media-window.c:2464
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2934
 msgid "Can't establish video stream"
 msgstr "Nie można utworzyć strumienia obrazu"
 
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "Audio"
 msgstr "Dźwięk"
 
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Zadzwoń jeszcze raz"
-
 #: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "Kamera jest wyłączona"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "Dekoder:"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "Kamera jest włączona"
+msgid "Disable camera"
+msgstr "Wyłącz kamerę"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Dekoder:"
+msgid "Display the dialpad"
+msgstr "Wyświetl panel wybierania"
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Wyłączenie kamery i zatrzymanie wysyłania obrazu"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "Koder:"
 
 #: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Włączenie kamery i wysyłania obrazu"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Hang up"
+msgstr "Rozłącz"
 
 #: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Włączenie kamery, ale bez wysyłania obrazu"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Hang up current call"
+msgstr "Rozłącza bieżącą rozmowę"
 
 #: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Koder:"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "Lokalny kandydat:"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "Rozłącz"
+msgid "Maximise me"
+msgstr "Zmaksymalizuj"
 
 #: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Rozłącza bieżącą rozmowę"
+msgid "Minimise me"
+msgstr "Zminimalizuj"
 
 #: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Lokalny kandydat:"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "Zdalny kandydat:"
 
 #: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "PodglÄ…d"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Send Audio"
+msgstr "Wyślij dźwięk"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "Wybierz ponownie"
+msgid "Send Video"
+msgstr "Wyślij obraz wideo"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Zdalny kandydat:"
+msgid "Show dialpad"
+msgstr "Wyświetl panel wybierania"
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "Wyślij dźwięk"
+msgid "Start a video call"
+msgstr "Rozpocznij wideorozmowÄ™"
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Przełącza przesyłanie dźwięku"
+msgid "Start an audio call"
+msgstr "Rozpocznij rozmowę głosową"
+
+#: ../src/empathy-call-window.ui.h:18
+msgid "Swap camera"
+msgstr "Przełącz kamery"
 
 #: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "_Wideo"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr "Przełącza przesyłanie dźwięku"
 
 #: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "Wideo"
+msgid "Toggle video transmission"
+msgstr "Przełącza przesyłanie obrazu wideo"
 
 #: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "Obraz jest wyłączony"
-
-#: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "Obraz jest włączony"
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:2431 ../src/empathy-call-window.c:2432
+#: ../src/empathy-call-window.c:2433 ../src/empathy-call-window.c:2434
+msgid "Unknown"
+msgstr "Nieznany"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "PodglÄ…d obrazu"
+msgid "Video call"
+msgstr "Wideorozmowa"
 
 #: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "_Zadzwoń"
 
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:25
+msgid "_Camera"
+msgstr "_Kamera"
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:18
+msgid "_Contents"
+msgstr "_Spis treści"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
+msgid "_Debug"
+msgstr "_Debugowanie"
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:22
+msgid "_Help"
+msgstr "Pomo_c"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Microphone"
+msgstr "_Mikrofon"
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "_Settings"
+msgstr "_Ustawienia"
+
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_Widok"
 
-#: ../src/empathy-chat-window.c:474 ../src/empathy-chat-window.c:494
+#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3240,7 +3669,7 @@ msgstr[0] "%s (%d nieprzeczytana)"
 msgstr[1] "%s (%d nieprzeczytane)"
 msgstr[2] "%s (%d nieprzeczytanych)"
 
-#: ../src/empathy-chat-window.c:486
+#: ../src/empathy-chat-window.c:493
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3248,7 +3677,7 @@ msgstr[0] "%s (i %u inna)"
 msgstr[1] "%s (i %u inne)"
 msgstr[2] "%s (i %u innych)"
 
-#: ../src/empathy-chat-window.c:502
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3256,7 +3685,7 @@ msgstr[0] "%s (%d nieprzeczytana od innych)"
 msgstr[1] "%s (%d nieprzeczytane od innych)"
 msgstr[2] "%s (%d nieprzeczytanych od innych)"
 
-#: ../src/empathy-chat-window.c:511
+#: ../src/empathy-chat-window.c:518
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3264,7 +3693,19 @@ msgstr[0] "%s (%d nieprzeczytana od wszystkich)"
 msgstr[1] "%s (%d nieprzeczytane od wszystkich)"
 msgstr[2] "%s (%d nieprzeczytanych od wszystkich)"
 
-#: ../src/empathy-chat-window.c:721
+#: ../src/empathy-chat-window.c:733
+msgid "SMS:"
+msgstr "SMS:"
+
+#: ../src/empathy-chat-window.c:743
+#, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "Wysyłanie %d wiadomości"
+msgstr[1] "Wysyłanie %d wiadomości"
+msgstr[2] "Wysyłanie %d wiadomości"
+
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
 msgstr "Pisze wiadomość."
 
@@ -3276,10 +3717,6 @@ msgstr "_Wyczyść"
 msgid "C_ontact"
 msgstr "K_ontakt"
 
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Rozmowa"
-
 #: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
 msgstr "Wstaw _emotikonÄ™"
@@ -3300,10 +3737,6 @@ msgstr "PrzenieÅ› kartÄ™ w p_rawo"
 msgid "Notify for All Messages"
 msgstr "Powiadamianie o wszystkich wiadomościach"
 
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
-msgid "_Contents"
-msgstr "_Spis treści"
-
 #: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "_Rozmowa"
@@ -3312,18 +3745,10 @@ msgstr "_Rozmowa"
 msgid "_Detach Tab"
 msgstr "_Odłącz kartę"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
-msgid "_Edit"
-msgstr "_Edycja"
-
 #: ../src/empathy-chat-window.ui.h:13
 msgid "_Favorite Chat Room"
 msgstr "_Ulubiony pokój rozmowy"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
-msgid "_Help"
-msgstr "Pomo_c"
-
 #: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "_Następna karta"
@@ -3344,15 +3769,15 @@ msgstr "_Karty"
 msgid "_Undo Close Tab"
 msgstr "_Cofnij zamknięcie karty"
 
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
 msgstr "Pokój"
 
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "Automatyczne Å‚Ä…czenie"
 
@@ -3360,90 +3785,96 @@ msgstr "Automatyczne Å‚Ä…czenie"
 msgid "Manage Favorite Rooms"
 msgstr "ZarzÄ…dzanie ulubionymi pokojami"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming video call"
 msgstr "PrzychodzÄ…ca rozmowa wideo"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1408
 msgid "Incoming call"
 msgstr "Przychodząca rozmowa głosowa"
 
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:525
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "Wideorozmowa przychodząca od użytkownika %s. Odebrać ją?"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "Przychodząca rozmowa głosowa od użytkownika %s. Odebrać ją?"
 
-#: ../src/empathy-event-manager.c:515 ../src/empathy-event-manager.c:667
+#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1414
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Przychodząca rozmowa głosowa od użytkownika %s"
 
-#: ../src/empathy-event-manager.c:540
+#: ../src/empathy-event-manager.c:554
 msgid "_Reject"
 msgstr "_Odrzuć"
 
-#: ../src/empathy-event-manager.c:546
+#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
 msgid "_Answer"
 msgstr "_Odbierz"
 
-#: ../src/empathy-event-manager.c:667
+#: ../src/empathy-event-manager.c:570
+msgid "_Answer with video"
+msgstr "_Odbierz z obrazem wideo"
+
+#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1414
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Wideorozmowa przychodząca od użytkownika %s"
 
-#: ../src/empathy-event-manager.c:744
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
 msgstr "Zaproszenie do pokoju"
 
-#: ../src/empathy-event-manager.c:746
+#: ../src/empathy-event-manager.c:838
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Zaproszenie do dołączenia do %s"
 
-#: ../src/empathy-event-manager.c:753
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "Użytkownik %s zaprasza do dołączenia do %s"
 
-#: ../src/empathy-event-manager.c:761
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
 msgstr "_Odmów"
 
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Dołącz"
 
-#: ../src/empathy-event-manager.c:793
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s zaprosił użytkownika do dołączenia do %s"
 
-#: ../src/empathy-event-manager.c:799
+#: ../src/empathy-event-manager.c:891
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Zaproszono użytkownika do dołączenia do %s"
 
-#: ../src/empathy-event-manager.c:850
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Plik przychodzący od użytkownika %s"
 
-#: ../src/empathy-event-manager.c:1020 ../src/empathy-main-window.c:370
+#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
 msgid "Password required"
 msgstr "Hasło wymagane"
 
-#: ../src/empathy-event-manager.c:1076
+#: ../src/empathy-event-manager.c:1190
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s prosi o dostęp do informacji o obecności użytkownika online"
 
-#: ../src/empathy-event-manager.c:1080
+#: ../src/empathy-event-manager.c:1194
 #, c-format
 msgid ""
 "\n"
@@ -3453,105 +3884,105 @@ msgstr ""
 "Wiadomość: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:100
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:102
+#: ../src/empathy-ft-manager.c:103
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:179
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s z %s o prędkości %s/s"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:275
 #, c-format
 msgid "%s of %s"
 msgstr "%s z %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:305
+#: ../src/empathy-ft-manager.c:306
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Odbieranie pliku \"%s\" od użytkownika %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:309
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Wysyłanie pliku \"%s\" do użytkownika %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:338
+#: ../src/empathy-ft-manager.c:339
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Błąd podczas odbierania pliku \"%s\" od użytkownika %s"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:342
 msgid "Error receiving a file"
 msgstr "BÅ‚Ä…d podczas odbierania pliku"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:347
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Błąd podczas wysyłania pliku \"%s\" do użytkownika %s"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:350
 msgid "Error sending a file"
 msgstr "Błąd podczas wysyłania pliku"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:489
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "Otrzymano plik \"%s\" od użytkownika %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:493
+#: ../src/empathy-ft-manager.c:494
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "Wysłano \"%s\" do użytkownika %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:497
 msgid "File transfer completed"
 msgstr "Ukończono przesyłanie pliku"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
 msgid "Waiting for the other participant's response"
 msgstr "Oczekiwanie na odpowiedź drugiej strony"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Sprawdzanie spójności pliku \"%s\""
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Obliczanie sumy kontrolnej pliku \"%s\""
 
-#: ../src/empathy-ft-manager.c:1016
+#: ../src/empathy-ft-manager.c:1026
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1028
+#: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "Plik"
 
-#: ../src/empathy-ft-manager.c:1050
+#: ../src/empathy-ft-manager.c:1060
 msgid "Remaining"
 msgstr "Pozostało"
 
@@ -3588,127 +4019,140 @@ msgstr "Protokół"
 msgid "Source"
 msgstr "Źródło"
 
-#: ../src/empathy-main-window.c:387
+#: ../src/empathy-main-window.c:392
 msgid "Provide Password"
 msgstr "Wprowadź hasło"
 
-#: ../src/empathy-main-window.c:393
+#: ../src/empathy-main-window.c:398
 msgid "Disconnect"
 msgstr "Rozłącz"
 
-#: ../src/empathy-main-window.c:533
+#: ../src/empathy-main-window.c:622
 msgid "No match found"
 msgstr "Nie odnaleziono wyników"
 
-#: ../src/empathy-main-window.c:688
+#: ../src/empathy-main-window.c:777
 msgid "Reconnect"
 msgstr "Połącz ponownie"
 
-#: ../src/empathy-main-window.c:694
+#: ../src/empathy-main-window.c:783
 msgid "Edit Account"
 msgstr "Modyfikuj konto"
 
-#: ../src/empathy-main-window.c:700
+#: ../src/empathy-main-window.c:789
 msgid "Close"
 msgstr "Zamknij"
 
-#: ../src/empathy-main-window.c:1418
+#. Translators: this string will be something like:
+#. *   Top up My Account ($1.23)..."
+#: ../src/empathy-main-window.c:928
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr "Doładuj %s (%s)..."
+
+#: ../src/empathy-main-window.c:975
+msgid "Top up account credit"
+msgstr "Doładowuje konto kredytowe"
+
+#. top up button
+#: ../src/empathy-main-window.c:1046
+msgid "Top Up..."
+msgstr "Doładuj..."
+
+#: ../src/empathy-main-window.c:1789
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../src/empathy-main-window.c:1765
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "Lista kontaktów"
 
-#: ../src/empathy-main-window.c:1881
-msgid "Show and edit accounts"
-msgstr "Wyświetla i umożliwia modyfikowanie kont"
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "Kontakty na _mapie"
 
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-main-window-menubar.ui.h:2
+msgid "Credit Balance"
+msgstr "Saldo kredytowe"
+
+#: ../src/empathy-main-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "Znajdź na _liście kontaktów"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "Dołącz do _ulubionych"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "ZarzÄ…dzaj ulubionymi"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "Zwykły r_ozmiar"
 
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "Nowa _rozmowa głosowa…"
 
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "Zwykły rozmiar z _awatarami"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "P_referencje"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "Wyświetlanie p_rotokołów"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "Porządkowanie według _nazwy"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "Porządkowanie według _stanu"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Konta"
 
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "Za_blokowane kontakty"
 
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "Zmniejszony ro_zmiar"
 
-#: ../src/empathy-main-window.ui.h:18
-msgid "_Debug"
-msgstr "_Debugowanie"
-
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "_Przesyłanie plików"
 
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "_Dołącz…"
 
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "_Nowa rozmowa…"
 
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "K_ontakty w trybie offline"
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "I_nformacje osobiste"
 
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "_Pokój"
 
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window-menubar.ui.h:29
 msgid "_Search for Contacts…"
 msgstr "_Wyszukaj kontakty…"
 
@@ -3722,7 +4166,7 @@ msgstr "Członkowie"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:560
+#: ../src/empathy-new-chatroom-dialog.c:553
 #, c-format
 msgid ""
 "%s\n"
@@ -3735,16 +4179,16 @@ msgstr ""
 "Wymagane hasło: %s\n"
 "Członkowie: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "No"
 msgstr "Nie"
 
-#: ../src/empathy-new-chatroom-dialog.c:591
+#: ../src/empathy-new-chatroom-dialog.c:584
 msgid "Could not start room listing"
 msgstr "Nie można uruchomić listy pokoi"
 
-#: ../src/empathy-new-chatroom-dialog.c:601
+#: ../src/empathy-new-chatroom-dialog.c:594
 msgid "Could not stop room listing"
 msgstr "Nie można zatrzymać listy pokoi"
 
@@ -3779,39 +4223,79 @@ msgstr "Listy pokoi"
 msgid "_Room:"
 msgstr "_Pokój:"
 
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr "Otrzymano wiadomość"
 
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr "Wysłano wiadomość"
 
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
 msgstr "Nowa rozmowa"
 
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
 msgstr "Kontakt przeszedł do trybu online"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
 msgstr "Kontakt przeszedł do trybu offline"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
 msgstr "Konto połączone"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
 msgstr "Konto rozłączone"
 
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr "Język"
 
-#: ../src/empathy-preferences.c:875
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:734
+msgid "Juliet"
+msgstr "Julia"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:741
+msgid "Romeo"
+msgstr "Romeo"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:747
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr "Romeo! Czemuż ty jesteś Romeo!"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:750
+msgid "Deny thy father and refuse thy name;"
+msgstr "Wyrzecz się swego rodu, rzuć tę nazwę!"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:753
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr "Lub jeśli tego nie możesz uczynić,"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:756
+msgid "And I'll no longer be a Capulet."
+msgstr "To przysiąż wiernym być mojej miłości,"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:759
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr "A ja przestanę być z krwi Kapuletów."
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:762
+msgid "Juliet has disconnected"
+msgstr "Użytkownik Julia został rozłączony"
+
+#: ../src/empathy-preferences.c:1166
 msgid "Preferences"
 msgstr "Preferencje"
 
@@ -3819,67 +4303,87 @@ msgstr "Preferencje"
 msgid "Appearance"
 msgstr "WyglÄ…d"
 
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
 msgstr "Zachowanie"
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
 msgid "Chat Th_eme:"
 msgstr "Motyw _rozmowy:"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
 msgid "Disable notifications when _away or busy"
 msgstr "_Bez powiadomień podczas nieobecności lub zajętości"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
 msgid "Disable sounds when _away or busy"
 msgstr "B_ez odtwarzania dźwięków podczas nieobecności lub zajętości"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Wyświetlanie zdarzeń przychodzących w obszarze powiadamiania"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"Usuwanie echa zwiększa czystość głosu użytkownika dla osoby po drugiej "
+"stronie, ale może powodować problemy na niektórych komputerach. Jeśli "
+"słychać dziwne dźwięki lub piski podczas rozmów, to należy spróbować "
+"wyłączyć usuwanie echa i ponownie rozpocząć rozmowę głosową."
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "Powiadomienia, kiedy kontakt przeszedł do trybu online"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "Powiadomienia, kiedy kontakt przeszedł do trybu offline"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Powiadomienia, kiedy okno _rozmowy jest nieaktywne"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "Sprawdzanie pisowni dla języków:"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "Ogólne"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input level:"
+msgstr "Poziom wejściowy:"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "Głośność wejścia:"
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "Źródła położenia:"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "Zapisywanie rozmów do dziennika"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "Powiadomienia"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Odtwarzanie dźwięków zdarzeń"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "Prywatność"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -3889,66 +4393,70 @@ msgstr ""
 "miasto, stan/województwo i kraj. Koordynaty GPS będą dokładne do 1 miejsca "
 "po przecinku."
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "_Emotikony jako obrazy"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "_Lista kontaktów w pokojach"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "Dźwięki"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "Sprawdzanie pisowni"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "Lista języków odzwierciedla stan faktycznie zainstalowanych słowników."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "Motywy"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:30
+msgid "Variant:"
+msgstr "Wariant:"
+
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "Automatycznie Å‚Ä…czenie podczas _uruchamiania"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Telefon komórkowy"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "Wy_skakujÄ…ce powiadomienia"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "Powia_domienia dźwiękowe"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Sieć (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "_Otwieranie nowych rozmów w oddzielnych oknach"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "_Publikowanie położenia kontaktom"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "_Zmniejszenie dokładności położenia"
 
@@ -3960,83 +4468,131 @@ msgstr "Stan"
 msgid "_Quit"
 msgstr "Za_kończ"
 
-#: ../src/empathy-map-view.c:442
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "Zadzwoń jeszcze raz"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "Kamera jest wyłączona"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "Kamera jest włączona"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "Wyłączenie kamery i zatrzymanie wysyłania obrazu"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "Włączenie kamery i wysyłania obrazu"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "Włączenie kamery, ale bez wysyłania obrazu"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "PodglÄ…d"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "Wybierz ponownie"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "_Wideo"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "Obraz jest wyłączony"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "Obraz jest włączony"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "PodglÄ…d obrazu"
+
+#: ../src/empathy-map-view.c:448
 msgid "Contact Map View"
 msgstr "Widok mapy kontaktów"
 
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
 msgid "Save"
 msgstr "Zapisz"
 
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
 msgstr "Okno debugowania"
 
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
 msgstr "Wstrzymaj"
 
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
 msgstr "Poziom "
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
 msgid "Debug"
 msgstr "Debugowanie"
 
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
 msgid "Info"
 msgstr "Informacje"
 
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
 msgid "Message"
 msgstr "Wiadomość"
 
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
 msgid "Critical"
 msgstr "Krytyczny"
 
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
 msgid "Time"
 msgstr "Czas"
 
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
 msgid "Domain"
 msgstr "Domena"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
 msgstr "Kategoria"
 
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "Poziom"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr ""
 "Wybrany menedżer połączenia nie obsługuje rozszerzenia zdalnego debugowania."
 
-#: ../src/empathy-invite-participant-dialog.c:34
-#: ../src/empathy-invite-participant-dialog.c:48
+#: ../src/empathy-invite-participant-dialog.c:179
+#: ../src/empathy-invite-participant-dialog.c:205
 msgid "Invite Participant"
 msgstr "Zaproszenie uczestnika"
 
-#: ../src/empathy-invite-participant-dialog.c:35
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Proszę wybrać kontakt do zaproszenia do rozmowy:"
 
-#: ../src/empathy-invite-participant-dialog.c:45
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "ZaproÅ›"
 
@@ -4069,7 +4625,15 @@ msgstr "- Konta programu Empathy"
 msgid "Empathy Accounts"
 msgstr "Konta programu Empathy"
 
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr "Wyświetla konkretną usługę"
+
+#: ../src/empathy-debugger.c:75
+msgid "- Empathy Debugger"
+msgstr "- debuger programu Empathy"
+
+#: ../src/empathy-debugger.c:114
 msgid "Empathy Debugger"
 msgstr "Debuger programu Empathy"
 
@@ -4077,36 +4641,73 @@ msgstr "Debuger programu Empathy"
 msgid "- Empathy Chat Client"
 msgstr " - komunikator Empathy"
 
-#: ../src/empathy-notifications-approver.c:184
+#: ../src/empathy-notifications-approver.c:203
 msgid "Respond"
 msgstr "Odpowiedz"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1418
 msgid "Reject"
 msgstr "Odrzuć"
 
-#: ../src/empathy-notifications-approver.c:194
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1419
 msgid "Answer"
 msgstr "Odbierz"
 
-#: ../src/empathy-notifications-approver.c:201
-#: ../src/empathy-notifications-approver.c:211
+#: ../src/empathy-notifications-approver.c:227
+msgid "Answer with video"
+msgstr "Odbierz z obrazem wideo"
+
+#: ../src/empathy-notifications-approver.c:235
+#: ../src/empathy-notifications-approver.c:245
 msgid "Decline"
 msgstr "Odmów"
 
-#: ../src/empathy-notifications-approver.c:205
-#: ../src/empathy-notifications-approver.c:216
+#: ../src/empathy-notifications-approver.c:239
+#: ../src/empathy-notifications-approver.c:250
 msgid "Accept"
 msgstr "Zaakceptuj"
 
-#: ../src/empathy-call-observer.c:130
-#, c-format
-msgid "Missed call from %s"
-msgstr "Nieodebrana rozmowa głosowa od użytkownika %s"
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:260
+msgid "Provide"
+msgstr "Wprowadź"
 
-#: ../src/empathy-call-observer.c:133
+#: ../src/empathy-call-observer.c:134
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr ""
 "Użytkownik %s próbował się dodzwonić, ale w tym czasie prowadzono inną "
 "rozmowÄ™."
+
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1047 ../src/empathy-call-window.c:1070
+msgid "i"
+msgstr "i"
+
+#: ../src/empathy-call-window.c:2727
+msgid "On hold"
+msgstr "Odłożone"
+
+#: ../src/empathy-call-window.c:2730
+msgid "Mute"
+msgstr "Wycisz"
+
+#: ../src/empathy-call-window.c:2732
+msgid "Duration"
+msgstr "Czas trwania"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2735
+#, c-format
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02dm"
+
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "_Rozróżnianie wielkości liter"
diff --git a/po/pt.po b/po/pt.po
index 74f842ef7..72b756805 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0\n"
+"Project-Id-Version: 3.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-21 00:12+0000\n"
-"PO-Revision-Date: 2011-03-07 23:40+0000\n"
+"POT-Creation-Date: 2011-09-16 22:59+0100\n"
+"PO-Revision-Date: 2011-09-17 00:30+0000\n"
 "Last-Translator: Duarte Loreto <happyguy_pt@hotmail.com>\n"
 "Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
 "Language: pt\n"
@@ -40,6 +40,22 @@ msgid "Always open a separate chat window for new chats."
 msgstr "Abrir sempre uma janela de diálogo distinta para novos diálogos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr "Volume da chamada"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr "Volume da chamada, em percentagem."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Camera device"
+msgstr "Dispositivo de câmara"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "Posição da câmara"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -47,46 +63,54 @@ msgstr ""
 "Caracter a adicionar após a alcunha ao utilizar o completar de alcunhas "
 "(tab) em diálogos de grupo."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "Tema da janela de diálogo"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+msgid "Chat window theme variant"
+msgstr "Variante do tema da janela de diálogo"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "Lista separada por vírgulas de idiomas de verificação ortográfica a utilizar "
 "(por ex. \"pt, en, fr\")."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "Lista de contactos compacta"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "Deverá ser utilizado um gestor de ligações"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "Critério de ordenamento da lista de contactos"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Dispositivo de câmara por omissão a utilizar em chamadas de vídeo, por ex. /dev/video0."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
 msgstr "Directório por omissão de onde seleccionar uma imagem de avatar"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr "Desactivar notificações de popup quando ausente"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr "Desactivar sons quando ausente"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
 msgstr "Apresentar eventos recebidos na área de estado"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -94,242 +118,259 @@ msgstr ""
 "Apresentar eventos recebidos na área de estado. Se falso, apresentá-los ao "
 "utilizador imediatamente."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+msgid "Echo cancellation support"
+msgstr "Suporte para cancelamento de eco"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr "O Empathy pode publicar a localização do utilizador"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "O Empathy pode utilizar o GPS para calcular a localização"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr ""
 "O Empathy pode utilizar a rede de telemóvel para calcular a localização"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr "O Empathy pode utilizar a rede para calcular a localização"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr "Pasta de downloads por omissão do Empathy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
 msgstr "O Empathy migrou os registos butterfly"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy deverá colocar automaticamente como ausente quando inactivo"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy deverá ligar-se automaticamente ao iniciar"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy deverá reduzir a precisão da localização"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
 "Empathy deverá utilizar o avatar do contacto como ícone da janela de diálogo"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr "Activar as Ferramentas de Desenvolvimento WebKit"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "Activar notificações de popup de novas mensagens"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "Activar a verificação ortográfica"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "Esconder a janela principal"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "Esconder a janela principal."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "Caracter após alcunha completada"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "Abrir novos diálogos em janelas distintas"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "Caminho do tema Adium a utilizar"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
 "Caminho do tema Adium a utilizar se o tema utilizado para a conversa for "
 "Adium."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Reproduzir um som ao receber mensagens"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "Reproduzir um som ao ser iniciado um novo diálogo"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Reproduzir um som ao enviar mensagens"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "Reproduzir um som quando um contacto inicia uma sessão"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "Reproduzir um som quando um contacto termina a sessão"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "Reproduzir um som iniciar uma sessão"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "Reproduzir um som ao terminar a sessão"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Notificações em popup se o diálogo não tiver o foco"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "Notificações em popup quando um contacto inicia uma sessão"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "Notificações em popup quando um contacto termina a sessão"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr "Posição onde a antevisão de câmara deverá estar durante uma chamada."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+msgid "Show Balance in contact list"
+msgstr "Apresentar Saldo na lista de contactos"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "Apresentar os avatares"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "Apresentar a lista de contactos nas salas"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr "Apresentar dica sobre fechar a janela principal"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr "Apresentar os contactos desligados"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
 msgstr "Apresentar os protocolos"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "Idiomas de verificação ortográfica"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr "A pasta onde por omissão gravar ficheiros transferidos."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
 msgstr "O último directório de onde foi seleccionada uma imagem de avatar."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
 msgstr "A posição do painel lateral da janela de diálogo"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr ""
 "A posição armazenada (em pixels) do painel lateral da janela de diálogo."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "O tema utilizado para apresentar o diálogo em janelas de diálogo."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "A variante de tema utilizada para apresentar o diálogo em janelas de diálogo."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Utilizar risonhos gráficos"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "Utilizar sons de notificação"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "Utilizar tema para salas de diálogo"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr ""
 "Se o Empathy pode ou não publicar a localização do utilizador aos seus "
 "contactos."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Se o Empathy pode ou não utilizar o GPS para calcular a localização."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
 "Se o Empathy pode ou não utilizar a rede de telemóveis para calcular a "
 "localização."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Se o Empathy pode ou não utilizar a rede para calcular a localização."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "Se o Empathy migrou ou não os registos butterfly."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr ""
 "Se o Empathy deverá ou não iniciar automaticamente a sessão com as suas "
 "contas ao iniciar."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
 "Se o Empathy deverá ou não ficar em estado ausente automaticamente quando o "
 "utilizador está inactivo."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 "Se o Empathy deverá ou não reduzir a precisão da localização por motivos de "
 "privacidade."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 "Se o Empathy deverá ou não utilizar os avatares dos contactos como ícones "
 "das janelas de diálogo."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Se as ferramentas de desenvolvimento WebKit, tais como o Inspector Web, "
 "deverão estar activas."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
@@ -337,72 +378,76 @@ msgstr ""
 "Se deverão ou não ser utilizado gestores de ligações para desligar/religar "
 "automaticamente."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr ""
 "Se verificar ou não as palavras introduzidas contra os idiomas para os quais "
 "deseja verificar."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "Se converter ou não risonhos em imagens gráficas nos diálogos."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Se activar ou não o filtro de cancelamento de eco do Pulseaudio."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr ""
 "Se reproduzir ou não um som para notificar que contactos iniciaram uma "
 "sessão na rede."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
 "Se reproduzir ou não um som para notificar que contactos terminaram a sessão "
 "na rede."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "Se reproduzir ou não um som para notificar a ocorrência de eventos."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Se reproduzir ou não um som para notificar da recepção de mensagens."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr ""
 "Se reproduzir ou não um som para notificar do início de novos diálogos."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Se reproduzir ou não um som para notificar de mensagens enviadas."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "Se reproduzir ou não um som ao iniciar uma sessão na rede."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Se reproduzir ou não um som ao terminar a sessão numa rede."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr "Se reproduzir ou não sons de notificação quando ausente ou ocupado."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr ""
 "Se apresentar ou não popups de notificação quando um contacto termina a sua "
 "sessão."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr ""
 "Se apresentar ou não popups de notificação quando um contacto inicia uma "
 "sessão."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -410,40 +455,44 @@ msgstr ""
 "Se apresentar ou não um popup de notificação ao receber uma nova mensagem "
 "mesmo que o diálogo já esteja aberto mas não detenha o foco."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr ""
 "Se apresentar ou não um popup de notificação ao receber uma nova mensagem."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+msgid "Whether to show account balances in the contact list."
+msgstr "Se apresentar ou não os saldos de conta na lista de contactos."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 "Se apresentar ou não os avatares dos contactos na lista de contactos e "
 "janelas de diálogo."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "Se apresentar ou não na lista de contactos os que estejam desligados."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
 msgstr "Se apresentar ou não popups de notificação quando ausente ou ocupado."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr ""
 "Se apresentar ou não os protocolos dos contactos na lista de contactos."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Se apresentar ou não a lista de contactos nas salas de diálogo."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "Se apresentar a lista de contactos em modo compacto ou não."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -451,11 +500,11 @@ msgstr ""
 "Se apresentar ou não o diálogo de mensagem sobre fechar a janela principal "
 "no botão 'x' da barra de título."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "Se utilizar ou não o tema nas janelas de diálogo."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -471,7 +520,7 @@ msgstr "Gerir contas de Mensagens Instantâneas e VoIP"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2242
+#: ../src/empathy-accounts-dialog.c:2324
 msgid "Messaging and VoIP Accounts"
 msgstr "Contas de Mensagens Instantâneas e VoIP"
 
@@ -479,18 +528,34 @@ msgstr "Contas de Mensagens Instantâneas e VoIP"
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Transferência de ficheiro terminada, mas o ficheiro estava corrompido"
 
-#: ../libempathy/empathy-ft-handler.c:1113
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
 msgstr "Transferência de ficheiros não é suportada pelo contacto remoto"
 
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is not a regular file"
 msgstr "O ficheiro seleccionado não é um ficheiro normal"
 
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1176
 msgid "The selected file is empty"
 msgstr "O ficheiro seleccionado está vazio"
 
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#, c-format
+msgid "Missed call from %s"
+msgstr "Chamada perdida de %s"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, c-format
+msgid "Called %s"
+msgstr "Chamada para %s"
+
+#: ../libempathy/empathy-message.c:422
+#, c-format
+msgid "Call from %s"
+msgstr "Chamada de %s"
+
 #: ../libempathy/empathy-tp-file.c:268
 msgid "Socket type not supported"
 msgstr "Tipo de socket não é suportado"
@@ -519,145 +584,143 @@ msgstr "Erro ao tentar transferir o ficheiro"
 msgid "The other participant is unable to transfer the file"
 msgstr "O outro participante é incapaz de transferir o ficheiro"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:382
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
 msgid "Unknown reason"
 msgstr "Motivo desconhecido"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:222
 msgid "Available"
 msgstr "Disponível"
 
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:224
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:227
 msgid "Away"
 msgstr "Ausente"
 
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:229
 msgid "Invisible"
 msgstr "Invisível"
 
-#: ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-utils.c:231
 msgid "Offline"
 msgstr "Desligado"
 
-#: ../libempathy/empathy-utils.c:315
-#: ../src/empathy-streamed-media-window.c:1904
-#: ../src/empathy-streamed-media-window.c:1905
-#: ../src/empathy-streamed-media-window.c:1906
-#: ../src/empathy-streamed-media-window.c:1907
-#: ../src/empathy-call-window.ui.h:18
+#. translators: presence type is unknown
+#: ../libempathy/empathy-utils.c:234
+msgctxt "presence"
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:274
 msgid "No reason specified"
 msgstr "Nenhum motivo especificado"
 
-#: ../libempathy/empathy-utils.c:356 ../libempathy/empathy-utils.c:412
+#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
 msgid "Status is set to offline"
 msgstr "Estado definido como desligado"
 
-#: ../libempathy/empathy-utils.c:358 ../libempathy/empathy-utils.c:392
+#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "Erro de rede"
 
-#: ../libempathy/empathy-utils.c:360 ../libempathy/empathy-utils.c:394
+#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
 msgid "Authentication failed"
 msgstr "Falha na autenticação"
 
-#: ../libempathy/empathy-utils.c:362 ../libempathy/empathy-utils.c:396
+#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
 msgid "Encryption error"
 msgstr "Erro de encriptação"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:284
 msgid "Name in use"
 msgstr "Nome já utilizado"
 
-#: ../libempathy/empathy-utils.c:366 ../libempathy/empathy-utils.c:398
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
 msgid "Certificate not provided"
 msgstr "Não foi apresentado o certificado"
 
-#: ../libempathy/empathy-utils.c:368 ../libempathy/empathy-utils.c:400
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
 msgid "Certificate untrusted"
 msgstr "Certificado não é credível"
 
-#: ../libempathy/empathy-utils.c:370 ../libempathy/empathy-utils.c:402
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
 msgid "Certificate expired"
 msgstr "Certificado expirou"
 
-#: ../libempathy/empathy-utils.c:372 ../libempathy/empathy-utils.c:404
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
 msgid "Certificate not activated"
 msgstr "Certificado não está activo"
 
-#: ../libempathy/empathy-utils.c:374 ../libempathy/empathy-utils.c:406
+#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
 msgid "Certificate hostname mismatch"
 msgstr "Falha no nome de servidor do certificado"
 
-#: ../libempathy/empathy-utils.c:376 ../libempathy/empathy-utils.c:408
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate fingerprint mismatch"
 msgstr "Falha na impressão digital do certificado"
 
-#: ../libempathy/empathy-utils.c:378 ../libempathy/empathy-utils.c:410
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate self-signed"
 msgstr "Certificado assinado pelo próprio"
 
-#: ../libempathy/empathy-utils.c:380
+#: ../libempathy/empathy-utils.c:300
 msgid "Certificate error"
 msgstr "Erro no certificado"
 
-#: ../libempathy/empathy-utils.c:414
+#: ../libempathy/empathy-utils.c:334
 msgid "Encryption is not available"
 msgstr "Encriptação não está disponível"
 
-#: ../libempathy/empathy-utils.c:416
+#: ../libempathy/empathy-utils.c:336
 msgid "Certificate is invalid"
 msgstr "Certificado é inválido"
 
-#: ../libempathy/empathy-utils.c:418
+#: ../libempathy/empathy-utils.c:338
 msgid "Connection has been refused"
 msgstr "A ligação foi recusada"
 
-#: ../libempathy/empathy-utils.c:420
+#: ../libempathy/empathy-utils.c:340
 msgid "Connection can't be established"
 msgstr "Incapaz de estabelecer a ligação"
 
-#: ../libempathy/empathy-utils.c:422
+#: ../libempathy/empathy-utils.c:342
 msgid "Connection has been lost"
 msgstr "A ligação perdeu-se"
 
-#: ../libempathy/empathy-utils.c:424
+#: ../libempathy/empathy-utils.c:344
 msgid "This resource is already connected to the server"
 msgstr "Este recurso já se encontra ligado ao servidor"
 
-#: ../libempathy/empathy-utils.c:426
+#: ../libempathy/empathy-utils.c:346
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "A ligação foi substituída por uma nova ligação utilizando o mesmo recurso"
 
-#: ../libempathy/empathy-utils.c:429
+#: ../libempathy/empathy-utils.c:349
 msgid "The account already exists on the server"
 msgstr "A conta já existe no servidor"
 
-#: ../libempathy/empathy-utils.c:431
+#: ../libempathy/empathy-utils.c:351
 msgid "Server is currently too busy to handle the connection"
 msgstr "O servidor está demasiado ocupado para aceitar a ligação"
 
-#: ../libempathy/empathy-utils.c:433
+#: ../libempathy/empathy-utils.c:353
 msgid "Certificate has been revoked"
 msgstr "O certificado foi revogado"
 
-#: ../libempathy/empathy-utils.c:435
+#: ../libempathy/empathy-utils.c:355
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "O certificado utiliza um algoritmo de cifra inseguro ou é criptograficamente "
 "fraco"
 
-#: ../libempathy/empathy-utils.c:438
+#: ../libempathy/empathy-utils.c:358
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -668,150 +731,144 @@ msgstr ""
 
 # 48x48/emblems/emblem-people.icon.in.h:1
 # 48x48/emblems/emblem-people.icon.in.h:1
-#: ../libempathy/empathy-utils.c:601
+#: ../libempathy/empathy-utils.c:519
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "Pessoas Próximas"
 
-#: ../libempathy/empathy-utils.c:606
+#: ../libempathy/empathy-utils.c:524
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japão"
 
-#: ../libempathy/empathy-utils.c:635
+#: ../libempathy/empathy-utils.c:553
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:636
+#: ../libempathy/empathy-utils.c:554
 msgid "Facebook Chat"
 msgstr "Diálogo Facebook"
 
-#: ../libempathy/empathy-time.c:137
+#: ../libempathy/empathy-time.c:88
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d segundo atrás"
 msgstr[1] "%d segundos atrás"
 
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:93
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minuto atrás"
 msgstr[1] "%d minutos atrás"
 
-#: ../libempathy/empathy-time.c:147
+#: ../libempathy/empathy-time.c:98
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d hora atrás"
 msgstr[1] "%d horas atrás"
 
-#: ../libempathy/empathy-time.c:152
+#: ../libempathy/empathy-time.c:103
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d dia atrás"
 msgstr[1] "%d dias atrás"
 
-#: ../libempathy/empathy-time.c:157
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d semana atrás"
 msgstr[1] "%d semanas atrás"
 
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:113
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d mês atrás"
 msgstr[1] "%d meses atrás"
 
-#: ../libempathy/empathy-time.c:167
+#: ../libempathy/empathy-time.c:136
 msgid "in the future"
 msgstr "no futuro"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:491
-msgid "All"
-msgstr "Todos"
+#: ../libempathy-gtk/empathy-account-chooser.c:540
+msgid "All accounts"
+msgstr "Todas as contas"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../libempathy-gtk/empathy-log-window.c:643
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "Conta"
 
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "Senha"
 
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:685
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Porto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:757
-#: ../libempathy-gtk/empathy-account-widget.c:814
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1166
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "As Minhas Contas Web"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "A conta %s é editada através do Minhas Contas Web."
+msgid "The account %s is edited via %s."
+msgstr "A conta %s é editada através de %s."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1172
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "A conta %s não pode ser editada no Empathy."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
 msgstr "Iniciar o Minhas Contas Web"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1530
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "Editar %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Utilizador:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1897
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "A_plicar"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1927
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
 msgstr "_Iniciar sessão"
 
-#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1993
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:520
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1481
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "Conta:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2004
-msgid "_Enabled"
-msgstr "_Activo"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2069
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "Esta conta já existe no servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2072
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "Criar uma nova conta no servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2264
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "Ca_ncelar"
 
@@ -820,19 +877,19 @@ msgstr "Ca_ncelar"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2561
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s em %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2587
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "Conta %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2591
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "Nova conta"
 
@@ -844,6 +901,7 @@ msgstr "<b>Exemplo:</b> MeuNomeVisível"
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -857,7 +915,7 @@ msgstr "Avançado"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "Pass_word:"
 msgstr "Sen_ha:"
@@ -867,7 +925,7 @@ msgstr "Sen_ha:"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
 msgid "Remember Password"
 msgstr "Recordar Senha"
 
@@ -877,7 +935,7 @@ msgstr "Recordar Senha"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 #: ../libempathy-gtk/empathy-password-dialog.c:311
 msgid "Remember password"
@@ -953,76 +1011,84 @@ msgstr "Qual é o seu UIN do ICQ?"
 msgid "What is your ICQ password?"
 msgstr "Qual é a sua senha do ICQ?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:183
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "Auto"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:221
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "Registro"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:226
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "Opções"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "Nenhuma"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Character set:"
 msgstr "Conjunto de caracteres:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"A maioria dos servidores IRC não requer uma senha, pelo que se não tem a "
+"certeza, não introduza nenhuma."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Network"
 msgstr "Rede"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Network:"
 msgstr "Rede:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Alcunha:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "Mensagem de saída:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "Nome real:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Servers"
 msgstr "Servidores"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "What is your IRC nickname?"
 msgstr "Qual é a sua alcunha no IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Que rede de IRC?"
 
@@ -1156,58 +1222,67 @@ msgid "Discover the STUN server automatically"
 msgstr "Descobrir automaticamente o servidor STUN"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "Ignore TLS Errors"
+msgstr "Ignorar Erros TLS"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Interval (seconds)"
 msgstr "Intervalo (segundos)"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
 msgid "Keep-Alive Options"
 msgstr "Opções de Manter-Activo"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
 msgid "Loose Routing"
 msgstr "Roteamento Flexível"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Mechanism:"
 msgstr "Mecanismo:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
 msgid "Miscellaneous Options"
 msgstr "Opções Várias"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 msgid "NAT Traversal Options"
 msgstr "Opções de Cruzamento NAT"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 msgid "Port:"
 msgstr "Porto:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 msgid "Proxy Options"
 msgstr "Opções de Proxy"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "STUN Server:"
 msgstr "Servidor STUN:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.c:347
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid "Transport:"
 msgstr "Transporte:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Utilizar esta conta para telefonar para _linhas fixas e telemóveis"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "Qual é a senha da sua conta SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Qual é o seu ID SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "_Utilizador:"
 
@@ -1231,28 +1306,36 @@ msgstr "I_D Yahoo!:"
 msgid "_Room List locale:"
 msgstr "Configuração regional da Lista de _Salas:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:448
-#: ../libempathy-gtk/empathy-avatar-chooser.c:524
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "Incapaz de converter a imagem"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "Nenhum dos formatos de imagem aceites é suportado pelo seu sistema"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:930
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+msgid "Couldn't save picture to file"
+msgstr "Incapaz de gravar a imagem num ficheiro"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "Seleccione a Imagem do seu Avatar"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
+msgid "Take a picture..."
+msgstr "Tirar uma fotografia..."
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "Nenhuma Imagem"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:995
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "Imagens"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:999
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "Todos os Ficheiros"
 
@@ -1260,35 +1343,61 @@ msgstr "Todos os Ficheiros"
 msgid "Click to enlarge"
 msgstr "Clique para aumentar"
 
-#: ../libempathy-gtk/empathy-chat.c:652
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
+msgid "There was an error starting the call"
+msgstr "Ocorreu um erro ao iniciar a chamada"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact doesn't support calls"
+msgstr "O contacto especificado não suporta chamadas"
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is offline"
+msgstr "O contacto especificado está desligado"
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "The specified contact is not valid"
+msgstr "O contacto especificado não é válido"
+
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "Emergency calls are not supported on this protocol"
+msgstr "Este protocolo não suporta chamadas de emergência"
+
+#: ../libempathy-gtk/empathy-chat.c:702
 msgid "Failed to open private chat"
 msgstr "Falha ao abrir um diálogo privado"
 
-#: ../libempathy-gtk/empathy-chat.c:717
+#: ../libempathy-gtk/empathy-chat.c:763
 msgid "Topic not supported on this conversation"
 msgstr "Tópico não é suportado neste diálogo"
 
-#: ../libempathy-gtk/empathy-chat.c:723
+#: ../libempathy-gtk/empathy-chat.c:769
 msgid "You are not allowed to change the topic"
 msgstr "Não lhe é permitido alterar o tópico"
 
-#: ../libempathy-gtk/empathy-chat.c:906
+#: ../libempathy-gtk/empathy-chat.c:973
+#, c-format
+msgid "“%s� is not a valid contact ID"
+msgstr "“%s� não é um ID de contacto válido"
+
+#: ../libempathy-gtk/empathy-chat.c:1058
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: limpa todas as mensagens do diálogo actual"
 
-#: ../libempathy-gtk/empathy-chat.c:909
+#: ../libempathy-gtk/empathy-chat.c:1061
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <tópico>: define o tópico do diálogo actual"
 
-#: ../libempathy-gtk/empathy-chat.c:912
+#: ../libempathy-gtk/empathy-chat.c:1064
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ID sala diálogo>: entrar numa nova sala de diálogo"
 
-#: ../libempathy-gtk/empathy-chat.c:915
+#: ../libempathy-gtk/empathy-chat.c:1067
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ID sala diálogo>: entrar numa nova sala de diálogo"
 
-#: ../libempathy-gtk/empathy-chat.c:920
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1296,23 +1405,23 @@ msgstr ""
 "/part [<ID sala diálogo>] [<motivo>]: abandonar a sala de diálogo, por "
 "omissão a actual"
 
-#: ../libempathy-gtk/empathy-chat.c:925
+#: ../libempathy-gtk/empathy-chat.c:1075
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ID contacto> [<mensagem>]: abre uma janela de diálogo privada"
 
-#: ../libempathy-gtk/empathy-chat.c:928
+#: ../libempathy-gtk/empathy-chat.c:1078
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ID contacto> <mensagem>: abre uma janela de diálogo privada"
 
-#: ../libempathy-gtk/empathy-chat.c:931
+#: ../libempathy-gtk/empathy-chat.c:1081
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <alcunha>: alterar a sua alcunha no servidor actual"
 
-#: ../libempathy-gtk/empathy-chat.c:934
+#: ../libempathy-gtk/empathy-chat.c:1084
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <mensagem>: envia uma mensagem ACTION para o diálogo actual"
 
-#: ../libempathy-gtk/empathy-chat.c:937
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1322,7 +1431,11 @@ msgstr ""
 "enviar uma mensagem começada por '/'. Por exemplo: \"/say /join é utilizado "
 "para entrar numa nova sala de diálogo\""
 
-#: ../libempathy-gtk/empathy-chat.c:942
+#: ../libempathy-gtk/empathy-chat.c:1092
+msgid "/whois <contact ID>: display information about a contact"
+msgstr "/whois <ID contacto>: apresenta informação sobre um contacto"
+
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1330,99 +1443,114 @@ msgstr ""
 "/help [<comando>]: apresenta todos os comandos suportados. Se <comando> "
 "estiver definido, apresenta a sua forma de utilização."
 
-#: ../libempathy-gtk/empathy-chat.c:952
+#: ../libempathy-gtk/empathy-chat.c:1112
 #, c-format
 msgid "Usage: %s"
 msgstr "Utilização: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:991
+#: ../libempathy-gtk/empathy-chat.c:1157
 msgid "Unknown command"
 msgstr "Comando desconhecido"
 
-#: ../libempathy-gtk/empathy-chat.c:1117
+#: ../libempathy-gtk/empathy-chat.c:1283
 msgid "Unknown command; see /help for the available commands"
 msgstr ""
 "Comando desconhecido; consulte /help para obter os comandos disponíveis"
 
-#: ../libempathy-gtk/empathy-chat.c:1254
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1453
+msgid "insufficient balance to send message"
+msgstr "saldo insuficiente para enviar a mensagem"
+
+#: ../libempathy-gtk/empathy-chat.c:1455
+msgid "not capable"
+msgstr "incapaz"
+
+#: ../libempathy-gtk/empathy-chat.c:1462
 msgid "offline"
 msgstr "desligado"
 
-#: ../libempathy-gtk/empathy-chat.c:1257
+#: ../libempathy-gtk/empathy-chat.c:1465
 msgid "invalid contact"
 msgstr "contacto inválido"
 
-#: ../libempathy-gtk/empathy-chat.c:1260
+#: ../libempathy-gtk/empathy-chat.c:1468
 msgid "permission denied"
 msgstr "permissão negada"
 
-#: ../libempathy-gtk/empathy-chat.c:1263
+#: ../libempathy-gtk/empathy-chat.c:1471
 msgid "too long message"
 msgstr "mensagem demasiado extensa"
 
-#: ../libempathy-gtk/empathy-chat.c:1266
+#: ../libempathy-gtk/empathy-chat.c:1474
 msgid "not implemented"
 msgstr "não implementado"
 
-#: ../libempathy-gtk/empathy-chat.c:1270
+#: ../libempathy-gtk/empathy-chat.c:1478
 msgid "unknown"
 msgstr "desconhecido"
 
-#: ../libempathy-gtk/empathy-chat.c:1274
+#: ../libempathy-gtk/empathy-chat.c:1484
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Erro ao enviar a mensagem '%s': %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1335 ../src/empathy-chat-window.c:717
+#: ../libempathy-gtk/empathy-chat.c:1488
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Erro ao enviar a mensagem: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1549 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Tópico:"
 
-#: ../libempathy-gtk/empathy-chat.c:1347
+#: ../libempathy-gtk/empathy-chat.c:1561
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Tópico definido como: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1349
+#: ../libempathy-gtk/empathy-chat.c:1563
 msgid "No topic defined"
 msgstr "Nenhum tópico definido"
 
-#: ../libempathy-gtk/empathy-chat.c:1848
+#: ../libempathy-gtk/empathy-chat.c:2072
 msgid "(No Suggestions)"
 msgstr "(Nenhuma Sugestão)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1916
+#: ../libempathy-gtk/empathy-chat.c:2140
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Adicionar '%s' ao Dicionário"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1953
+#: ../libempathy-gtk/empathy-chat.c:2177
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Adicionar '%s' ao Dicionário %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2010
+#: ../libempathy-gtk/empathy-chat.c:2247
 msgid "Insert Smiley"
 msgstr "Inserir Risonho"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2028
-#: ../libempathy-gtk/empathy-ui-utils.c:1808
+#: ../libempathy-gtk/empathy-chat.c:2265
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "_Enviar"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2063
+#: ../libempathy-gtk/empathy-chat.c:2319
 msgid "_Spelling Suggestions"
 msgstr "_Sugestões de Ortografia"
 
-#: ../libempathy-gtk/empathy-chat.c:2152
+#: ../libempathy-gtk/empathy-chat.c:2408
 msgid "Failed to retrieve recent logs"
 msgstr "Falha ao obter os registos recentes"
 
-#: ../libempathy-gtk/empathy-chat.c:2263
+#: ../libempathy-gtk/empathy-chat.c:2545
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s terminou a sessão"
@@ -1430,12 +1558,12 @@ msgstr "%s terminou a sessão"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2270
+#: ../libempathy-gtk/empathy-chat.c:2552
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s foi expulso por %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2273
+#: ../libempathy-gtk/empathy-chat.c:2555
 #, c-format
 msgid "%s was kicked"
 msgstr "%s foi expulso"
@@ -1443,17 +1571,17 @@ msgstr "%s foi expulso"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2281
+#: ../libempathy-gtk/empathy-chat.c:2563
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s foi banifo por %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2284
+#: ../libempathy-gtk/empathy-chat.c:2566
 #, c-format
 msgid "%s was banned"
 msgstr "%s foi banido"
 
-#: ../libempathy-gtk/empathy-chat.c:2288
+#: ../libempathy-gtk/empathy-chat.c:2570
 #, c-format
 msgid "%s has left the room"
 msgstr "%s abandonou a sala"
@@ -1463,105 +1591,137 @@ msgstr "%s abandonou a sala"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2297
+#: ../libempathy-gtk/empathy-chat.c:2579
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2322
+#: ../libempathy-gtk/empathy-chat.c:2604
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s entrou na sala"
 
-#: ../libempathy-gtk/empathy-chat.c:2347
+#: ../libempathy-gtk/empathy-chat.c:2629
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s é agora conhecido como %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2486
-#: ../src/empathy-streamed-media-window.c:1949
-#: ../src/empathy-event-manager.c:1122
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2768
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1391
+#: ../src/empathy-call-window.c:1441 ../src/empathy-call-window.c:2479
 msgid "Disconnected"
 msgstr "Desligado"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3116
+#: ../libempathy-gtk/empathy-chat.c:3415
 msgid "Would you like to store this password?"
 msgstr "Deseja armazenar esta senha?"
 
-#: ../libempathy-gtk/empathy-chat.c:3122
+#: ../libempathy-gtk/empathy-chat.c:3421
 msgid "Remember"
 msgstr "Recordar"
 
-#: ../libempathy-gtk/empathy-chat.c:3132
+#: ../libempathy-gtk/empathy-chat.c:3431
 msgid "Not now"
 msgstr "Agora não"
 
-#: ../libempathy-gtk/empathy-chat.c:3176
+#: ../libempathy-gtk/empathy-chat.c:3475
 msgid "Retry"
 msgstr "Tentar Novamente"
 
-#: ../libempathy-gtk/empathy-chat.c:3180
+#: ../libempathy-gtk/empathy-chat.c:3479
 msgid "Wrong password; please try again:"
 msgstr "Senha incorrecta; tente novamente:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3297
+#: ../libempathy-gtk/empathy-chat.c:3609
 msgid "This room is protected by a password:"
 msgstr "Esta sala está protegida por uma senha:"
 
-#: ../libempathy-gtk/empathy-chat.c:3324
+#: ../libempathy-gtk/empathy-chat.c:3636
 msgid "Join"
 msgstr "Juntar"
 
-#: ../libempathy-gtk/empathy-chat.c:3494 ../src/empathy-event-manager.c:1144
+#: ../libempathy-gtk/empathy-chat.c:3838 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "Ligado"
 
-#: ../libempathy-gtk/empathy-chat.c:3547
-#: ../libempathy-gtk/empathy-log-window.c:650
+#: ../libempathy-gtk/empathy-chat.c:3893
 msgid "Conversation"
 msgstr "Diálogo"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:422
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:3898
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (SMS)"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
 msgid "Unknown or invalid identifier"
 msgstr "Identificador inválido ou desconhecido"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
 msgid "Contact blocking temporarily unavailable"
 msgstr "Bloqueio de contactos temporariamente indisponível"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
 msgid "Contact blocking unavailable"
 msgstr "Bloqueio de contactos indisponível"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
 msgid "Permission Denied"
 msgstr "Permissão Negada"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
 msgid "Could not block contact"
 msgstr "Incapaz de bloquear o contacto"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:701
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
 msgid "Edit Blocked Contacts"
 msgstr "Editar Contactos Bloqueados"
 
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Account:"
+msgstr "Conta:"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "Contactos Bloqueados"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Remover"
+
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:794
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Copiar o Endereço do Link"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:801
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Abrir Link"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:420
+#: ../libempathy-gtk/empathy-chat-text-view.c:415
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
@@ -1579,25 +1739,27 @@ msgstr "Informação Pessoal"
 msgid "New Contact"
 msgstr "Novo Contacto"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:532
-#: ../libempathy-gtk/empathy-individual-dialogs.c:199
+#: ../libempathy-gtk/empathy-contact-dialogs.c:533
+#: ../libempathy-gtk/empathy-individual-dialogs.c:200
 #, c-format
 msgid "Block %s?"
 msgstr "Bloquear %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:537
-#: ../libempathy-gtk/empathy-individual-dialogs.c:247
+#: ../libempathy-gtk/empathy-contact-dialogs.c:538
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
-msgstr "Tem a certeza de que deseja bloquear '%s' impedindo-o de o contactar novamente?"
+msgstr ""
+"Tem a certeza de que deseja bloquear '%s' impedindo-o de o contactar "
+"novamente?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:542
-#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-contact-dialogs.c:543
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:552
-#: ../libempathy-gtk/empathy-individual-dialogs.c:278
+#: ../libempathy-gtk/empathy-contact-dialogs.c:559
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Reportar este contacto como abusivo"
@@ -1623,301 +1785,331 @@ msgstr "Sem Grupo"
 msgid "Favorite People"
 msgstr "Pessoas Favoritas"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2001
-#: ../libempathy-gtk/empathy-individual-view.c:2336
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Deseja mesmo remover o grupo '%s'?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2003
-#: ../libempathy-gtk/empathy-individual-view.c:2339
+#: ../libempathy-gtk/empathy-contact-list-view.c:1988
+#: ../libempathy-gtk/empathy-individual-view.c:2379
 msgid "Removing group"
 msgstr "A remover o grupo"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2052
-#: ../libempathy-gtk/empathy-contact-list-view.c:2129
-#: ../libempathy-gtk/empathy-individual-view.c:2394
-#: ../libempathy-gtk/empathy-individual-view.c:2588
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../libempathy-gtk/empathy-contact-list-view.c:2037
+#: ../libempathy-gtk/empathy-contact-list-view.c:2114
+#: ../libempathy-gtk/empathy-individual-view.c:2434
+#: ../libempathy-gtk/empathy-individual-view.c:2637
 msgid "_Remove"
 msgstr "_Remover"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2082
-#: ../libempathy-gtk/empathy-individual-view.c:2458
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
+#: ../libempathy-gtk/empathy-individual-view.c:2501
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Deseja mesmo remover o contacto '%s'?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2084
-#: ../libempathy-gtk/empathy-individual-view.c:2479
+#: ../libempathy-gtk/empathy-contact-list-view.c:2069
+#: ../libempathy-gtk/empathy-individual-view.c:2522
 msgid "Removing contact"
 msgstr "A remover o contacto"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:219
-#: ../src/empathy-main-window.ui.h:13
+#: ../libempathy-gtk/empathy-contact-menu.c:220
+#: ../src/empathy-main-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "_Adicionar Contacto…"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:296
+#: ../libempathy-gtk/empathy-contact-menu.c:300
 msgid "_Block Contact"
 msgstr "_Bloquear o Contacto"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:325
-#: ../libempathy-gtk/empathy-individual-menu.c:517
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:329
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "_Diálogo"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:356
-#: ../libempathy-gtk/empathy-individual-menu.c:560
+#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "Ch_amada �udio"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:387
-#: ../libempathy-gtk/empathy-individual-menu.c:602
+#: ../libempathy-gtk/empathy-contact-menu.c:394
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "Chamada de _Vídeo"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:433
-#: ../libempathy-gtk/empathy-individual-menu.c:645
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:440
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "Diálogos _Anteriores"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:455
-#: ../libempathy-gtk/empathy-individual-menu.c:686
+#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "Enviar Ficheiro"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:478
-#: ../libempathy-gtk/empathy-individual-menu.c:728
+#: ../libempathy-gtk/empathy-contact-menu.c:485
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
 msgstr "Partilhar o Meu Ambiente de Trabalho"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:518
-#: ../libempathy-gtk/empathy-contact-widget.c:1763
-#: ../libempathy-gtk/empathy-individual-menu.c:763
+#: ../libempathy-gtk/empathy-contact-menu.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:1886
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
 #: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "Favorito"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:547
-#: ../libempathy-gtk/empathy-individual-menu.c:791
+#: ../libempathy-gtk/empathy-contact-menu.c:554
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "Infor_mação"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:593
+#: ../libempathy-gtk/empathy-contact-menu.c:600
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:647
-#: ../libempathy-gtk/empathy-individual-menu.c:972
-#: ../src/empathy-chat-window.c:935
+#: ../libempathy-gtk/empathy-contact-menu.c:654
+#: ../libempathy-gtk/empathy-individual-menu.c:1283
+#: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "A convidá-lo para esta sala"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:678
-#: ../libempathy-gtk/empathy-individual-menu.c:1019
+#: ../libempathy-gtk/empathy-contact-menu.c:685
+#: ../libempathy-gtk/empathy-individual-menu.c:1329
 msgid "_Invite to Chat Room"
 msgstr "_Convidar Para a Sala de Diálogo"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:513
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
 msgid "Search contacts"
 msgstr "Procurar nos contactos"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:543
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
 msgid "Search: "
 msgstr "Procurar: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:601
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
 msgid "_Add Contact"
 msgstr "_Adicionar Contacto"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:619
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
 msgid "No contacts found"
 msgstr "Nenhum contacto encontrado"
 
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr "A sua mensagem de apresentação:"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
+msgstr "Agradeço que me permita vê-lo quando estiver ligado. Obrigado!"
+
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "Seleccione um contacto"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:295
+#: ../libempathy-gtk/empathy-contact-widget.c:336
 #: ../libempathy-gtk/empathy-individual-widget.c:153
 msgid "Full name:"
 msgstr "Nome completo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:296
+#: ../libempathy-gtk/empathy-contact-widget.c:337
 #: ../libempathy-gtk/empathy-individual-widget.c:154
 msgid "Phone number:"
 msgstr "Número de telefone:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:297
+#: ../libempathy-gtk/empathy-contact-widget.c:338
 #: ../libempathy-gtk/empathy-individual-widget.c:155
 msgid "E-mail address:"
 msgstr "Endereço de email:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:298
+#: ../libempathy-gtk/empathy-contact-widget.c:339
 #: ../libempathy-gtk/empathy-individual-widget.c:156
 msgid "Website:"
 msgstr "Página web:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:299
+#: ../libempathy-gtk/empathy-contact-widget.c:340
 #: ../libempathy-gtk/empathy-individual-widget.c:157
 msgid "Birthday:"
 msgstr "Data de Nascimento:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:346
+msgid "Last seen:"
+msgstr "Última vez visto:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:348
+msgid "Connected from:"
+msgstr "Ligado de:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:353
+msgid "Away message:"
+msgstr "Mensagem de ausente:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+msgid "Channels:"
+msgstr "Canais:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
 msgstr "Código de País ISO:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Country:"
 msgstr "País:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "State:"
 msgstr "Estado:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:768
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "City:"
 msgstr "Cidade:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:770
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Area:"
 msgstr "�rea:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:772
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
 msgstr "Código Postal:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:774
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Street:"
 msgstr "Rua:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:776
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
 msgstr "Edifício:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:778
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Floor:"
 msgstr "Piso:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:780
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Room:"
 msgstr "Sala:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:782
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Text:"
 msgstr "Texto:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:784
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Description:"
 msgstr "Descrição:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:786
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
 msgstr "Nível de Precisão:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:790
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr "Erro:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:792
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
 msgstr "Erro Vertical (metros):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:794
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
 msgstr "Erro Horizontal (metros):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr "Velocidade:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Bearing:"
 msgstr "Orientação:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:800
-#: ../libempathy-gtk/empathy-individual-widget.c:526
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
 msgstr "Velocidade de Escalada:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:802
-#: ../libempathy-gtk/empathy-individual-widget.c:528
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
 msgstr "Última Actualização a:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:804
-#: ../libempathy-gtk/empathy-individual-widget.c:530
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
 msgstr "Longitude:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:806
-#: ../libempathy-gtk/empathy-individual-widget.c:532
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
 msgstr "Latitude:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:808
-#: ../libempathy-gtk/empathy-individual-widget.c:534
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
 msgstr "Altitude:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:871
-#: ../libempathy-gtk/empathy-contact-widget.c:888
-#: ../libempathy-gtk/empathy-individual-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:633
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "Localização"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:890
-#: ../libempathy-gtk/empathy-individual-widget.c:635
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:942
-#: ../libempathy-gtk/empathy-individual-widget.c:684
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y às %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1024
-#: ../libempathy-gtk/empathy-individual-widget.c:919
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
 msgid "Save Avatar"
 msgstr "Gravar Avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1080
-#: ../libempathy-gtk/empathy-individual-widget.c:977
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
 msgid "Unable to save avatar"
 msgstr "Incapaz de gravar o avatar"
 
@@ -1927,7 +2119,7 @@ msgstr "<b>Localização</b> em (data)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1307
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr "Alcunha:"
 
@@ -1947,7 +2139,7 @@ msgstr "Detalhes do Contacto"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "Identificador:"
 
@@ -1964,11 +2156,11 @@ msgstr "SO:"
 msgid "Version:"
 msgstr "Versão:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:332
+#: ../libempathy-gtk/empathy-groups-widget.c:333
 msgid "Groups"
 msgstr "Grupos"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:344
+#: ../libempathy-gtk/empathy-groups-widget.c:345
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -1976,46 +2168,46 @@ msgstr ""
 "Seleccione os grupos em que deseja que este contacto surja. Pode seleccionar "
 "mais do que um grupo ou nenhum."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:363
+#: ../libempathy-gtk/empathy-groups-widget.c:364
 msgid "_Add Group"
 msgstr "_Adicionar Grupo"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:398
+#: ../libempathy-gtk/empathy-groups-widget.c:399
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Seleccionar"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1436
+#: ../libempathy-gtk/empathy-groups-widget.c:409
+#: ../src/empathy-main-window.c:1807
 msgid "Group"
 msgstr "Grupo"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Será bloqueada a seguinte identidade:"
 msgstr[1] "Serão bloqueadas as seguintes identidades:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:259
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Não é possível bloquear a seguinte identidade:"
 msgstr[1] "Não é possível bloquear as seguintes identidades:"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
 msgstr "Contactos Associados"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:354
+#: ../libempathy-gtk/empathy-individual-linker.c:370
 msgid "Select contacts to link"
 msgstr "Seleccione os contactos a associar"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:428
+#: ../libempathy-gtk/empathy-individual-linker.c:444
 msgid "New contact preview"
 msgstr "Antevisão de novo contacto"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:472
+#: ../libempathy-gtk/empathy-individual-linker.c:488
 msgid "Contacts selected in the list on the left will be linked together."
 msgstr ""
 "Os contactos seleccionados na lista à esquerda serão associados entre si."
@@ -2023,28 +2215,59 @@ msgstr ""
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:131
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:839
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "Seleccione a conta a utilizar para realizar a chamada"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "Chamada"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+msgid "Mobile"
+msgstr "Móvel"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "Trabalho"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "Casa"
+
+#. add an SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+msgid "_SMS"
+msgstr "_SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1141
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Editar"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:865
+#: ../libempathy-gtk/empathy-individual-menu.c:1167
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "A_ssociar Contactos…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2301
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 msgid "Delete and _Block"
 msgstr "Apagar e _Bloquear"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2467
+#: ../libempathy-gtk/empathy-individual-view.c:2510
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2053,7 +2276,7 @@ msgstr ""
 "Deseja realmente remover o contacto ligado '%s'? Note que tal irá remover "
 "todos os contactos que constituem este contacto ligado."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2138,65 +2361,202 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "_Separar"
 
-#: ../libempathy-gtk/empathy-log-window.c:660
-msgid "Date"
-msgstr "Data"
+#: ../libempathy-gtk/empathy-log-window.c:634
+msgid "History"
+msgstr "Histórico"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
-msgstr "Diálogos"
+#: ../libempathy-gtk/empathy-log-window.c:689
+msgid "Show"
+msgstr "Apresentar"
+
+#: ../libempathy-gtk/empathy-log-window.c:711
+msgid "Search"
+msgstr "Procurar"
+
+#: ../libempathy-gtk/empathy-log-window.c:1159
+#, c-format
+msgid "Chat in %s"
+msgstr "Dialogar em %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1161
+#, c-format
+msgid "Chat with %s"
+msgstr "Dialogar com %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%A, %d de %B de %Y"
+
+#. Translators: this is an emote: '* Danielle waves'
+#: ../libempathy-gtk/empathy-log-window.c:1300
+#, c-format
+msgid "<i>* %s %s</i>"
+msgstr "<i>* %s %s</i>"
+
+#. Translators: this is a message: 'Danielle: hello'
+#. * The string in bold is the sender's name
+#: ../libempathy-gtk/empathy-log-window.c:1306
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1382
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s segundo"
+msgstr[1] "%s segundos"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s minuto"
+msgstr[1] "%s minutos"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "Chamada durou %s, terminou às %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1729
+msgid "Today"
+msgstr "Hoje"
+
+#: ../libempathy-gtk/empathy-log-window.c:1733
+msgid "Yesterday"
+msgstr "Ontem"
+
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
+msgid "%e %B %Y"
+msgstr "%d de %B de %Y"
+
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3425
+msgid "Anytime"
+msgstr "Qualquer hora"
+
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2353
+msgid "Anyone"
+msgstr "Qualquer pessoa"
+
+#: ../libempathy-gtk/empathy-log-window.c:2666
+msgid "Who"
+msgstr "Quem"
+
+#: ../libempathy-gtk/empathy-log-window.c:2870
+msgid "When"
+msgstr "Quando"
+
+#: ../libempathy-gtk/empathy-log-window.c:2986
+msgid "Anything"
+msgstr "Qualquer coisa"
+
+#: ../libempathy-gtk/empathy-log-window.c:2988
+msgid "Text chats"
+msgstr "Diálogos de texto"
+
+#: ../libempathy-gtk/empathy-log-window.c:2990
+#: ../src/empathy-preferences.ui.h:4
+msgid "Calls"
+msgstr "Chamadas"
+
+#: ../libempathy-gtk/empathy-log-window.c:2995
+msgid "Incoming calls"
+msgstr "Chamadas recebidas"
+
+#: ../libempathy-gtk/empathy-log-window.c:2996
+msgid "Outgoing calls"
+msgstr "Chamadas realizadas"
+
+#: ../libempathy-gtk/empathy-log-window.c:2997
+msgid "Missed calls"
+msgstr "Chamadas perdidas"
+
+#: ../libempathy-gtk/empathy-log-window.c:3019
+msgid "What"
+msgstr "O quê"
+
+#: ../libempathy-gtk/empathy-log-window.c:3728
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr ""
+"Tem a certeza de que deseja apagar os registos de todos os diálogos anteriores?"
+
+#: ../libempathy-gtk/empathy-log-window.c:3732
+msgid "Clear All"
+msgstr "Limpar Todos"
+
+#: ../libempathy-gtk/empathy-log-window.c:3739
+msgid "Delete from:"
+msgstr "Apagar desde:"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">A Ler...</span>"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "Procurar Seguinte"
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Chat"
+msgstr "Diálogo"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "Procurar Anterior"
+msgid "Delete All History..."
+msgstr "Apagar Todo o Histórico..."
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr "Diálogos Anteriores"
+msgid "Profile"
+msgstr "Perfil"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Video"
+msgstr "Vídeo"
 
-#. Tab Label
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "Procurar"
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:20
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "_File"
+msgstr "_Ficheiro"
 
-#. Searching *for* something
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "_Por:"
+msgid "page 2"
+msgstr "página 2"
 
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
 msgid "Contact ID:"
 msgstr "ID de Contacto:"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:171
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
 msgid "C_hat"
 msgstr "_Diálogo"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:181
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
 msgstr "Novo Diálogo"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:253
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
 msgid "Send _Video"
 msgstr "Enviar _Vídeo"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:261
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
 msgid "C_all"
 msgstr "Ch_amar"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:271
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "New Call"
 msgstr "Nova Chamada"
 
@@ -2215,34 +2575,34 @@ msgstr ""
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Message…"
 msgstr "Mensagem Personalizada…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messages…"
 msgstr "Editar as Mensagens Personalizadas…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
 msgstr "Clique para remover este estado dos favoritos"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
 msgstr "Clique para tornar este estado num favorito"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
 msgstr "Definir estado"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:946
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
 msgid "Set your presence and current status"
 msgstr "Defina a sua presença e estado actual"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1134
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
 msgid "Custom messages…"
 msgstr "Mensagens personalizadas…"
 
@@ -2255,18 +2615,26 @@ msgstr "Mensagens personalizadas…"
 msgid "New %s account"
 msgstr "Nova conta %s"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "Procurar:"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "Coincidir a capitalização"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Mat_ch case"
+msgstr "_Coincidir a capitalização"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
 msgid "Phrase not found"
 msgstr "Frase não encontrada"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "_Next"
+msgstr "_Seguinte"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+msgid "_Previous"
+msgstr "_Anterior"
+
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
 msgstr "Mensagem instantânea recebida"
@@ -2307,35 +2675,32 @@ msgstr "A realizar chamada de voz"
 msgid "Voice call ended"
 msgstr "Chamada de voz terminada"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "Introduza a Mensagem Personalizada"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
 msgstr "Editar as Mensagens Personalizadas"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr "Gravar a _Nova Mensagem de Estado"
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#, c-format
+msgid "Message edited at %s"
+msgstr "Mensagem editada em %s"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Status Messages"
-msgstr "Mensagens de Estado Gravadas"
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
+msgid "Normal"
+msgstr "Normal"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "Clássico"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "Simples"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "Espartano"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "Azul"
 
@@ -2413,19 +2778,19 @@ msgstr "Recordar esta selecção para ligações futuras"
 msgid "Certificate Details"
 msgstr "Detalhes do Certificado"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1705
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
 msgstr "Incapaz de abrir o URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1800
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
 msgstr "Seleccione um ficheiro"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
 msgid "Insufficient free space to save file"
 msgstr "Espaço disponível em disco é insuficiente para gravar o ficheiro"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2434,7 +2799,7 @@ msgstr ""
 "É necessário %s de espaço livre para gravar este ficheiro, mas apenas está "
 "disponível %s. Seleccione outra localização."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1924
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Ficheiro recebido de %s"
@@ -2622,24 +2987,24 @@ msgstr "Nenhuma mensagem de erro"
 msgid "Instant Message (Empathy)"
 msgstr "Mensagem Instantânea (Empathy)"
 
-#: ../src/empathy.c:308
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "Não estabelecer ligação ao iniciar"
 
-#: ../src/empathy.c:312
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr ""
 "Não apresentar a lista de contactos nem qualquer outro diálogo ao iniciar"
 
-#: ../src/empathy.c:320
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr "- Cliente de MI Empathy"
 
-#: ../src/empathy.c:499
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
 msgstr "Erro ao contactar o Gestor de Conta"
 
-#: ../src/empathy.c:501
+#: ../src/empathy.c:639
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2790,8 +3155,8 @@ msgid "Select the accounts you want to import:"
 msgstr "Seleccione as contas que deseja importar:"
 
 #: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "Yes"
 msgstr "Sim"
 
@@ -2865,34 +3230,35 @@ msgstr "Existem alterações por gravar na sua conta %s."
 msgid "Your new account has not been saved yet."
 msgstr "A sua nova conta ainda não foi gravada."
 
-#: ../src/empathy-accounts-dialog.c:286
-#: ../src/empathy-streamed-media-window.c:809
+#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1175
 msgid "Connecting…"
 msgstr "A estabelecer ligação…"
 
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:386
 #, c-format
 msgid "Offline — %s"
 msgstr "Desligado — %s"
 
-#: ../src/empathy-accounts-dialog.c:339
+#: ../src/empathy-accounts-dialog.c:398
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Desligado — %s"
 
-#: ../src/empathy-accounts-dialog.c:350
+#: ../src/empathy-accounts-dialog.c:409
 msgid "Offline — No Network Connection"
 msgstr "Desligado — Nenhuma Ligação de Rede"
 
-#: ../src/empathy-accounts-dialog.c:357
+#: ../src/empathy-accounts-dialog.c:416
 msgid "Unknown Status"
 msgstr "Estado Desconhecido"
 
-#: ../src/empathy-accounts-dialog.c:369
+#: ../src/empathy-accounts-dialog.c:428
 msgid "Offline — Account Disabled"
 msgstr "Desligado — Conta Desactivada"
 
-#: ../src/empathy-accounts-dialog.c:772
+#: ../src/empathy-accounts-dialog.c:831
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2900,16 +3266,16 @@ msgstr ""
 "Está prestes a criar uma nova conta, que irá descartar as\n"
 "suas alterações. Tem a certeza de que deseja continuar?"
 
-#: ../src/empathy-accounts-dialog.c:1133
+#: ../src/empathy-accounts-dialog.c:1192
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Deseja remover %s do seu computador?"
 
-#: ../src/empathy-accounts-dialog.c:1137
+#: ../src/empathy-accounts-dialog.c:1196
 msgid "This will not remove your account on the server."
 msgstr "Isto não irá remover a sua conta no servidor."
 
-#: ../src/empathy-accounts-dialog.c:1375
+#: ../src/empathy-accounts-dialog.c:1432
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2918,15 +3284,15 @@ msgstr ""
 "as suas alterações. Tem a certeza de que deseja continuar?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1571
+#: ../src/empathy-accounts-dialog.c:1643
 msgid "_Enable"
 msgstr "_Activar"
 
-#: ../src/empathy-accounts-dialog.c:1572
+#: ../src/empathy-accounts-dialog.c:1644
 msgid "_Disable"
 msgstr "_Desactivar"
 
-#: ../src/empathy-accounts-dialog.c:2086
+#: ../src/empathy-accounts-dialog.c:2154
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2935,18 +3301,22 @@ msgstr ""
 "as suas alterações. Tem a certeza de que deseja continuar?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Adicionar…"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
 msgid "Loading account information"
 msgstr "A ler informação de conta"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "No protocol installed"
 msgstr "Nenhum protocolo instalado"
 
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -2954,19 +3324,15 @@ msgstr ""
 "Para adicionar uma nova conta, tem primeiro de instalar um motor de suporte "
 "para cada protocolo que desejar utilizar."
 
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add…"
-msgstr "_Adicionar…"
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Import…"
 msgstr "_Importar…"
 
-#: ../src/empathy-auth-client.c:246
+#: ../src/empathy-auth-client.c:249
 msgid " - Empathy authentication client"
 msgstr " - Cliente de autenticação do Empathy"
 
-#: ../src/empathy-auth-client.c:262
+#: ../src/empathy-auth-client.c:265
 msgid "Empathy authentication client"
 msgstr "Cliente de autenticação do Empathy"
 
@@ -2976,94 +3342,116 @@ msgstr "Cliente de autenticação do Empathy"
 msgid "People nearby"
 msgstr "Pessoas próximas"
 
-#: ../src/empathy-av.c:118
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr "- Cliente de �udio/Vídeo do Empathy"
 
-#: ../src/empathy-av.c:134
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "Cliente de �udio/Vídeo do Empathy"
 
-#: ../src/empathy-streamed-media-window.c:479
+#: ../src/empathy-streamed-media-window.c:431
 msgid "Contrast"
 msgstr "Contraste"
 
-#: ../src/empathy-streamed-media-window.c:482
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Brightness"
 msgstr "Brilho"
 
-#: ../src/empathy-streamed-media-window.c:485
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Gamma"
 msgstr "Gama"
 
-#: ../src/empathy-streamed-media-window.c:590
+#: ../src/empathy-streamed-media-window.c:542
 msgid "Volume"
 msgstr "Volume"
 
-#: ../src/empathy-streamed-media-window.c:1166
+#: ../src/empathy-streamed-media-window.c:1110
 msgid "_Sidebar"
 msgstr "Barra _Lateral"
 
-#: ../src/empathy-streamed-media-window.c:1186
+#: ../src/empathy-streamed-media-window.c:1130
 msgid "Audio input"
 msgstr "Entrada áudio"
 
-#: ../src/empathy-streamed-media-window.c:1190
+#: ../src/empathy-streamed-media-window.c:1134
 msgid "Video input"
 msgstr "Entrada vídeo"
 
-#: ../src/empathy-streamed-media-window.c:1194
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Dialpad"
 msgstr "Teclado Numérico"
 
-#: ../src/empathy-streamed-media-window.c:1205
+#: ../src/empathy-streamed-media-window.c:1151
 msgid "Details"
 msgstr "Detalhes"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1274
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1782
 #, c-format
 msgid "Call with %s"
 msgstr "Chamada com %s"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-streamed-media-window.c:1353
-msgid "Call"
-msgstr "Chamada"
-
-#: ../src/empathy-streamed-media-window.c:1507
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:2026
 msgid "The IP address as seen by the machine"
 msgstr "O endereço IP tal como visto pela máquina"
 
-#: ../src/empathy-streamed-media-window.c:1509
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:2028
 msgid "The IP address as seen by a server on the Internet"
 msgstr "O endereço IP tal como visto por um servidor na Internet"
 
-#: ../src/empathy-streamed-media-window.c:1511
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:2030
 msgid "The IP address of the peer as seen by the other side"
 msgstr "O endereço IP do par tal como visto pelo outro lado"
 
-#: ../src/empathy-streamed-media-window.c:1513
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:2032
 msgid "The IP address of a relay server"
 msgstr "O endereço IP de um servidor de relay"
 
-#: ../src/empathy-streamed-media-window.c:1515
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:2034
 msgid "The IP address of the multicast group"
 msgstr "O endereço IP do grupo multicast"
 
+#: ../src/empathy-streamed-media-window.c:1843
+msgctxt "encoding video codec"
+msgid "Unknown"
+msgstr "Desconhecido"
+
+#: ../src/empathy-streamed-media-window.c:1846
+msgctxt "encoding audio codec"
+msgid "Unknown"
+msgstr "Desconhecido"
+
+#: ../src/empathy-streamed-media-window.c:1849
+msgctxt "decoding video codec"
+msgid "Unknown"
+msgstr "Desconhecido"
+
+#: ../src/empathy-streamed-media-window.c:1852
+msgctxt "decoding audio codec"
+msgid "Unknown"
+msgstr "Desconhecido"
+
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2266
+#: ../src/empathy-streamed-media-window.c:2144
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Ligado — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2327
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2798
 msgid "Technical Details"
 msgstr "Detalhes Técnicos"
 
-#: ../src/empathy-streamed-media-window.c:2365
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2836
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3072,7 +3460,8 @@ msgstr ""
 "As aplicações de %s não suportam nenhum dos formatos áudio suportados pelo "
 "seu computador"
 
-#: ../src/empathy-streamed-media-window.c:2370
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2841
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3081,7 +3470,8 @@ msgstr ""
 "As aplicações de %s não suportam nenhum dos formatos vídeo suportados pelo "
 "seu computador"
 
-#: ../src/empathy-streamed-media-window.c:2376
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2847
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3090,25 +3480,29 @@ msgstr ""
 "Incapaz de estabelecer uma ligação com %s. Um dos utilizadores deve estar "
 "numa rede que não permite ligações directas."
 
-#: ../src/empathy-streamed-media-window.c:2382
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2853
 msgid "There was a failure on the network"
 msgstr "Ocorreu um erro na rede"
 
-#: ../src/empathy-streamed-media-window.c:2386
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2857
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Os formatos áudio necessários para esta chamada não estão instalados no seu "
 "computador"
 
-#: ../src/empathy-streamed-media-window.c:2389
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2860
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Os formatos vídeo necessários para esta chamada não estão instalados no seu "
 "computador"
 
-#: ../src/empathy-streamed-media-window.c:2399
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2872
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3119,147 +3513,200 @@ msgstr ""
 "\">Relate isto como um erro</a> e junte os registos obtidos pela janela "
 "'Depuração' no menu Ajuda."
 
-#: ../src/empathy-streamed-media-window.c:2407
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2881
 msgid "There was a failure in the call engine"
 msgstr "Ocorreu um erro no motor de chamadas"
 
-#: ../src/empathy-streamed-media-window.c:2410
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2884
 msgid "The end of the stream was reached"
 msgstr "Foi alcançado o final do fluxo"
 
-#: ../src/empathy-streamed-media-window.c:2450
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2924
 msgid "Can't establish audio stream"
 msgstr "Incapaz de estabelecer fluxo áudio"
 
-#: ../src/empathy-streamed-media-window.c:2460
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2934
 msgid "Can't establish video stream"
 msgstr "Incapaz de estabelecer fluxo vídeo"
 
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "Audio"
 msgstr "�udio"
 
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Chamar o contacto novamente"
-
 #: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "Câmara Desligada"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "Codec Descodificador:"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "Câmara Ligada"
+msgid "Disable camera"
+msgstr "Desactivar a câmara"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Codec Descodificador:"
+msgid "Display the dialpad"
+msgstr "Apresentar o teclado numérico"
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Desactivar a câmara e parar de enviar vídeo"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "Codec Codificador:"
 
 #: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Activar a câmara e enviar vídeo"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Hang up"
+msgstr "Desligar"
 
 #: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Activar a câmara mas não enviar vídeo"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Hang up current call"
+msgstr "Desligar a chamada actual"
 
 #: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Codec Codificador:"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "Candidato Local:"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "Desligar"
+msgid "Maximise me"
+msgstr "Maximizar-me"
 
 #: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Desligar a chamada actual"
+msgid "Minimise me"
+msgstr "Minimizar-me"
 
 #: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Candidato Local:"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "Candidato Remoto:"
 
 #: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "Antevisão"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Send Audio"
+msgstr "Enviar �udio"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "Marcar Novamente"
+msgid "Send Video"
+msgstr "Enviar Vídeo"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Candidato Remoto:"
+msgid "Show dialpad"
+msgstr "Apresentar teclado numérico"
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "Enviar �udio"
+msgid "Start a video call"
+msgstr "Iniciar uma chamada vídeo"
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Alternar a transmissão áudio"
+msgid "Start an audio call"
+msgstr "Iniciar uma chamada áudio"
+
+#: ../src/empathy-call-window.ui.h:18
+msgid "Swap camera"
+msgstr "Trocar a câmara"
 
 #: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "Víd_eo"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr "Alternar a transmissão áudio"
 
 #: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "Vídeo"
+msgid "Toggle video transmission"
+msgstr "Alternar a transmissão vídeo"
 
 #: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "Vídeo Desligado"
-
-#: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "Vídeo Ligado"
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:2431 ../src/empathy-call-window.c:2432
+#: ../src/empathy-call-window.c:2433 ../src/empathy-call-window.c:2434
+msgid "Unknown"
+msgstr "Desconhecido"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "Antevisão do Vídeo"
+msgid "Video call"
+msgstr "Chamada de vídeo"
 
 #: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "_Chamar"
 
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:25
+msgid "_Camera"
+msgstr "_Câmara"
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:18
+msgid "_Contents"
+msgstr "_Conteúdo"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
+msgid "_Debug"
+msgstr "_Depurar"
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:22
+msgid "_Help"
+msgstr "_Ajuda"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Microphone"
+msgstr "_Microfone"
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "_Settings"
+msgstr "_Definições"
+
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_Visualizar"
 
-#: ../src/empathy-chat-window.c:474 ../src/empathy-chat-window.c:494
+#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d por ler)"
 msgstr[1] "%s (%d por ler)"
 
-#: ../src/empathy-chat-window.c:486
+#: ../src/empathy-chat-window.c:493
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (e %u outro)"
 msgstr[1] "%s (e %u outros)"
 
-#: ../src/empathy-chat-window.c:502
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d por ler de outros)"
 msgstr[1] "%s (%d por ler de outros)"
 
-#: ../src/empathy-chat-window.c:511
+#: ../src/empathy-chat-window.c:518
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d por ler de todos)"
 msgstr[1] "%s (%d por ler de todos)"
 
-#: ../src/empathy-chat-window.c:721
+#: ../src/empathy-chat-window.c:733
+msgid "SMS:"
+msgstr "SMS:"
+
+#: ../src/empathy-chat-window.c:743
+#, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "A enviar %d mensagem"
+msgstr[1] "A enviar %d mensagens"
+
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
 msgstr "A escrever uma mensagem."
 
@@ -3271,10 +3718,6 @@ msgstr "_Limpar"
 msgid "C_ontact"
 msgstr "C_ontacto"
 
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Diálogo"
-
 #: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
 msgstr "Inserir _Risonho"
@@ -3295,10 +3738,6 @@ msgstr "Mover Separador à _Direita"
 msgid "Notify for All Messages"
 msgstr "Notificar Para Todas as Mensagens"
 
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
-msgid "_Contents"
-msgstr "_Conteúdo"
-
 #: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "_Diálogo"
@@ -3307,18 +3746,10 @@ msgstr "_Diálogo"
 msgid "_Detach Tab"
 msgstr "_Destacar Separador"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
-msgid "_Edit"
-msgstr "_Editar"
-
 #: ../src/empathy-chat-window.ui.h:13
 msgid "_Favorite Chat Room"
 msgstr "Sala de Diálogo _Favorita"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
-msgid "_Help"
-msgstr "_Ajuda"
-
 #: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "Separador _Seguinte"
@@ -3339,15 +3770,15 @@ msgstr "_Separadores"
 msgid "_Undo Close Tab"
 msgstr "_Desfazer Fecho de Separador"
 
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
 msgstr "Sala"
 
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "Ligar Automaticamente"
 
@@ -3355,90 +3786,96 @@ msgstr "Ligar Automaticamente"
 msgid "Manage Favorite Rooms"
 msgstr "Gerir as Salas Favoritas"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming video call"
 msgstr "Chamada de vídeo a receber"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1408
 msgid "Incoming call"
 msgstr "Chamada a receber"
 
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:525
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s está a ligar-lhe em videoconferência. Deseja atender?"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s está a ligar-lhe. Deseja atender?"
 
-#: ../src/empathy-event-manager.c:515 ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1414
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Chamada a receber de %s"
 
-#: ../src/empathy-event-manager.c:540
+#: ../src/empathy-event-manager.c:554
 msgid "_Reject"
 msgstr "_Rejeitar"
 
-#: ../src/empathy-event-manager.c:546
+#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
 msgid "_Answer"
 msgstr "_Atender"
 
-#: ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:570
+msgid "_Answer with video"
+msgstr "_Atender com vídeo"
+
+#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1414
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Chamada vídeo a receber de %s"
 
-#: ../src/empathy-event-manager.c:737
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
 msgstr "Convite para uma sala"
 
-#: ../src/empathy-event-manager.c:739
+#: ../src/empathy-event-manager.c:838
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Convite para entrar na sala %s"
 
-#: ../src/empathy-event-manager.c:746
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s está a convidá-lo para entrar na sala %s"
 
-#: ../src/empathy-event-manager.c:754
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
 msgstr "_Recusar"
 
-#: ../src/empathy-event-manager.c:759
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Entrar"
 
-#: ../src/empathy-event-manager.c:786
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s convidou-o a entrar na sala %s"
 
-#: ../src/empathy-event-manager.c:792
+#: ../src/empathy-event-manager.c:891
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Foi convidado para se juntar à sala %s"
 
-#: ../src/empathy-event-manager.c:843
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "A receber transferência de ficheiro de %s"
 
-#: ../src/empathy-event-manager.c:1013 ../src/empathy-main-window.c:370
+#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
 msgid "Password required"
 msgstr "É necessária senha"
 
-#: ../src/empathy-event-manager.c:1069
+#: ../src/empathy-event-manager.c:1190
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s gostaria de ter permissão para o poder ver quando está ligado"
 
-#: ../src/empathy-event-manager.c:1073
+#: ../src/empathy-event-manager.c:1194
 #, c-format
 msgid ""
 "\n"
@@ -3448,105 +3885,105 @@ msgstr ""
 "Mensagem: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:100
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:102
+#: ../src/empathy-ft-manager.c:103
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:179
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Desconhecida"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s de %s a %s/s"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:275
 #, c-format
 msgid "%s of %s"
 msgstr "%s de %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:305
+#: ../src/empathy-ft-manager.c:306
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "A receber\"%s\" de %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:309
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "A enviar \"%s\" para %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:338
+#: ../src/empathy-ft-manager.c:339
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Erro ao receber\"%s\" de %s"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:342
 msgid "Error receiving a file"
 msgstr "Erro ao receber um ficheiro"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:347
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Erro ao enviar \"%s\" para %s"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:350
 msgid "Error sending a file"
 msgstr "Erro ao enviar um ficheiro"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:489
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" obtido de %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:493
+#: ../src/empathy-ft-manager.c:494
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" enviado para %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:497
 msgid "File transfer completed"
 msgstr "Transferência de ficheiro terminada"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
 msgid "Waiting for the other participant's response"
 msgstr "A aguardar a resposta do outro participante"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "A verificar a integridade de \"%s\""
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "A calcular o código de verificação de \"%s\""
 
-#: ../src/empathy-ft-manager.c:1016
+#: ../src/empathy-ft-manager.c:1026
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1028
+#: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "Ficheiro"
 
-#: ../src/empathy-ft-manager.c:1050
+#: ../src/empathy-ft-manager.c:1060
 msgid "Remaining"
 msgstr "Remanescente"
 
@@ -3585,127 +4022,140 @@ msgstr "Protocolo"
 msgid "Source"
 msgstr "Origem"
 
-#: ../src/empathy-main-window.c:387
+#: ../src/empathy-main-window.c:392
 msgid "Provide Password"
 msgstr "Indique a Senha"
 
-#: ../src/empathy-main-window.c:393
+#: ../src/empathy-main-window.c:398
 msgid "Disconnect"
 msgstr "Desligar"
 
-#: ../src/empathy-main-window.c:533
+#: ../src/empathy-main-window.c:622
 msgid "No match found"
 msgstr "Nenhuma equivalência encontrada"
 
-#: ../src/empathy-main-window.c:688
+#: ../src/empathy-main-window.c:777
 msgid "Reconnect"
 msgstr "Ligar Novamente"
 
-#: ../src/empathy-main-window.c:694
+#: ../src/empathy-main-window.c:783
 msgid "Edit Account"
 msgstr "Editar a Conta"
 
-#: ../src/empathy-main-window.c:700
+#: ../src/empathy-main-window.c:789
 msgid "Close"
 msgstr "Fechar"
 
-#: ../src/empathy-main-window.c:1418
+#. Translators: this string will be something like:
+#. *   Top up My Account ($1.23)..."
+#: ../src/empathy-main-window.c:928
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr "Carregar %s (%s)..."
+
+#: ../src/empathy-main-window.c:975
+msgid "Top up account credit"
+msgstr "Carregar o saldo de conta"
+
+#. top up button
+#: ../src/empathy-main-window.c:1046
+msgid "Top Up..."
+msgstr "Carregar..."
+
+#: ../src/empathy-main-window.c:1789
 msgid "Contact"
 msgstr "Contacto"
 
-#: ../src/empathy-main-window.c:1765
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "Lista de Contactos"
 
-#: ../src/empathy-main-window.c:1881
-msgid "Show and edit accounts"
-msgstr "Apresentar e editar contas"
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "Contactos num _Mapa"
 
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-main-window-menubar.ui.h:2
+msgid "Credit Balance"
+msgstr "Saldo"
+
+#: ../src/empathy-main-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "Procurar na _Lista de Contactos"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "Juntar às _Favoritas"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "Gerir as Favoritas"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "Tamanho N_ormal"
 
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "Nova _Chamada…"
 
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "Tamanho Normal com _Avatares"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "P_referências"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "Apresentar os P_rotocolos"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "Ordenar por _Nome"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "Ordenar por E_stado"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Contas"
 
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "Contactos _Bloqueados"
 
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "Tamanho _Compacto"
 
-#: ../src/empathy-main-window.ui.h:18
-msgid "_Debug"
-msgstr "_Depurar"
-
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "Transferências de _Ficheiros"
 
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "_Entrar…"
 
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "_Novo Diálogo…"
 
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "Contactos _Desligados"
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "Informação _Pessoal"
 
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "_Sala"
 
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window-menubar.ui.h:29
 msgid "_Search for Contacts…"
 msgstr "_Procurar por Contactos…"
 
@@ -3719,7 +4169,7 @@ msgstr "Membros"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:560
+#: ../src/empathy-new-chatroom-dialog.c:553
 #, c-format
 msgid ""
 "%s\n"
@@ -3732,16 +4182,16 @@ msgstr ""
 "Requer senha: %s\n"
 "Membros: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "No"
 msgstr "Não"
 
-#: ../src/empathy-new-chatroom-dialog.c:591
+#: ../src/empathy-new-chatroom-dialog.c:584
 msgid "Could not start room listing"
 msgstr "Incapaz de iniciar uma listagem de salas"
 
-#: ../src/empathy-new-chatroom-dialog.c:601
+#: ../src/empathy-new-chatroom-dialog.c:594
 msgid "Could not stop room listing"
 msgstr "Incapaz de parar uma listagem de salas"
 
@@ -3776,39 +4226,79 @@ msgstr "Lista de Salas"
 msgid "_Room:"
 msgstr "_Sala:"
 
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr "Mensagem recebida"
 
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr "Mensagem enviada"
 
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
 msgstr "Novo diálogo"
 
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
 msgstr "Contacto iniciou uma sessão"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
 msgstr "Contacto terminou a sessão"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
 msgstr "Conta ligou-se"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
 msgstr "Conta desligou-se"
 
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr "Idioma"
 
-#: ../src/empathy-preferences.c:875
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:734
+msgid "Juliet"
+msgstr "Julieta"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:741
+msgid "Romeo"
+msgstr "Romeu"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:747
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr "Oh, Romeu, Romeu, onde estais vós, Romeu?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:750
+msgid "Deny thy father and refuse thy name;"
+msgstr "Renegai o vosso pai e recusai o vosso nome;"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:753
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr "Ou se assim não o fizerdes, não mais tereis do que a promessa do meu amor"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:756
+msgid "And I'll no longer be a Capulet."
+msgstr "E não mais serei uma Capuleto."
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:759
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr "Deverei ouvir mais, ou deverei responder?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:762
+msgid "Juliet has disconnected"
+msgstr "Julieta terminou a sessão"
+
+#: ../src/empathy-preferences.c:1166
 msgid "Preferences"
 msgstr "Preferências"
 
@@ -3816,67 +4306,87 @@ msgstr "Preferências"
 msgid "Appearance"
 msgstr "Aparência"
 
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
 msgstr "Comportamento"
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
 msgid "Chat Th_eme:"
 msgstr "T_ema do diálogo:"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
 msgid "Disable notifications when _away or busy"
 msgstr "Desactivar notificações quando _ausente ou ocupado"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
 msgid "Disable sounds when _away or busy"
 msgstr "Desactivar sons quando _ausente ou ocupado"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Apresentar eventos recebidos na área de notificação"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"Cancelamento de eco ajuda a que a sua voz seja mais perceptível pela outra "
+"pessoa, mas pode causar problemas em alguns computadores. Caso oiça ou a "
+"outra pessoa oiça barulhos estranhos ou falhas durante a chamada, tente "
+"desligar o cancelamento de eco e reiniciar a chamada."
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "Activar as notificações quando um contacto inicia sessão"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "Activar as notificações quando um contacto termina a sessão"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Activar as notificações quando o _diálogo não possui o foco"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "Activar a verificação ortográfica para os idiomas:"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "Geral"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input level:"
+msgstr "Nível de entrada:"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "Volume de entrada:"
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "Origem da localização:"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "Guardar Registo dos Diálogos"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "Notificações"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Reproduzir som para eventos"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -3886,23 +4396,23 @@ msgstr ""
 "publicado nada mais preciso do que a sua cidade, região e país.  As "
 "coordenadas GPS terão uma precisão de uma casa decimal."
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "Apresentar _risonhos como imagens"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "Apresentar _lista de contactos nas salas"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "Verificação Ortográfica"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
@@ -3910,44 +4420,48 @@ msgstr ""
 "A lista de idiomas reflecte apenas aqueles para os quais possui um "
 "dicionário instalado."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "Temas"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:30
+msgid "Variant:"
+msgstr "Variante:"
+
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "_Ligar automaticamente ao iniciar"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Telemóvel"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "_Activar as notificações em bolha"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "_Activar notificações sonoras"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Rede (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "_Abrir novos diálogos em janelas distintas"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "_Publicar a localização para os meus contactos"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "_Reduzir a precisão da localização"
 
@@ -3959,83 +4473,131 @@ msgstr "Estado"
 msgid "_Quit"
 msgstr "_Sair"
 
-#: ../src/empathy-map-view.c:442
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "Chamar o contacto novamente"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "Câmara Desligada"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "Câmara Ligada"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "Desactivar a câmara e parar de enviar vídeo"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "Activar a câmara e enviar vídeo"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "Activar a câmara mas não enviar vídeo"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "Antevisão"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "Marcar Novamente"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "Víd_eo"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "Vídeo Desligado"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "Vídeo Ligado"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "Antevisão do Vídeo"
+
+#: ../src/empathy-map-view.c:448
 msgid "Contact Map View"
 msgstr "Vista de Mapa de Contactos"
 
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
 msgid "Save"
 msgstr "Gravar"
 
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
 msgstr "Janela de Depuração"
 
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
 msgstr "Nível "
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
 msgid "Debug"
 msgstr "Depuração"
 
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
 msgid "Info"
 msgstr "Informação"
 
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
 msgid "Message"
 msgstr "Mensagem"
 
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
 msgid "Critical"
 msgstr "Crítico"
 
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
 msgid "Error"
 msgstr "Erro"
 
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
 msgid "Time"
 msgstr "Hora"
 
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
 msgid "Domain"
 msgstr "Domínio"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
 msgstr "Categoria"
 
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "Nível"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr ""
 "O gestor de ligações seleccionado não suporta a extensão remota de depuração."
 
-#: ../src/empathy-invite-participant-dialog.c:34
-#: ../src/empathy-invite-participant-dialog.c:48
+#: ../src/empathy-invite-participant-dialog.c:179
+#: ../src/empathy-invite-participant-dialog.c:205
 msgid "Invite Participant"
 msgstr "Convidar Participante"
 
-#: ../src/empathy-invite-participant-dialog.c:35
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Seleccione um contacto a convidar para o diálogo:"
 
-#: ../src/empathy-invite-participant-dialog.c:45
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "Convidar"
 
@@ -4070,7 +4632,15 @@ msgstr "- Contas Empathy"
 msgid "Empathy Accounts"
 msgstr "Contas Empathy"
 
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr "Apresentar um serviço específico"
+
+#: ../src/empathy-debugger.c:75
+msgid "- Empathy Debugger"
+msgstr "- Depurador Empathy"
+
+#: ../src/empathy-debugger.c:114
 msgid "Empathy Debugger"
 msgstr "Depurador Empathy"
 
@@ -4078,38 +4648,111 @@ msgstr "Depurador Empathy"
 msgid "- Empathy Chat Client"
 msgstr "- Cliente de Diálogo Empathy"
 
-#: ../src/empathy-notifications-approver.c:184
+#: ../src/empathy-notifications-approver.c:203
 msgid "Respond"
 msgstr "Responder"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1418
 msgid "Reject"
 msgstr "Rejeitar"
 
-#: ../src/empathy-notifications-approver.c:194
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1419
 msgid "Answer"
 msgstr "Responder"
 
-#: ../src/empathy-notifications-approver.c:201
-#: ../src/empathy-notifications-approver.c:211
+#: ../src/empathy-notifications-approver.c:227
+msgid "Answer with video"
+msgstr "Atender com vídeo"
+
+#: ../src/empathy-notifications-approver.c:235
+#: ../src/empathy-notifications-approver.c:245
 msgid "Decline"
 msgstr "Recusar"
 
-#: ../src/empathy-notifications-approver.c:205
-#: ../src/empathy-notifications-approver.c:216
+#: ../src/empathy-notifications-approver.c:239
+#: ../src/empathy-notifications-approver.c:250
 msgid "Accept"
 msgstr "Aceitar"
 
-#: ../src/empathy-call-observer.c:130
-#, c-format
-msgid "Missed call from %s"
-msgstr "Chamada perdida de %s"
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:260
+msgid "Provide"
+msgstr "Indicar"
 
-#: ../src/empathy-call-observer.c:133
+#: ../src/empathy-call-observer.c:134
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s tentou ligar-lhe enquanto estava com outra chamada."
 
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1047 ../src/empathy-call-window.c:1070
+msgid "i"
+msgstr "i"
+
+#: ../src/empathy-call-window.c:2727
+msgid "On hold"
+msgstr "Em espera"
+
+#: ../src/empathy-call-window.c:2730
+msgid "Mute"
+msgstr "Silenciar"
+
+#: ../src/empathy-call-window.c:2732
+msgid "Duration"
+msgstr "Duração"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2735
+#, c-format
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02dm"
+
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "Coi_ncidir a capitalização"
+
+#~ msgid "All"
+#~ msgstr "Todos"
+
+#~ msgid "_Enabled"
+#~ msgstr "_Activo"
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ msgid "Conversations"
+#~ msgstr "Diálogos"
+
+#~ msgid "Find Next"
+#~ msgstr "Procurar Seguinte"
+
+#~ msgid "Find Previous"
+#~ msgstr "Procurar Anterior"
+
+#~ msgid "Previous Conversations"
+#~ msgstr "Diálogos Anteriores"
+
+#~ msgid "_For:"
+#~ msgstr "_Por:"
+
+#~ msgid "Enter Custom Message"
+#~ msgstr "Introduza a Mensagem Personalizada"
+
+#~ msgid "Save _New Status Message"
+#~ msgstr "Gravar a _Nova Mensagem de Estado"
+
+#~ msgid "Saved Status Messages"
+#~ msgstr "Mensagens de Estado Gravadas"
+
+#~ msgid "Show and edit accounts"
+#~ msgstr "Apresentar e editar contas"
+
 #~ msgid "Empathy has asked about importing accounts"
 #~ msgstr "O Empathy questionou sobre importar contas"
 
@@ -4211,9 +4854,6 @@ msgstr "%s tentou ligar-lhe enquanto estava com outra chamada."
 #~ msgid "%s account"
 #~ msgstr "Conta %s"
 
-#~ msgid "Salut account is created"
-#~ msgstr "Criada uma conta de boas vindas"
-
 #~ msgid ""
 #~ "Whether or not the Salut account has been created on the first Empathy "
 #~ "run."
@@ -4300,9 +4940,6 @@ msgstr "%s tentou ligar-lhe enquanto estava com outra chamada."
 #~ "Caso mais tarde decida voltar a adicionar a conta, estes estarão "
 #~ "disponíveis novamente."
 
-#~ msgid "Accounts"
-#~ msgstr "Contas"
-
 #~ msgid "Add new"
 #~ msgstr "Adicionar nova"
 
@@ -4376,9 +5013,6 @@ msgstr "%s tentou ligar-lhe enquanto estava com outra chamada."
 #~ msgid "_Check Word Spelling..."
 #~ msgstr "_Verificar a Ortografia da Palavra..."
 
-#~ msgid "<b>Topic:</b>"
-#~ msgstr "<b>Tópico:</b>"
-
 #~ msgid "Group Chat"
 #~ msgstr "Diálogo de Grupo"
 
@@ -4412,9 +5046,6 @@ msgstr "%s tentou ligar-lhe enquanto estava com outra chamada."
 #~ msgid "<b>New Account</b>"
 #~ msgstr "<b>Nova Conta</b>"
 
-#~ msgid "<b>Settings</b>"
-#~ msgstr "<b>Definições</b>"
-
 #~| msgid "Empathy accounts"
 #~ msgid "Import Accounts..."
 #~ msgstr "Importar Contas..."
@@ -4503,9 +5134,6 @@ msgstr "%s tentou ligar-lhe enquanto estava com outra chamada."
 #~ msgid "Show _avatars"
 #~ msgstr "Apresentar _avatares"
 
-#~ msgid "Show co_mpact contact list"
-#~ msgstr "_Apresentar lista de contactos compacta"
-
 #~ msgid "Enable popup when contact is available"
 #~ msgstr "Activar popup quando o contacto fica disponível"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 2c88d30bc..0f6ac546b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -20,9 +20,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Empathy\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-31 23:33-0400\n"
-"PO-Revision-Date: 2011-09-01 00:18-0300\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2011-09-15 19:02+0000\n"
+"PO-Revision-Date: 2011-09-15 16:24-0300\n"
 "Last-Translator: Antonio Fernandes C. Neto <fernandesn@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -787,7 +788,7 @@ msgstr[1] "%d meses atrás"
 msgid "in the future"
 msgstr "no futuro"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:539
+#: ../libempathy-gtk/empathy-account-chooser.c:540
 msgid "All accounts"
 msgstr "Todas as contas"
 
@@ -816,43 +817,53 @@ msgstr "Porta"
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1167
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "Minhas contas web"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "A conta %s é editada através do Minhas contas web."
+msgid "The account %s is edited via %s."
+msgstr "A conta %s é editada através do %s."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1173
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "A conta %s não pode ser editada no Empathy."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1193
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
 msgstr "Iniciar Minhas contas web"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1533
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "Editar %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Nome de usuário:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1851
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "A_plicar"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1881
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
 msgstr "C_onectar"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1955
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "Esta conta já existe no servidor"
 
 # Tooltip.
-#: ../libempathy-gtk/empathy-account-widget.c:1958
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "Criar uma nova conta no servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2150
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "_Cancelar"
 
@@ -861,19 +872,19 @@ msgstr "_Cancelar"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2428
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s em %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2454
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "Conta no %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2458
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "Nova conta"
 
@@ -1369,23 +1380,23 @@ msgstr "Você não está autorizado a alter o tópico"
 msgid "“%s� is not a valid contact ID"
 msgstr "\"%s\" não é um identificador de contato válido"
 
-#: ../libempathy-gtk/empathy-chat.c:1030
+#: ../libempathy-gtk/empathy-chat.c:1058
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: limpa todas as mensagens da conversa atual"
 
-#: ../libempathy-gtk/empathy-chat.c:1033
+#: ../libempathy-gtk/empathy-chat.c:1061
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <tópico>: define o tópico da conversa atual"
 
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1064
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ID da sala de bate-papo>: entra em uma nova sala de bate-papo"
 
-#: ../libempathy-gtk/empathy-chat.c:1039
+#: ../libempathy-gtk/empathy-chat.c:1067
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ID da sala de bate-papo> Entra em uma nova sala de bate-papo"
 
-#: ../libempathy-gtk/empathy-chat.c:1043
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1393,23 +1404,23 @@ msgstr ""
 "/part [<ID sala de bate-papo>] [<motivo>]: abandonar a sala de bate-papo, "
 "por padrão a sala atual"
 
-#: ../libempathy-gtk/empathy-chat.c:1047
+#: ../libempathy-gtk/empathy-chat.c:1075
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ID do contato> [<mensagem>]: abre um bate-papo privado"
 
-#: ../libempathy-gtk/empathy-chat.c:1050
+#: ../libempathy-gtk/empathy-chat.c:1078
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ID do contato> [<mensagem>]: abre um bate-papo privado"
 
-#: ../libempathy-gtk/empathy-chat.c:1053
+#: ../libempathy-gtk/empathy-chat.c:1081
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <apelido>: altera o seu apelido no servidor atual"
 
-#: ../libempathy-gtk/empathy-chat.c:1056
+#: ../libempathy-gtk/empathy-chat.c:1084
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <mensagem>: envia uma mensagem de AÇÃO para a conversa atual"
 
-#: ../libempathy-gtk/empathy-chat.c:1059
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1419,11 +1430,11 @@ msgstr ""
 "enviar uma mensagem iniciando com \"/\". Por exemplo: \"/say /join é "
 "utilizado para entrar em uma nova sala de bate-papo\""
 
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ID do contato>: exibe informações sobre um contato"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1431,113 +1442,113 @@ msgstr ""
 "/help [<comando>]: mostra todos os comandos suportados. Se <comando> estiver "
 "definido, será exibido instruções de uso."
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1112
 #, c-format
 msgid "Usage: %s"
 msgstr "Utilização: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1116
+#: ../libempathy-gtk/empathy-chat.c:1157
 msgid "Unknown command"
 msgstr "Comando desconhecido"
 
-#: ../libempathy-gtk/empathy-chat.c:1242
+#: ../libempathy-gtk/empathy-chat.c:1283
 msgid "Unknown command; see /help for the available commands"
 msgstr "Comando desconhecido; veja /help para os comandos disponíveis"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1412
+#: ../libempathy-gtk/empathy-chat.c:1453
 msgid "insufficient balance to send message"
 msgstr "Créditos insuficientes para enviar mensagens"
 
-#: ../libempathy-gtk/empathy-chat.c:1414
+#: ../libempathy-gtk/empathy-chat.c:1455
 msgid "not capable"
 msgstr "incapaz"
 
-#: ../libempathy-gtk/empathy-chat.c:1421
+#: ../libempathy-gtk/empathy-chat.c:1462
 msgid "offline"
 msgstr "desconectado"
 
-#: ../libempathy-gtk/empathy-chat.c:1424
+#: ../libempathy-gtk/empathy-chat.c:1465
 msgid "invalid contact"
 msgstr "contato inválido"
 
-#: ../libempathy-gtk/empathy-chat.c:1427
+#: ../libempathy-gtk/empathy-chat.c:1468
 msgid "permission denied"
 msgstr "permissão negada"
 
-#: ../libempathy-gtk/empathy-chat.c:1430
+#: ../libempathy-gtk/empathy-chat.c:1471
 msgid "too long message"
 msgstr "mensagem muito longa"
 
-#: ../libempathy-gtk/empathy-chat.c:1433
+#: ../libempathy-gtk/empathy-chat.c:1474
 msgid "not implemented"
 msgstr "não implementado"
 
-#: ../libempathy-gtk/empathy-chat.c:1437
+#: ../libempathy-gtk/empathy-chat.c:1478
 msgid "unknown"
 msgstr "desconhecido"
 
-#: ../libempathy-gtk/empathy-chat.c:1443
+#: ../libempathy-gtk/empathy-chat.c:1484
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Erro enviando mensagem \"%s\": %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1447
+#: ../libempathy-gtk/empathy-chat.c:1488
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Erro ao enviar mensagem: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1508 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1549 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Tópico:"
 
-#: ../libempathy-gtk/empathy-chat.c:1520
+#: ../libempathy-gtk/empathy-chat.c:1561
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Tópico definido como: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1563
 msgid "No topic defined"
 msgstr "Nenhum tópico definido"
 
-#: ../libempathy-gtk/empathy-chat.c:2031
+#: ../libempathy-gtk/empathy-chat.c:2072
 msgid "(No Suggestions)"
 msgstr "(Sem sugestões)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2099
+#: ../libempathy-gtk/empathy-chat.c:2140
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Adicionar \"%s\" ao dicionário"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2136
+#: ../libempathy-gtk/empathy-chat.c:2177
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Adicionar \"%s\" ao dicionário %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2206
+#: ../libempathy-gtk/empathy-chat.c:2247
 msgid "Insert Smiley"
 msgstr "Inserir smiley"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2224
+#: ../libempathy-gtk/empathy-chat.c:2265
 #: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "_Enviar"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2278
+#: ../libempathy-gtk/empathy-chat.c:2319
 msgid "_Spelling Suggestions"
 msgstr "_Sugestões de ortografia"
 
-#: ../libempathy-gtk/empathy-chat.c:2367
+#: ../libempathy-gtk/empathy-chat.c:2408
 msgid "Failed to retrieve recent logs"
 msgstr "Falha ao receber os registros recentes"
 
-#: ../libempathy-gtk/empathy-chat.c:2504
+#: ../libempathy-gtk/empathy-chat.c:2545
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s desconectou"
@@ -1545,12 +1556,12 @@ msgstr "%s desconectou"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2511
+#: ../libempathy-gtk/empathy-chat.c:2552
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s foi expulso por %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2514
+#: ../libempathy-gtk/empathy-chat.c:2555
 #, c-format
 msgid "%s was kicked"
 msgstr "%s foi expulso"
@@ -1558,17 +1569,17 @@ msgstr "%s foi expulso"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2522
+#: ../libempathy-gtk/empathy-chat.c:2563
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s foi banido por %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2525
+#: ../libempathy-gtk/empathy-chat.c:2566
 #, c-format
 msgid "%s was banned"
 msgstr "%s foi banido"
 
-#: ../libempathy-gtk/empathy-chat.c:2529
+#: ../libempathy-gtk/empathy-chat.c:2570
 #, c-format
 msgid "%s has left the room"
 msgstr "%s saiu da sala"
@@ -1578,68 +1589,72 @@ msgstr "%s saiu da sala"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2538
+#: ../libempathy-gtk/empathy-chat.c:2579
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2604
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s entrou na sala"
 
-#: ../libempathy-gtk/empathy-chat.c:2588
+#: ../libempathy-gtk/empathy-chat.c:2629
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s é agora conhecido como %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2727
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2768
 #: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:2355
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1391
+#: ../src/empathy-call-window.c:1441 ../src/empathy-call-window.c:2479
 msgid "Disconnected"
 msgstr "Desconectado"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3374
+#: ../libempathy-gtk/empathy-chat.c:3415
 msgid "Would you like to store this password?"
 msgstr "Deseja armazenar esta senha?"
 
-#: ../libempathy-gtk/empathy-chat.c:3380
+#: ../libempathy-gtk/empathy-chat.c:3421
 msgid "Remember"
 msgstr "Lembrar"
 
-#: ../libempathy-gtk/empathy-chat.c:3390
+#: ../libempathy-gtk/empathy-chat.c:3431
 msgid "Not now"
 msgstr "Agora não"
 
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3475
 msgid "Retry"
 msgstr "Repetir"
 
-#: ../libempathy-gtk/empathy-chat.c:3438
+#: ../libempathy-gtk/empathy-chat.c:3479
 msgid "Wrong password; please try again:"
 msgstr "Senha errada; por favor, tente novamente:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3568
+#: ../libempathy-gtk/empathy-chat.c:3609
 msgid "This room is protected by a password:"
 msgstr "Esta sala é protegida por uma senha:"
 
-#: ../libempathy-gtk/empathy-chat.c:3595
+#: ../libempathy-gtk/empathy-chat.c:3636
 msgid "Join"
 msgstr "Entrar"
 
-#: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:3838 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../libempathy-gtk/empathy-chat.c:3852
+#: ../libempathy-gtk/empathy-chat.c:3893
 msgid "Conversation"
 msgstr "Conversa"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3857
+#: ../libempathy-gtk/empathy-chat.c:3898
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1672,7 +1687,7 @@ msgstr "Editar contatos bloqueados"
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:512
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1485
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
@@ -1844,7 +1859,7 @@ msgstr "Compartilhar minha área de trabalho"
 #: ../libempathy-gtk/empathy-contact-menu.c:525
 #: ../libempathy-gtk/empathy-contact-widget.c:1886
 #: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1373
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "Favoritos"
 
@@ -2071,7 +2086,7 @@ msgstr "Altitude:"
 #: ../libempathy-gtk/empathy-contact-widget.c:1011
 #: ../libempathy-gtk/empathy-individual-widget.c:607
 #: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "Localização"
 
@@ -2123,7 +2138,7 @@ msgstr "Detalhes do contato"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1515
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "Identificação:"
 
@@ -2260,7 +2275,7 @@ msgstr ""
 "Deseja realmente remover o contato agrupado \"%s\"? Note que isso irá "
 "remover todos os contatos que constituem este contato agrupado."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1662
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2344,129 +2359,136 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "_Desconectar"
 
-#: ../libempathy-gtk/empathy-log-window.c:633
+#: ../libempathy-gtk/empathy-log-window.c:634
 msgid "History"
 msgstr "Histórico"
 
-#: ../libempathy-gtk/empathy-log-window.c:685
+#: ../libempathy-gtk/empathy-log-window.c:689
 msgid "Show"
 msgstr "Mostrar"
 
-#: ../libempathy-gtk/empathy-log-window.c:707
+#: ../libempathy-gtk/empathy-log-window.c:711
 msgid "Search"
 msgstr "Pesquisar"
 
-#: ../libempathy-gtk/empathy-log-window.c:1155
+#: ../libempathy-gtk/empathy-log-window.c:1159
 #, c-format
 msgid "Chat in %s"
 msgstr "Conversa em %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1157
+#: ../libempathy-gtk/empathy-log-window.c:1161
 #, c-format
 msgid "Chat with %s"
 msgstr "Conversa com %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1207
-#: ../libempathy-gtk/empathy-log-window.c:1354
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1296
+#: ../libempathy-gtk/empathy-log-window.c:1300
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1302
+#: ../libempathy-gtk/empathy-log-window.c:1306
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
-#: ../libempathy-gtk/empathy-log-window.c:1375
-#: ../src/empathy-ft-manager.c:1026
-msgid "%"
-msgstr "%"
-
 #: ../libempathy-gtk/empathy-log-window.c:1382
 #, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s segundo"
+msgstr[1] "%s segundos"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s minuto"
+msgstr[1] "%s minutos"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
+#, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Chamada durou %s, encerrada às %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1714
+#: ../libempathy-gtk/empathy-log-window.c:1729
 msgid "Today"
 msgstr "Hoje"
 
-#: ../libempathy-gtk/empathy-log-window.c:1718
+#: ../libempathy-gtk/empathy-log-window.c:1733
 msgid "Yesterday"
 msgstr "Ontem"
 
-#: ../libempathy-gtk/empathy-log-window.c:1734
-msgctxt ""
-"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1815
-#: ../libempathy-gtk/empathy-log-window.c:3396
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3425
 msgid "Anytime"
 msgstr "Qualquer hora"
 
-#: ../libempathy-gtk/empathy-log-window.c:1895
-#: ../libempathy-gtk/empathy-log-window.c:2325
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2353
 msgid "Anyone"
 msgstr "Qualquer um"
 
-#: ../libempathy-gtk/empathy-log-window.c:2637
+#: ../libempathy-gtk/empathy-log-window.c:2666
 msgid "Who"
 msgstr "Quem"
 
-#: ../libempathy-gtk/empathy-log-window.c:2841
+#: ../libempathy-gtk/empathy-log-window.c:2870
 msgid "When"
 msgstr "Quando"
 
-#: ../libempathy-gtk/empathy-log-window.c:2957
+#: ../libempathy-gtk/empathy-log-window.c:2986
 msgid "Anything"
 msgstr "Qualquer coisa"
 
-#: ../libempathy-gtk/empathy-log-window.c:2959
+#: ../libempathy-gtk/empathy-log-window.c:2988
 msgid "Text chats"
 msgstr "Conversas de texto"
 
-#: ../libempathy-gtk/empathy-log-window.c:2961
+#: ../libempathy-gtk/empathy-log-window.c:2990
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "Chamadas"
 
-#: ../libempathy-gtk/empathy-log-window.c:2966
+#: ../libempathy-gtk/empathy-log-window.c:2995
 msgid "Incoming calls"
 msgstr "Chamadas recebidas"
 
-#: ../libempathy-gtk/empathy-log-window.c:2967
+#: ../libempathy-gtk/empathy-log-window.c:2996
 msgid "Outgoing calls"
 msgstr "Chamadas realizadas"
 
-#: ../libempathy-gtk/empathy-log-window.c:2968
+#: ../libempathy-gtk/empathy-log-window.c:2997
 msgid "Missed calls"
 msgstr "Chamadas não atendidas"
 
-#: ../libempathy-gtk/empathy-log-window.c:2990
+#: ../libempathy-gtk/empathy-log-window.c:3019
 msgid "What"
 msgstr "O que"
 
-#: ../libempathy-gtk/empathy-log-window.c:3699
+#: ../libempathy-gtk/empathy-log-window.c:3728
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr ""
 "Tem certeza que deseja deletar todos os registros das conversas anteriores?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3703
+#: ../libempathy-gtk/empathy-log-window.c:3732
 msgid "Clear All"
 msgstr "_Limpar tudo"
 
-#: ../libempathy-gtk/empathy-log-window.c:3710
+#: ../libempathy-gtk/empathy-log-window.c:3739
 msgid "Delete from:"
 msgstr "Deletar de:"
 
@@ -2655,12 +2677,12 @@ msgstr "Chamada de voz finalizada"
 msgid "Edit Custom Messages"
 msgstr "Editar mensagens personalizadas"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1030
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
 #, c-format
 msgid "Message edited at %s"
 msgstr "Mensagem editada às %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1720
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
 msgid "Normal"
 msgstr "Normal"
 
@@ -3223,7 +3245,7 @@ msgstr "Sua nova conta ainda não foi salva."
 
 #: ../src/empathy-accounts-dialog.c:345
 #: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1164
+#: ../src/empathy-call-window.c:1175
 msgid "Connecting…"
 msgstr "Conectando..."
 
@@ -3331,11 +3353,11 @@ msgstr "Cliente de autenticação do Empathy"
 msgid "People nearby"
 msgstr "Pessoas por perto"
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:127
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr "- Cliente de áudio/vídeo do Empathy"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:152
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "Cliente de áudio/vídeo do Empathy"
 
@@ -3378,33 +3400,33 @@ msgstr "Detalhes"
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1672
+#: ../src/empathy-call-window.c:1782
 #, c-format
 msgid "Call with %s"
 msgstr "Chamada de %s"
 
 #: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:1916
+#: ../src/empathy-call-window.c:2026
 msgid "The IP address as seen by the machine"
 msgstr "O endereço IP como visto pela máquina"
 
 #: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:1918
+#: ../src/empathy-call-window.c:2028
 msgid "The IP address as seen by a server on the Internet"
 msgstr "O endereço IP como visto por um servidor na Internet"
 
 #: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:1920
+#: ../src/empathy-call-window.c:2030
 msgid "The IP address of the peer as seen by the other side"
 msgstr "O endereço IP do par como visto pelo outro lado"
 
 #: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:1922
+#: ../src/empathy-call-window.c:2032
 msgid "The IP address of a relay server"
 msgstr "O endereço IP de um servidor de retransmissão"
 
 #: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:1924
+#: ../src/empathy-call-window.c:2034
 msgid "The IP address of the multicast group"
 msgstr "O endereço IP do grupo de multicast"
 
@@ -3435,12 +3457,12 @@ msgid "Connected — %d:%02dm"
 msgstr "Conectado — %d:%02dm"
 
 #: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2674
+#: ../src/empathy-call-window.c:2798
 msgid "Technical Details"
 msgstr "Detalhes técnicos"
 
 #: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2712
+#: ../src/empathy-call-window.c:2836
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3450,7 +3472,7 @@ msgstr ""
 "seu computador"
 
 #: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2717
+#: ../src/empathy-call-window.c:2841
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3460,7 +3482,7 @@ msgstr ""
 "seu computador"
 
 #: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2723
+#: ../src/empathy-call-window.c:2847
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3470,12 +3492,12 @@ msgstr ""
 "que não permite conexões diretas."
 
 #: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2729
+#: ../src/empathy-call-window.c:2853
 msgid "There was a failure on the network"
 msgstr "Ocorreu uma falha de rede"
 
 #: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2733
+#: ../src/empathy-call-window.c:2857
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
@@ -3483,7 +3505,7 @@ msgstr ""
 "seu computador"
 
 #: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2736
+#: ../src/empathy-call-window.c:2860
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
@@ -3491,7 +3513,7 @@ msgstr ""
 "seu computador"
 
 #: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2748
+#: ../src/empathy-call-window.c:2872
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3503,22 +3525,22 @@ msgstr ""
 "\"Depuração\" no menu Ajuda."
 
 #: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2757
+#: ../src/empathy-call-window.c:2881
 msgid "There was a failure in the call engine"
 msgstr "Ocorreu uma falha no mecanismo de chamada"
 
 #: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2760
+#: ../src/empathy-call-window.c:2884
 msgid "The end of the stream was reached"
 msgstr "Alcançado o fim do fluxo"
 
 #: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2800
+#: ../src/empathy-call-window.c:2924
 msgid "Can't establish audio stream"
 msgstr "Não foi possível realizar uma transmissão de áudio"
 
 #: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2810
+#: ../src/empathy-call-window.c:2934
 msgid "Can't establish video stream"
 msgstr "Não foi possível realizar uma transmissão de vídeo"
 
@@ -3609,8 +3631,8 @@ msgstr "Alternar transmissão de vídeo"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2307 ../src/empathy-call-window.c:2308
-#: ../src/empathy-call-window.c:2309 ../src/empathy-call-window.c:2310
+#: ../src/empathy-call-window.c:2431 ../src/empathy-call-window.c:2432
+#: ../src/empathy-call-window.c:2433 ../src/empathy-call-window.c:2434
 msgid "Unknown"
 msgstr "Desconhecido"
 
@@ -3779,7 +3801,7 @@ msgstr "Gerenciar salas favoritas"
 msgid "Incoming video call"
 msgstr "Recebendo chamada de vídeo"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1408
 msgid "Incoming call"
 msgstr "Recebendo chamada"
 
@@ -3794,7 +3816,7 @@ msgid "%s is calling you. Do you want to answer?"
 msgstr "%s está chamando você, você quer responder?"
 
 #: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1414
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Recebendo chamada de %s"
@@ -3812,6 +3834,7 @@ msgid "_Answer with video"
 msgstr "_Responder com vídeo"
 
 #: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1414
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Recebendo chamada de vídeo de %s"
@@ -3965,6 +3988,10 @@ msgstr "Verificando integridade de \"%s\""
 msgid "Hashing \"%s\""
 msgstr "Fazendo hash de \"%s\""
 
+#: ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "%"
+
 #: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "Arquivo"
@@ -4050,7 +4077,7 @@ msgstr "Recarregar..."
 msgid "Contact"
 msgstr "Contato"
 
-#: ../src/empathy-main-window.c:2119
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "Lista de contatos"
 
@@ -4314,54 +4341,66 @@ msgid "Display incoming events in the notification area"
 msgstr "Exibir eventos recebidos na área de notificação"
 
 #: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"Cancelamento de eco ajuda a produzir o som de sua voz mais claro para a "
+"outra pessoa, mas pode causar problemas em alguns computadores. Se você ou a "
+"outra pessoa ouvir barulhos estranhos ou falhas durante as chamadas, tente "
+"desligar o cancelamento de eco e reiniciar a chamada."
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "Habilitar notificações quando um contato conectar"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "Habilitar notificações quando um contato desconectar"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Exibir notificações quando o bate-papo não estiver em _foco"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "Habilitar verificação ortográfica para os idiomas:"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "Geral"
 
-#: ../src/empathy-preferences.ui.h:14
-msgid "Input level"
-msgstr "Nível de entrada"
-
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input volume"
-msgstr "Volume de entrada"
+msgid "Input level:"
+msgstr "Nível de entrada:"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "Volume de entrada:"
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "Fontes de localização:"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "Registro de conversas"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "Notificações"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Reproduzir sons para eventos"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -4371,23 +4410,23 @@ msgstr ""
 "sua cidade, estado e país serão publicados. As coordenadas do GPS terão a "
 "precisão de 1 casa decimal."
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "Mostrar _smileys como imagens"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "_Mostrar lista de contatos nas salas"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "Verificação de ortografia"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
@@ -4395,48 +4434,48 @@ msgstr ""
 "A lista de idiomas representa somente os idiomas para os quais você já "
 "possui dicionários instalados."
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "Temas"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "Variante:"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "Conectar automati_camente ao iniciar "
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "Telefone _celular"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "Ha_bilitar balões de notificação"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "H_abilitar sons de notificação"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Rede (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "_Abrir novos bate-papos em janelas separadas"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "_Publicar a localização para os meus contatos"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "_Reduzir a precisão de localização"
 
@@ -4564,16 +4603,16 @@ msgstr ""
 "O gerenciador de conexões selecionado não suporta a extensão de depuração "
 "remota."
 
+#: ../src/empathy-invite-participant-dialog.c:179
 #: ../src/empathy-invite-participant-dialog.c:205
-#: ../src/empathy-invite-participant-dialog.c:231
 msgid "Invite Participant"
 msgstr "Convidar participante"
 
-#: ../src/empathy-invite-participant-dialog.c:206
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Escolha um contato para convidar para a conversa:"
 
-#: ../src/empathy-invite-participant-dialog.c:227
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "Convidar"
 
@@ -4627,11 +4666,13 @@ msgid "Respond"
 msgstr "Responder"
 
 #: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1418
 msgid "Reject"
 msgstr "Rejeitar"
 
 #: ../src/empathy-notifications-approver.c:222
 #: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1419
 msgid "Answer"
 msgstr "Responder"
 
@@ -4649,6 +4690,9 @@ msgstr "Recusar"
 msgid "Accept"
 msgstr "Aceitar"
 
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
 #: ../src/empathy-notifications-approver.c:260
 msgid "Provide"
 msgstr "Proporcionar"
@@ -4660,24 +4704,24 @@ msgstr "%s tentou te ligar enquanto você estava em outra chamada."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1036 ../src/empathy-call-window.c:1059
+#: ../src/empathy-call-window.c:1047 ../src/empathy-call-window.c:1070
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2603
+#: ../src/empathy-call-window.c:2727
 msgid "On hold"
 msgstr "Em espera"
 
-#: ../src/empathy-call-window.c:2606
+#: ../src/empathy-call-window.c:2730
 msgid "Mute"
 msgstr "Mudo"
 
-#: ../src/empathy-call-window.c:2608
+#: ../src/empathy-call-window.c:2732
 msgid "Duration"
 msgstr "Duração"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2611
+#: ../src/empathy-call-window.c:2735
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
diff --git a/po/ru.po b/po/ru.po
index f313cc926..242f3d4c6 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy trunk\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-08-30 09:49+0000\n"
-"PO-Revision-Date: 2011-09-01 23:41+0300\n"
+"POT-Creation-Date: 2011-09-15 13:17+0000\n"
+"PO-Revision-Date: 2011-09-17 12:33+0300\n"
 "Last-Translator: Yuri Myasoedov <omerta13@yandex.ru>\n"
 "Language-Team: Russian <gnome-cyr@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -57,7 +57,6 @@ msgid "Camera device"
 msgstr "Камера"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-#| msgid "Camera On"
 msgid "Camera position"
 msgstr "Положение камеры"
 
@@ -736,71 +735,81 @@ msgstr[2] "%d ме��цев назад"
 msgid "in the future"
 msgstr "в будущем"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:539
+#: ../libempathy-gtk/empathy-account-chooser.c:540
 msgid "All accounts"
 msgstr "В�е учётные запи�и"
 
-#: ../libempathy-gtk/empathy-account-widget.c:693
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "Учётна� запи�ь"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "Пароль"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Сервер"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Порт"
 
-#: ../libempathy-gtk/empathy-account-widget.c:768
-#: ../libempathy-gtk/empathy-account-widget.c:825
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1166
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "Мои �етевые учётные запи�и"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "Учётна� запи�ь %s изменена через «Мои учётные запи�и»."
+msgid "The account %s is edited via %s."
+msgstr "Учётна� запи�ь %s изменена по�ред�твом %s."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1172
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "Учётную запи�ь %s нельз� изменить в Empathy."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
 msgstr "Запу�тить «Мои учётные запи�и»"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1532
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "Изменить %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Им� пользовател�:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1850
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "П_рименить"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1880
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
 msgstr "_Войти"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1954
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "Эта учётна� запи�ь уже �уще�твует на �ервере"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1957
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "Создать новую учётную запи�ь на �ервере"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2149
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "О_тменить"
 
@@ -809,19 +818,19 @@ msgstr "О_тменить"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2427
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s на %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2453
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "Учётна� запи�ь %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2457
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "�ова� учётна� запи�ь"
 
@@ -1307,162 +1316,162 @@ msgstr "Вы не можете мен�ть тему"
 msgid "“%s� is not a valid contact ID"
 msgstr "«%s» не �вл�ет�� допу�тимым идентификатором контакта"
 
-#: ../libempathy-gtk/empathy-chat.c:1030
+#: ../libempathy-gtk/empathy-chat.c:1058
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: очи�тить в�е �ообщени� в текущей бе�еде"
 
-#: ../libempathy-gtk/empathy-chat.c:1033
+#: ../libempathy-gtk/empathy-chat.c:1061
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <тема>: у�тановить тему текущей бе�еды"
 
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1064
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ID комнаты>: войти в новую комнату"
 
-#: ../libempathy-gtk/empathy-chat.c:1039
+#: ../libempathy-gtk/empathy-chat.c:1067
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ID комнаты>: войти в новую комнату"
 
-#: ../libempathy-gtk/empathy-chat.c:1043
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one"
 msgstr "/part [<ID комнаты>] [<причина>]: покинуть комнату, по умолчанию — текущую"
 
-#: ../libempathy-gtk/empathy-chat.c:1047
+#: ../libempathy-gtk/empathy-chat.c:1075
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ID контакта> [<�ообщение>]: открыть личную бе�еду"
 
-#: ../libempathy-gtk/empathy-chat.c:1050
+#: ../libempathy-gtk/empathy-chat.c:1078
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ID контакта> <�ообщение>: открыть личную бе�еду"
 
-#: ../libempathy-gtk/empathy-chat.c:1053
+#: ../libempathy-gtk/empathy-chat.c:1081
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <п�евдоним>: изменить п�евдоним на текущем �ервере"
 
-#: ../libempathy-gtk/empathy-chat.c:1056
+#: ../libempathy-gtk/empathy-chat.c:1084
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <�ообщение>: отправить �ообщение о ДЕЙСТВИИ"
 
-#: ../libempathy-gtk/empathy-chat.c:1059
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/say <message>: send <message> to the current conversation. This is used to send a message starting with a '/'. For example: \"/say /join is used to join a new chat room\""
 msgstr "/say <�ообщение>: отправить <�ообщение> в текущей бе�еде. И�пользует�� дл� отправки �ообщени�, начинающего�� � «/». �апример: «/say /join и�пользует�� дл� входа в новую комнату»"
 
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ID контакта>: показать информацию о контакте"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
 msgstr "/help [<команда>]: показать в�е поддерживаемые команды. Е�ли <команда> определена, показать её и�пользование."
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1112
 #, c-format
 msgid "Usage: %s"
 msgstr "И�пользование: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1116
+#: ../libempathy-gtk/empathy-chat.c:1157
 msgid "Unknown command"
 msgstr "�еизве�тна� команда"
 
-#: ../libempathy-gtk/empathy-chat.c:1242
+#: ../libempathy-gtk/empathy-chat.c:1283
 msgid "Unknown command; see /help for the available commands"
 msgstr "�еизве�тна� команда; дл� в�ех до�тупных команд �м. /help"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1412
+#: ../libempathy-gtk/empathy-chat.c:1453
 msgid "insufficient balance to send message"
 msgstr "недо�таточно �ред�тв дл� отправки �ообщени�"
 
-#: ../libempathy-gtk/empathy-chat.c:1414
+#: ../libempathy-gtk/empathy-chat.c:1455
 msgid "not capable"
 msgstr "не поддерживает��"
 
-#: ../libempathy-gtk/empathy-chat.c:1421
+#: ../libempathy-gtk/empathy-chat.c:1462
 msgid "offline"
 msgstr "не в �ети"
 
-#: ../libempathy-gtk/empathy-chat.c:1424
+#: ../libempathy-gtk/empathy-chat.c:1465
 msgid "invalid contact"
 msgstr "неверный �обе�едник"
 
-#: ../libempathy-gtk/empathy-chat.c:1427
+#: ../libempathy-gtk/empathy-chat.c:1468
 msgid "permission denied"
 msgstr "отказано"
 
-#: ../libempathy-gtk/empathy-chat.c:1430
+#: ../libempathy-gtk/empathy-chat.c:1471
 msgid "too long message"
 msgstr "�лишком длинное �ообщение"
 
-#: ../libempathy-gtk/empathy-chat.c:1433
+#: ../libempathy-gtk/empathy-chat.c:1474
 msgid "not implemented"
 msgstr "�та возможно�ть не �анкционирована"
 
-#: ../libempathy-gtk/empathy-chat.c:1437
+#: ../libempathy-gtk/empathy-chat.c:1478
 msgid "unknown"
 msgstr "неизве�тно"
 
-#: ../libempathy-gtk/empathy-chat.c:1443
+#: ../libempathy-gtk/empathy-chat.c:1484
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Ошибка при отправке �ообщени� «%s»: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1447
+#: ../libempathy-gtk/empathy-chat.c:1488
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Ошибка при отправке �ообщени�: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1508
+#: ../libempathy-gtk/empathy-chat.c:1549
 #: ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Тема:"
 
-#: ../libempathy-gtk/empathy-chat.c:1520
+#: ../libempathy-gtk/empathy-chat.c:1561
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Тема: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1563
 msgid "No topic defined"
 msgstr "Тема не у�тановлена"
 
-#: ../libempathy-gtk/empathy-chat.c:2031
+#: ../libempathy-gtk/empathy-chat.c:2072
 msgid "(No Suggestions)"
 msgstr "(�ет предположений)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2099
+#: ../libempathy-gtk/empathy-chat.c:2140
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Добавить «%s» в �ловарь"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2136
+#: ../libempathy-gtk/empathy-chat.c:2177
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Добавить «%s» в �ловарь «%s»"
 
-#: ../libempathy-gtk/empathy-chat.c:2206
+#: ../libempathy-gtk/empathy-chat.c:2247
 msgid "Insert Smiley"
 msgstr "В�тавить улыбку"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2224
+#: ../libempathy-gtk/empathy-chat.c:2265
 #: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "От_править"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2278
+#: ../libempathy-gtk/empathy-chat.c:2319
 msgid "_Spelling Suggestions"
 msgstr "_Варианты правопи�ани�"
 
-#: ../libempathy-gtk/empathy-chat.c:2367
+#: ../libempathy-gtk/empathy-chat.c:2408
 msgid "Failed to retrieve recent logs"
 msgstr "�е удало�ь получить по�ледние журналы"
 
-#: ../libempathy-gtk/empathy-chat.c:2504
+#: ../libempathy-gtk/empathy-chat.c:2545
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s отключил��"
@@ -1470,12 +1479,12 @@ msgstr "%s отключил��"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2511
+#: ../libempathy-gtk/empathy-chat.c:2552
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s выгнал %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2514
+#: ../libempathy-gtk/empathy-chat.c:2555
 #, c-format
 msgid "%s was kicked"
 msgstr "%s выгнали"
@@ -1483,17 +1492,17 @@ msgstr "%s выгнали"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2522
+#: ../libempathy-gtk/empathy-chat.c:2563
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s забанил %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2525
+#: ../libempathy-gtk/empathy-chat.c:2566
 #, c-format
 msgid "%s was banned"
 msgstr "%s забанили"
 
-#: ../libempathy-gtk/empathy-chat.c:2529
+#: ../libempathy-gtk/empathy-chat.c:2570
 #, c-format
 msgid "%s has left the room"
 msgstr "%s покинул бе�еду"
@@ -1503,70 +1512,75 @@ msgstr "%s покинул бе�еду"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2538
+#: ../libempathy-gtk/empathy-chat.c:2579
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2604
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s при�оединил�� к бе�еде"
 
-#: ../libempathy-gtk/empathy-chat.c:2588
+#: ../libempathy-gtk/empathy-chat.c:2629
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s теперь изве�тен как %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2727
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2768
 #: ../src/empathy-streamed-media-window.c:1894
 #: ../src/empathy-event-manager.c:1240
-#: ../src/empathy-call-window.c:2335
+#: ../src/empathy-call-window.c:1391
+#: ../src/empathy-call-window.c:1441
+#: ../src/empathy-call-window.c:2479
 msgid "Disconnected"
 msgstr "От�оединён"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3374
+#: ../libempathy-gtk/empathy-chat.c:3415
 msgid "Would you like to store this password?"
 msgstr "Хотите запомнить �тот пароль?"
 
-#: ../libempathy-gtk/empathy-chat.c:3380
+#: ../libempathy-gtk/empathy-chat.c:3421
 msgid "Remember"
 msgstr "Запомнить"
 
-#: ../libempathy-gtk/empathy-chat.c:3390
+#: ../libempathy-gtk/empathy-chat.c:3431
 msgid "Not now"
 msgstr "�е �ейча�"
 
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3475
 msgid "Retry"
 msgstr "Повторить"
 
-#: ../libempathy-gtk/empathy-chat.c:3438
+#: ../libempathy-gtk/empathy-chat.c:3479
 msgid "Wrong password; please try again:"
 msgstr "�еправильный пароль. Попробуйте �нова:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3568
+#: ../libempathy-gtk/empathy-chat.c:3609
 msgid "This room is protected by a password:"
 msgstr "Эта комната защищена паролем:"
 
-#: ../libempathy-gtk/empathy-chat.c:3595
+#: ../libempathy-gtk/empathy-chat.c:3636
 msgid "Join"
 msgstr "Войти"
 
-#: ../libempathy-gtk/empathy-chat.c:3797
+#: ../libempathy-gtk/empathy-chat.c:3838
 #: ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "Соединён"
 
-#: ../libempathy-gtk/empathy-chat.c:3852
+#: ../libempathy-gtk/empathy-chat.c:3893
 msgid "Conversation"
 msgstr "Бе�еда"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3857
+#: ../libempathy-gtk/empathy-chat.c:3898
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1599,7 +1613,7 @@ msgstr "Изменить заблокированных �обе�едников
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:512
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1485
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
@@ -1770,7 +1784,7 @@ msgstr "ПредоÑ�тавить доÑ�туп к моему рабочему Ñ�Ñ
 #: ../libempathy-gtk/empathy-contact-menu.c:525
 #: ../libempathy-gtk/empathy-contact-widget.c:1886
 #: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1373
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "Избранный"
 
@@ -1996,7 +2010,7 @@ msgstr "Вы�ота:"
 #: ../libempathy-gtk/empathy-contact-widget.c:1011
 #: ../libempathy-gtk/empathy-individual-widget.c:607
 #: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "Ме�тоположение"
 
@@ -2048,7 +2062,7 @@ msgstr "Информаци� о �обе�еднике"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1515
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "Идентификатор:"
 
@@ -2140,7 +2154,6 @@ msgid "Call"
 msgstr "Вызов"
 
 #: ../libempathy-gtk/empathy-individual-menu.c:378
-#| msgid "Profile"
 msgid "Mobile"
 msgstr "Мобильный"
 
@@ -2179,7 +2192,7 @@ msgstr "Удалить и _заблокировать"
 msgid "Do you really want to remove the linked contact '%s'? Note that this will remove all the contacts which make up this linked contact."
 msgstr "Дей�твительно удалить �в�занный контакт «%s»? Это приведёт к удалению в�ех контактов, которые �вл�ют�� ча�тью �того �в�занного контакта."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1662
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2258,127 +2271,144 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "_Разъединить"
 
-#: ../libempathy-gtk/empathy-log-window.c:633
+#: ../libempathy-gtk/empathy-log-window.c:634
 msgid "History"
 msgstr "И�тори�"
 
-#: ../libempathy-gtk/empathy-log-window.c:685
+#: ../libempathy-gtk/empathy-log-window.c:689
 msgid "Show"
 msgstr "Показать"
 
-#: ../libempathy-gtk/empathy-log-window.c:707
+#: ../libempathy-gtk/empathy-log-window.c:711
 msgid "Search"
 msgstr "Пои�к"
 
-#: ../libempathy-gtk/empathy-log-window.c:1155
+#: ../libempathy-gtk/empathy-log-window.c:1159
 #, c-format
 msgid "Chat in %s"
 msgstr "Разговор в %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1157
+#: ../libempathy-gtk/empathy-log-window.c:1161
 #, c-format
 msgid "Chat with %s"
 msgstr "Разговор � %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1207
-#: ../libempathy-gtk/empathy-log-window.c:1354
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1296
+#: ../libempathy-gtk/empathy-log-window.c:1300
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1302
+#: ../libempathy-gtk/empathy-log-window.c:1306
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
-#: ../libempathy-gtk/empathy-log-window.c:1375
-#: ../src/empathy-ft-manager.c:1026
-msgid "%"
-msgstr "%"
-
 #: ../libempathy-gtk/empathy-log-window.c:1382
 #, c-format
+#| msgid "%d second ago"
+#| msgid_plural "%d seconds ago"
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s �екунда"
+msgstr[1] "%s �екунды"
+msgstr[2] "%s �екунд"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+#| msgid "%d minute ago"
+#| msgid_plural "%d minutes ago"
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s минута"
+msgstr[1] "%s минуты"
+msgstr[2] "%s минут"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
+#, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Вызов продолжал�� %s, закончил�� %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1714
+#: ../libempathy-gtk/empathy-log-window.c:1729
 msgid "Today"
 msgstr "Сегодн�"
 
-#: ../libempathy-gtk/empathy-log-window.c:1718
+#: ../libempathy-gtk/empathy-log-window.c:1733
 msgid "Yesterday"
 msgstr "Вчера"
 
-#: ../libempathy-gtk/empathy-log-window.c:1734
-msgctxt "A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
+#| msgctxt ""
+#| "A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+#| msgid "%e %B %Y"
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1815
-#: ../libempathy-gtk/empathy-log-window.c:3396
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3425
 msgid "Anytime"
 msgstr "В�егда"
 
-#: ../libempathy-gtk/empathy-log-window.c:1895
-#: ../libempathy-gtk/empathy-log-window.c:2325
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2353
 msgid "Anyone"
 msgstr "Любой"
 
-#: ../libempathy-gtk/empathy-log-window.c:2637
+#: ../libempathy-gtk/empathy-log-window.c:2666
 msgid "Who"
 msgstr "Кто"
 
-#: ../libempathy-gtk/empathy-log-window.c:2841
+#: ../libempathy-gtk/empathy-log-window.c:2870
 msgid "When"
 msgstr "Когда"
 
-#: ../libempathy-gtk/empathy-log-window.c:2957
+#: ../libempathy-gtk/empathy-log-window.c:2986
 msgid "Anything"
 msgstr "В�ё"
 
-#: ../libempathy-gtk/empathy-log-window.c:2959
+#: ../libempathy-gtk/empathy-log-window.c:2988
 msgid "Text chats"
 msgstr "Тек�товые чаты"
 
-#: ../libempathy-gtk/empathy-log-window.c:2961
+#: ../libempathy-gtk/empathy-log-window.c:2990
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "Вызовы"
 
-#: ../libempathy-gtk/empathy-log-window.c:2966
+#: ../libempathy-gtk/empathy-log-window.c:2995
 msgid "Incoming calls"
 msgstr "Вход�щие вызовы"
 
-#: ../libempathy-gtk/empathy-log-window.c:2967
+#: ../libempathy-gtk/empathy-log-window.c:2996
 msgid "Outgoing calls"
 msgstr "И�ход�щие вызовы"
 
-#: ../libempathy-gtk/empathy-log-window.c:2968
+#: ../libempathy-gtk/empathy-log-window.c:2997
 msgid "Missed calls"
 msgstr "Пропущенные вызовы"
 
-#: ../libempathy-gtk/empathy-log-window.c:2990
+#: ../libempathy-gtk/empathy-log-window.c:3019
 msgid "What"
 msgstr "Что"
 
-#: ../libempathy-gtk/empathy-log-window.c:3699
+#: ../libempathy-gtk/empathy-log-window.c:3728
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Дей�твительно хотите удалить в�е журналы предыдущих бе�ед?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3703
+#: ../libempathy-gtk/empathy-log-window.c:3732
 msgid "Clear All"
 msgstr "Очи�тить в�ё"
 
-#: ../libempathy-gtk/empathy-log-window.c:3710
+#: ../libempathy-gtk/empathy-log-window.c:3739
 msgid "Delete from:"
 msgstr "Удалить из:"
 
@@ -2568,12 +2598,12 @@ msgstr "Вызов завершён"
 msgid "Edit Custom Messages"
 msgstr "Изменить на�траиваемые �ообщени�"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1030
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
 #, c-format
 msgid "Message edited at %s"
 msgstr "Сообщение изменено %s "
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1720
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
 msgid "Normal"
 msgstr "Обычна�"
 
@@ -2868,23 +2898,23 @@ msgstr "Сообщение об ошибке от�ут�твует"
 msgid "Instant Message (Empathy)"
 msgstr "Мгновенное �ообщение (Empathy)"
 
-#: ../src/empathy.c:400
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "�е �оедин�ть�� при запу�ке"
 
-#: ../src/empathy.c:404
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "�е показывать �пи�ок �обе�едников и диалоговые окна при запу�ке"
 
-#: ../src/empathy.c:419
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr " — клиент обмена мгновенными �ообщени�ми Empathy"
 
-#: ../src/empathy.c:606
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
 msgstr "Ошибка �в�зи � ди�петчером учётных запи�ей"
 
-#: ../src/empathy.c:608
+#: ../src/empathy.c:639
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. The error was:\n"
@@ -3063,7 +3093,7 @@ msgstr "Ваша новаÑ� учётнаÑ� запиÑ�ÑŒ ещё не была Ñ�Ð
 
 #: ../src/empathy-accounts-dialog.c:345
 #: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1159
+#: ../src/empathy-call-window.c:1175
 msgid "Connecting…"
 msgstr "Соединение…"
 
@@ -3168,12 +3198,12 @@ msgid "People nearby"
 msgstr "Люди поблизо�ти"
 
 #: ../src/empathy-av.c:118
-#: ../src/empathy-call.c:127
+#: ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr " — клиент Empathy дл� аудио и видео"
 
 #: ../src/empathy-av.c:134
-#: ../src/empathy-call.c:152
+#: ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "Клиент Empathy дл� аудио и видео"
 
@@ -3199,15 +3229,15 @@ msgstr "_Бокова� панель"
 
 #: ../src/empathy-streamed-media-window.c:1130
 msgid "Audio input"
-msgstr "Вход звука"
+msgstr "Звуковой вход"
 
 #: ../src/empathy-streamed-media-window.c:1134
 msgid "Video input"
-msgstr "Вход видео"
+msgstr "Видеовход"
 
 #: ../src/empathy-streamed-media-window.c:1140
 msgid "Dialpad"
-msgstr "Цифрова� панель"
+msgstr "Панель набора"
 
 #: ../src/empathy-streamed-media-window.c:1151
 msgid "Details"
@@ -3216,33 +3246,33 @@ msgstr "Подробно�ти"
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1667
+#: ../src/empathy-call-window.c:1782
 #, c-format
 msgid "Call with %s"
 msgstr "Разговор � %s"
 
 #: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:1911
+#: ../src/empathy-call-window.c:2026
 msgid "The IP address as seen by the machine"
 msgstr "IP-адре�, определённый хо�том"
 
 #: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:1913
+#: ../src/empathy-call-window.c:2028
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP-адре�, определённый �ервером в Интернете"
 
 #: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:1915
+#: ../src/empathy-call-window.c:2030
 msgid "The IP address of the peer as seen by the other side"
 msgstr "IP-адре� точки, определённый � другой �тороны"
 
 #: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:1917
+#: ../src/empathy-call-window.c:2032
 msgid "The IP address of a relay server"
 msgstr "IP-адре� ретран�лирующего �ервера"
 
 #: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:1919
+#: ../src/empathy-call-window.c:2034
 msgid "The IP address of the multicast group"
 msgstr "Широковещательный IP-адре� группы"
 
@@ -3273,66 +3303,66 @@ msgid "Connected — %d:%02dm"
 msgstr "Соединён — %d:%02dm"
 
 #: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2654
+#: ../src/empathy-call-window.c:2798
 msgid "Technical Details"
 msgstr "Информаци� о �обе�еднике"
 
 #: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2692
+#: ../src/empathy-call-window.c:2836
 #, c-format
 msgid "%s's software does not understand any of the audio formats supported by your computer"
 msgstr "Программное обе�печение %s не понимает аудиоформаты, поддерживаемые вашим компьютером"
 
 #: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2697
+#: ../src/empathy-call-window.c:2841
 #, c-format
 msgid "%s's software does not understand any of the video formats supported by your computer"
 msgstr "Программное обе�печение %s не понимает видеоформаты, поддерживаемые вашим компьютером"
 
 #: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2703
+#: ../src/empathy-call-window.c:2847
 #, c-format
 msgid "Can't establish a connection to %s. One of you might be on a network that does not allow direct connections."
 msgstr "�е удало�ь у�тановить �оединение � %s. Один из ва� может находить�� в �ети, котора� не поддерживает пр�мые подключени�."
 
 #: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2709
+#: ../src/empathy-call-window.c:2853
 msgid "There was a failure on the network"
 msgstr "Сбой �ети"
 
 #: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2713
+#: ../src/empathy-call-window.c:2857
 msgid "The audio formats necessary for this call are not installed on your computer"
 msgstr "�удиоформаты, необходимые дл� �того вызова, не у�тановлены на вашем компьютере"
 
 #: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2716
+#: ../src/empathy-call-window.c:2860
 msgid "The video formats necessary for this call are not installed on your computer"
 msgstr "Видеоформаты, необходимые дл� �того вызова, не у�тановлены на вашем компьютере"
 
 #: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2728
+#: ../src/empathy-call-window.c:2872
 #, c-format
 msgid "Something unexpected happened in a Telepathy component. Please <a href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' window in the Help menu."
 msgstr "Что-то неожиданное �лучило�ь � компонентом Telepathy. <a href=\"%s\">Сообщите об �той ошибке</a> и прикрепите журналы, �обранные из окна отладки в меню «Справка»."
 
 #: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2737
+#: ../src/empathy-call-window.c:2881
 msgid "There was a failure in the call engine"
 msgstr "Сбой в движке вызова"
 
 #: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2740
+#: ../src/empathy-call-window.c:2884
 msgid "The end of the stream was reached"
 msgstr "До�тигнут конец потока"
 
 #: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2780
+#: ../src/empathy-call-window.c:2924
 msgid "Can't establish audio stream"
 msgstr "�е удало�ь у�тановить аудиопоток"
 
 #: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2790
+#: ../src/empathy-call-window.c:2934
 msgid "Can't establish video stream"
 msgstr "�е удало�ь у�тановить видеопоток"
 
@@ -3424,10 +3454,10 @@ msgstr "Включить или выключить передачу видео"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2287
-#: ../src/empathy-call-window.c:2288
-#: ../src/empathy-call-window.c:2289
-#: ../src/empathy-call-window.c:2290
+#: ../src/empathy-call-window.c:2431
+#: ../src/empathy-call-window.c:2432
+#: ../src/empathy-call-window.c:2433
+#: ../src/empathy-call-window.c:2434
 msgid "Unknown"
 msgstr "�еизве�тно"
 
@@ -3606,6 +3636,7 @@ msgid "Incoming video call"
 msgstr "Вход�щий видеовызов"
 
 #: ../src/empathy-event-manager.c:521
+#: ../src/empathy-call-window.c:1408
 msgid "Incoming call"
 msgstr "Вход�щий вызов"
 
@@ -3622,6 +3653,7 @@ msgstr "%s вызывает ва�. Хотите ответить?"
 #: ../src/empathy-event-manager.c:529
 #: ../src/empathy-event-manager.c:730
 #: ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1414
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Вход�щий вызов от %s"
@@ -3641,6 +3673,7 @@ msgstr "Ответить � _видео"
 
 #: ../src/empathy-event-manager.c:730
 #: ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1414
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Вход�щий видеовызов от %s"
@@ -3796,6 +3829,10 @@ msgstr "Проверка цело�тно�ти «%s»"
 msgid "Hashing \"%s\""
 msgstr "Х�ширование «%s»"
 
+#: ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "%"
+
 #: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "Файл"
@@ -3877,7 +3914,7 @@ msgstr "Пополнить…"
 msgid "Contact"
 msgstr "Собе�едник"
 
-#: ../src/empathy-main-window.c:2119
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "Спи�ок �обе�едников"
 
@@ -4132,119 +4169,125 @@ msgid "Display incoming events in the notification area"
 msgstr "Показывать приближающие�� �обыти� в обла�ти уведомлений"
 
 #: ../src/empathy-preferences.ui.h:9
+msgid "Echo cancellation helps to make your voice sound clearer to the other person, but may cause problems on some computers. If you or the other person hear strange noises or glitches during calls, try turning echo cancellation off and restarting the call."
+msgstr "Подавление �ха позвол�ет �делать передачу вашего голо�а чище, но �то может вызывать проблемы на некоторых компьютерах. Е�ли вы или ваш �обе�едник �лышите �транные шумы или �бои во врем� разговора, попробуйте выключить подавление �ха и повторить вызов �обе�едника."
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "Включить уведомлени�, когда �обе�едник по�вл�ет�� в �ети"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "Включить уведомлени�, когда �обе�едник выходит из �ети"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Включить уведомлени�, когда _бе�еда не в фоку�е"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "Включить проверку орфографии дл� �зыков:"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "Общие"
 
-#: ../src/empathy-preferences.ui.h:14
-msgid "Input level"
-msgstr "Входной уровень"
-
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input volume"
-msgstr "Входна� громко�ть"
+#| msgid "Input level"
+msgid "Input level:"
+msgstr "Уровень запи�и:"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:16
+#| msgid "Input volume"
+msgid "Input volume:"
+msgstr "Громко�ть запи�и:"
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "И�точники ме�тоположений:"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "Ве�ти журнал бе�ед"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "Уведомлени�"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Во�производить звук дл� �обытий"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "Приватно�ть"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:23
 msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published.  GPS coordinates will be accurate to 1 decimal place."
 msgstr "Примерное определение ме�тоположени� означает, что публикует�� только ваш город, регион и �трана. Координаты GPS будут отображать�� � точно�тью до 1 знака по�ле зап�той."
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "Показывать _графиче�кие улыбки"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "Показывать _�пи�ок �обе�едников в комнатах"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "Звуки"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "Проверка орфографии"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
 msgid "The list of languages reflects only the languages for which you have a dictionary installed."
 msgstr "В �том �пи�ке показаны только те �зыки, дл� которых у�тановлены �ловари."
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "Темы"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "Вариант:"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "_�втоматиче�ки �оедин�ть�� при запу�ке"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "С_отова� �еть"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "Включить _в�плывающие уведомлени�"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "_Включить звуковые уведомлени�"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "С_еть (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "_Открывать новые бе�еды в отдельном окне"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "Пу_бликовать ме�тоположение дл� �обе�едников"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "_Снижать точно�ть определени� ме�тоположени�"
 
@@ -4369,16 +4412,16 @@ msgstr "Уровень"
 msgid "The selected connection manager does not support the remote debugging extension."
 msgstr "Выбранный менеджер �оединений не поддерживает ра�ширение удалённой отладки."
 
+#: ../src/empathy-invite-participant-dialog.c:179
 #: ../src/empathy-invite-participant-dialog.c:205
-#: ../src/empathy-invite-participant-dialog.c:231
 msgid "Invite Participant"
 msgstr "Пригла�ить уча�тника"
 
-#: ../src/empathy-invite-participant-dialog.c:206
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Выберите �обе�едника дл� приглашени� к бе�еде:"
 
-#: ../src/empathy-invite-participant-dialog.c:227
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "Пригла�ить"
 
@@ -4427,11 +4470,13 @@ msgid "Respond"
 msgstr "Ответить"
 
 #: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1418
 msgid "Reject"
 msgstr "Отказать"
 
 #: ../src/empathy-notifications-approver.c:222
 #: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1419
 msgid "Answer"
 msgstr "Ответить"
 
@@ -4449,6 +4494,9 @@ msgstr "Отклонить"
 msgid "Accept"
 msgstr "Прин�ть"
 
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
 #: ../src/empathy-notifications-approver.c:260
 msgid "Provide"
 msgstr "Предо�тавить"
@@ -4460,25 +4508,25 @@ msgstr "СобеÑ�едник %s попыталÑ�Ñ� до ваÑ� дозвонитÑ
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1031
-#: ../src/empathy-call-window.c:1054
+#: ../src/empathy-call-window.c:1047
+#: ../src/empathy-call-window.c:1070
 msgid "i"
 msgstr "Инфо"
 
-#: ../src/empathy-call-window.c:2583
+#: ../src/empathy-call-window.c:2727
 msgid "On hold"
 msgstr "Удержание"
 
-#: ../src/empathy-call-window.c:2586
+#: ../src/empathy-call-window.c:2730
 msgid "Mute"
 msgstr "Приглушить"
 
-#: ../src/empathy-call-window.c:2588
+#: ../src/empathy-call-window.c:2732
 msgid "Duration"
 msgstr "Длительно�ть"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2591
+#: ../src/empathy-call-window.c:2735
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
diff --git a/po/sk.po b/po/sk.po
index c4d9b1da4..4dcb9ba62 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,19 +8,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=empathy&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-03-25 04:09+0000\n"
-"PO-Revision-Date: 2011-03-25 09:35+0100\n"
+"product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2011-10-01 11:14+0000\n"
+"PO-Revision-Date: 2011-10-01 19:38+0200\n"
 "Last-Translator: Pavol Kla�anský <pavol@klacansky.com>\n"
 "Language-Team: Slovak <gnome-sk-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
 msgstr ""
+"Komunikujte pomocou služieb Google Talk, Facebook, MSN a mnohých �alších"
 
 #: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
@@ -28,7 +30,7 @@ msgstr "Empathy"
 
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
-msgstr ""
+msgstr "Empathy - internetová komunikácia"
 
 #: ../data/empathy.desktop.in.in.h:4
 msgid "IM Client"
@@ -39,6 +41,28 @@ msgid "Always open a separate chat window for new chats."
 msgstr "Vždy otvoriť samostatné okno pre nové rozhovory."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+#, fuzzy
+#| msgid "Call from %s"
+msgid "Call volume"
+msgstr "Hovor od %s"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#, fuzzy
+#| msgid "Camera On"
+msgid "Camera device"
+msgstr "Zapnúť kameru"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#, fuzzy
+#| msgid "Camera On"
+msgid "Camera position"
+msgstr "Zapnúť kameru"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -46,285 +70,303 @@ msgstr ""
 "Znak, ktorý má byť pridaný za prezývku pri použití automatického dopĺňania "
 "prezývok (tab) v skupinovom rozhovore."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "Téma okna rozhovoru"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+msgid "Chat window theme variant"
+msgstr "Variant témy okna rozhovoru"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "Čiarkami oddelený zoznam jazykov pre kontrolu pravopisu (napr. \"en, fr, nl"
 "\")."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "Kompaktný zoznam kontaktov"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "Mal by byť použitý správca pripojenia"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "Kritérium zoradenia zoznamu kontaktov"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Default directory to select an avatar image from"
 msgstr "Predvolený prie�inok pre výber obrázku podobizne"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable popup notifications when away"
 msgstr "Zakázať vyskakovacie upozornenia, ke� som pre�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Disable sounds when away"
 msgstr "Zakázať zvuky, ke� som pre�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Display incoming events in the status area"
-msgstr ""
+msgstr "Zobraziť prichádzajúce udalosti v stavovej oblasti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+msgid "Echo cancellation support"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can publish the user's location"
 msgstr "Empathy môže publikovať používateľovu polohu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy môže použiť GPS na odhadnutie polohy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy môže použiť sieť mobilného operátora na odhadnutie polohy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy môže použiť sieť na odhadnutie polohy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy default download folder"
 msgstr "Predvolený prie�inok na sťahovanie"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Empathy has migrated butterfly logs"
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-#, fuzzy
-#| msgid "Empathy should auto-connect on startup"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
-msgstr "Empathy by mohol byť automaticky pripojený pri štarte"
+msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy by sa mal automaticky pripojiť pri štarte"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy by mal znížiť presnosť ur�enia polohy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy by mal použiť podobizeň kontaktu ako ikonu okna rozhovoru"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr "Povoliť vývojové nástroje pre WebKit"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "Povoliť vyskakovacie upozornenia pre nové správy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "Povoliť kontrolu pravopisu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "Skryť hlavné okno"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "Skryje hlavné okno."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+msgid "Last account selected in Join Room dialog"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Nick completed character"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Open new chats in separate windows"
 msgstr "Nové rozhovory otvoriť v samostatných oknách"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use"
 msgstr "Cesta k téme Adium, ktorá sa má použiť"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
 "Cesta k téme Adium, ktorá sa má použiť, ak je Adium použitá ako téma pre "
 "rozhovor."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for incoming messages"
 msgstr "Prehrať zvuk pri príchode správ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for new conversations"
 msgstr "Prehrať zvuk pri novej konverzácii"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound for outgoing messages"
 msgstr "Prehrať zvuk pri odchádzajúcej správe"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs in"
 msgstr "Prehrať zvuk pri prihlásení kontaktu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when a contact logs out"
 msgstr "Prehrať zvuk pri odhlásení kontaktu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log in"
 msgstr "Prehrať zvuk pri prihlásení"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Play a sound when we log out"
 msgstr "Prehrať zvuk pri odhlásení"
 
 # Mylsím že pop up je v tomto prípade sloveso preto si nie som istý správnosťou prekladu a neviem navrhnúť iný preklad - prekonzultuj preklad v mailing liste (Ďalej len ML)
 # viackrát nesprávne preložené pop up
 # PK: je to popis dconf kluca, myslim ze to moze
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Vyskakovacie upozornenia, ak rozhovor nie je aktívny"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs in"
 msgstr "Vyskakovacie upozornenia, ke� sa kontakt prihlási"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "Pop up notifications when a contact logs out"
 msgstr "Vyskakovacie upozornenia ke� sa kontakt odhlási"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+msgid "Position the camera preview should be during a call."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+msgid "Show Balance in contact list"
+msgstr "Zobraziť zostatok kreditu v zozname kontaktov"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show avatars"
 msgstr "Zobraziť podobizne"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show contact list in rooms"
 msgstr "Zobraziť zoznam kontaktov v miestnostiach"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show hint about closing the main window"
 msgstr "Zobraziť radu ohľadne zatvárania hlavného okna"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show offline contacts"
-msgstr "Zobraziť odhlásené kontakty."
+msgstr "Zobraziť odhlásené kontakty"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Show protocols"
 msgstr "Zobraziť protokoly"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Spell checking languages"
 msgstr "Jazyky pre kontrolu pravopisu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The default folder to save file transfers in."
 msgstr "Predvolený prie�inok na uloženie prenesených súborov."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Posledný prie�inok, z ktorého bol vybratý obrázok podobizne."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The position for the chat window side pane"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr ""
 "Téma, ktorá je použitá na zobrazenie konverzácie v oknách s rozhovormi."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr ""
+
 # http://live.gnome.org/SlovakTranslation/Others/JULS
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use graphical smileys"
-msgstr "Použiť grafických smajlíkov"
+msgstr "Použiť grafických smejkov"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use notification sounds"
 msgstr "Použiť zvukové upozornenia"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Use theme for chat rooms"
 msgstr "Použiť tému pre diskusné miestnosti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Či Empathy môže publikovať polohu používateľa jeho kontaktom."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Či má Empathy použiť GPS na odhadnutie polohy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Či má Empathy použiť mobilnú sieť na odhadnutie polohy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Či má Empathy použiť sieť na odhadnutie polohy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-#, fuzzy
-#| msgid ""
-#| "Whether Empathy has asked about importing accounts from other programs."
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Či sa má Empathy pýtať na importovanie ú�tov z iných programov."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Či sa má Empathy automaticky prihlasovať k vaším ú�tom po spustení."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 #, fuzzy
-#| msgid ""
-#| "Whether Empathy should automatically log into your accounts on startup."
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr "Či sa má Empathy automaticky prihlasovať k vaším ú�tom po spustení."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 "Či má Empathy znížiť presnosť ur�enia polohy z dôvodu ochrany súkromia."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "Či má Empathy použiť podobizeň kontaktu ako ikonu okna rozhovoru."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Či majú byť povolené vývojové nástroje pre WebKit, ako napr. Web Inspector."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
@@ -332,63 +374,67 @@ msgstr ""
 "Či sa má použiť správca pripojenia na automatické odpojenie alebo obnovenie "
 "spojenia."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "Či sa má kontrolovať pravopis zadaných slov s vami zadanými jazykmi."
 
 # http://live.gnome.org/SlovakTranslation/Others/JULS
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Či sa majú v konverzáciách prevádzať smajlíci na grafické obrázky."
+msgstr "Či sa majú v konverzáciách prevádzať smejkovia na grafické obrázky."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "Či sa má prehrať zvuk upozorňujúci na prihlásenie kontaktu do siete."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "Či sa má prehrať zvuk upozorňujúci na odhlásenie kontaktu zo siete."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "Či sa má prehrať zvuk upozorňujúci na udalosti."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Či sa má prehrať zvuk upozorňujúci na prichádzajúce správy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Či sa má prehrať zvuk upozorňujúci na nové konverzácie."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Či sa má prehrať zvuk upozorňujúci na odchádzajúce správy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "Či sa má prehrať zvuk pri prihlasovaní sa do siete."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Či sa má prehrať zvuk pri odhlasovaní sa zo siete."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr ""
 "Či sa majú prehrávať zvukové upozornenia v stave pre� alebo zaneprázdnený."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "Či sa má zobraziť vyskakovacie upozornenie pri odhlásení kontaktu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "Či sa má zobraziť vyskakovacie upozornenie pri prihlásení kontaktu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -396,40 +442,45 @@ msgstr ""
 "Či sa má zobraziť vyskakovacie upozornenie pri prijatí novej správy aj "
 "vtedy, ke� je okno rozhovoru už otvorené, ale nie je aktívne."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "Či sa má zobraziť vyskakovacie upozornenie pri prijatí novej správy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#, fuzzy
+msgid "Whether to show account balances in the contact list."
+msgstr "Či sa majú v zozname kontaktov zobrazovať pri kontakoch protokoly."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 "Či sa majú zobrazovať podobizne kontaktov v zozname kontaktov a v oknách s "
 "rozhovormi."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "Či sa majú zobrazovať v zozname kontaktov aj odhlásené kontakty."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
 msgstr ""
 "Či sa majú zobrazovať vyskakovacie upozornenia v stave pre� alebo "
 "zaneprázdnený."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "Či sa majú v zozname kontaktov zobrazovať pri kontakoch protokoly."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Či sa má zobrazovať zoznam kontaktov v diskusných miestnostiach."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "Či sa má zobrazovať zoznam kontaktov v kompaktnom režime."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -437,11 +488,11 @@ msgstr ""
 "Či sa má zobraziť dialógové okno o zatvorení hlavného okna tla�idlom 'x' v "
 "titulku okna."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "Či sa má pre diskusné miestnosti používať téma."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 #, fuzzy
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
@@ -454,237 +505,234 @@ msgstr ""
 
 #: ../data/empathy-accounts.desktop.in.in.h:1
 msgid "Manage Messaging and VoIP accounts"
-msgstr "Spravovať konverzácie a VoIP ú�ty"
+msgstr "Spravovať rozhovory a VoIP ú�ty"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2269
+#: ../src/empathy-accounts-dialog.c:2324
 msgid "Messaging and VoIP Accounts"
-msgstr "Konverzácie a VoIP ú�ty"
+msgstr "Rozhovory a VoIP ú�ty"
 
-#: ../libempathy/empathy-ft-handler.c:825
-#, fuzzy
-#| msgid "File transfer completed"
+#: ../libempathy/empathy-ft-handler.c:838
 msgid "File transfer completed, but the file was corrupted"
-msgstr "Prenos súboru bol dokon�ený"
+msgstr "Prenos súboru bol dokon�ený, ale súbor bol poškodený"
 
 # znie to viac slovensky
-#: ../libempathy/empathy-ft-handler.c:1113
+#: ../libempathy/empathy-ft-handler.c:1124
 msgid "File transfer not supported by remote contact"
 msgstr "Vzdialený kontakt nepodporuje prenos súboru"
 
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1180
 msgid "The selected file is not a regular file"
 msgstr "Vybraný súbor nie je oby�ajný súbor"
 
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1189
 msgid "The selected file is empty"
 msgstr "Vybraný súbor je prázdny"
 
-#: ../libempathy/empathy-tp-file.c:268
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#, c-format
+msgid "Missed call from %s"
+msgstr "Zmeškaný hovor od %s"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, fuzzy, c-format
+msgid "Called %s"
+msgstr "Hovor s %s"
+
+#: ../libempathy/empathy-message.c:422
+#, c-format
+msgid "Call from %s"
+msgstr "Hovor od %s"
+
+#: ../libempathy/empathy-tp-file.c:258
 msgid "Socket type not supported"
 msgstr "Typ soketu nie je podporovaný"
 
-#: ../libempathy/empathy-tp-file.c:387
+#: ../libempathy/empathy-tp-file.c:377
 msgid "No reason was specified"
 msgstr "Nebol špecifikovaný žiaden dôvod"
 
-#: ../libempathy/empathy-tp-file.c:390
+#: ../libempathy/empathy-tp-file.c:380
 msgid "The change in state was requested"
 msgstr "Bola vyžiadaná zmena stavu"
 
-#: ../libempathy/empathy-tp-file.c:393
+#: ../libempathy/empathy-tp-file.c:383
 msgid "You canceled the file transfer"
 msgstr "Zrušili ste prenos súboru"
 
-#: ../libempathy/empathy-tp-file.c:396
+#: ../libempathy/empathy-tp-file.c:386
 msgid "The other participant canceled the file transfer"
 msgstr "Druhý ú�astník zrušil prenos súboru"
 
-#: ../libempathy/empathy-tp-file.c:399
+#: ../libempathy/empathy-tp-file.c:389
 msgid "Error while trying to transfer the file"
 msgstr "Chyba po�as pokusu o prenos súboru"
 
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-tp-file.c:392
 msgid "The other participant is unable to transfer the file"
 msgstr "Druhý ú�astník nie je schopný preniesť súbor"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:382
+#: ../libempathy/empathy-tp-file.c:395 ../libempathy/empathy-utils.c:312
 msgid "Unknown reason"
 msgstr "Neznámy dôvod"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:232
 msgid "Available"
 msgstr "Prítomný"
 
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:234
 msgid "Busy"
 msgstr "Zaneprázdnený"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:237
 msgid "Away"
 msgstr "Pre�"
 
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:239
 msgid "Invisible"
 msgstr "Neviditeľný"
 
-#: ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-utils.c:241
 msgid "Offline"
 msgstr "Odhlásený"
 
-#: ../libempathy/empathy-utils.c:315
-#: ../src/empathy-streamed-media-window.c:1904
-#: ../src/empathy-streamed-media-window.c:1905
-#: ../src/empathy-streamed-media-window.c:1906
-#: ../src/empathy-streamed-media-window.c:1907
-#: ../src/empathy-call-window.ui.h:18
-#, fuzzy
-#| msgctxt "file transfer percent"
-#| msgid "Unknown"
+#. translators: presence type is unknown
+#: ../libempathy/empathy-utils.c:244
+msgctxt "presence"
 msgid "Unknown"
 msgstr "Neznámy"
 
-#: ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:284
 msgid "No reason specified"
 msgstr "Nebol uvedený žiadny dôvod"
 
-#: ../libempathy/empathy-utils.c:356 ../libempathy/empathy-utils.c:412
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
 msgid "Status is set to offline"
 msgstr "Stav je nastavený na odhlásený"
 
-#: ../libempathy/empathy-utils.c:358 ../libempathy/empathy-utils.c:392
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "Chyba siete"
 
-#: ../libempathy/empathy-utils.c:360 ../libempathy/empathy-utils.c:394
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
 msgid "Authentication failed"
 msgstr "Overenie totožnosti zlyhalo"
 
-#: ../libempathy/empathy-utils.c:362 ../libempathy/empathy-utils.c:396
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
 msgid "Encryption error"
 msgstr "Chyba Å¡ifrovania"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:294
 msgid "Name in use"
 msgstr "Meno sa používa"
 
-#: ../libempathy/empathy-utils.c:366 ../libempathy/empathy-utils.c:398
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate not provided"
 msgstr "Certifikát nebol poskytnutý"
 
-#: ../libempathy/empathy-utils.c:368 ../libempathy/empathy-utils.c:400
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate untrusted"
 msgstr "Nedôveryhodný certifikát"
 
-#: ../libempathy/empathy-utils.c:370 ../libempathy/empathy-utils.c:402
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
 msgid "Certificate expired"
 msgstr "Certifikát vypršal"
 
-#: ../libempathy/empathy-utils.c:372 ../libempathy/empathy-utils.c:404
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
 msgid "Certificate not activated"
 msgstr "Certifikát nie je aktivovaný"
 
-#: ../libempathy/empathy-utils.c:374 ../libempathy/empathy-utils.c:406
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
 msgid "Certificate hostname mismatch"
 msgstr "Názov hostiteľa certifikátu nesúhlasí"
 
-#: ../libempathy/empathy-utils.c:376 ../libempathy/empathy-utils.c:408
+#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
 msgid "Certificate fingerprint mismatch"
 msgstr "Odtla�ok certifikátu sa nezhoduje"
 
-#: ../libempathy/empathy-utils.c:378 ../libempathy/empathy-utils.c:410
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
 msgid "Certificate self-signed"
 msgstr "Certifikát podpísaný sám sebou"
 
-#: ../libempathy/empathy-utils.c:380
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate error"
 msgstr "Chyba certifikátu"
 
-#: ../libempathy/empathy-utils.c:414
+#: ../libempathy/empathy-utils.c:344
 msgid "Encryption is not available"
-msgstr ""
+msgstr "Šifrovanie nie je dostupné"
 
-#: ../libempathy/empathy-utils.c:416
-#, fuzzy
-#| msgid "Certificate not activated"
+#: ../libempathy/empathy-utils.c:346
 msgid "Certificate is invalid"
-msgstr "Certifikát nie je aktivovaný"
+msgstr "Certifikát je neplatný"
 
-#: ../libempathy/empathy-utils.c:418
-#, fuzzy
-#| msgid "Connection managers should be used"
+#: ../libempathy/empathy-utils.c:348
 msgid "Connection has been refused"
-msgstr "Mal by byť použitý správca pripojenia"
+msgstr "Pripojenie bolo odmietnuté"
 
-#: ../libempathy/empathy-utils.c:420
-#, fuzzy
-#| msgid "Connection managers should be used"
+#: ../libempathy/empathy-utils.c:350
 msgid "Connection can't be established"
-msgstr "Mal by byť použitý správca pripojenia"
+msgstr "Pripojenie sa nedá vytvoriť"
 
-#: ../libempathy/empathy-utils.c:422
-#, fuzzy
-#| msgid "Connection managers should be used"
+#: ../libempathy/empathy-utils.c:352
 msgid "Connection has been lost"
-msgstr "Mal by byť použitý správca pripojenia"
+msgstr "Pripojenie bolo prerušené"
 
-#: ../libempathy/empathy-utils.c:424
-#, fuzzy
-#| msgid "This account already exists on the server"
+#: ../libempathy/empathy-utils.c:354
 msgid "This resource is already connected to the server"
-msgstr "Tento ú�et už na serveri existuje"
+msgstr "Tento zdroj už je pripojený k serveru"
 
-#: ../libempathy/empathy-utils.c:426
+#: ../libempathy/empathy-utils.c:356
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:429
-#, fuzzy
-#| msgid "This account already exists on the server"
+#: ../libempathy/empathy-utils.c:359
 msgid "The account already exists on the server"
-msgstr "Tento ú�et už na serveri existuje"
+msgstr "Ú�et už na serveri existuje"
 
-#: ../libempathy/empathy-utils.c:431
+#: ../libempathy/empathy-utils.c:361
 msgid "Server is currently too busy to handle the connection"
 msgstr ""
+"Server je teraz príliš zaneprázdnený, a preto nemôže obslúžiť pripojenie"
 
-#: ../libempathy/empathy-utils.c:433
+#: ../libempathy/empathy-utils.c:363
 #, fuzzy
-#| msgid "Certificate not provided"
 msgid "Certificate has been revoked"
 msgstr "Certifikát nebol poskytnutý"
 
-#: ../libempathy/empathy-utils.c:435
+#: ../libempathy/empathy-utils.c:365
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:438
+#: ../libempathy/empathy-utils.c:368
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:601
+#: ../libempathy/empathy-utils.c:529
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "Ľudia v okolí"
 
-#: ../libempathy/empathy-utils.c:606
+#: ../libempathy/empathy-utils.c:534
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:635
+#: ../libempathy/empathy-utils.c:563
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:636
+#: ../libempathy/empathy-utils.c:564
 msgid "Facebook Chat"
 msgstr "Facebook Chat"
 
-#: ../libempathy/empathy-time.c:137
+#: ../libempathy/empathy-time.c:88
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
@@ -692,7 +740,7 @@ msgstr[0] "pred %d sekundami"
 msgstr[1] "pred %d sekundou"
 msgstr[2] "pred %d sekundami"
 
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:93
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -700,7 +748,7 @@ msgstr[0] "pred %d minútami"
 msgstr[1] "pred %d minútou"
 msgstr[2] "pred %d minútami"
 
-#: ../libempathy/empathy-time.c:147
+#: ../libempathy/empathy-time.c:98
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -708,7 +756,7 @@ msgstr[0] "pred %d hodinami"
 msgstr[1] "pred %d hodinou"
 msgstr[2] "pred %d hodinami"
 
-#: ../libempathy/empathy-time.c:152
+#: ../libempathy/empathy-time.c:103
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -716,7 +764,7 @@ msgstr[0] "pred %d dňami"
 msgstr[1] "pred %d dňom"
 msgstr[2] "pred %d dňami"
 
-#: ../libempathy/empathy-time.c:157
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -724,7 +772,7 @@ msgstr[0] "pred %d týždňami"
 msgstr[1] "pred %d týždňom"
 msgstr[2] "pred %d týždňami"
 
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:113
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -732,100 +780,89 @@ msgstr[0] "pred %d mesiacmi"
 msgstr[1] "pred %d mesiacom"
 msgstr[2] "pred %d mesiacmi"
 
-#: ../libempathy/empathy-time.c:167
+#: ../libempathy/empathy-time.c:136
 msgid "in the future"
 msgstr "v budúcnosti"
 
-# * https://bugzilla.gnome.org/show_bug.cgi?id=645689
-# PŠ: toto asi nebude správny odkaz na bugreport... opraviť!
-#: ../libempathy-gtk/empathy-account-chooser.c:491
-msgid "All"
-msgstr "VÅ¡etky"
+#: ../libempathy-gtk/empathy-account-chooser.c:540
+msgid "All accounts"
+msgstr "Všetky ú�ty"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../libempathy-gtk/empathy-log-window.c:643
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "Ú�et"
 
-#: ../libempathy-gtk/empathy-account-widget.c:683
-#| msgid "Password:"
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "Heslo"
 
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:685
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:757
-#: ../libempathy-gtk/empathy-account-widget.c:814
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1166
-#, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+#, fuzzy
+msgid "My Web Accounts"
+msgstr "- Empathy ú�ty"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1172
+#: ../libempathy-gtk/empathy-account-widget.c:1209
+#, fuzzy, c-format
+#| msgid "The account %s cannot be edited in Empathy."
+msgid "The account %s is edited via %s."
+msgstr "Ú�et %s sa nedá upraviť v Empathy."
+
+#: ../libempathy-gtk/empathy-account-widget.c:1215
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
-msgstr ""
+msgstr "Ú�et %s sa nedá upraviť v Empathy."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1234
 #, fuzzy
-#| msgid "- Empathy Accounts"
 msgid "Launch My Web Accounts"
 msgstr "- Empathy ú�ty"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1530
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1242
+#, fuzzy, c-format
+#| msgid "_Edit"
+msgid "Edit %s"
+msgstr "_Upraviť"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1592
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Používateľské meno:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1897
+#: ../libempathy-gtk/empathy-account-widget.c:1910
 msgid "A_pply"
 msgstr "Po_užiť"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1927
+#: ../libempathy-gtk/empathy-account-widget.c:1940
 msgid "L_og in"
 msgstr "_Prihlásiť sa"
 
-#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1993
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:520
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1481
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "Ú�et:"
-
-# * https://bugzilla.gnome.org/show_bug.cgi?id=645689
-# PŠ: toto asi nebude správny odkaz na bugreport... opraviť!
-#: ../libempathy-gtk/empathy-account-widget.c:2004
-#, fuzzy
-#| msgid "Enabled"
-msgid "_Enabled"
-msgstr "Povolený"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2069
+#: ../libempathy-gtk/empathy-account-widget.c:2014
 msgid "This account already exists on the server"
 msgstr "Tento ú�et už na serveri existuje"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2072
+#: ../libempathy-gtk/empathy-account-widget.c:2017
 msgid "Create a new account on the server"
 msgstr "Vytvoriť na serveri nový ú�et"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2264
+#: ../libempathy-gtk/empathy-account-widget.c:2209
 msgid "Ca_ncel"
 msgstr "_Zrušiť"
 
@@ -834,19 +871,19 @@ msgstr "_Zrušiť"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2561
+#: ../libempathy-gtk/empathy-account-widget.c:2487
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s na %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2587
+#: ../libempathy-gtk/empathy-account-widget.c:2513
 #, c-format
 msgid "%s Account"
 msgstr "Ú�et %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2591
+#: ../libempathy-gtk/empathy-account-widget.c:2517
 msgid "New account"
 msgstr "Nový ú�et"
 
@@ -858,6 +895,7 @@ msgstr "<b>Príklad:</b> MojaPrezvýka"
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -871,7 +909,7 @@ msgstr "Pokro�ilé"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "Pass_word:"
 msgstr "_Heslo:"
@@ -881,11 +919,9 @@ msgstr "_Heslo:"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-#, fuzzy
-#| msgid "Password:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
 msgid "Remember Password"
-msgstr "Heslo:"
+msgstr "Zapamätať heslo"
 
 #. remember password ticky box
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
@@ -893,11 +929,11 @@ msgstr "Heslo:"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 #: ../libempathy-gtk/empathy-password-dialog.c:311
 msgid "Remember password"
-msgstr ""
+msgstr "Zapamätať si heslo"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 msgid "Screen _Name:"
@@ -958,10 +994,8 @@ msgstr "<b>Príklad:</b> 123456789"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
-#, fuzzy
-#| msgid "Character set:"
 msgid "Ch_aracter set:"
-msgstr "Znaková sada:"
+msgstr "Zn_aková sada:"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
 msgid "ICQ _UIN:"
@@ -977,82 +1011,87 @@ msgstr "Aké je vaše heslo pre ICQ?"
 
 # * https://bugzilla.gnome.org/show_bug.cgi?id=645689
 # PŠ: toto asi nebude správny odkaz na bugreport... opraviť!
-#: ../libempathy-gtk/empathy-account-widget-sip.c:183
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "Automaticky"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:221
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "Registrovať"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:226
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "Voľby"
 
 # * https://bugzilla.gnome.org/show_bug.cgi?id=645689
 # PŠ: toto asi nebude správny odkaz na bugreport... opraviť!
-#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "Žiadna"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Character set:"
 msgstr "Znaková sada:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Network"
 msgstr "Sieť"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Network:"
 msgstr "Sieť:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Prezývka:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "Správa pri odchode:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "Skuto�né meno:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Servers"
 msgstr "Servery"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
-#, fuzzy
-#| msgid "What is your AIM screen name?"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "What is your IRC nickname?"
-msgstr "Aká je vaša prezývka pre AIM?"
+msgstr "Aká je vaša prezývka pre IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+# TC
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
-msgstr ""
+msgstr "Ktorú IRC sieť?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
 msgid "<b>Example:</b> user@gmail.com"
@@ -1063,14 +1102,10 @@ msgid "<b>Example:</b> user@jabber.org"
 msgstr "<b>Príklad:</b> používateľ@jabber.org"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-#, fuzzy
-#| msgid "_Encryption required (TLS/SSL)"
 msgid "Encr_yption required (TLS/SSL)"
-msgstr "_Vyžadovať šifrovanie (TLS/SSL)"
+msgstr "V_yžadovať šifrovanie (TLS/SSL)"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-#, fuzzy
-#| msgid "_Ignore SSL certificate errors"
 msgid "I_gnore SSL certificate errors"
 msgstr "_Ignorovať chyby SSL certifikátu"
 
@@ -1079,8 +1114,6 @@ msgid "Override server settings"
 msgstr "Potla�iť nastavenia servera"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-#, fuzzy
-#| msgid "Pri_ority:"
 msgid "Priori_ty:"
 msgstr "_Priorita:"
 
@@ -1150,16 +1183,12 @@ msgid "What is your Windows Live password?"
 msgstr "Aké je vaše heslo pre Windows Live?"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-#, fuzzy
-#| msgid "E-mail address:"
 msgid "E-_mail address:"
-msgstr "Emailová adresa:"
+msgstr "E_mailová adresa:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
-#, fuzzy
-#| msgid "Nickname:"
 msgid "Nic_kname:"
-msgstr "Prezývka:"
+msgstr "Prezýv_ka:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
 msgid "_First Name:"
@@ -1192,69 +1221,76 @@ msgstr "Vyhľadať STUN"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "Discover the STUN server automatically"
-msgstr "Automaticky objaviť STUN server"
+msgstr "Automaticky objaviť server STUN"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "Ignore TLS Errors"
+msgstr "Ignorovať chyby TLS"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Interval (seconds)"
 msgstr "Interval (sekundy)"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
 msgid "Keep-Alive Options"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
 msgid "Loose Routing"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Mechanism:"
 msgstr "Mechanizmus:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
 msgid "Miscellaneous Options"
 msgstr "Ďalšie voľby"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 msgid "NAT Traversal Options"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 msgid "Port:"
 msgstr "Port:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 msgid "Proxy Options"
 msgstr "Voľby proxy"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "STUN Server:"
 msgstr "STUN server:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.c:347
 msgid "Server:"
 msgstr "Server:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid "Transport:"
 msgstr "Prenos:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "Aké je heslo pre váš SIP ú�et?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Aký je váš identifikátor pre SIP prihlásenie?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "_Používateľské meno:"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-#, fuzzy
-#| msgid "_Ignore conference and chat room invitations"
 msgid "I_gnore conference and chat room invitations"
-msgstr "_Ignorovať pozvánky do konferencií a diskusných miestností."
+msgstr "I_gnorovať pozvánky do konferencií a diskusných miestností"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "What is your Yahoo! ID?"
@@ -1275,29 +1311,39 @@ msgstr "I_dentifikátor pre Yahoo!:"
 msgid "_Room List locale:"
 msgstr "Locale _zoznamu miestností"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:448
-#: ../libempathy-gtk/empathy-avatar-chooser.c:524
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "Nepodarilo sa previesť obrázok"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr ""
 "Žiadny z prípustných formátov obrázkov nie je podporovaný vo vašom systéme"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:930
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+#, fuzzy
+#| msgid "Couldn't save pixbuf to png"
+msgid "Couldn't save picture to file"
+msgstr "Nepodarilo sa uložiť pixbuf do png"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "Vyberte si obrázok podobizne"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
+msgid "Take a picture..."
+msgstr "Odfotiť..."
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "Žiadny obrázok"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:995
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "Obrázky"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:999
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "Všetky súbory"
 
@@ -1305,58 +1351,86 @@ msgstr "Všetky súbory"
 msgid "Click to enlarge"
 msgstr "Kliknutím zvä�šíte"
 
-#: ../libempathy-gtk/empathy-chat.c:652
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
+msgid "There was an error starting the call"
+msgstr "Po�as vytvárania hovoru nastala chyba"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact doesn't support calls"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is offline"
+msgstr "Zvolený kontakt je odhlásený"
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "The specified contact is not valid"
+msgstr "Zvolený kontakt nie je platný"
+
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "Emergency calls are not supported on this protocol"
+msgstr "Tiesňové volania nie sú podporované týmto protokolom"
+
+#: ../libempathy-gtk/empathy-chat.c:704
 msgid "Failed to open private chat"
 msgstr "Zlyhalo otvorenie súkromného rozhovoru"
 
-#: ../libempathy-gtk/empathy-chat.c:717
+#: ../libempathy-gtk/empathy-chat.c:765
 msgid "Topic not supported on this conversation"
 msgstr "Téma nie je pri tejto konverzácii podporovaná"
 
-#: ../libempathy-gtk/empathy-chat.c:723
+#: ../libempathy-gtk/empathy-chat.c:771
 msgid "You are not allowed to change the topic"
 msgstr "Nie je vám dovolené meniť tému"
 
-#: ../libempathy-gtk/empathy-chat.c:906
+#: ../libempathy-gtk/empathy-chat.c:975
+#, c-format
+msgid "“%s� is not a valid contact ID"
+msgstr "“%s� je neplatný identifikátor kontaktu"
+
+#: ../libempathy-gtk/empathy-chat.c:1070
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: vymaže všetky správy z aktuálnej konverzácie"
 
-#: ../libempathy-gtk/empathy-chat.c:909
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <téma>: nastaví tému aktuálnej konverzácie"
 
-#: ../libempathy-gtk/empathy-chat.c:912
+#: ../libempathy-gtk/empathy-chat.c:1076
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ID diskusnej miestnosti>: vstúpi do novej diskusnej miestnosti"
 
-#: ../libempathy-gtk/empathy-chat.c:915
+#: ../libempathy-gtk/empathy-chat.c:1079
 msgid "/j <chat room ID>: join a new chat room"
 msgstr ""
 "/j <identifikátor diskusnej miestnosti>: vstúpi do novej diskusnej miestnosti"
 
-#: ../libempathy-gtk/empathy-chat.c:920
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr ""
+"/part [<identifikátor diskusnej miestnosti>] [<dôvod>]: opustí diskusnú "
+"miestnosť, predvolene tú aktuálnu"
 
-#: ../libempathy-gtk/empathy-chat.c:925
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <identifikátor kontaktu> [<správa>]: otvorí súkromný rozhovor"
 
-#: ../libempathy-gtk/empathy-chat.c:928
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <identifikátor kontaktu> <správa>: otvorí súkromný rozhovor"
 
-#: ../libempathy-gtk/empathy-chat.c:931
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <prezývka>: zmeni vašu prezývku na aktuálnom serveri"
 
-#: ../libempathy-gtk/empathy-chat.c:934
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <správa>: pošle ACTION správu do aktuálnej konverzácie"
 
-#: ../libempathy-gtk/empathy-chat.c:937
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1366,7 +1440,11 @@ msgstr ""
 "odoslanie správy za�ínajúcej s '/'. Napríklad: \"/say /join sa používa na "
 "vstúpenie do novej diskusnej miestnosti\""
 
-#: ../libempathy-gtk/empathy-chat.c:942
+#: ../libempathy-gtk/empathy-chat.c:1104
+msgid "/whois <contact ID>: display information about a contact"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1374,242 +1452,287 @@ msgstr ""
 "/help [<príkaz>]: zobrazí zoznam všetkých podporovaných príkazov. Ak je "
 "zadaný aj <príkaz>, zobrazí sa jeho použitie."
 
-#: ../libempathy-gtk/empathy-chat.c:952
+#: ../libempathy-gtk/empathy-chat.c:1126
 #, c-format
 msgid "Usage: %s"
 msgstr "Použitie: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:991
+#: ../libempathy-gtk/empathy-chat.c:1171
 msgid "Unknown command"
 msgstr "Neznámy príkaz"
 
-#: ../libempathy-gtk/empathy-chat.c:1117
+#: ../libempathy-gtk/empathy-chat.c:1297
 msgid "Unknown command; see /help for the available commands"
 msgstr "Neznámy príkaz; použite /help na zobrazenie dostupných príkazov"
 
-#: ../libempathy-gtk/empathy-chat.c:1254
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1467
+msgid "insufficient balance to send message"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1469
+msgid "not capable"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1476
 msgid "offline"
 msgstr "odpojený"
 
-#: ../libempathy-gtk/empathy-chat.c:1257
+#: ../libempathy-gtk/empathy-chat.c:1479
 msgid "invalid contact"
 msgstr "neplatný kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1260
+#: ../libempathy-gtk/empathy-chat.c:1482
 msgid "permission denied"
 msgstr "prístup zamietnutý"
 
-#: ../libempathy-gtk/empathy-chat.c:1263
+#: ../libempathy-gtk/empathy-chat.c:1485
 msgid "too long message"
 msgstr "príliš dlhá správa"
 
-#: ../libempathy-gtk/empathy-chat.c:1266
+#: ../libempathy-gtk/empathy-chat.c:1488
 msgid "not implemented"
 msgstr "nie je implementované"
 
-#: ../libempathy-gtk/empathy-chat.c:1270
+#: ../libempathy-gtk/empathy-chat.c:1492
 msgid "unknown"
 msgstr "neznámy"
 
-#: ../libempathy-gtk/empathy-chat.c:1274
+#: ../libempathy-gtk/empathy-chat.c:1498
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Chyba pri posielaní správy '%s': %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1335 ../src/empathy-chat-window.c:717
+#: ../libempathy-gtk/empathy-chat.c:1502
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Chyba pri posielaní správy: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1563 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Téma:"
 
-#: ../libempathy-gtk/empathy-chat.c:1347
+#: ../libempathy-gtk/empathy-chat.c:1575
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Téma nastavená na: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1349
+#: ../libempathy-gtk/empathy-chat.c:1577
 msgid "No topic defined"
 msgstr "Nebola nastavená žiadna téma"
 
-#: ../libempathy-gtk/empathy-chat.c:1848
+#: ../libempathy-gtk/empathy-chat.c:2086
 msgid "(No Suggestions)"
 msgstr "(Žiadne návrhy)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1916
+#: ../libempathy-gtk/empathy-chat.c:2154
 #, c-format
 msgid "Add '%s' to Dictionary"
-msgstr ""
+msgstr "Pridať '%s' do slovníka"
 
+# slovnik je v tvare napr. "slovencina", "anglictina" (podst. m.)
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1953
+#: ../libempathy-gtk/empathy-chat.c:2191
 #, c-format
 msgid "Add '%s' to %s Dictionary"
-msgstr ""
+msgstr "Pridať '%s' do slovníka pre jazyk %s"
 
-# http://live.gnome.org/SlovakTranslation/Others/JULS
-#: ../libempathy-gtk/empathy-chat.c:2010
+#  http://live.gnome.org/SlovakTranslation/Others/JULS
+#: ../libempathy-gtk/empathy-chat.c:2261
 msgid "Insert Smiley"
-msgstr "Vložiť smajlíka"
+msgstr "Vložiť smejka"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2028
-#: ../libempathy-gtk/empathy-ui-utils.c:1808
+#: ../libempathy-gtk/empathy-chat.c:2279
+#: ../libempathy-gtk/empathy-ui-utils.c:1840
 msgid "_Send"
 msgstr "_Poslať"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2063
+#: ../libempathy-gtk/empathy-chat.c:2333
 msgid "_Spelling Suggestions"
 msgstr "_Návrhy kontroly pravopisu"
 
-#: ../libempathy-gtk/empathy-chat.c:2152
+#: ../libempathy-gtk/empathy-chat.c:2422
 msgid "Failed to retrieve recent logs"
 msgstr "Zlyhalo získavanie nedávnych záznamov"
 
-#: ../libempathy-gtk/empathy-chat.c:2263
+#: ../libempathy-gtk/empathy-chat.c:2559
 #, c-format
 msgid "%s has disconnected"
-msgstr "%s sa odpojil"
+msgstr "Kontakt %s sa odpojil"
 
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2270
+#: ../libempathy-gtk/empathy-chat.c:2566
 #, c-format
 msgid "%1$s was kicked by %2$s"
-msgstr "%1$s bol vykopnutý používateľom %2$s"
+msgstr "Kontakt %1$s bol vykopnutý používateľom %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2273
+#: ../libempathy-gtk/empathy-chat.c:2569
 #, c-format
 msgid "%s was kicked"
-msgstr "%s bol vykopnutý"
+msgstr "Kontakt %s bol vykopnutý"
 
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2281
+#: ../libempathy-gtk/empathy-chat.c:2577
 #, c-format
 msgid "%1$s was banned by %2$s"
-msgstr "%1$s dostal zákaz od %2$s"
+msgstr "Kontakt %1$s dostal zákaz od %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2284
+#: ../libempathy-gtk/empathy-chat.c:2580
 #, c-format
 msgid "%s was banned"
-msgstr "%s dostal zákaz"
+msgstr "Kontakt %s dostal zákaz"
 
-#: ../libempathy-gtk/empathy-chat.c:2288
+#: ../libempathy-gtk/empathy-chat.c:2584
 #, c-format
 msgid "%s has left the room"
-msgstr "%s opustil miestnosť"
+msgstr "Kontakt %s opustil miestnosť"
 
 #. Note to translators: this string is appended to
 #. * notifications like "foo has left the room", with the message
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2297
+#: ../libempathy-gtk/empathy-chat.c:2593
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2322
+#: ../libempathy-gtk/empathy-chat.c:2618
 #, c-format
 msgid "%s has joined the room"
-msgstr "%s vstúpil do miestnosti"
+msgstr "Kontakt %s vstúpil do miestnosti"
 
-#: ../libempathy-gtk/empathy-chat.c:2347
+#: ../libempathy-gtk/empathy-chat.c:2643
 #, c-format
 msgid "%s is now known as %s"
-msgstr "%s je teraz známy ako %s"
-
-#: ../libempathy-gtk/empathy-chat.c:2486
-#: ../src/empathy-streamed-media-window.c:1949
-#: ../src/empathy-event-manager.c:1122
+msgstr "Kontakt %s je teraz známy ako %s"
+
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2796
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1260 ../src/empathy-call-window.c:1546
+#: ../src/empathy-call-window.c:1596 ../src/empathy-call-window.c:2641
 msgid "Disconnected"
 msgstr "Odpojený"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3116
+#: ../libempathy-gtk/empathy-chat.c:3440
 msgid "Would you like to store this password?"
-msgstr ""
+msgstr "Želáte si uložiť toto heslo?"
 
-#: ../libempathy-gtk/empathy-chat.c:3122
-#, fuzzy
-#| msgid "Members"
+#: ../libempathy-gtk/empathy-chat.c:3446
 msgid "Remember"
-msgstr "Ú�astníkov"
+msgstr "Zapamätať"
 
-#: ../libempathy-gtk/empathy-chat.c:3132
+#: ../libempathy-gtk/empathy-chat.c:3456
 msgid "Not now"
-msgstr ""
+msgstr "Teraz nie"
 
-#: ../libempathy-gtk/empathy-chat.c:3176
+#: ../libempathy-gtk/empathy-chat.c:3500
 msgid "Retry"
 msgstr "Opakovať"
 
-#: ../libempathy-gtk/empathy-chat.c:3180
+#: ../libempathy-gtk/empathy-chat.c:3504
 msgid "Wrong password; please try again:"
 msgstr "Nesprávne heslo; prosím, skúste to znova:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3297
+#: ../libempathy-gtk/empathy-chat.c:3634
 msgid "This room is protected by a password:"
 msgstr "Miestnosť je chránená heslom:"
 
-#: ../libempathy-gtk/empathy-chat.c:3324
+#: ../libempathy-gtk/empathy-chat.c:3661
 msgid "Join"
 msgstr "Vstúpiť"
 
-#: ../libempathy-gtk/empathy-chat.c:3494 ../src/empathy-event-manager.c:1144
+#: ../libempathy-gtk/empathy-chat.c:3863 ../src/empathy-event-manager.c:1281
 msgid "Connected"
 msgstr "Pripojený"
 
-#: ../libempathy-gtk/empathy-chat.c:3547
-#: ../libempathy-gtk/empathy-log-window.c:650
+#: ../libempathy-gtk/empathy-chat.c:3918
 msgid "Conversation"
 msgstr "Konverzácia"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:422
-msgid "Unknown or invalid identifier"
-msgstr ""
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:3923
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (SMS)"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
-msgid "Contact blocking temporarily unavailable"
-msgstr ""
+msgid "Unknown or invalid identifier"
+msgstr "Neznámy alebo neplatný identifikátor"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
-msgid "Contact blocking unavailable"
-msgstr ""
+msgid "Contact blocking temporarily unavailable"
+msgstr "Blokovanie kontaktu je do�asne nedostupné"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
-#, fuzzy
-#| msgid "permission denied"
+msgid "Contact blocking unavailable"
+msgstr "Blokovanie kontaktu je nedostupné"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
 msgid "Permission Denied"
-msgstr "prístup zamietnutý"
+msgstr "Prístup zamietnutý"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
 msgid "Could not block contact"
-msgstr ""
+msgstr "Nepodarilo sa zablokovať kontakt"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:701
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
 msgid "Edit Blocked Contacts"
-msgstr ""
+msgstr "Upraviť zablokované kontakty"
+
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Account:"
+msgstr "Ú�et:"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+#| msgid "_Blocked Contacts"
+msgid "Blocked Contacts"
+msgstr "Zablokované kontakty"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Odstrániť"
 
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:794
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Kopírovať adresu odkazu"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:801
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Otvoriť odkaz"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:420
+#: ../libempathy-gtk/empathy-chat-text-view.c:415
 msgid "%A %B %d %Y"
 msgstr "%A, %d.%m.%Y"
 
@@ -1628,29 +1751,29 @@ msgid "New Contact"
 msgstr "Nový kontakt"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:199
+#: ../libempathy-gtk/empathy-individual-dialogs.c:200
 #, c-format
 msgid "Block %s?"
-msgstr ""
+msgstr "Zablokovať %s?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:247
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr ""
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
 msgid "_Block"
-msgstr ""
+msgstr "Za_blokovať"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:278
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "_Nahlásiť tieto kontakty ako obťažujúce"
+msgstr[1] "_Nahlásiť tento kontakt ako obťažujúci"
+msgstr[2] "_Nahlásiť tieto kontakty ako obťažujúce"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
@@ -1662,7 +1785,7 @@ msgstr "Žiadosť o zapísanie"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
 msgid "_Block User"
-msgstr ""
+msgstr "Za_blokovať používateľa"
 
 #: ../libempathy-gtk/empathy-contact-list-store.h:71
 msgid "Ungrouped"
@@ -1670,317 +1793,334 @@ msgstr ""
 
 #: ../libempathy-gtk/empathy-contact-list-store.h:72
 msgid "Favorite People"
-msgstr ""
+msgstr "Obľúbení ľudia"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2001
-#: ../libempathy-gtk/empathy-individual-view.c:2336
+#: ../libempathy-gtk/empathy-contact-list-view.c:1985
+#: ../libempathy-gtk/empathy-individual-view.c:2375
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Naozaj chcete odstrániť skupinu '%s'?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2003
-#: ../libempathy-gtk/empathy-individual-view.c:2339
+#: ../libempathy-gtk/empathy-contact-list-view.c:1987
+#: ../libempathy-gtk/empathy-individual-view.c:2378
 msgid "Removing group"
 msgstr "Skupina sa odstraňuje"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2052
-#: ../libempathy-gtk/empathy-contact-list-view.c:2129
-#: ../libempathy-gtk/empathy-individual-view.c:2394
-#: ../libempathy-gtk/empathy-individual-view.c:2588
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../libempathy-gtk/empathy-contact-list-view.c:2036
+#: ../libempathy-gtk/empathy-contact-list-view.c:2113
+#: ../libempathy-gtk/empathy-individual-view.c:2433
+#: ../libempathy-gtk/empathy-individual-view.c:2636
 msgid "_Remove"
 msgstr "O_dstrániť"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2082
-#: ../libempathy-gtk/empathy-individual-view.c:2458
+#: ../libempathy-gtk/empathy-contact-list-view.c:2066
+#: ../libempathy-gtk/empathy-individual-view.c:2500
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Naozaj chcete odstrániť kontakt '%s'?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2084
-#: ../libempathy-gtk/empathy-individual-view.c:2479
+#: ../libempathy-gtk/empathy-contact-list-view.c:2068
+#: ../libempathy-gtk/empathy-individual-view.c:2521
 msgid "Removing contact"
 msgstr "Kontakt sa odstraňuje"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:219
-#: ../src/empathy-main-window.ui.h:13
+#: ../libempathy-gtk/empathy-contact-menu.c:220
+#: ../src/empathy-main-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "_Pridať kontakt…"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:299
-#, fuzzy
-#| msgid "Contact"
+#: ../libempathy-gtk/empathy-contact-menu.c:300
 msgid "_Block Contact"
-msgstr "Kontakt"
+msgstr "Za_blokovať kontakt"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:328
-#: ../libempathy-gtk/empathy-individual-menu.c:517
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:329
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "_Rozhovor"
 
 # PŠ: navrhujem Hlasový
-#: ../libempathy-gtk/empathy-contact-menu.c:359
-#: ../libempathy-gtk/empathy-individual-menu.c:560
+#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Zvukový hovor"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:390
-#: ../libempathy-gtk/empathy-individual-menu.c:602
+#: ../libempathy-gtk/empathy-contact-menu.c:394
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Video hovor"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:436
-#: ../libempathy-gtk/empathy-individual-menu.c:645
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:440
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "P_redchádzajúce konverzácie"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:458
-#: ../libempathy-gtk/empathy-individual-menu.c:686
-#| msgid "Send file"
+#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "Poslať súbor"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:481
-#: ../libempathy-gtk/empathy-individual-menu.c:728
-#| msgid "Share my desktop"
+#: ../libempathy-gtk/empathy-contact-menu.c:485
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
 msgstr "Zdieľať moju plochu"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:521
-#: ../libempathy-gtk/empathy-contact-widget.c:1763
-#: ../libempathy-gtk/empathy-individual-menu.c:763
+#: ../libempathy-gtk/empathy-contact-menu.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:1887
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
 #: ../libempathy-gtk/empathy-individual-widget.c:1372
-#, fuzzy
-#| msgid "Join _Favorites"
 msgid "Favorite"
-msgstr "Vstúpiť do _obľúbených"
+msgstr "Obľúbený"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:550
-#: ../libempathy-gtk/empathy-individual-menu.c:791
+#: ../libempathy-gtk/empathy-contact-menu.c:554
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "_Podrobnosti"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:596
+#: ../libempathy-gtk/empathy-contact-menu.c:600
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "_Upraviť"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:650
-#: ../libempathy-gtk/empathy-individual-menu.c:972
-#: ../src/empathy-chat-window.c:935
+#: ../libempathy-gtk/empathy-contact-menu.c:654
+#: ../libempathy-gtk/empathy-individual-menu.c:1284
+#: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "Pozýva vás do tejto miestnosti"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:681
-#: ../libempathy-gtk/empathy-individual-menu.c:1019
-#| msgid "_Invite to chat room"
+#: ../libempathy-gtk/empathy-contact-menu.c:685
+#: ../libempathy-gtk/empathy-individual-menu.c:1330
 msgid "_Invite to Chat Room"
 msgstr "_Pozvať do diskusnej miestnosti"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:513
-#, fuzzy
-#| msgid "Select a contact"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
 msgid "Search contacts"
-msgstr "Vybrať kontakt"
+msgstr "Hľadať kontakty"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:543
-#, fuzzy
-#| msgid "Search"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
 msgid "Search: "
-msgstr "Hľadať"
+msgstr "Hľadať: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:601
-#| msgid "_Add Contact…"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
 msgid "_Add Contact"
 msgstr "_Pridať kontakt"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:619
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
 msgid "No contacts found"
+msgstr "Nenájdený žiadny kontakt"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
 msgstr ""
 
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "Vybrať kontakt"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:295
+#: ../libempathy-gtk/empathy-contact-widget.c:336
 #: ../libempathy-gtk/empathy-individual-widget.c:153
 msgid "Full name:"
 msgstr "Celé meno:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:296
+#: ../libempathy-gtk/empathy-contact-widget.c:337
 #: ../libempathy-gtk/empathy-individual-widget.c:154
 msgid "Phone number:"
-msgstr ""
+msgstr "Telefónne �íslo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:297
+#: ../libempathy-gtk/empathy-contact-widget.c:338
 #: ../libempathy-gtk/empathy-individual-widget.c:155
 msgid "E-mail address:"
 msgstr "Emailová adresa:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:298
+#: ../libempathy-gtk/empathy-contact-widget.c:339
 #: ../libempathy-gtk/empathy-individual-widget.c:156
 msgid "Website:"
 msgstr "Webová stránka:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:299
+#: ../libempathy-gtk/empathy-contact-widget.c:340
 #: ../libempathy-gtk/empathy-individual-widget.c:157
 msgid "Birthday:"
 msgstr "Narodeniny:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:346
+msgid "Last seen:"
+msgstr "Naposledy videný:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:348
+msgid "Connected from:"
+msgstr "Pripojený z:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:353
+msgid "Away message:"
+msgstr "Správa pri odchode:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+msgid "Channels:"
+msgstr "Kanály:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
 msgstr "ISO kód krajiny:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Country:"
 msgstr "Krajina:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "State:"
 msgstr "Štát:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:768
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "City:"
 msgstr "Mesto:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:770
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Area:"
 msgstr "Oblasť:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:772
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
 msgstr "PSČ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:774
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Street:"
 msgstr "Ulica:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:776
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
 msgstr "Budova:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:778
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Floor:"
 msgstr "Poschodie:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:780
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Room:"
 msgstr "Miestnosť:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:782
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Text:"
 msgstr "Text:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:784
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Description:"
 msgstr "Popis:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:786
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
 msgstr "Stupeň presnosti:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:790
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr "Chyba:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:792
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
 msgstr "Vertikálna chyba (v metroch):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:794
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
 msgstr "Horizontálna chyba (v metroch):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr "Rýchlosť:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Bearing:"
 msgstr "Azimut:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:800
-#: ../libempathy-gtk/empathy-individual-widget.c:526
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
 msgstr "Rýchlosť stúpania:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:802
-#: ../libempathy-gtk/empathy-individual-widget.c:528
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
 msgstr "Posledná aktualizácia:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:804
-#: ../libempathy-gtk/empathy-individual-widget.c:530
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
 msgstr "Zemepisná dĺžka:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:806
-#: ../libempathy-gtk/empathy-individual-widget.c:532
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
 msgstr "Zemepisná šírka:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:808
-#: ../libempathy-gtk/empathy-individual-widget.c:534
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
 msgstr "Nadmorská výška:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:871
-#: ../libempathy-gtk/empathy-contact-widget.c:888
-#: ../libempathy-gtk/empathy-individual-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:633
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "Poloha"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:890
-#: ../libempathy-gtk/empathy-individual-widget.c:635
-#, fuzzy, c-format
-#| msgid "%s of %s"
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
+#, c-format
 msgid "%s, %s"
-msgstr "%s z %s"
+msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:942
-#: ../libempathy-gtk/empathy-individual-widget.c:684
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
 msgstr "%d. %B %Y, %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1024
-#: ../libempathy-gtk/empathy-individual-widget.c:919
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
 msgid "Save Avatar"
 msgstr "Uložiť podobizeň"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1080
-#: ../libempathy-gtk/empathy-individual-widget.c:977
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
 msgid "Unable to save avatar"
 msgstr "Podobizeň sa nedá uložiť"
 
@@ -1990,7 +2130,7 @@ msgstr "<b>Poloha</b> dňa (dátum)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1307
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr "Prezývka:"
 
@@ -2011,16 +2151,14 @@ msgstr "Informácie o kontakte"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "Identifikátor:"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-#, fuzzy
-#| msgid "Information requested&#x2026;"
 msgid "Information requested…"
-msgstr "Požadované informácie&#x2026;"
+msgstr "Získavajú sa informácie…"
 
 # * https://bugzilla.gnome.org/show_bug.cgi?id=645689
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:10
@@ -2031,11 +2169,11 @@ msgstr "OS:"
 msgid "Version:"
 msgstr "Verzia:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:332
+#: ../libempathy-gtk/empathy-groups-widget.c:333
 msgid "Groups"
 msgstr "Skupiny"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:344
+#: ../libempathy-gtk/empathy-groups-widget.c:345
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2043,96 +2181,116 @@ msgstr ""
 "Vyberte skupiny, do ktorých chcete kontakt zaradiť. Môžete vybrať viac ako "
 "jednu skupinu alebo nevybrať žiadnu skupinu."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:363
+#: ../libempathy-gtk/empathy-groups-widget.c:364
 msgid "_Add Group"
 msgstr "_Pridať skupinu"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:398
-#, fuzzy
-#| msgid "Select"
+#: ../libempathy-gtk/empathy-groups-widget.c:399
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Vybrať"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1436
+#: ../libempathy-gtk/empathy-groups-widget.c:409
+#: ../src/empathy-main-window.c:1833
 msgid "Group"
 msgstr "Skupina"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Nasledujúce identity budú zablokované:"
+msgstr[1] "Nasledujúca identita bude zablokovaná:"
+msgstr[2] "Nasledujúce identity budú zablokované:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:259
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Nasledujúce identity sa nedajú zablokovať:"
+msgstr[1] "Nasledujúca identita sa nedá zablokovať:"
+msgstr[2] "Nasledujúce identity sa nedajú zablokovať:"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
-#, fuzzy
-#| msgid "_Offline Contacts"
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
-msgstr "_Odhlásené kontakty"
+msgstr "Prepojené kontakty"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:354
-#, fuzzy
-#| msgid "Select a contact"
+#: ../libempathy-gtk/empathy-individual-linker.c:370
 msgid "Select contacts to link"
-msgstr "Vybrať kontakt"
+msgstr "Vyberte kontakt na prepojenie"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:428
-#, fuzzy
-#| msgid "New Contact"
+#: ../libempathy-gtk/empathy-individual-linker.c:444
 msgid "New contact preview"
-msgstr "Nový kontakt"
+msgstr "Náhľad nového kontaktu"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:472
+#: ../libempathy-gtk/empathy-individual-linker.c:488
 msgid "Contacts selected in the list on the left will be linked together."
-msgstr ""
+msgstr "Kontakty vybrané v zozname vľavo budú navzájom prepojené."
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:131
-#, fuzzy, c-format
-#| msgid " (%s)"
+#: ../libempathy-gtk/empathy-individual-menu.c:145
+#, c-format
 msgid "%s (%s)"
-msgstr " (%s)"
+msgstr "%s (%s)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-individual-menu.c:839
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "Hovor"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
 #, fuzzy
-#| msgid "_Edit"
+#| msgid "Profile"
+msgid "Mobile"
+msgstr "Profil"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr ""
+
+#. add an SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+msgid "_SMS"
+msgstr "_SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1142
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Upraviť"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:865
-#, fuzzy
-#| msgid "_Add Contact…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1168
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
-msgstr "_Pridať kontakt…"
+msgstr "_Prepojiť kontakty…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2301
+#: ../libempathy-gtk/empathy-individual-view.c:2340
 msgid "Delete and _Block"
-msgstr ""
+msgstr "Odstrániť a za_blokovať"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2467
+#: ../libempathy-gtk/empathy-individual-view.c:2509
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
 "remove all the contacts which make up this linked contact."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2141,10 +2299,8 @@ msgstr[1] ""
 msgstr[2] ""
 
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:1
-#, fuzzy
-#| msgid "<b>Location</b> at (date)\t"
 msgid "<b>Location</b> at (date)"
-msgstr "<b>Poloha</b> dňa (dátum)\t"
+msgstr "<b>Poloha</b> dňa (dátum)"
 
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Online from a phone or mobile device"
@@ -2156,15 +2312,13 @@ msgstr "Nová sieť"
 
 #: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
 msgid "Choose an IRC network"
-msgstr ""
+msgstr "Zvoľte IRC sieť"
 
 #: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
 msgid "Reset _Networks List"
-msgstr ""
+msgstr "Vynulovať zoznam _sietí"
 
 #: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
-#, fuzzy
-#| msgid "Select"
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Vybrať"
@@ -2181,113 +2335,250 @@ msgstr "SSL"
 #. * right-clicking on a contact and selecting "Link…"). "Link" in this title
 #. * is a verb.
 #: ../libempathy-gtk/empathy-linking-dialog.c:115
-#, fuzzy
-#| msgid "_Offline Contacts"
 msgid "Link Contacts"
-msgstr "_Odhlásené kontakty"
+msgstr "Prepojiť kontakty"
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:120
-#, fuzzy
-#| msgid "_Join…"
 msgctxt "Unlink individual (button)"
 msgid "_Unlink…"
-msgstr "_Vstúpiť…"
+msgstr "Zr_ušiť prepojenie…"
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:121
 msgid ""
 "Completely split the displayed linked contacts into the separate contacts."
-msgstr ""
+msgstr "Úplne oddelí zobrazené prepojené kontakty na samostatné kontakty."
 
 #. Add button
 #. Translators: this is an action button in the linking dialogue. "Link" is
 #. * used here as a verb meaning "to connect two contacts to form a
 #. * meta-contact".
 #: ../libempathy-gtk/empathy-linking-dialog.c:136
-#, fuzzy
-#| msgid "_Open Link"
 msgid "_Link"
-msgstr "_Otvoriť odkaz"
+msgstr "_Prepojiť"
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, fuzzy, c-format
-#| msgid "invalid contact"
+#, c-format
 msgid "Unlink linked contacts '%s'?"
-msgstr "neplatný kontakt"
+msgstr "Zrušiť prepojenie kontaktov '%s'?"
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:186
 msgid ""
 "Are you sure you want to unlink these linked contacts? This will completely "
 "split the linked contacts into separate contacts."
 msgstr ""
+"Ste si istý, že chcete zrušiť prepojenie medzi týmito kontaktami? Toto "
+"úplne oddelí prepojené kontakty na samostatné kontakty."
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:190
 msgctxt "Unlink individual (button)"
 msgid "_Unlink"
+msgstr "Zr_ušiť prepojenie"
+
+#: ../libempathy-gtk/empathy-log-window.c:634
+msgid "History"
+msgstr "História"
+
+#: ../libempathy-gtk/empathy-log-window.c:689
+msgid "Show"
+msgstr "Zobraziť"
+
+#: ../libempathy-gtk/empathy-log-window.c:711
+msgid "Search"
+msgstr "Hľadať"
+
+#: ../libempathy-gtk/empathy-log-window.c:1159
+#, fuzzy, c-format
+#| msgid "Chat with %s"
+msgid "Chat in %s"
+msgstr "Rozhovor s kontaktom %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1161
+#, c-format
+msgid "Chat with %s"
+msgstr "Rozhovor s kontaktom %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
+#, fuzzy
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%A, %d.%m.%Y"
+
+#. Translators: this is an emote: '* Danielle waves'
+#: ../libempathy-gtk/empathy-log-window.c:1300
+#, c-format
+msgid "<i>* %s %s</i>"
+msgstr "<i>* %s %s</i>"
+
+#. Translators: this is a message: 'Danielle: hello'
+#. * The string in bold is the sender's name
+#: ../libempathy-gtk/empathy-log-window.c:1306
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1382
+#, fuzzy, c-format
+#| msgid "%d second ago"
+#| msgid_plural "%d seconds ago"
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "pred %d sekundami"
+msgstr[1] "pred %d sekundou"
+msgstr[2] "pred %d sekundami"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, fuzzy, c-format
+#| msgid "%d minute ago"
+#| msgid_plural "%d minutes ago"
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "pred %d minútami"
+msgstr[1] "pred %d minútou"
+msgstr[2] "pred %d minútami"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
+#, c-format
+msgid "Call took %s, ended at %s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:660
-msgid "Date"
-msgstr "Dátum"
+#: ../libempathy-gtk/empathy-log-window.c:1729
+msgid "Today"
+msgstr "Dnes"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
-msgstr "Konverzácie"
+#: ../libempathy-gtk/empathy-log-window.c:1733
+msgid "Yesterday"
+msgstr "V�era"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
+msgid "%e %B %Y"
+msgstr "%e. %B %Y"
+
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3444
+msgid "Anytime"
+msgstr "Hocikedy"
+
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2372
+msgid "Anyone"
+msgstr "VÅ¡etci"
+
+#: ../libempathy-gtk/empathy-log-window.c:2685
+msgid "Who"
+msgstr "Kto"
+
+#: ../libempathy-gtk/empathy-log-window.c:2889
+msgid "When"
+msgstr "Kedy"
+
+#: ../libempathy-gtk/empathy-log-window.c:3005
+msgid "Anything"
+msgstr "VÅ¡etko"
+
+#: ../libempathy-gtk/empathy-log-window.c:3007
+msgid "Text chats"
+msgstr "Textové rozhovory"
+
+#: ../libempathy-gtk/empathy-log-window.c:3009
+#: ../src/empathy-preferences.ui.h:4
+msgid "Calls"
+msgstr "Hovory"
+
+#: ../libempathy-gtk/empathy-log-window.c:3014
+msgid "Incoming calls"
+msgstr "Prichádzajúce hovory"
+
+#: ../libempathy-gtk/empathy-log-window.c:3015
+msgid "Outgoing calls"
+msgstr "Odchádzajúce hovory"
+
+#: ../libempathy-gtk/empathy-log-window.c:3016
+msgid "Missed calls"
+msgstr "Zmeškané hovory"
+
+#: ../libempathy-gtk/empathy-log-window.c:3038
+msgid "What"
+msgstr "ÄŒo"
+
+#: ../libempathy-gtk/empathy-log-window.c:3747
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr ""
+"Ste si istý, že chcete odstrániť všetky záznamy predchádzajúcich konverzácií?"
+
+#: ../libempathy-gtk/empathy-log-window.c:3751
+msgid "Clear All"
+msgstr "Vymazať všetko"
+
+# nazov uctu alebo vsetky ucty
+#: ../libempathy-gtk/empathy-log-window.c:3758
+msgid "Delete from:"
+msgstr "Odstrániť z:"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "<span size=\"x-large\">Loading...</span>"
 msgstr ""
 
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Chat"
+msgstr "Rozhovor"
+
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-#, fuzzy
-#| msgid "Video Preview"
-msgid "Find Previous"
-msgstr "Náhľad videa"
+msgid "Delete All History..."
+msgstr ""
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr "Predchádzajúce konverzácie"
+msgid "Profile"
+msgstr "Profil"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Video"
+msgstr "Video"
 
-#. Tab Label
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "Hľadať"
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:20
+msgid "_Edit"
+msgstr "_Upraviť"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "_File"
+msgstr "_Súbor"
 
-#. Searching *for* something
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "_Hľadať:"
+msgid "page 2"
+msgstr "strana 2"
 
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
 msgid "Contact ID:"
 msgstr "Identifikátor kontaktu:"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:171
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
 msgid "C_hat"
 msgstr "_Rozhovor"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:181
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
-msgstr "Nový rozhovor"
+msgstr "Nová konverzácia"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:253
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
 msgid "Send _Video"
 msgstr "Odoslať _video"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:261
-#, fuzzy
-#| msgid "Call"
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
 msgid "C_all"
-msgstr "Zavolať"
+msgstr "Z_avolať"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:271
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "New Call"
 msgstr "Nový hovor"
 
@@ -2297,6 +2588,8 @@ msgid ""
 "Enter your password for account\n"
 "<b>%s</b>"
 msgstr ""
+"Zadajte vaše heslo pre ú�et\n"
+"<b>%s</b>"
 
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
@@ -2304,34 +2597,34 @@ msgstr ""
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Message…"
 msgstr "Vlastná správa…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messages…"
 msgstr "Upraviť vlastné správy…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
 msgstr "Kliknutím odstránite tento stav z obľúbených"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
 msgstr "Kliknutím nastavíte tento stav ako obľúbený"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
 msgstr "Nastaviť stav"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:946
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
 msgid "Set your presence and current status"
 msgstr "Nastaviť vašu prítomnosť a aktuálny stav"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1134
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
 msgid "Custom messages…"
 msgstr "Vlastné správy…"
 
@@ -2344,18 +2637,30 @@ msgstr "Vlastné správy…"
 msgid "New %s account"
 msgstr "Nový ú�et %s"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "Nájsť:"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Mat_ch case"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
 msgid "Phrase not found"
 msgstr "Fráza sa nenašla"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+#, fuzzy
+#| msgid "_Next Tab"
+msgid "_Next"
+msgstr "Ďalšia _karta"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+#, fuzzy
+#| msgid "_Previous Tab"
+msgid "_Previous"
+msgstr "_Predchádzajúca karta"
+
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
 msgstr "Prijatá okamžitá správa"
@@ -2382,7 +2687,7 @@ msgstr "Pripojenie k serveru"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:63
 msgid "Disconnected from server"
-msgstr "Odpojenie od severa"
+msgstr "Odpojenie od servera"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:65
 msgid "Incoming voice call"
@@ -2396,59 +2701,52 @@ msgstr "Odchádzajúci hovor"
 msgid "Voice call ended"
 msgstr "Hlasový hovor bol ukon�ený"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "Zadajte vlastnú správu"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
 msgstr "Upraviť vlastné správy"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr ""
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#, fuzzy, c-format
+#| msgid "Message received"
+msgid "Message edited at %s"
+msgstr "Prijatá správa"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-#, fuzzy
-#| msgid "Edit Custom Messages"
-msgid "Saved Status Messages"
-msgstr "Upraviť vlastné správy"
+# Téma rozhovoru:
+#: ../libempathy-gtk/empathy-theme-adium.c:1740
+msgid "Normal"
+msgstr "Normálna"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "Klasická"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "Jednoduchá"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "Čistá"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "Modrá"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:150
 msgid "The identity provided by the chat server cannot be verified."
-msgstr ""
+msgstr "Identita poskytnutá serverom pre rozhovory sa nedá overiť."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:157
 msgid "The certificate is not signed by a Certification Authority."
 msgstr ""
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:161
-#, fuzzy
-#| msgid "Certificate expired"
 msgid "The certificate has expired."
-msgstr "Certifikát vypršal"
+msgstr "Certifikátu vypršala platnosť."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:164
-#, fuzzy
-#| msgid "Certificate not activated"
 msgid "The certificate hasn't yet been activated."
-msgstr "Certifikát nie je aktivovaný"
+msgstr "Certifikát nie je aktivovaný."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:167
 msgid "The certificate does not have the expected fingerprint."
@@ -2459,10 +2757,8 @@ msgid "The hostname verified by the certificate doesn't match the server name."
 msgstr ""
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:174
-#, fuzzy
-#| msgid "Certificate self-signed"
 msgid "The certificate is self-signed."
-msgstr "Certifikát podpísaný sám sebou"
+msgstr "Certifikát je podpísaný sám sebou."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:177
 msgid ""
@@ -2479,66 +2775,58 @@ msgstr ""
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:188
 #, fuzzy
-#| msgid "Certificate expired"
 msgid "The certificate is malformed."
 msgstr "Certifikát vypršal"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:206
-#, fuzzy, c-format
-#| msgid "Certificate hostname mismatch"
+#, c-format
 msgid "Expected hostname: %s"
-msgstr "Názov hostiteľa certifikátu nesúhlasí"
+msgstr "O�akávaný názov hostiteľa: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:209
-#, fuzzy, c-format
-#| msgid "Certificate hostname mismatch"
+#, c-format
 msgid "Certificate hostname: %s"
-msgstr "Názov hostiteľa certifikátu nesúhlasí"
+msgstr "Názov hostiteľa certifikátu: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-#, fuzzy
-#| msgid "Context"
 msgid "Continue"
-msgstr "Kontext"
+msgstr "Pokra�ovať"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
 msgid "This connection is untrusted. Would you like to continue anyway?"
-msgstr ""
+msgstr "Toto pripojenie je nedôveryhodné. Želáte si napriek tomu pokra�ovať?"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:297
 msgid "Remember this choice for future connections"
 msgstr ""
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:303
-#, fuzzy
-#| msgid "Certificate expired"
 msgid "Certificate Details"
-msgstr "Certifikát vypršal"
+msgstr "Podrobnosti certifikátu"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1705
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
 msgstr "Nie je možné otvoriť URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1800
+#: ../libempathy-gtk/empathy-ui-utils.c:1832
 msgid "Select a file"
 msgstr "Vyberte súbor"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1904
 msgid "Insufficient free space to save file"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#: ../libempathy-gtk/empathy-ui-utils.c:1912
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1924
-#, fuzzy, c-format
-#| msgid "Incoming call from %s"
+#: ../libempathy-gtk/empathy-ui-utils.c:1956
+#, c-format
 msgid "Incoming file from %s"
-msgstr "Prichádzajúci hovor od %s"
+msgstr "Prichádzajúci súbor od %s"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
@@ -2725,26 +3013,25 @@ msgstr "Žiadna chybová správa"
 msgid "Instant Message (Empathy)"
 msgstr "Okamžitá správa (Empathy)"
 
-#: ../src/empathy.c:308
+#: ../src/empathy.c:434
 msgid "Don't connect on startup"
 msgstr "Nepripájať sa po spustení"
 
-#: ../src/empathy.c:312
+#: ../src/empathy.c:438
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr ""
 "Nezobrazovať zoznam kontaktov alebo akékoľvek iné dialógové okno pri spustení"
 
-#: ../src/empathy.c:320
+#: ../src/empathy.c:453
 msgid "- Empathy IM Client"
 msgstr "- Komunikátor Empathy"
 
-#: ../src/empathy.c:499
+#: ../src/empathy.c:640
 msgid "Error contacting the Account Manager"
 msgstr ""
 
-#: ../src/empathy.c:501
+#: ../src/empathy.c:642
 #, fuzzy, c-format
-#| msgid "There was an error while parsing the account details."
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
 "The error was:\n"
@@ -2760,9 +3047,9 @@ msgid ""
 "version."
 msgstr ""
 "Empathy je slobodný softvér. Môžete ho �alej šíriť a/alebo upravovať podľa "
-"ustanovení Všeobecnej verejnej licencie GNU tak, ako bola vydaná organizáciou "
-"Free Software Foundation, a to bu� verzie 2 tejto licencie, alebo (podľa "
-"vášho uváženia) ktorejkoľvek neskoršej verzie."
+"ustanovení Všeobecnej verejnej licencie GNU tak, ako bola vydaná "
+"organizáciou Free Software Foundation, a to bu� verzie 2 tejto licencie, "
+"alebo (podľa vášho uváženia) ktorejkoľvek neskoršej verzie."
 
 #: ../src/empathy-about-dialog.c:85
 msgid ""
@@ -2895,8 +3182,8 @@ msgid "Select the accounts you want to import:"
 msgstr "Vyberte si ú�ty, ktoré chcete importovať:"
 
 #: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:625
+#: ../src/empathy-new-chatroom-dialog.c:626
 msgid "Yes"
 msgstr "�no"
 
@@ -2913,10 +3200,10 @@ msgid ""
 "details below are correct. You can easily change these details later or "
 "disable this feature by using the 'Accounts' dialog"
 msgstr ""
-"Empathy môže automaticky nájsť a rozprávať sa s ľu�mi pripojenými v "
-"rovnakej sieti, ako ste vy. Ak chcete túto funkciu používať, skontrolujte, "
-"prosím, správnosť údajov uvedených nižšie. Pomocou dialógového okna 'Ú�ty' "
-"ich môžete jednoducho zmeniť, alebo túto funkciu vypnúť."
+"Empathy môže automaticky nájsť a rozprávať sa s ľu�mi pripojenými v rovnakej "
+"sieti, ako ste vy. Ak chcete túto funkciu používať, skontrolujte, prosím, "
+"správnosť údajov uvedených nižšie. Pomocou dialógového okna 'Ú�ty' ich "
+"môžete jednoducho zmeniť, alebo túto funkciu vypnúť."
 
 #: ../src/empathy-account-assistant.c:1091
 #: ../src/empathy-account-assistant.c:1147
@@ -2924,10 +3211,8 @@ msgid "Edit->Accounts"
 msgstr "Upraviť->Ú�ty"
 
 #: ../src/empathy-account-assistant.c:1107
-#, fuzzy
-#| msgid "I don't want to enable this feature for now"
 msgid "I do _not want to enable this feature for now"
-msgstr "Teraz nechcem povoliť túto funkciu"
+msgstr "Teraz _nechcem povoliť túto funkciu"
 
 #: ../src/empathy-account-assistant.c:1143
 msgid ""
@@ -2947,7 +3232,6 @@ msgstr "telepathy-salut nie je nainštalovaný"
 
 #: ../src/empathy-account-assistant.c:1195
 #, fuzzy
-#| msgid "Messaging and VoIP Accounts"
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "Konverzácie a VoIP ú�ty"
 
@@ -2976,34 +3260,35 @@ msgstr "Vo vašom ú�te %s máte neuložené zmeny."
 msgid "Your new account has not been saved yet."
 msgstr "Váš nový ú�et ešte nebol uložený."
 
-#: ../src/empathy-accounts-dialog.c:286
-#: ../src/empathy-streamed-media-window.c:809
+#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1330
 msgid "Connecting…"
 msgstr "Pripája sa…"
 
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:386
 #, c-format
 msgid "Offline — %s"
 msgstr "Odhlásený — %s"
 
-#: ../src/empathy-accounts-dialog.c:339
+#: ../src/empathy-accounts-dialog.c:398
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Odpojený — %s"
 
-#: ../src/empathy-accounts-dialog.c:350
+#: ../src/empathy-accounts-dialog.c:409
 msgid "Offline — No Network Connection"
 msgstr "Odhlásený — Žiadne sieťové pripojenie"
 
-#: ../src/empathy-accounts-dialog.c:357
+#: ../src/empathy-accounts-dialog.c:416
 msgid "Unknown Status"
 msgstr "Neznámy stav"
 
-#: ../src/empathy-accounts-dialog.c:369
+#: ../src/empathy-accounts-dialog.c:428
 msgid "Offline — Account Disabled"
 msgstr "Odhlásený — Ú�et zablokovaný"
 
-#: ../src/empathy-accounts-dialog.c:772
+#: ../src/empathy-accounts-dialog.c:831
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3011,16 +3296,16 @@ msgstr ""
 "Chystáte sa vytvoriť nový ú�et, �ím zrušíte vaše zmeny.\n"
 "Naozaj chcete pokra�ovať?"
 
-#: ../src/empathy-accounts-dialog.c:1133
+#: ../src/empathy-accounts-dialog.c:1192
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Naozaj chcete odstrániť %s z vášho po�íta�a?"
 
-#: ../src/empathy-accounts-dialog.c:1137
+#: ../src/empathy-accounts-dialog.c:1196
 msgid "This will not remove your account on the server."
 msgstr "Toto neodstráni váš ú�et na serveri."
 
-#: ../src/empathy-accounts-dialog.c:1375
+#: ../src/empathy-accounts-dialog.c:1432
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3031,17 +3316,15 @@ msgstr ""
 # * https://bugzilla.gnome.org/show_bug.cgi?id=645689
 # PŠ: toto asi nebude správny odkaz na bugreport... opraviť!
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1593
-#, fuzzy
-#| msgid "Enabled"
+#: ../src/empathy-accounts-dialog.c:1643
 msgid "_Enable"
-msgstr "Povolený"
+msgstr "_Povoliť"
 
-#: ../src/empathy-accounts-dialog.c:1594
+#: ../src/empathy-accounts-dialog.c:1644
 msgid "_Disable"
-msgstr ""
+msgstr "_Zakázať"
 
-#: ../src/empathy-accounts-dialog.c:2113
+#: ../src/empathy-accounts-dialog.c:2154
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3050,20 +3333,22 @@ msgstr ""
 "Naozaj chcete pokra�ovať?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
-#, fuzzy
-#| msgid "Edit Contact Information"
-msgid "Loading account information"
-msgstr "Upraviť podrobnosti kontaktu"
+msgid "Add…"
+msgstr "Pridať…"
 
 #: ../src/empathy-accounts-dialog.ui.h:2
+msgid "Loading account information"
+msgstr "Na�ítavajú sa informácie o ú�te"
+
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "No protocol installed"
 msgstr "Nebol nainštalovaný žiadny protokol"
 
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3071,27 +3356,17 @@ msgstr ""
 "Aby ste mohli pridať nový ú�et, musíte najprv nainštalovať podporu pre každý "
 "protokol, ktorý chcete použiť."
 
-#: ../src/empathy-accounts-dialog.ui.h:5
-#, fuzzy
-#| msgid "_Add Contact…"
-msgid "_Add…"
-msgstr "_Pridať kontakt…"
-
-#: ../src/empathy-accounts-dialog.ui.h:6
-#, fuzzy
-#| msgid "Import"
+#: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Import…"
-msgstr "Importovať"
+msgstr "_Importovať…"
 
-#: ../src/empathy-auth-client.c:250
+#: ../src/empathy-auth-client.c:249
 #, fuzzy
-#| msgid "- Empathy IM Client"
 msgid " - Empathy authentication client"
 msgstr "- Komunikátor Empathy"
 
-#: ../src/empathy-auth-client.c:266
+#: ../src/empathy-auth-client.c:265
 #, fuzzy
-#| msgid "Authentication failed"
 msgid "Empathy authentication client"
 msgstr "Autentifikácia zlyhala"
 
@@ -3099,119 +3374,128 @@ msgstr "Autentifikácia zlyhala"
 msgid "People nearby"
 msgstr "Ľudia v okolí"
 
-#: ../src/empathy-av.c:118
-#, fuzzy
-#| msgid "- Empathy IM Client"
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
-msgstr "- Komunikátor Empathy"
+msgstr "- Empathy - klient pre zvuk a video"
 
-#: ../src/empathy-av.c:134
-#, fuzzy
-#| msgid "Empathy IM Client"
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
-msgstr "Empathy - komunikátor"
+msgstr "Empathy - klient pre zvuk a video"
 
-#: ../src/empathy-streamed-media-window.c:479
+#: ../src/empathy-streamed-media-window.c:431
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: ../src/empathy-streamed-media-window.c:482
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Brightness"
 msgstr "Jas"
 
-#: ../src/empathy-streamed-media-window.c:485
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Gamma"
 msgstr "Gama"
 
-#: ../src/empathy-streamed-media-window.c:590
+#: ../src/empathy-streamed-media-window.c:542
 msgid "Volume"
 msgstr "Hlasitosť"
 
-#: ../src/empathy-streamed-media-window.c:1166
+#: ../src/empathy-streamed-media-window.c:1110
 msgid "_Sidebar"
 msgstr "_Bo�ný panel"
 
-#: ../src/empathy-streamed-media-window.c:1186
+#: ../src/empathy-streamed-media-window.c:1130
 msgid "Audio input"
 msgstr "Zvukový vstup"
 
-#: ../src/empathy-streamed-media-window.c:1190
+#: ../src/empathy-streamed-media-window.c:1134
 msgid "Video input"
 msgstr "Video vstup"
 
-#: ../src/empathy-streamed-media-window.c:1194
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Dialpad"
 msgstr "Číselník"
 
-#: ../src/empathy-streamed-media-window.c:1205
-#, fuzzy
-#| msgid "Contact Details"
+#: ../src/empathy-streamed-media-window.c:1151
 msgid "Details"
-msgstr "Informácie o kontakte"
+msgstr "Podrobnosti"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1274
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1939
 #, c-format
 msgid "Call with %s"
 msgstr "Hovor s %s"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-streamed-media-window.c:1353
-msgid "Call"
-msgstr "Hovor"
-
-#: ../src/empathy-streamed-media-window.c:1507
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:2183
 msgid "The IP address as seen by the machine"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:1509
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:2185
 msgid "The IP address as seen by a server on the Internet"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:1511
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:2187
 msgid "The IP address of the peer as seen by the other side"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:1513
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:2189
 msgid "The IP address of a relay server"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:1515
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:2191
 msgid "The IP address of the multicast group"
 msgstr ""
 
+# * https://bugzilla.gnome.org/show_bug.cgi?id=646131
+#: ../src/empathy-streamed-media-window.c:1843
+#: ../src/empathy-streamed-media-window.c:1846
+#: ../src/empathy-streamed-media-window.c:1849
+#: ../src/empathy-streamed-media-window.c:1852
+#, fuzzy
+#| msgid "Unknown"
+msgctxt "codec"
+msgid "Unknown"
+msgstr "Neznámy"
+
 # PÅ : som za "%d min %d s"
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2266
+#: ../src/empathy-streamed-media-window.c:2144
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Pripojený — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2327
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2960
 msgid "Technical Details"
 msgstr "Technické údaje"
 
-#: ../src/empathy-streamed-media-window.c:2365
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2998
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr ""
-"Softvér používateľa %s nepodporuje žiaden z audio formátov podporovaných "
-"vo vašom po�íta�i"
+"Softvér používateľa %s nepodporuje žiaden z audio formátov podporovaných vo "
+"vašom po�íta�i"
 
-#: ../src/empathy-streamed-media-window.c:2370
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3003
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr ""
-"Softvér používateľa %s nepodporuje žiaden z video formátov podporovaných "
-"vo vašom po�íta�i"
+"Softvér používateľa %s nepodporuje žiaden z video formátov podporovaných vo "
+"vašom po�íta�i"
 
-#: ../src/empathy-streamed-media-window.c:2376
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3009
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3220,23 +3504,27 @@ msgstr ""
 "Spojenie s %s sa nedá nadviazať. Jeden z vás môže byť v sieti, ktorá "
 "neumožňuje priame pripojenie."
 
-#: ../src/empathy-streamed-media-window.c:2382
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:3015
 msgid "There was a failure on the network"
 msgstr "Došlo k výpadku v sieti"
 
-#: ../src/empathy-streamed-media-window.c:2386
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:3019
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Audio formáty potrebné pre tento hovor nie sú nainštalované vo vašom po�íta�i"
 
-#: ../src/empathy-streamed-media-window.c:2389
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:3022
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Video formáty potrebné pre tento hovor nie sú nainštalované vo vašom po�íta�i"
 
-#: ../src/empathy-streamed-media-window.c:2399
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:3034
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3247,124 +3535,176 @@ msgstr ""
 "prosím, túto chybu</a> a pripojte k nej záznamy získané z okna 'Ladenie' z "
 "ponuky Pomocník."
 
-#: ../src/empathy-streamed-media-window.c:2407
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure in the call engine"
-msgstr ""
+msgstr "Došlo k výpadku sú�asti pre volanie"
 
-#: ../src/empathy-streamed-media-window.c:2410
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:3046
 msgid "The end of the stream was reached"
-msgstr ""
+msgstr "Bol dosiahnutý koniec streamu"
 
-#: ../src/empathy-streamed-media-window.c:2450
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:3086
 msgid "Can't establish audio stream"
 msgstr "Audio spojenie sa nedá nadviazať"
 
-#: ../src/empathy-streamed-media-window.c:2460
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:3096
 msgid "Can't establish video stream"
 msgstr "Video spojenie sa nedá nadviazať"
 
 # * https://bugzilla.gnome.org/show_bug.cgi?id=645689
-#: ../src/empathy-call-window.ui.h:1
-#, fuzzy
-#| msgid "Auto"
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "Audio"
-msgstr "Automaticky"
-
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Volať kontakt znova"
+msgstr "Zvuk"
 
 #: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "Vypnúť kameru"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "Zapnúť kameru"
+#, fuzzy
+#| msgid "_Disable"
+msgid "Disable camera"
+msgstr "_Zakázať"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
+msgid "Display the dialpad"
 msgstr ""
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Zakázať kameru a ukon�iť odosielanie videa"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Povoliť kameru a posielať video"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Hang up"
+msgstr "Položiť"
 
 #: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Povoliť kameru, ale neodosielať video"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Hang up current call"
+msgstr "Položiť aktuálny hovor"
 
 #: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Local Candidate:"
 msgstr ""
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "Položiť"
+msgid "Maximise me"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Položiť aktuálny hovor"
+msgid "Minimise me"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Remote Candidate:"
 msgstr ""
 
 #: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "Náhľad"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Send Audio"
+msgstr "Odoslať zvuk"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "Vyto�iť znova"
+#, fuzzy
+#| msgid "Send _Video"
+msgid "Send Video"
+msgstr "Odoslať _video"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr ""
+#, fuzzy
+#| msgid "Dialpad"
+msgid "Show dialpad"
+msgstr "Číselník"
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "Odoslať zvuk"
+msgid "Start a video call"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Prepnúť prenos zvuku"
+msgid "Start an audio call"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:18
+msgid "Swap camera"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ideo"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr "Prepnúť prenos zvuku"
 
 #: ../src/empathy-call-window.ui.h:20
 #, fuzzy
-#| msgid "V_ideo"
-msgid "Video"
-msgstr "V_ideo"
+#| msgid "Toggle audio transmission"
+msgid "Toggle video transmission"
+msgstr "Prepnúť prenos zvuku"
 
+# * https://bugzilla.gnome.org/show_bug.cgi?id=646131
 #: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "Vypnúť video"
-
-#: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "Zapnúť video"
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:2590 ../src/empathy-call-window.c:2591
+#: ../src/empathy-call-window.c:2592 ../src/empathy-call-window.c:2593
+msgid "Unknown"
+msgstr "Neznámy"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "Náhľad videa"
+#, fuzzy
+#| msgctxt "menu item"
+#| msgid "_Video Call"
+msgid "Video call"
+msgstr "_Video hovor"
 
 #: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "Za_volať"
 
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:25
+#, fuzzy
+#| msgid "Camera On"
+msgid "_Camera"
+msgstr "Zapnúť kameru"
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:18
+msgid "_Contents"
+msgstr "Ob_sah"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
+msgid "_Debug"
+msgstr "_Ladiť"
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:22
+msgid "_Help"
+msgstr "_Pomocník"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Microphone"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "_Settings"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_Zobraziť"
 
-#: ../src/empathy-chat-window.c:474 ../src/empathy-chat-window.c:494
+#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3372,15 +3712,15 @@ msgstr[0] "%s (%d nepre�ítaných)"
 msgstr[1] "%s (%d nepre�ítaná)"
 msgstr[2] "%s (%d nepre�ítané)"
 
-#: ../src/empathy-chat-window.c:486
+#: ../src/empathy-chat-window.c:493
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%s (a %u ostatných)"
+msgstr[1] "%s (a %u ostatný)"
+msgstr[2] "%s (a %u ostatní)"
 
-#: ../src/empathy-chat-window.c:502
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3388,7 +3728,7 @@ msgstr[0] "%s (%d nepre�ítaných od iných)"
 msgstr[1] "%s (%d nepre�ítaná od iných)"
 msgstr[2] "%s (%d nepre�ítané od iných)"
 
-#: ../src/empathy-chat-window.c:511
+#: ../src/empathy-chat-window.c:518
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3396,7 +3736,19 @@ msgstr[0] "%s (%d nepre�ítaných od všetkých)"
 msgstr[1] "%s (%d nepre�ítaná od všetkých)"
 msgstr[2] "%s (%d nepre�ítané od všetkých)"
 
-#: ../src/empathy-chat-window.c:721
+#: ../src/empathy-chat-window.c:733
+msgid "SMS:"
+msgstr "SMS:"
+
+#: ../src/empathy-chat-window.c:743
+#, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "Posiela sa %d správ"
+msgstr[1] "Posiela sa %d správa"
+msgstr[2] "Posielajú sa %d správy"
+
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
 msgstr "Píše správu."
 
@@ -3408,14 +3760,10 @@ msgstr "Vy_mazať"
 msgid "C_ontact"
 msgstr "_Kontakt"
 
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Rozhovor"
-
 # http://live.gnome.org/SlovakTranslation/Others/JULS
 #: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
-msgstr "Vložiť _smajlíka"
+msgstr "Vložiť _smejka"
 
 #: ../src/empathy-chat-window.ui.h:5
 msgid "Invite _Participant…"
@@ -3430,14 +3778,8 @@ msgid "Move Tab _Right"
 msgstr "Presunúť kartu vp_ravo"
 
 #: ../src/empathy-chat-window.ui.h:8
-#, fuzzy
-#| msgid "No error message"
 msgid "Notify for All Messages"
-msgstr "Žiadna chybová správa"
-
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
-msgid "_Contents"
-msgstr "Ob_sah"
+msgstr "Upozorniť na všetky správy"
 
 #: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
@@ -3447,18 +3789,10 @@ msgstr "_Konverzácia"
 msgid "_Detach Tab"
 msgstr "_Oddeliť kartu"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
-msgid "_Edit"
-msgstr "_Upraviť"
-
 #: ../src/empathy-chat-window.ui.h:13
 msgid "_Favorite Chat Room"
 msgstr "_Obľúbené diskusné miestnosti"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
-msgid "_Help"
-msgstr "_Pomocník"
-
 #: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "Ďalšia _karta"
@@ -3477,17 +3811,17 @@ msgstr "_Karty"
 
 #: ../src/empathy-chat-window.ui.h:19
 msgid "_Undo Close Tab"
-msgstr ""
+msgstr "_Vrátiť spať zatvorenú kartu"
 
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "Názov"
 
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
 msgstr "Miestnosť"
 
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "Pripojiť sa automaticky"
 
@@ -3495,94 +3829,96 @@ msgstr "Pripojiť sa automaticky"
 msgid "Manage Favorite Rooms"
 msgstr "Spravovať obľúbené miestnosti"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming video call"
 msgstr "Prichádzajúci video hovor"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1563
 msgid "Incoming call"
 msgstr "Prichádzajúci hovor"
 
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:525
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s vám volá. Chcete prijať tento video hovor?"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s vám volá. Chcete hovor prijať?"
 
-#: ../src/empathy-event-manager.c:515 ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1569
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Prichádzajúci hovor od %s"
 
-#: ../src/empathy-event-manager.c:540
+#: ../src/empathy-event-manager.c:554
 msgid "_Reject"
 msgstr "_Odmietnuť"
 
-#: ../src/empathy-event-manager.c:546
+#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
 msgid "_Answer"
 msgstr "_Prijať"
 
-#: ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:570
+msgid "_Answer with video"
+msgstr "_Prijať (s videom)"
+
+#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1569
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Prichádzajúci video hovor od %s"
 
-#: ../src/empathy-event-manager.c:737
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
 msgstr "Pozvanie do miestnosti"
 
-#: ../src/empathy-event-manager.c:739
-#, fuzzy, c-format
-#| msgid "%s invited you to join %s"
+#: ../src/empathy-event-manager.c:838
+#, c-format
 msgid "Invitation to join %s"
-msgstr "%s ťa pozval do %s"
+msgstr "Pozvánka na vstup do %s"
 
-#: ../src/empathy-event-manager.c:746
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s vás pozýva, aby ste vstúpili do %s"
 
-#: ../src/empathy-event-manager.c:754
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
 msgstr "_Odmietnuť"
 
-#: ../src/empathy-event-manager.c:759
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Vstúpiť"
 
-#: ../src/empathy-event-manager.c:786
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s vás pozval do %s"
 
-#: ../src/empathy-event-manager.c:792
-#, fuzzy, c-format
-#| msgid "%s invited you to join %s"
+#: ../src/empathy-event-manager.c:891
+#, c-format
 msgid "You have been invited to join %s"
-msgstr "%s ťa pozval do %s"
+msgstr "Boli ste pozvaný na vstup do %s"
 
-#: ../src/empathy-event-manager.c:843
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Prichádzajúci prenos súboru od %s"
 
-#: ../src/empathy-event-manager.c:1013 ../src/empathy-main-window.c:370
-#, fuzzy
-#| msgid "Password:"
+#: ../src/empathy-event-manager.c:1145 ../src/empathy-main-window.c:378
 msgid "Password required"
-msgstr "Heslo:"
+msgstr "Vyžadované heslo"
 
-#: ../src/empathy-event-manager.c:1069
+#: ../src/empathy-event-manager.c:1210
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:1073
+#: ../src/empathy-event-manager.c:1214
 #, c-format
 msgid ""
 "\n"
@@ -3592,105 +3928,105 @@ msgstr ""
 "Správa: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:100
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u:%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:102
+#: ../src/empathy-ft-manager.c:103
 #, c-format
 msgid "%02u.%02u"
 msgstr "0:%02u:%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:179
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Neznámy"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s z %s pri %s/s"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:275
 #, c-format
 msgid "%s of %s"
 msgstr "%s z %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:305
+#: ../src/empathy-ft-manager.c:306
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Prijíma sa súbor \"%s\" od %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:309
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Odosiela sa súbor \"%s\" pre %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:338
+#: ../src/empathy-ft-manager.c:339
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Chyba pri prijímaní súboru \"%s\" od %s"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:342
 msgid "Error receiving a file"
 msgstr "Chyba pri prijímaní súboru"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:347
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Chyba pri odosielaní súboru \"%s\" pre %s"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:350
 msgid "Error sending a file"
 msgstr "Chyba pri odosielaní súboru"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:489
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "Súbor \"%s\" bol prijatý od %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:493
+#: ../src/empathy-ft-manager.c:494
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "Súbor \"%s\" bol odoslaný pre %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:497
 msgid "File transfer completed"
 msgstr "Prenos súboru bol dokon�ený"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
 msgid "Waiting for the other participant's response"
 msgstr "Čaká sa na odpove� od druhého ú�astníka"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Kontrola integrity \"%s\""
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Vytvára sa kontrolný sú�et \"%s\""
 
-#: ../src/empathy-ft-manager.c:1016
+#: ../src/empathy-ft-manager.c:1026
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1028
+#: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "Súbor"
 
-#: ../src/empathy-ft-manager.c:1050
+#: ../src/empathy-ft-manager.c:1060
 msgid "Remaining"
 msgstr "Zostáva"
 
@@ -3727,159 +4063,155 @@ msgstr "Protokol"
 msgid "Source"
 msgstr "Zdroj"
 
-#: ../src/empathy-main-window.c:387
-#, fuzzy
-#| msgid "Password:"
+#: ../src/empathy-main-window.c:395
 msgid "Provide Password"
-msgstr "Heslo:"
+msgstr "Poskytnúť heslo"
 
-#: ../src/empathy-main-window.c:393
-#, fuzzy
-#| msgid "Disconnected"
+#: ../src/empathy-main-window.c:401
 msgid "Disconnect"
-msgstr "Odpojený"
+msgstr "Odpojiť"
 
-#: ../src/empathy-main-window.c:533
-#, fuzzy
-#| msgid "No topic defined"
+#: ../src/empathy-main-window.c:642
 msgid "No match found"
-msgstr "Nebola nastavená žiadna téma"
+msgstr "Nenájdená žiadna zhoda"
 
-#: ../src/empathy-main-window.c:688
+#: ../src/empathy-main-window.c:803
 msgid "Reconnect"
 msgstr "Obnoviť spojenie"
 
-#: ../src/empathy-main-window.c:694
+#: ../src/empathy-main-window.c:809
 msgid "Edit Account"
 msgstr "Upraviť ú�et"
 
-#: ../src/empathy-main-window.c:700
+#: ../src/empathy-main-window.c:815
 msgid "Close"
 msgstr "Zatvoriť"
 
-#: ../src/empathy-main-window.c:1418
+#. Translators: this string will be something like:
+#. *   Top up My Account ($1.23)..."
+#: ../src/empathy-main-window.c:954
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr "Dobiť %s (%s)..."
+
+#: ../src/empathy-main-window.c:1001
+msgid "Top up account credit"
+msgstr "Dobiť kredit na ú�te"
+
+#. top up button
+#: ../src/empathy-main-window.c:1072
+msgid "Top Up..."
+msgstr "Dobiť..."
+
+#: ../src/empathy-main-window.c:1815
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../src/empathy-main-window.c:1765
+#: ../src/empathy-main-window.c:2190
 msgid "Contact List"
 msgstr "Zoznam kontaktov"
 
-#: ../src/empathy-main-window.c:1881
-msgid "Show and edit accounts"
-msgstr "Zobraziť a upraviť ú�ty"
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "Kontakty na _mape"
 
-#: ../src/empathy-main-window.ui.h:2
-#, fuzzy
-#| msgid "Contact List"
+#: ../src/empathy-main-window-menubar.ui.h:2
+msgid "Credit Balance"
+msgstr "Zostatok kreditu"
+
+#: ../src/empathy-main-window-menubar.ui.h:3
 msgid "Find in Contact _List"
-msgstr "Zoznam kontaktov"
+msgstr "Nájsť v _zozname kontaktov"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "Vstúpiť do _obľúbených"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "Spravovať obľúbené"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "Normálna _veľkosť"
 
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "Nový _hovor…"
 
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "_Normálna veľkosť s podobizňami"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "Nas_tavenia"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "_Zobraziť protokoly"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "Usporiadať podľa _mena"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "Usporiadať podľa _stavu"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "Ú�t_y"
 
-#: ../src/empathy-main-window.ui.h:14
-#, fuzzy
-#| msgid "_Offline Contacts"
+#: ../src/empathy-main-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
-msgstr "_Odhlásené kontakty"
+msgstr "Za_blokované kontakty"
 
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "_Kompaktná veľkosť"
 
-#: ../src/empathy-main-window.ui.h:18
-msgid "_Debug"
-msgstr "_Ladiť"
-
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "_Prenosy súborov"
 
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "_Vstúpiť…"
 
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
-msgstr "_Nový rozhovor…"
+msgstr "_Nová konverzácia…"
 
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "_Odhlásené kontakty"
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "_Osobné informácie"
 
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "_Miestnosť"
 
-#: ../src/empathy-main-window.ui.h:28
-#, fuzzy
-#| msgid "_Show Contact List"
+#: ../src/empathy-main-window-menubar.ui.h:29
 msgid "_Search for Contacts…"
-msgstr "_Zobraziť zoznam kontaktov"
+msgstr "_Hľadať kontakty…"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Diskusná miestnosť"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "Ú�astníci"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:560
+#: ../src/empathy-new-chatroom-dialog.c:623
 #, c-format
-#| msgid ""
-#| "<b>%s</b>\n"
-#| "Invite required: %s\n"
-#| "Password required: %s\n"
-#| "Members: %s"
 msgid ""
 "%s\n"
 "Invite required: %s\n"
@@ -3891,16 +4223,16 @@ msgstr ""
 "Vyžaduje sa heslo: %s\n"
 "Ú�astníkov: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:625
+#: ../src/empathy-new-chatroom-dialog.c:626
 msgid "No"
 msgstr "Nie"
 
-#: ../src/empathy-new-chatroom-dialog.c:591
+#: ../src/empathy-new-chatroom-dialog.c:654
 msgid "Could not start room listing"
 msgstr "Vymenovávanie miestností sa nedá spustiť"
 
-#: ../src/empathy-new-chatroom-dialog.c:601
+#: ../src/empathy-new-chatroom-dialog.c:664
 msgid "Could not stop room listing"
 msgstr "Vymenovávanie miestností sa nedá zastaviť"
 
@@ -3935,39 +4267,79 @@ msgstr "Zoznam miestností"
 msgid "_Room:"
 msgstr "_Miestnosť:"
 
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr "Prijatá správa"
 
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr "Odoslaná správa"
 
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
-msgstr "Nový rozhovor"
+msgstr "Nová konverzácia"
 
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
 msgstr "Kontakt sa pripojil"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
 msgstr "Kontakt sa odpojil"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
 msgstr "Ú�et pripojený"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
 msgstr "Ú�et odpojený"
 
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr "Jazyk"
 
-#: ../src/empathy-preferences.c:875
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:734
+msgid "Juliet"
+msgstr "Júlia"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:741
+msgid "Romeo"
+msgstr "Rómeo"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:747
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:750
+msgid "Deny thy father and refuse thy name;"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:753
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:756
+msgid "And I'll no longer be a Capulet."
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:759
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:762
+msgid "Juliet has disconnected"
+msgstr "Kontakt Júlia sa odpojil"
+
+#: ../src/empathy-preferences.c:1166
 msgid "Preferences"
 msgstr "Nastavenia"
 
@@ -3975,69 +4347,83 @@ msgstr "Nastavenia"
 msgid "Appearance"
 msgstr "Vzhľad"
 
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
 msgstr "Správanie"
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
 msgid "Chat Th_eme:"
 msgstr "_Téma rozhovoru:"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
 msgid "Disable notifications when _away or busy"
 msgstr "_Zakázať upozornenia v stave pre� alebo zaneprázdnený"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
 msgid "Disable sounds when _away or busy"
 msgstr "_Zakázať zvuky v stave pre� alebo zaneprázdnený"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
+msgstr "Zobraziť prichádzajúce udalosti v oblasti upozornení"
+
+#: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "Povoliť upozornenia, ke� sa kontakt prihlási"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "Povoliť upozornenia, ke� sa kontakt odhlási"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Povoliť upozornenia, ke� _rozhovor nie je aktívny"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "Povoliť kontrolu pravopisu pre jazyky:"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "Hlavné"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input level:"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "Zdroje umiestnenia:"
 
-#: ../src/empathy-preferences.ui.h:14
-#, fuzzy
-#| msgid "Conversations"
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
-msgstr "Konverzácie"
+msgstr "Zaznamenávať konverzácie"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "Upozornenia"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Prehrať zvuk pre udalosti"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "Súkromie"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -4045,69 +4431,71 @@ msgid ""
 msgstr ""
 
 # http://live.gnome.org/SlovakTranslation/Others/JULS
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
-msgstr "Zobraziť _smajlíkov ako obrázky"
+msgstr "Zobraziť _smejkov ako obrázky"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "Zobraziť _zoznam kontaktov v miestnostiach"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "Zvuky"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "Kontrola pravopisu"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 "Zoznam jazykov obsahuje iba tie jazyky, pre ktoré máte nainštalovaný slovník."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "Témy"
 
-#: ../src/empathy-preferences.ui.h:25
-#, fuzzy
-#| msgid "Automatically _connect on startup "
+#: ../src/empathy-preferences.ui.h:30
+msgid "Variant:"
+msgstr "Variant:"
+
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
-msgstr "Automaticky _pripojiť po spustení"
+msgstr "_Automaticky pripojiť po spustení"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Mobil"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "_Povoliť bublinové upozornenia"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "_Povoliť zvukové upozornenia"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Sieť (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "_Nové rozhovory otvárať v samostatných oknách"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "_Publikovať umiestnenie do mojich kontaktov"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "_Znížiť presnosť ur�enia polohy"
 
@@ -4119,253 +4507,300 @@ msgstr "Stav"
 msgid "_Quit"
 msgstr "U_kon�iť"
 
-#: ../src/empathy-map-view.c:442
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "Volať kontakt znova"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "Vypnúť kameru"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "Zapnúť kameru"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "Zakázať kameru a ukon�iť odosielanie videa"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "Povoliť kameru a posielať video"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "Povoliť kameru, ale neodosielať video"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "Náhľad"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "Vyto�iť znova"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "V_ideo"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "Vypnúť video"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "Zapnúť video"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "Náhľad videa"
+
+#: ../src/empathy-map-view.c:448
 #, fuzzy
 msgid "Contact Map View"
 msgstr "Zoznam kontaktov"
 
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
 msgid "Save"
 msgstr "Uložiť"
 
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
 msgstr "Okno ladenia"
 
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
 msgstr "Pozastaviť"
 
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
 msgstr "Úroveň"
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
 msgid "Debug"
 msgstr "Ladenie"
 
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
 msgid "Info"
 msgstr "Informácie"
 
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
 msgid "Message"
 msgstr "Správa"
 
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
 msgid "Warning"
 msgstr "Upozornenie"
 
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
 msgid "Critical"
 msgstr "Kritická"
 
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
 msgid "Error"
 msgstr "Chyba"
 
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
 msgid "Time"
 msgstr "ÄŒas"
 
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
 msgid "Domain"
 msgstr "Doména"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
 msgstr "Kategória"
 
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "Úroveň"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr ""
 "Zvolený správca pripojenia nepodporuje rozšírenie pre vzdialené ladenie."
 
-#: ../src/empathy-invite-participant-dialog.c:34
-#: ../src/empathy-invite-participant-dialog.c:48
+#: ../src/empathy-invite-participant-dialog.c:179
+#: ../src/empathy-invite-participant-dialog.c:205
 msgid "Invite Participant"
 msgstr "Pozvať ú�astníka"
 
-#: ../src/empathy-invite-participant-dialog.c:35
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Vyberte kontakt, ktorý chcete pozvať do konverzácie:"
 
-#: ../src/empathy-invite-participant-dialog.c:45
-#, fuzzy
-#| msgid "Invisible"
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
-msgstr "Neviditeľný"
+msgstr "Pozvať"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:184
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "Nezobrazovať žiadne dialógové okná; urobiť nejakú �innosť (napr. "
 "importovanie) a skon�iť"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:188
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:192
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 
 # * https://bugzilla.gnome.org/show_bug.cgi?id=645689
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:194
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:197
+#, fuzzy
+#| msgid "Show Balance in contact list"
+msgid "Show account assistant"
+msgstr "Zobraziť množstvo kreditu v zozname kontaktov"
+
+#: ../src/empathy-accounts.c:203
 msgid "- Empathy Accounts"
 msgstr "- ú�ty Empathy"
 
-#: ../src/empathy-accounts.c:237
-#, fuzzy
-#| msgid "- Empathy Accounts"
+#: ../src/empathy-accounts.c:242
 msgid "Empathy Accounts"
-msgstr "- Empathy ú�ty"
+msgstr "Empathy - ú�ty"
 
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr ""
+
+#: ../src/empathy-debugger.c:75
 #, fuzzy
-#| msgid "Empathy"
+#| msgid "Empathy Debugger"
+msgid "- Empathy Debugger"
+msgstr "Odla�ova� Empathy"
+
+#: ../src/empathy-debugger.c:114
 msgid "Empathy Debugger"
-msgstr "Empathy"
+msgstr "Odla�ova� Empathy"
 
 #: ../src/empathy-chat.c:107
-#, fuzzy
-#| msgid "- Empathy IM Client"
 msgid "- Empathy Chat Client"
 msgstr "- Komunikátor Empathy"
 
-#: ../src/empathy-notifications-approver.c:184
+#: ../src/empathy-notifications-approver.c:203
 msgid "Respond"
 msgstr "Odpovedať"
 
-#: ../src/empathy-notifications-approver.c:190
-#| msgid "_Reject"
+#: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1573
 msgid "Reject"
 msgstr "Odmietnuť"
 
-#: ../src/empathy-notifications-approver.c:194
-#| msgid "_Answer"
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1574
 msgid "Answer"
-msgstr "Zodvihnúť"
+msgstr "Prijať"
+
+#: ../src/empathy-notifications-approver.c:227
+msgid "Answer with video"
+msgstr "Prijať (s videom)"
 
-#: ../src/empathy-notifications-approver.c:201
-#: ../src/empathy-notifications-approver.c:211
-#| msgid "_Decline"
+#: ../src/empathy-notifications-approver.c:235
+#: ../src/empathy-notifications-approver.c:245
 msgid "Decline"
 msgstr "Odmietnuť"
 
-#: ../src/empathy-notifications-approver.c:205
-#: ../src/empathy-notifications-approver.c:216
+#: ../src/empathy-notifications-approver.c:239
+#: ../src/empathy-notifications-approver.c:250
 msgid "Accept"
 msgstr "Prijať"
 
-#: ../src/empathy-call-observer.c:130
-#, fuzzy, c-format
-#| msgid "Incoming call from %s"
-msgid "Missed call from %s"
-msgstr "Prichádzajúci hovor od %s"
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:260
+msgid "Provide"
+msgstr "Poskytnúť"
 
-#: ../src/empathy-call-observer.c:133
+#: ../src/empathy-call-observer.c:134
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
-msgstr ""
-
-#~ msgid "Send and receive messages"
-#~ msgstr "Posiela a prijíma okamžité správy"
-
-#~ msgid "Empathy has asked about importing accounts"
-#~ msgstr "Empathy požiadal o import ú�tov"
-
-#~ msgid "MC 4 accounts have been imported"
-#~ msgstr "Ú�ty MC 4 boli importované"
-
-#~ msgid "MC 4 accounts have been imported."
-#~ msgstr "Ú�ty MC 4 boli importované."
+msgstr "Kontakt %s sa vám pokúšal dovolať, ale mali ste iný hovor."
 
-#~ msgid "Salut account is created"
-#~ msgstr "Ú�et Salut je vytvorený"
-
-#~ msgid "Whether the Salut account has been created on the first Empathy run."
-#~ msgstr "Či sa má vytvoriť ú�et Salut pri prvom spustení Empathy."
-
-#~ msgid "The hash of the received file and the sent one do not match"
-#~ msgstr "Kontrolný sú�et prijatého a odoslaného súboru nesúhlasia"
-
-#~ msgid "_Character set:"
-#~ msgstr "_Znaková sada:"
-
-#~ msgid "_E-mail address:"
-#~ msgstr "_Emailová adresa:"
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1183 ../src/empathy-call-window.c:1206
+msgid "i"
+msgstr ""
 
-#~ msgid "_Nickname:"
-#~ msgstr "_Prezývka:"
+#: ../src/empathy-call-window.c:2889
+msgid "On hold"
+msgstr ""
 
-# proxy nie je slovenské slovo
-# proxy - je prostredník/sprostredkovateľ
-# prediskutuj v ML
-# viackrát
-# PK: proxy neprekladam ani v evolution, urcite nebudem ani tu, lebo normalny clovek by nevedel co to potom je
-#~ msgid "Port of the proxy for outbound requests."
-#~ msgstr "Port proxy pre odchádzajúce požiadavky."
+#: ../src/empathy-call-window.c:2892
+msgid "Mute"
+msgstr ""
 
-#~ msgid ""
-#~ "The username for SIP authentication, if different from the SIP URI\n"
-#~ "username."
-#~ msgstr ""
-#~ "Používateľské meno na overenie totožnosti SIP, ak sa odlišuje\n"
-#~ "používateľského mena SIP URI."
+#: ../src/empathy-call-window.c:2894
+#, fuzzy
+#| msgid "Location"
+msgid "Duration"
+msgstr "Poloha"
 
-#~ msgid "Use _Yahoo! Japan"
-#~ msgstr "Použiť _Yahoo! Japan"
+# PÅ : som za "%d min %d s"
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2897
+#, c-format
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02dm"
 
-#~ msgid "Failed to reconnect this chat"
-#~ msgstr "Zlyhalo znovu pripojenie tohto rozhovoru"
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr ""
 
-#~ msgid "Failed to join chat room"
-#~ msgstr "Zlyhalo vstúpenie do diskusnej miestnosti"
+#, fuzzy
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Či sa má Empathy pýtať na importovanie ú�tov z iných programov."
 
-#~ msgid "<b>Location</b>, "
-#~ msgstr "<b>Poloha</b>, "
+#~ msgid "Find Next"
+#~ msgstr "Nájsť �alšie"
 
-#~ msgid "Add _New Preset"
-#~ msgstr "Pridať _novú predvoľbu"
+#~ msgid "Find Previous"
+#~ msgstr "Nájsť predchádzajúce"
 
-#~ msgid "Saved Presets"
-#~ msgstr "Uložené predvoľby"
+#~ msgid "Enter Custom Message"
+#~ msgstr "Zadajte vlastnú správu"
 
-#~ msgid "Select a destination"
-#~ msgstr "Vyberte umiestnenie"
+#~ msgid "Save _New Status Message"
+#~ msgstr "Uložiť _novú stavovú správu"
 
-#~ msgid "Accounts"
-#~ msgstr "Ú�ty"
+#~ msgid "Saved Status Messages"
+#~ msgstr "Uložené stavové správy"
 
-#~ msgid "_Add&#x2026;"
-#~ msgstr "_Pridať&#x2026;"
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Neznámy"
 
-#~ msgid "_Import&#x2026;"
-#~ msgstr "_Importovať&#x2026;"
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Neznámy"
 
-#~ msgid "Subscription requested by %s"
-#~ msgstr "Žiadosť o zápis od %s"
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Neznámy"
 
-#~ msgid "%s is now offline."
-#~ msgstr "%s sa práve odhlásil."
+#
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Neznámy"
 
-#~ msgid "%s is now online."
-#~ msgstr "%s sa práve prihlásil."
+#~ msgid "_Dialpad"
+#~ msgstr "Čí_selník"
 
-#~ msgid "%s account"
-#~ msgstr "ú�at %s"
+#~ msgid "Show and edit accounts"
+#~ msgstr "Zobraziť a upraviť ú�ty"
 
-#~ msgid " Accounts"
-#~ msgstr "Ú�ty"
+#~ msgid "Call with %d participants"
+#~ msgstr "Hovor s %d posluchá�mi"
diff --git a/po/sl.po b/po/sl.po
index 1444e830e..26ccee27c 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-07-19 09:45+0000\n"
-"PO-Revision-Date: 2011-08-18 17:28+0100\n"
-"Last-Translator: Andrej Žnidarši� <andrej.znidarsic@gmail.com>\n"
+"POT-Creation-Date: 2011-09-26 10:06+0000\n"
+"PO-Revision-Date: 2011-09-26 12:13+0100\n"
+"Last-Translator: Matej Urban�i� <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenš�ina <gnome-si@googlegroups.com>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0)\n"
 "X-Poedit-Language: Slovenian\n"
 "X-Poedit-Country: SLOVENIA\n"
@@ -44,374 +44,414 @@ msgid "Always open a separate chat window for new chats."
 msgstr "Za nov klepet vedno odpri lo�eno klepetalno okno."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr "Glasnost klica"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr "Glasnost klica kot odstotek."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Camera device"
+msgstr "Naprava kamere"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "Položaj kamere"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid "Character to add after nickname when using nick completion (tab) in group chat."
 msgstr "Znak, ki naj bo dodan vzdevku ob uporabi možnosti dopolnjevanja vzdevkov (zavihek) v skupinskem klepetu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "Tema klepetalnega okna"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Chat window theme variant"
 msgstr "Razli�ica teme klepetalnega okna"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr "Z vejico lo�en seznam uporabljenih �rkovalnikov (primer: \"sl, en, fr\")."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "Skr�i seznam stikov"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "Uporabljen naj bo upravljalnik omrežja"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "Kriterij razvrš�anja seznama stikov"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "Pot predmeta vodila D-Bus zadnjega izbranega ra�una pri pridruženju klepetalnici."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Privzeta naprava kamere za uporabo pri video klicih, na primer /dev/video0."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Default directory to select an avatar image from"
 msgstr "Privzeta mapa slik za izbor podobe"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable popup notifications when away"
 msgstr "Onemogo�i pojavna obvestila ob odsotnosti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Disable sounds when away"
 msgstr "Onemogo�i zvok ob odsotnosti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Display incoming events in the status area"
 msgstr "Prikaz prihajajo�ih dogodkov v vrstici stanja."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Display incoming events in the status area. If false, present them to the user immediately."
 msgstr "Prikaz prihajajo�ih dogodkov v vrstici stanja. V primeru, da možnost ni izbrana, bodo prikazane takoj."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+msgid "Echo cancellation support"
+msgstr "Podpora odpravljanju odmevov"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can publish the user's location"
 msgstr "Program Empathy lahko objavi mesto nahajanja uporabnika"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Program Empathy lahko uporabi GPS za ugotavljanje mesta nahajanja"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Program Empathy lahko uporabi mobilni telefon za ugotavljanje mesta nahajanja"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy can use the network to guess the location"
 msgstr "Program Empathy lahko uporabi omrežje za ugotavljanje mesta nahajanja"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy default download folder"
 msgstr "Privzeta mapa za prenos datotek"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy has migrated butterfly logs"
 msgstr "Empathy je prenesel dnevniške zapise butterfly."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-away when idle"
 msgstr "Ob nedejavnosti samodejno preklopi na stanje odsotnosti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should auto-connect on startup"
 msgstr "Program Empathy naj se samodejno poveže ob zagonu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Program Empathy naj zmanjša natan�nost dolo�evanja nahajanja"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Program naj uporabi podobo stika kot ikono klepetalnega okna"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable WebKit Developer Tools"
 msgstr "Omogo�i razvojna orodja WebKit"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable popup notifications for new messages"
 msgstr "Omogo�i pojavna obvestila ob novih sporo�ilih"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Enable spell checker"
 msgstr "Omogo�i �rkovalnik"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide main window"
 msgstr "Skrij glavno okno"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Hide the main window."
 msgstr "Skrivanje glavnega okna."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+msgid "Last account selected in Join Room dialog"
+msgstr "Zadnji izbran ra�un v pogovornem oknu pridruženja klepetalnici"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Nick completed character"
 msgstr "Znak na koncu vzdevka"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Open new chats in separate windows"
 msgstr "Nov klepet naj se odpre v lo�enem oknu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Path of the Adium theme to use"
 msgstr "Pot do želene teme Adium "
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "Pot do želene teme Adium, kadar je ta dolo�ena za klepet."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for incoming messages"
 msgstr "Predvajaj zvok ob prejetju novih sporo�il"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound for new conversations"
 msgstr "Predvajaj zvok ob novih pogovorih"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound for outgoing messages"
 msgstr "Predvajaj zvok ob pošiljanju sporo�il"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when a contact logs in"
 msgstr "Predvajaj zvok ob prijavi stika"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when a contact logs out"
 msgstr "Predvajaj zvok ob odjavi stika"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Play a sound when we log in"
 msgstr "Predvajaj zvok ob prijavi"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Play a sound when we log out"
 msgstr "Predvajaj zvok ob odjavi"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Pokaži pojavna obvestila, ko klepetalno okno ni v žariš�u."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "Pop up notifications when a contact logs in"
 msgstr "Pokaži pojavna obvestila ob prijavi stikov"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Pop up notifications when a contact logs out"
 msgstr "Pokaži pojavna obvestila ob odjavi stikov"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+msgid "Position the camera preview should be during a call."
+msgstr "Položaj predogleda kamere med klicem."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show Balance in contact list"
 msgstr "Pokaži stanje na ra�unu v seznamu stikov"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show avatars"
 msgstr "Pokaži podobe"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show contact list in rooms"
 msgstr "Pokaži seznam stikov v klepetalnicah"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show hint about closing the main window"
 msgstr "Pokaži namig ob zapiranju glavnega okna"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Show offline contacts"
 msgstr "Pokaži tudi nepovezane stike"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Show protocols"
 msgstr "Pokaži protokole"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "Spell checking languages"
 msgstr "Jeziki za �rkovanje"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The default folder to save file transfers in."
 msgstr "Privzeta mapa za shranjevanje prejetih datotek."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Zadnja mapa iz katere je bila izbrana podoba."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The position for the chat window side pane"
 msgstr "Položaj stranskega pladnja v klepetalnem oknu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "Shranjen položaj (v to�kah) stranskega pladnja v klepetalnem oknu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Tema uporabljena za prikaz pogovorov v klepetalnih oknih."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "The theme variant that is used to display the conversation in chat windows."
 msgstr "Razli�ica teme, ki je uporabljena za prikaz pogovorov v klepetalnih oknih."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use graphical smileys"
 msgstr "Uporabi slikovne smeške"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Use notification sounds"
 msgstr "Uporabi zvoke obvestil"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Use theme for chat rooms"
 msgstr "Uporabi temo za klepetalnice"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Ali naj program Empathy objavlja mesta nahajanja uporabnika njegovim stikom."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Ali naj program Empathy za pridobivanje mesta nahajanja uporablja GPS."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Ali naj Empathy za pridobivanje mesta nahajanja uporablja podatke mobilnega omrežja."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Ali naj Empathy za pridobivanje mesta nahajanja uporablja omrežje."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "Ali je program Empathy preselil dnevniške zapise butterfly."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Ali naj se ob zagonu program Empathy samodejno prijavi v vaše ra�une."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr "Ali naj ob nedejavnosti program Empathy samodejno vzpostavi stanje odsotnosti."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "Ali naj program Empathy zaradi zasebnosti zmanjšuje natan�nost položaja."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "Ali naj program Empathy uporablja podobe stikov za ikone klepetalnih oken."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "Ali naj bodo vklju�ena razvijalna orodja WebKit kot je na primer Web Inspector."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
 msgstr "Ali naj upravljalnik omrežja samodejno vzpostavi in prekine povezavo."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Whether to check words typed against the languages you want to check with."
 msgstr "Ali naj se preverja �rkovanje besed v želenih jezikih."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "Ali naj se pri pogovorih smeški pretvorijo v sli�ice."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Ali naj se omogo�i filter odpravljanja odmevov Pulseaudio."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "Ali naj se predvaja zvok ob prijavi stika v omrežje."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "Ali naj se predvaja zvok ob odjavi stika iz omrežja."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of events."
 msgstr "Ali naj se predvaja zvok ob dogodkih."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Ali naj se predvaja zvok ob prejetju novega sporo�ila."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Ali naj se predvaja zvok ob novih pogovorih."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Ali naj se predvaja zvok ob pošiljanju sporo�il."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play a sound when logging into a network."
 msgstr "Ali naj se predvaja zvok ob prijavi v omrežje."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Ali naj se predvaja zvok ob odjavi iz omrežja."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to play sound notifications when away or busy."
 msgstr "Ali naj se predvaja zvok ob odsotnosti in zaposlenosti."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "Ali naj se pojavi obvestilo, ko stik izklopi povezavo."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "Ali naj se pojavi obvestilo ob vzpostavitvi povezave stika."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
 msgstr "Ali naj se pojavi obvestilo ob prejetju novega sporo�ila tudi, kadar je klepetalno okno že odprto, vendar ni v žariš�u."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "Ali naj se pojavi obvestilo ob prejetju novega sporo�ila."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show account balances in the contact list."
 msgstr "Ali naj se v seznamu stikov pokaže tudi stanje na ra�unu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "Ali naj bodo podobe stikov prikazane v seznamih in klepetalnih oknih."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "Ali naj bodo na seznamu stikov prikazani tudi nepovezani stiki."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show popup notifications when away or busy."
 msgstr "Ali naj bodo pojavna obvestila prikazana ob odsotnosti ali zaposlenosti."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "Ali naj bodo v seznamih stikov in klepetalnih oknih prikazani protokoli stikov."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Ali naj bo v klepetalnicah prikazan seznam stikov."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to show the contact list in compact mode."
 msgstr "Ali naj bo v skr�enem pogledu prikazan seznam stikov."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
 msgstr "Ali naj bo pogovorno okno sporo�ila o zapiranju glavnega okna prikazano z gumbom 'x' v nazivni vrstici."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
 msgid "Whether to use the theme for chat rooms."
 msgstr "Ali naj se za klepetalnice uporablja tema."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
 msgid "Which criterion to use when sorting the contact list. Default is to sort by the contact's name with the value \"name\". A value of \"state\" will sort the contact list by state."
 msgstr "Kateri kriterij naj se uporabi za razvrš�anje seznama stikov. Privzeto je razvrš�anje po imenu stika z vrednostjo \"ime\". Vrednost \"stanje\" pa razvrsti seznam glede na stanje stikov."
 
@@ -429,31 +469,31 @@ msgstr "Sporo�anje in ra�uni VoIP"
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Prenos datoteke je kon�an, vendar je datoteka pokvarjena"
 
-#: ../libempathy/empathy-ft-handler.c:1113
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
 msgstr "Prenos datotek s strani oddaljenega stika ni podprt"
 
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is not a regular file"
 msgstr "Izbrana datoteka ni obi�ajna datoteka"
 
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1176
 msgid "The selected file is empty"
 msgstr "Izbrana datoteka je prazna"
 
-#: ../libempathy/empathy-message.c:413
-#: ../src/empathy-call-observer.c:132
+#: ../libempathy/empathy-message.c:415
+#: ../src/empathy-call-observer.c:131
 #, c-format
 msgid "Missed call from %s"
 msgstr "Zgrešen klic od %s"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:417
+#: ../libempathy/empathy-message.c:419
 #, c-format
 msgid "Called %s"
 msgstr "Klicanje uporabnika %s"
 
-#: ../libempathy/empathy-message.c:420
+#: ../libempathy/empathy-message.c:422
 #, c-format
 msgid "Call from %s"
 msgstr "Klic uporabnika %s"
@@ -487,166 +527,166 @@ msgid "The other participant is unable to transfer the file"
 msgstr "Drug uporabnik ne more prenesti datoteke"
 
 #: ../libempathy/empathy-tp-file.c:405
-#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:312
 msgid "Unknown reason"
 msgstr "Neznan vzrok"
 
-#: ../libempathy/empathy-utils.c:212
+#: ../libempathy/empathy-utils.c:232
 msgid "Available"
 msgstr "Na voljo"
 
-#: ../libempathy/empathy-utils.c:214
+#: ../libempathy/empathy-utils.c:234
 msgid "Busy"
 msgstr "Zaposleno"
 
-#: ../libempathy/empathy-utils.c:217
+#: ../libempathy/empathy-utils.c:237
 msgid "Away"
 msgstr "Odsotno"
 
-#: ../libempathy/empathy-utils.c:219
+#: ../libempathy/empathy-utils.c:239
 msgid "Invisible"
 msgstr "Nevidno"
 
-#: ../libempathy/empathy-utils.c:221
+#: ../libempathy/empathy-utils.c:241
 msgid "Offline"
 msgstr "Nepovezano"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:224
+#: ../libempathy/empathy-utils.c:244
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Neznano"
 
-#: ../libempathy/empathy-utils.c:264
+#: ../libempathy/empathy-utils.c:284
 msgid "No reason specified"
 msgstr "Ni dolo�enega razloga"
 
-#: ../libempathy/empathy-utils.c:266
-#: ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:286
+#: ../libempathy/empathy-utils.c:342
 msgid "Status is set to offline"
 msgstr "Stanje je nastavljeno na brez povezave"
 
-#: ../libempathy/empathy-utils.c:268
-#: ../libempathy/empathy-utils.c:302
-#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:322
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "Napaka omrežja"
 
-#: ../libempathy/empathy-utils.c:270
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:290
+#: ../libempathy/empathy-utils.c:324
 msgid "Authentication failed"
 msgstr "Overitev ni uspela"
 
-#: ../libempathy/empathy-utils.c:272
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:326
 msgid "Encryption error"
 msgstr "Napaka Å¡ifriranja"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:294
 msgid "Name in use"
 msgstr "Ime je v uporabi"
 
-#: ../libempathy/empathy-utils.c:276
-#: ../libempathy/empathy-utils.c:308
+#: ../libempathy/empathy-utils.c:296
+#: ../libempathy/empathy-utils.c:328
 msgid "Certificate not provided"
 msgstr "Potrdilo ni na voljo"
 
-#: ../libempathy/empathy-utils.c:278
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:298
+#: ../libempathy/empathy-utils.c:330
 msgid "Certificate untrusted"
 msgstr "Potrdilo ni overjeno"
 
-#: ../libempathy/empathy-utils.c:280
-#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:332
 msgid "Certificate expired"
 msgstr "Potrdilo je preteklo"
 
-#: ../libempathy/empathy-utils.c:282
-#: ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:334
 msgid "Certificate not activated"
 msgstr "Potrdilo ni potrjeno"
 
-#: ../libempathy/empathy-utils.c:284
-#: ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:336
 msgid "Certificate hostname mismatch"
 msgstr "Neustrezno potrdilo gostitelja"
 
-#: ../libempathy/empathy-utils.c:286
-#: ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:338
 msgid "Certificate fingerprint mismatch"
 msgstr "Neustrezen prstni odtis potrdila"
 
-#: ../libempathy/empathy-utils.c:288
-#: ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:308
+#: ../libempathy/empathy-utils.c:340
 msgid "Certificate self-signed"
 msgstr "Potrdilo je samo-podpisano"
 
-#: ../libempathy/empathy-utils.c:290
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate error"
 msgstr "Napaka potrdila"
 
-#: ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:344
 msgid "Encryption is not available"
 msgstr "Å ifriranje ni na voljo."
 
-#: ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:346
 msgid "Certificate is invalid"
 msgstr "Potrdilo je neveljavno."
 
-#: ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:348
 msgid "Connection has been refused"
 msgstr "Omrežna povezava je zavrnjena."
 
-#: ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:350
 msgid "Connection can't be established"
 msgstr "Povezave ni mogo�e vzpostaviti."
 
-#: ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:352
 msgid "Connection has been lost"
 msgstr "Povezava je prekinjena."
 
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:354
 msgid "This resource is already connected to the server"
 msgstr "Vir je s strežnikom že povezan"
 
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:356
 msgid "Connection has been replaced by a new connection using the same resource"
 msgstr "Povezava je zamenjana z novo povezavo, ki uporablja isti vir."
 
-#: ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:359
 msgid "The account already exists on the server"
 msgstr "Ra�un na strežniku že obstaja"
 
-#: ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:361
 msgid "Server is currently too busy to handle the connection"
 msgstr "Strežnik je trenutno preve� zaposlen za upravljanje s povezavo."
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:363
 msgid "Certificate has been revoked"
 msgstr "Potrdilo je preklicano"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:365
 msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "Potrdilo ne uporablja varnega algoritma ali pa uporablja Å¡ibko Å¡ifriranje."
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:368
 msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
 msgstr "Dolžina potrdila strežnika ali pa globina verige potrdila presega omejitev, ki je dolo�ena s šifrirno knjižnico."
 
-#: ../libempathy/empathy-utils.c:509
+#: ../libempathy/empathy-utils.c:529
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "Uporabniki v bližini"
 
-#: ../libempathy/empathy-utils.c:514
+#: ../libempathy/empathy-utils.c:534
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:543
+#: ../libempathy/empathy-utils.c:563
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:544
+#: ../libempathy/empathy-utils.c:564
 msgid "Facebook Chat"
 msgstr "Facebook klepetanje"
 
@@ -708,70 +748,81 @@ msgstr[3] "Pred %d meseci"
 msgid "in the future"
 msgstr "v prihodnosti"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:539
+#: ../libempathy-gtk/empathy-account-chooser.c:540
 msgid "All accounts"
 msgstr "Vsi ra�uni"
 
-#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "Ra�un"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "Geslo"
 
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Strežnik"
 
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Vrata"
 
-#: ../libempathy-gtk/empathy-account-widget.c:756
-#: ../libempathy-gtk/empathy-account-widget.c:813
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1154
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "Moji spletni ra�uni"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "Ra�un %s se ureja preko upravljalnika spletnih ra�unov."
+msgid "The account %s is edited via %s."
+msgstr "Ra�un %s se ureja preko %s."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1160
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "Ra�una %s s programom Empathy ni mogo�e urejati."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1180
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
 msgstr "Zaženi spletne ra�une"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1518
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "Uredi %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Uporabniško ime:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1836
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "_Uveljavi"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1866
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
 msgstr "_Prijava"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "Ta ra�un na strežniku že obstaja"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1943
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "Ustvari nov ra�un na strežniku"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2135
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "_Prekli�i"
 
@@ -780,19 +831,19 @@ msgstr "_Prekli�i"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2413
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s na %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2439
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "%s ra�un"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2443
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "Nov ra�un"
 
@@ -804,6 +855,7 @@ msgstr "<b>Primer:</b> Ime Zaslona"
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -913,76 +965,80 @@ msgstr "Kakšen je vaš UIN ICQ?"
 msgid "What is your ICQ password?"
 msgstr "Kakšno je vaše geslo ICQ?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:184
-#: ../libempathy-gtk/empathy-account-widget-sip.c:217
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "Samodejno"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:187
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:193
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:222
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "Vpiši se"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:227
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "Možnosti"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "Brez"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Character set:"
 msgstr "Znakovni nabor:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid "Most IRC servers don't need a password, so if you're not sure, don't enter a password."
+msgstr "Ve�ina strežnikov IRC ne zahteva gesla, zato ga, �e niste prepri�ani, ne uporabite."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Network"
 msgstr "Omrežje"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Network:"
 msgstr "Omrežje:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Vzdevek:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "Geslo:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "Sporo�ilo kon�anja:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "Pravo ime:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Servers"
 msgstr "Strežniki"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "What is your IRC nickname?"
 msgstr "Kakšen je vaš IRC vzdevek?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Katero IRC omrežje?"
 
@@ -1163,14 +1219,18 @@ msgid "Transport:"
 msgstr "Prenos:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Uporabi ra�un za klicanje v daljnovodno omrežje in na mobilne telefone"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "Kakšno je vaše geslo SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Kakšen je prijavni ID vaše SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "_Uporabniško ime:"
 
@@ -1194,36 +1254,36 @@ msgstr "Yahoo! I_D:"
 msgid "_Room List locale:"
 msgstr "_Jezikovne nastavitve seznama klepetalnic:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:474
-#: ../libempathy-gtk/empathy-avatar-chooser.c:559
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "Ni bilo mogo�e pretvoriti slike"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:475
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "Vaš sistem ne podpira nobene izmed sprejetih vrst slik"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:822
-msgid "Couldn't save pixbuf to png"
-msgstr "Ni mogo�e shraniti medpomnilnika sli�ice v zapis png"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+msgid "Couldn't save picture to file"
+msgstr "Ni mogo�e shraniti slike v datoteko"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "Izberite sliko za svojo podobo"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:942
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
 msgstr "Zajem slike ..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:945
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "Brez slike"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "Slike"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1009
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "Vse datoteke"
 
@@ -1231,200 +1291,200 @@ msgstr "Vse datoteke"
 msgid "Click to enlarge"
 msgstr "Kliknite za pove�avo"
 
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:58
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Prišlo je do napake med za�enjanjem klica"
 
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact doesn't support calls"
 msgstr "Dolo�en stik ne podpira klicev."
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is offline"
 msgstr "Izbrani stik ni povezan v omrežje"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "The specified contact is not valid"
 msgstr "Izbrani stik ni veljaven"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:57
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Klic v sili ni podprt s tem protokolom"
 
-#: ../libempathy-gtk/empathy-chat.c:697
+#: ../libempathy-gtk/empathy-chat.c:704
 msgid "Failed to open private chat"
 msgstr "Napaka med odpiranjem zasebnega klepeta"
 
-#: ../libempathy-gtk/empathy-chat.c:758
+#: ../libempathy-gtk/empathy-chat.c:765
 msgid "Topic not supported on this conversation"
 msgstr "Tema ni podprta pri tem pogovoru"
 
-#: ../libempathy-gtk/empathy-chat.c:764
+#: ../libempathy-gtk/empathy-chat.c:771
 msgid "You are not allowed to change the topic"
 msgstr "Za spreminjanje teme nimate ustreznih dovoljenj."
 
-#: ../libempathy-gtk/empathy-chat.c:968
+#: ../libempathy-gtk/empathy-chat.c:975
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "“%s� ni veljaven ID stika"
 
-#: ../libempathy-gtk/empathy-chat.c:1025
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: po�isti vsa sporo�ila trenutnega pogovora"
 
-#: ../libempathy-gtk/empathy-chat.c:1028
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <tema>: dolo�i temo trenutnega pogovora"
 
-#: ../libempathy-gtk/empathy-chat.c:1031
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ID klepetalnice>: pridruževanje novi klepetalnici"
 
-#: ../libempathy-gtk/empathy-chat.c:1034
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ID klepetalnice>: pridruži se novi klepetalnici"
 
-#: ../libempathy-gtk/empathy-chat.c:1038
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one"
 msgstr "/part [<ID klepetalnice>] [<razlog>]: zapusti klepetalnico, privzeto je to trenutna klepetalnica"
 
-#: ../libempathy-gtk/empathy-chat.c:1042
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ID stika> [<sporo�ilo>]: odpre zasebni klepet"
 
-#: ../libempathy-gtk/empathy-chat.c:1045
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ID stika> <sporo�ilo>: odpre zasebni klepet"
 
-#: ../libempathy-gtk/empathy-chat.c:1048
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <vzdevek>: spremeni vaš vzdevek na trenutnem strežniku"
 
-#: ../libempathy-gtk/empathy-chat.c:1051
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <sporo�ilo>: pošlje sporo�ilo DEJANJA v trenutni pogovor"
 
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/say <message>: send <message> to the current conversation. This is used to send a message starting with a '/'. For example: \"/say /join is used to join a new chat room\""
 msgstr "/say <sporo�ilo>: pošlje <sporo�ilo> v trenutni pogovor. Možnost se uporablja za pošiljanje sporo�ila, ki se za�ne z '/'. Primer: \"/say /join se uporablja za pridruževanje novi klepetalnici\""
 
-#: ../libempathy-gtk/empathy-chat.c:1059
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ID stika>: pokaže podrobnosti stika"
 
-#: ../libempathy-gtk/empathy-chat.c:1062
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
 msgstr "/help [<ukaz>], pokaže vse podprte ukaze in njihov na�in uporabe."
 
-#: ../libempathy-gtk/empathy-chat.c:1072
+#: ../libempathy-gtk/empathy-chat.c:1114
 #, c-format
 msgid "Usage: %s"
 msgstr "Uporaba: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1111
+#: ../libempathy-gtk/empathy-chat.c:1159
 msgid "Unknown command"
 msgstr "Neznan ukaz"
 
-#: ../libempathy-gtk/empathy-chat.c:1237
+#: ../libempathy-gtk/empathy-chat.c:1285
 msgid "Unknown command; see /help for the available commands"
 msgstr "Neznan ukaz, za ve� si vpišite /help"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1407
+#: ../libempathy-gtk/empathy-chat.c:1455
 msgid "insufficient balance to send message"
 msgstr "nezadostno stanje na ra�unu za pošiljanje sporo�il"
 
-#: ../libempathy-gtk/empathy-chat.c:1409
+#: ../libempathy-gtk/empathy-chat.c:1457
 msgid "not capable"
 msgstr "ni mogo�e"
 
-#: ../libempathy-gtk/empathy-chat.c:1416
+#: ../libempathy-gtk/empathy-chat.c:1464
 msgid "offline"
 msgstr "brez povezave"
 
-#: ../libempathy-gtk/empathy-chat.c:1419
+#: ../libempathy-gtk/empathy-chat.c:1467
 msgid "invalid contact"
 msgstr "neveljaven stik"
 
-#: ../libempathy-gtk/empathy-chat.c:1422
+#: ../libempathy-gtk/empathy-chat.c:1470
 msgid "permission denied"
 msgstr "ni dovoljenja"
 
-#: ../libempathy-gtk/empathy-chat.c:1425
+#: ../libempathy-gtk/empathy-chat.c:1473
 msgid "too long message"
 msgstr "predolgo sporo�ilo"
 
-#: ../libempathy-gtk/empathy-chat.c:1428
+#: ../libempathy-gtk/empathy-chat.c:1476
 msgid "not implemented"
 msgstr "ni del programa"
 
-#: ../libempathy-gtk/empathy-chat.c:1432
+#: ../libempathy-gtk/empathy-chat.c:1480
 msgid "unknown"
 msgstr "neznano"
 
-#: ../libempathy-gtk/empathy-chat.c:1438
+#: ../libempathy-gtk/empathy-chat.c:1486
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Napaka med pošiljanjem sporo�ila '%s': %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1442
+#: ../libempathy-gtk/empathy-chat.c:1490
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Napaka med pošiljanjem sporo�ila: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1503
-#: ../src/empathy-chat-window.c:760
+#: ../libempathy-gtk/empathy-chat.c:1551
+#: ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Tema:"
 
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1563
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Tema je dolo�ena na: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1517
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "No topic defined"
 msgstr "Ni dolo�ene teme"
 
-#: ../libempathy-gtk/empathy-chat.c:2024
+#: ../libempathy-gtk/empathy-chat.c:2074
 msgid "(No Suggestions)"
 msgstr "(Ni predlogov)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2092
+#: ../libempathy-gtk/empathy-chat.c:2142
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Dodaj '%s' v slovar"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2129
+#: ../libempathy-gtk/empathy-chat.c:2179
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Dodaj '%s' v slovar %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2186
+#: ../libempathy-gtk/empathy-chat.c:2249
 msgid "Insert Smiley"
 msgstr "Vstavi smeška"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2204
-#: ../libempathy-gtk/empathy-ui-utils.c:1756
+#: ../libempathy-gtk/empathy-chat.c:2267
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "_Pošlji"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2239
+#: ../libempathy-gtk/empathy-chat.c:2321
 msgid "_Spelling Suggestions"
 msgstr "Predlogi �r_kovalnika"
 
-#: ../libempathy-gtk/empathy-chat.c:2328
+#: ../libempathy-gtk/empathy-chat.c:2410
 msgid "Failed to retrieve recent logs"
 msgstr "Napaka med pridobivanjem nedavnih dnevnikov"
 
-#: ../libempathy-gtk/empathy-chat.c:2465
+#: ../libempathy-gtk/empathy-chat.c:2547
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s je prekinil povezavo"
@@ -1432,12 +1492,12 @@ msgstr "%s je prekinil povezavo"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2472
+#: ../libempathy-gtk/empathy-chat.c:2554
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s je izgnal %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2475
+#: ../libempathy-gtk/empathy-chat.c:2557
 #, c-format
 msgid "%s was kicked"
 msgstr "%s je bil izgnan"
@@ -1445,17 +1505,17 @@ msgstr "%s je bil izgnan"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2483
+#: ../libempathy-gtk/empathy-chat.c:2565
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s je izob�il %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2486
+#: ../libempathy-gtk/empathy-chat.c:2568
 #, c-format
 msgid "%s was banned"
 msgstr "%s je izob�en"
 
-#: ../libempathy-gtk/empathy-chat.c:2490
+#: ../libempathy-gtk/empathy-chat.c:2572
 #, c-format
 msgid "%s has left the room"
 msgstr "%s je zapustil klepetalnico"
@@ -1465,71 +1525,75 @@ msgstr "%s je zapustil klepetalnico"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2499
+#: ../libempathy-gtk/empathy-chat.c:2581
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2524
+#: ../libempathy-gtk/empathy-chat.c:2606
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s je vstopil v klepetalnico"
 
-#: ../libempathy-gtk/empathy-chat.c:2549
+#: ../libempathy-gtk/empathy-chat.c:2631
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je preimenovan v %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2688
-#: ../src/empathy-streamed-media-window.c:1939
-#: ../src/empathy-event-manager.c:1241
-#: ../src/empathy-call-window.c:1858
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2784
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1240
+#: ../src/empathy-call-window.c:1432
+#: ../src/empathy-call-window.c:1482
+#: ../src/empathy-call-window.c:2527
 msgid "Disconnected"
 msgstr "Prekinjena povezava"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3332
+#: ../libempathy-gtk/empathy-chat.c:3428
 msgid "Would you like to store this password?"
 msgstr "Ali želite shraniti geslo?"
 
-#: ../libempathy-gtk/empathy-chat.c:3338
+#: ../libempathy-gtk/empathy-chat.c:3434
 msgid "Remember"
 msgstr "Zapomni si"
 
-#: ../libempathy-gtk/empathy-chat.c:3348
+#: ../libempathy-gtk/empathy-chat.c:3444
 msgid "Not now"
 msgstr "Ne zdaj"
 
-#: ../libempathy-gtk/empathy-chat.c:3392
+#: ../libempathy-gtk/empathy-chat.c:3488
 msgid "Retry"
 msgstr "Poskusi znova"
 
-#: ../libempathy-gtk/empathy-chat.c:3396
+#: ../libempathy-gtk/empathy-chat.c:3492
 msgid "Wrong password; please try again:"
 msgstr "Napa�no geslo; poskusite znova:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3526
+#: ../libempathy-gtk/empathy-chat.c:3622
 msgid "This room is protected by a password:"
 msgstr "Klepetalnica je zaš�itena z geslom:"
 
-#: ../libempathy-gtk/empathy-chat.c:3553
+#: ../libempathy-gtk/empathy-chat.c:3649
 msgid "Join"
 msgstr "Pridruži se"
 
-#: ../libempathy-gtk/empathy-chat.c:3755
-#: ../src/empathy-event-manager.c:1262
-#: ../src/empathy-call-window.c:2105
+#: ../libempathy-gtk/empathy-chat.c:3851
+#: ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "Povezano"
 
-#: ../libempathy-gtk/empathy-chat.c:3810
+#: ../libempathy-gtk/empathy-chat.c:3906
 msgid "Conversation"
 msgstr "Pogovor"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3815
+#: ../libempathy-gtk/empathy-chat.c:3911
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1554,15 +1618,15 @@ msgstr "Dovoljenje je zavrnjeno"
 msgid "Could not block contact"
 msgstr "Stika ni mogo�e blokirati"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:772
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
 msgid "Edit Blocked Contacts"
 msgstr "Uredi blokirane stike"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:521
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1495
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
@@ -1573,15 +1637,22 @@ msgstr "Ra�un:"
 msgid "Blocked Contacts"
 msgstr "Blokirani stiki"
 
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Odstrani"
+
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:1417
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "Kopiraj _naslov povezave"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:1424
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Odpri povezavo"
 
@@ -1612,18 +1683,18 @@ msgid "Block %s?"
 msgstr "Ali želite blokirati %s?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Ali ste prepri�ani, da želite blokirati ponovno vzpostavitev stika med '%s' in vami?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:274
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
 msgid "_Block"
 msgstr "_Blokiraj"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:283
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Poro�aj te stike kot žaljive"
@@ -1651,38 +1722,38 @@ msgstr "Brez skupine"
 msgid "Favorite People"
 msgstr "Priljubljene osebe"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1983
-#: ../libempathy-gtk/empathy-individual-view.c:2375
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Ali zares želite odstraniti skupino '%s'?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1985
-#: ../libempathy-gtk/empathy-individual-view.c:2378
+#: ../libempathy-gtk/empathy-contact-list-view.c:1988
+#: ../libempathy-gtk/empathy-individual-view.c:2379
 msgid "Removing group"
 msgstr "Odstranjevanje skupine"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2034
-#: ../libempathy-gtk/empathy-contact-list-view.c:2111
-#: ../libempathy-gtk/empathy-individual-view.c:2433
-#: ../libempathy-gtk/empathy-individual-view.c:2636
+#: ../libempathy-gtk/empathy-contact-list-view.c:2037
+#: ../libempathy-gtk/empathy-contact-list-view.c:2114
+#: ../libempathy-gtk/empathy-individual-view.c:2434
+#: ../libempathy-gtk/empathy-individual-view.c:2637
 msgid "_Remove"
 msgstr "_Odstrani"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2064
-#: ../libempathy-gtk/empathy-individual-view.c:2500
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
+#: ../libempathy-gtk/empathy-individual-view.c:2501
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Ali zares želite odstraniti stik '%s'?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2066
-#: ../libempathy-gtk/empathy-individual-view.c:2521
+#: ../libempathy-gtk/empathy-contact-list-view.c:2069
+#: ../libempathy-gtk/empathy-individual-view.c:2522
 msgid "Removing contact"
 msgstr "Odstranjevanje stika"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "_Dodaj stik ..."
 
@@ -1691,48 +1762,48 @@ msgid "_Block Contact"
 msgstr "_Blokiraj stik"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:548
-#: ../src/empathy-main-window.ui.h:16
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "_Klepet"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:639
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Zvo�ni klic"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:684
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Video klic"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:737
-#: ../src/empathy-main-window.ui.h:27
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "Predhodni po_govori"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:778
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "Pošlji datoteko"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:820
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
 msgstr "Souporaba namizja"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1890
-#: ../libempathy-gtk/empathy-individual-menu.c:855
-#: ../libempathy-gtk/empathy-individual-widget.c:1386
+#: ../libempathy-gtk/empathy-contact-widget.c:1887
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "Priljubljeno"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:883
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "_Podrobnosti"
 
@@ -1742,33 +1813,41 @@ msgid "_Edit"
 msgstr "_Uredi"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1070
-#: ../src/empathy-chat-window.c:1010
+#: ../libempathy-gtk/empathy-individual-menu.c:1284
+#: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "Vabila v klepetalnico"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1116
+#: ../libempathy-gtk/empathy-individual-menu.c:1330
 msgid "_Invite to Chat Room"
 msgstr "_Povabi v klepetalnico"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:514
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
 msgid "Search contacts"
 msgstr "Iskanje stikov"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:544
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
 msgid "Search: "
 msgstr "Poiš�i:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:602
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
 msgid "_Add Contact"
 msgstr "_Dodaj stik"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:620
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
 msgid "No contacts found"
 msgstr "Ni najdenih stikov."
 
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr "Predstavitveno sporo�ilo:"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
+msgstr "Želel bi videti, kdaj ste na zvezi. Hvala!"
+
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "Izberi stik"
@@ -1821,153 +1900,153 @@ msgstr "Sporo�ilo odsotnosti:"
 msgid "Channels:"
 msgstr "Kanali:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
 msgstr "ISO oznaka države:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Country:"
 msgstr "Država:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "State:"
 msgstr "Okraj:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "City:"
 msgstr "Mesto:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Area:"
 msgstr "Podro�je:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
 msgstr "Poštna številka:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Street:"
 msgstr "Ulica:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
 msgstr "Stavba:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Floor:"
 msgstr "Nadstropje:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Room:"
 msgstr "Klepetalnica:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Text:"
 msgstr "Besedilo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:517
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:519
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:521
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
 msgstr "Raven natan�nosti:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:523
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr "Napaka:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
 msgstr "Napaka navpi�no (v metrih):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:527
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
 msgstr "Napaka vodoravno (v metrih):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:529
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr "Hitrost:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:531
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Bearing:"
 msgstr "Smer:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:533
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
 msgstr "Hitrost dviganja:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:535
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
 msgstr "Zadnji� posodobljeno:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:537
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
 msgstr "Zemljepisna dolžina:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:945
-#: ../libempathy-gtk/empathy-individual-widget.c:539
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
 msgstr "Zemljepisna Å¡irina:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:947
-#: ../libempathy-gtk/empathy-individual-widget.c:541
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
 msgstr "Nadmorska višina:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1000
-#: ../libempathy-gtk/empathy-contact-widget.c:1015
-#: ../libempathy-gtk/empathy-individual-widget.c:629
-#: ../libempathy-gtk/empathy-individual-widget.c:644
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "Mesto"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1017
-#: ../libempathy-gtk/empathy-individual-widget.c:646
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1069
-#: ../libempathy-gtk/empathy-individual-widget.c:695
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e.%B %Y ob %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1151
-#: ../libempathy-gtk/empathy-individual-widget.c:931
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
 msgid "Save Avatar"
 msgstr "Shrani podobo"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1207
-#: ../libempathy-gtk/empathy-individual-widget.c:989
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
 msgid "Unable to save avatar"
 msgstr "Ni mogo�e shraniti podobe"
 
@@ -1977,7 +2056,7 @@ msgstr "<b>Mesto</b> na (datum)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1321
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr "Vzdevek:"
 
@@ -1997,7 +2076,7 @@ msgstr "Podrobnosti stika"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1525
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "Dolo�ilo:"
 
@@ -2032,11 +2111,11 @@ msgid "Select"
 msgstr "Izbor"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1835
+#: ../src/empathy-main-window.c:1807
 msgid "Group"
 msgstr "Skupina"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:257
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Naslednje identitete bodo blokirane:"
@@ -2044,7 +2123,7 @@ msgstr[1] "Naslednja identiteta bo blokirana:"
 msgstr[2] "Naslednji identiteti bosta blokirani:"
 msgstr[3] "Naslednje identitete bodo blokirane:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:264
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Naslednjih identitet ni mogo�e blokirati:"
@@ -2072,39 +2151,64 @@ msgstr "Stiki izbrani na seznamu na levi, bodo povezani skupaj."
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:138
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "Izbor ra�una za klicanje"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "Kli�i"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+msgid "Mobile"
+msgstr "Mobilni telefon"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "Delo"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "Doma�a mapa"
+
 #. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:594
-#: ../libempathy-gtk/empathy-new-message-dialog.c:248
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:931
+#: ../libempathy-gtk/empathy-individual-menu.c:1142
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Uredi"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:957
+#: ../libempathy-gtk/empathy-individual-menu.c:1168
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "_Poveži stike ..."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2340
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 msgid "Delete and _Block"
 msgstr "Izbriši in _blokiraj"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2509
+#: ../libempathy-gtk/empathy-individual-view.c:2510
 #, c-format
 msgid "Do you really want to remove the linked contact '%s'? Note that this will remove all the contacts which make up this linked contact."
 msgstr "Ali res želite odstraniti povezan stik '%s'? S tem bo odstranjeni tudi vsi stiki, ki so opredeljeni kot povezani."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1672
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2184,126 +2288,139 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "_Odstrani povezavo"
 
-#: ../libempathy-gtk/empathy-log-window.c:458
+#: ../libempathy-gtk/empathy-log-window.c:634
 msgid "History"
 msgstr "Zgodovina"
 
-#: ../libempathy-gtk/empathy-log-window.c:510
+#: ../libempathy-gtk/empathy-log-window.c:689
 msgid "Show"
 msgstr "Pokaži"
 
-#: ../libempathy-gtk/empathy-log-window.c:532
+#: ../libempathy-gtk/empathy-log-window.c:711
 msgid "Search"
 msgstr "Poiš�i"
 
-#: ../libempathy-gtk/empathy-log-window.c:946
+#: ../libempathy-gtk/empathy-log-window.c:1159
 #, c-format
 msgid "Chat in %s"
 msgstr "Klepet v %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:948
+#: ../libempathy-gtk/empathy-log-window.c:1161
 #, c-format
 msgid "Chat with %s"
 msgstr "Klepet s stikom %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:998
-#: ../libempathy-gtk/empathy-log-window.c:1176
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %d. %B %Y"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1118
+#: ../libempathy-gtk/empathy-log-window.c:1300
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1124
+#: ../libempathy-gtk/empathy-log-window.c:1306
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1195
-#: ../libempathy-gtk/empathy-log-window.c:1197
-#: ../src/empathy-ft-manager.c:1026
-msgid "%"
-msgstr "%"
-
-#: ../libempathy-gtk/empathy-log-window.c:1204
+#: ../libempathy-gtk/empathy-log-window.c:1382
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s sekund"
+msgstr[1] "%s sekunda"
+msgstr[2] "%s sekundi"
+msgstr[3] "%s sekunde"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s minut"
+msgstr[1] "%s minuta"
+msgstr[2] "%s minuti"
+msgstr[3] "%s minute"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Klic za�et %s, kon�an %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1536
+#: ../libempathy-gtk/empathy-log-window.c:1729
 msgid "Today"
 msgstr "Danes"
 
-#: ../libempathy-gtk/empathy-log-window.c:1540
+#: ../libempathy-gtk/empathy-log-window.c:1733
 msgid "Yesterday"
 msgstr "V�eraj"
 
-#: ../libempathy-gtk/empathy-log-window.c:1556
-msgctxt "A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
 msgid "%e %B %Y"
-msgstr "e. %B %Y"
+msgstr "%e. %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1637
-#: ../libempathy-gtk/empathy-log-window.c:3203
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3444
 msgid "Anytime"
 msgstr "Kadarkoli"
 
-#: ../libempathy-gtk/empathy-log-window.c:1717
-#: ../libempathy-gtk/empathy-log-window.c:2154
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2372
 msgid "Anyone"
 msgstr "Kdorkoli"
 
-#: ../libempathy-gtk/empathy-log-window.c:2451
+#: ../libempathy-gtk/empathy-log-window.c:2685
 msgid "Who"
 msgstr "Kdo"
 
-#: ../libempathy-gtk/empathy-log-window.c:2655
+#: ../libempathy-gtk/empathy-log-window.c:2889
 msgid "When"
 msgstr "Kdaj"
 
-#: ../libempathy-gtk/empathy-log-window.c:2771
+#: ../libempathy-gtk/empathy-log-window.c:3005
 msgid "Anything"
 msgstr "Karkoli"
 
-#: ../libempathy-gtk/empathy-log-window.c:2773
+#: ../libempathy-gtk/empathy-log-window.c:3007
 msgid "Text chats"
 msgstr "Besedilni klepet"
 
-#: ../libempathy-gtk/empathy-log-window.c:2775
+#: ../libempathy-gtk/empathy-log-window.c:3009
+#: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "Klici"
 
-#: ../libempathy-gtk/empathy-log-window.c:2780
+#: ../libempathy-gtk/empathy-log-window.c:3014
 msgid "Incoming calls"
 msgstr "Dohodni klici"
 
-#: ../libempathy-gtk/empathy-log-window.c:2781
+#: ../libempathy-gtk/empathy-log-window.c:3015
 msgid "Outgoing calls"
 msgstr "Odhodni klici"
 
-#: ../libempathy-gtk/empathy-log-window.c:2782
+#: ../libempathy-gtk/empathy-log-window.c:3016
 msgid "Missed calls"
 msgstr "Prezrti klici"
 
-#: ../libempathy-gtk/empathy-log-window.c:2804
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "What"
 msgstr "Kaj"
 
-#: ../libempathy-gtk/empathy-log-window.c:3506
+#: ../libempathy-gtk/empathy-log-window.c:3747
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Ali ste prepri�ani, da želite izbrisati vse podatke beležanja predhodnih pogovorov?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3510
+#: ../libempathy-gtk/empathy-log-window.c:3751
 msgid "Clear All"
 msgstr "Po�isti vse"
 
-#: ../libempathy-gtk/empathy-log-window.c:3517
+#: ../libempathy-gtk/empathy-log-window.c:3758
 msgid "Delete from:"
 msgstr "Izbriši iz:"
 
@@ -2311,13 +2428,6 @@ msgstr "Izbriši iz:"
 msgid "<span size=\"x-large\">Loading...</span>"
 msgstr "<span size=\"x-large\">Nalaganje ...</span>"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1344
-msgid "Call"
-msgstr "Kli�i"
-
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
 #: ../src/empathy-chat-window.ui.h:3
 msgid "Chat"
@@ -2332,14 +2442,15 @@ msgid "Profile"
 msgstr "Profil"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:22
 #: ../src/empathy-streamed-media-window.ui.h:20
 msgid "Video"
 msgstr "Video"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
+#: ../src/empathy-call-window.ui.h:28
 #: ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window-menubar.ui.h:20
 msgid "_Edit"
 msgstr "_Uredi"
 
@@ -2356,27 +2467,27 @@ msgid "Contact ID:"
 msgstr "ID stika:"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:258
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
 msgid "C_hat"
 msgstr "Kle_pet"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:277
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
 msgstr "Nov pogovor"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:231
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
 msgid "Send _Video"
 msgstr "Pošlji _video"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
 msgid "C_all"
 msgstr "_Kli�i"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:252
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "New Call"
 msgstr "Nov klic"
 
@@ -2436,24 +2547,24 @@ msgid "New %s account"
 msgstr "Nov ra�un %s"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "Najdi naslednje"
+msgid "Find:"
+msgstr "Najdi:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "Najdi predhodne"
+msgid "Mat_ch case"
+msgstr "Upoštevaj _velikost �rk"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Find:"
-msgstr "Najdi:"
+msgid "Phrase not found"
+msgstr "Rekla ni mogo�e najti"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "Upoštevaj velikost �rk"
+msgid "_Next"
+msgstr "_Naslednji"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "Phrase not found"
-msgstr "Rekla ni mogo�e najti"
+msgid "_Previous"
+msgstr "_Predhodni"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2499,34 +2610,28 @@ msgstr "Klic je kon�an"
 msgid "Edit Custom Messages"
 msgstr "Urejanje sporo�ila po meri"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
-#: ../src/empathy-chatrooms-window.ui.h:3
-msgid "Remove"
-msgstr "Odstrani"
-
-#: ../libempathy-gtk/empathy-theme-adium.c:1121
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
 #, c-format
 msgid "Message edited at %s"
 msgstr "Sporo�ilo je bilo nazadnje spremenjeno ob %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1943
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
 msgid "Normal"
 msgstr "Obi�ajno"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:75
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "Obi�ajna"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:76
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "Enostavna"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:77
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "ÄŒista"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:78
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "Modro"
 
@@ -2600,24 +2705,24 @@ msgstr "Zapomni si izbor za prihodnje povezave"
 msgid "Certificate Details"
 msgstr "Podrobnosti potrdila"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1653
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
 msgstr "Ni mogo�e odpreti naslova URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1748
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
 msgstr "Izbor datoteke"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1820
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
 msgid "Insufficient free space to save file"
 msgstr "Ni dovolj prostora za shranjevanje datoteke"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1828
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
 #, c-format
 msgid "%s of free space are required to save this file, but only %s is available. Please choose another location."
 msgstr "%s prostora mora biti na voljo za shranjevanje te datoteke, vendar je na voljo le %s. Izbrati bo treba drugo mesto."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Prihajajo�a datoteka od %s"
@@ -2805,23 +2910,23 @@ msgstr "Ni sporo�il o napakah"
 msgid "Instant Message (Empathy)"
 msgstr "Hipno sporo�anje (Empathy)"
 
-#: ../src/empathy.c:309
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "Brez samodejne povezave ob zagonu"
 
-#: ../src/empathy.c:313
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Ne prikaži seznama stikov in drugih pogovornih oken ob zagonu"
 
-#: ../src/empathy.c:321
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr "- Empathy sporo�ilnik"
 
-#: ../src/empathy.c:500
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
 msgstr "Napaka delovanja upravljalnika ra�unov"
 
-#: ../src/empathy.c:502
+#: ../src/empathy.c:639
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. The error was:\n"
@@ -2934,8 +3039,8 @@ msgid "Select the accounts you want to import:"
 msgstr "Izbor ra�une za uvoz:"
 
 #: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:625
+#: ../src/empathy-new-chatroom-dialog.c:626
 msgid "Yes"
 msgstr "Da"
 
@@ -2994,8 +3099,8 @@ msgid "Your new account has not been saved yet."
 msgstr "Novi ra�un še ni bil shranjen."
 
 #: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:801
-#: ../src/empathy-call-window.c:880
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1216
 msgid "Connecting…"
 msgstr "Povezovanje ..."
 
@@ -3100,193 +3205,180 @@ msgid "People nearby"
 msgstr "Uporabniki v bližini"
 
 #: ../src/empathy-av.c:118
-#: ../src/empathy-call.c:124
+#: ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathy odjemalec zvoka in slike"
 
 #: ../src/empathy-av.c:134
-#: ../src/empathy-call.c:145
+#: ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy odjemalec zvoka in slike"
 
-#: ../src/empathy-streamed-media-window.c:478
-#: ../src/empathy-call-window.c:458
+#: ../src/empathy-streamed-media-window.c:431
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: ../src/empathy-streamed-media-window.c:481
-#: ../src/empathy-call-window.c:461
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Brightness"
 msgstr "Svetlost"
 
-#: ../src/empathy-streamed-media-window.c:484
-#: ../src/empathy-call-window.c:464
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Gamma"
 msgstr "Gama"
 
-#: ../src/empathy-streamed-media-window.c:589
-#: ../src/empathy-call-window.c:569
+#: ../src/empathy-streamed-media-window.c:542
 msgid "Volume"
 msgstr "Glasnost"
 
-#: ../src/empathy-streamed-media-window.c:1157
-#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.c:1110
 msgid "_Sidebar"
 msgstr "_Stranska vrstica"
 
-#: ../src/empathy-streamed-media-window.c:1177
-#: ../src/empathy-call-window.c:1149
+#: ../src/empathy-streamed-media-window.c:1130
 msgid "Audio input"
 msgstr "Zvo�ni vhod"
 
-#: ../src/empathy-streamed-media-window.c:1181
-#: ../src/empathy-call-window.c:1153
+#: ../src/empathy-streamed-media-window.c:1134
 msgid "Video input"
 msgstr "Video vhod"
 
-#: ../src/empathy-streamed-media-window.c:1185
-#: ../src/empathy-call-window.c:1157
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Dialpad"
 msgstr "Števil�nica"
 
-#: ../src/empathy-streamed-media-window.c:1196
-#: ../src/empathy-call-window.c:1167
+#: ../src/empathy-streamed-media-window.c:1151
 msgid "Details"
 msgstr "Podrobnosti"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1265
-#: ../src/empathy-call-window.c:1250
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1825
 #, c-format
 msgid "Call with %s"
 msgstr "Klic z %s"
 
-#: ../src/empathy-streamed-media-window.c:1498
-#: ../src/empathy-call-window.c:1447
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:2069
 msgid "The IP address as seen by the machine"
 msgstr "Naslov IP kot ga zazna strojna oprema"
 
-#: ../src/empathy-streamed-media-window.c:1500
-#: ../src/empathy-call-window.c:1449
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:2071
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Naslov IP kot ga zazna strežnik v omrežju"
 
-#: ../src/empathy-streamed-media-window.c:1502
-#: ../src/empathy-call-window.c:1451
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:2073
 msgid "The IP address of the peer as seen by the other side"
 msgstr "Naslov IP kot ga zazna uporabnik na drugi strani"
 
-#: ../src/empathy-streamed-media-window.c:1504
-#: ../src/empathy-call-window.c:1453
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:2075
 msgid "The IP address of a relay server"
 msgstr "Naslov IP posredovalnega strežnika"
 
-#: ../src/empathy-streamed-media-window.c:1506
-#: ../src/empathy-call-window.c:1455
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:2077
 msgid "The IP address of the multicast group"
 msgstr "Naslov IP skupine za ve�smerno oddajanje"
 
-#: ../src/empathy-streamed-media-window.c:1888
+#: ../src/empathy-streamed-media-window.c:1843
 msgctxt "encoding video codec"
 msgid "Unknown"
 msgstr "Neznano"
 
-#: ../src/empathy-streamed-media-window.c:1891
+#: ../src/empathy-streamed-media-window.c:1846
 msgctxt "encoding audio codec"
 msgid "Unknown"
 msgstr "Neznano"
 
-#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-streamed-media-window.c:1849
 msgctxt "decoding video codec"
 msgid "Unknown"
 msgstr "Neznano"
 
-#: ../src/empathy-streamed-media-window.c:1897
+#: ../src/empathy-streamed-media-window.c:1852
 msgctxt "decoding audio codec"
 msgid "Unknown"
 msgstr "Neznano"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2189
+#: ../src/empathy-streamed-media-window.c:2144
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Povezan - %d:%02d m"
 
-#: ../src/empathy-streamed-media-window.c:2250
-#: ../src/empathy-call-window.c:2167
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2846
 msgid "Technical Details"
 msgstr "Tehni�ne podrobnosti"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2205
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2884
 #, c-format
 msgid "%s's software does not understand any of the audio formats supported by your computer"
 msgstr "Program stika %s ne prepozna zvo�nih zapisov podprtih na vašem sistemu"
 
-#: ../src/empathy-streamed-media-window.c:2293
-#: ../src/empathy-call-window.c:2210
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2889
 #, c-format
 msgid "%s's software does not understand any of the video formats supported by your computer"
 msgstr "Program stika %s ne prepozna video zapisov podprtih na vašem sistemu"
 
-#: ../src/empathy-streamed-media-window.c:2299
-#: ../src/empathy-call-window.c:2216
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2895
 #, c-format
 msgid "Can't establish a connection to %s. One of you might be on a network that does not allow direct connections."
 msgstr "Ni mogo�e vzpostaviti povezave z %s. Morda je eden od odjemalcev je v omrežju, ki ne dovoli neposrednih povezav."
 
-#: ../src/empathy-streamed-media-window.c:2305
-#: ../src/empathy-call-window.c:2222
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2901
 msgid "There was a failure on the network"
 msgstr "Prišlo je do napake na omrežju"
 
-#: ../src/empathy-streamed-media-window.c:2309
-#: ../src/empathy-call-window.c:2226
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2905
 msgid "The audio formats necessary for this call are not installed on your computer"
 msgstr "Zvo�ni zapisi za ta klic niso nameš�eni"
 
-#: ../src/empathy-streamed-media-window.c:2312
-#: ../src/empathy-call-window.c:2229
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2908
 msgid "The video formats necessary for this call are not installed on your computer"
 msgstr "Video zapisi za ta klic niso nameš�eni"
 
-#: ../src/empathy-streamed-media-window.c:2322
-#: ../src/empathy-call-window.c:2241
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2920
 #, c-format
 msgid "Something unexpected happened in a Telepathy component. Please <a href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' window in the Help menu."
 msgstr "Prišlo je do nepri�akovane napake v delu programa Telepathy. Pošljite <a href=\"%s\">poro�ilo o hroš�u</a> in pripnite dnevnik razhroš�evanja iz menija pomo�i."
 
-#: ../src/empathy-streamed-media-window.c:2330
-#: ../src/empathy-call-window.c:2250
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2929
 msgid "There was a failure in the call engine"
 msgstr "Prišlo je do napake v klicnem programniku"
 
-#: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:2253
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2932
 msgid "The end of the stream was reached"
 msgstr "Dosežen je konec pretoka"
 
-#: ../src/empathy-streamed-media-window.c:2373
-#: ../src/empathy-call-window.c:2293
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2972
 msgid "Can't establish audio stream"
 msgstr "Ni mogo�e vzpostaviti zvo�nega pretoka"
 
-#: ../src/empathy-streamed-media-window.c:2383
-#: ../src/empathy-call-window.c:2303
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2982
 msgid "Can't establish video stream"
 msgstr "Ni mogo�e vzpostaviti video pretoka"
 
 #: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-preferences.ui.h:2
 #: ../src/empathy-streamed-media-window.ui.h:1
 msgid "Audio"
 msgstr "Zvok"
 
-#: ../src/empathy-call-window.ui.h:2
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Znova pokli�i stik"
-
 #: ../src/empathy-call-window.ui.h:3
 #: ../src/empathy-streamed-media-window.ui.h:5
 msgid "Decoding Codec:"
@@ -3329,59 +3421,99 @@ msgid "Minimise me"
 msgstr "Skr�i"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Ponovno pokli�i"
-
-#: ../src/empathy-call-window.ui.h:13
 #: ../src/empathy-streamed-media-window.ui.h:15
 msgid "Remote Candidate:"
 msgstr "Oddaljeni odjemalec:"
 
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:13
 #: ../src/empathy-streamed-media-window.ui.h:16
 msgid "Send Audio"
 msgstr "Pošlji zvo�ni posnetek"
 
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:14
 msgid "Send Video"
 msgstr "Pošlji video"
 
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:15
 msgid "Show dialpad"
 msgstr "Pokaži števil�nico"
 
+#: ../src/empathy-call-window.ui.h:16
+msgid "Start a video call"
+msgstr "Za�ni video klic"
+
 #: ../src/empathy-call-window.ui.h:17
+msgid "Start an audio call"
+msgstr "Za�ni zvo�ni klic"
+
+#: ../src/empathy-call-window.ui.h:18
+msgid "Swap camera"
+msgstr "Zamenjaj videokamero"
+
+#: ../src/empathy-call-window.ui.h:19
 #: ../src/empathy-streamed-media-window.ui.h:17
 msgid "Toggle audio transmission"
 msgstr "Preklopi prenos zvoka"
 
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:20
 msgid "Toggle video transmission"
 msgstr "Preklopi prenos videa"
 
-#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:1813
-#: ../src/empathy-call-window.c:1814
-#: ../src/empathy-call-window.c:1815
-#: ../src/empathy-call-window.c:1816
+#: ../src/empathy-call-window.c:2476
+#: ../src/empathy-call-window.c:2477
+#: ../src/empathy-call-window.c:2478
+#: ../src/empathy-call-window.c:2479
 msgid "Unknown"
 msgstr "Neznano"
 
-#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:23
+msgid "Video call"
+msgstr "Video klic"
+
+#: ../src/empathy-call-window.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "Po_kli�i"
 
-#: ../src/empathy-call-window.ui.h:23
-#: ../src/empathy-main-window.ui.h:30
+#: ../src/empathy-call-window.ui.h:25
+msgid "_Camera"
+msgstr "_Kamera"
+
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:18
+msgid "_Contents"
+msgstr "_Vsebina"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
+msgid "_Debug"
+msgstr "_Razhroš�evanje"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:22
+msgid "_Help"
+msgstr "Pomo_�"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Microphone"
+msgstr "_Mikrofon"
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "_Settings"
+msgstr "_Nastavitve"
+
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_Pogled"
 
-#: ../src/empathy-chat-window.c:480
-#: ../src/empathy-chat-window.c:500
+#: ../src/empathy-chat-window.c:481
+#: ../src/empathy-chat-window.c:501
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3390,7 +3522,7 @@ msgstr[1] "%s (%d neprebrano)"
 msgstr[2] "%s (%d neprebrani)"
 msgstr[3] "%s (%d neprebrana)"
 
-#: ../src/empathy-chat-window.c:492
+#: ../src/empathy-chat-window.c:493
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3399,7 +3531,7 @@ msgstr[1] "%s (in %u drugo)"
 msgstr[2] "%s (in %u drugi)"
 msgstr[3] "%s (in %u druga)"
 
-#: ../src/empathy-chat-window.c:508
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3408,7 +3540,7 @@ msgstr[1] "%s (%d neprebrano od drugih)"
 msgstr[2] "%s (%d neprebrani od drugih)"
 msgstr[3] "%s (%d neprebrana od drugih)"
 
-#: ../src/empathy-chat-window.c:517
+#: ../src/empathy-chat-window.c:518
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3417,11 +3549,11 @@ msgstr[1] "%s (%d neprebrano od vseh)"
 msgstr[2] "%s (%d neprebrani od vseh)"
 msgstr[3] "%s (%d neprebrana od vseh)"
 
-#: ../src/empathy-chat-window.c:732
+#: ../src/empathy-chat-window.c:733
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:742
+#: ../src/empathy-chat-window.c:743
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3430,7 +3562,7 @@ msgstr[1] "Pošiljanje %d sporo�ila"
 msgstr[2] "Pošiljanje %d sporo�il"
 msgstr[3] "Pošiljanje %d sporo�il"
 
-#: ../src/empathy-chat-window.c:764
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
 msgstr "Pisanje sporo�ila."
 
@@ -3462,11 +3594,6 @@ msgstr "Premakni zavihek _desno"
 msgid "Notify for All Messages"
 msgstr "Obvesti o vseh novih sporo�ilih"
 
-#: ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window.ui.h:18
-msgid "_Contents"
-msgstr "_Vsebina"
-
 #: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "_Pogovor"
@@ -3479,11 +3606,6 @@ msgstr "_Odpni zavihek"
 msgid "_Favorite Chat Room"
 msgstr "_Priljubljena klepetalnica"
 
-#: ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window.ui.h:22
-msgid "_Help"
-msgstr "Pomo_�"
-
 #: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "_Naslednji zavihek"
@@ -3521,99 +3643,102 @@ msgstr "Samodejno povezovanje"
 msgid "Manage Favorite Rooms"
 msgstr "Upravljanje priljubljenih klepetalnic"
 
-#: ../src/empathy-event-manager.c:522
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming video call"
 msgstr "Dohodni video klic"
 
-#: ../src/empathy-event-manager.c:522
+#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-call-window.c:1449
 msgid "Incoming call"
 msgstr "Dohodni klic"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:525
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s vas kli�e preko video kanala. Ali se želite javiti?"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s vas kli�e. Ali se želite javiti?"
 
-#: ../src/empathy-event-manager.c:530
-#: ../src/empathy-event-manager.c:731
-#: ../src/empathy-event-manager.c:764
+#: ../src/empathy-event-manager.c:529
+#: ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Dohodni klic od %s"
 
-#: ../src/empathy-event-manager.c:555
+#: ../src/empathy-event-manager.c:554
 msgid "_Reject"
 msgstr "_Zavrni"
 
-#: ../src/empathy-event-manager.c:563
-#: ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:562
+#: ../src/empathy-event-manager.c:570
 msgid "_Answer"
 msgstr "_Odgovori"
 
-#: ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:570
 msgid "_Answer with video"
 msgstr "_Odgovori z videom"
 
-#: ../src/empathy-event-manager.c:731
-#: ../src/empathy-event-manager.c:764
+#: ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Dohodni video klic od %s"
 
-#: ../src/empathy-event-manager.c:837
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
 msgstr "Vabilo v klepetalnico"
 
-#: ../src/empathy-event-manager.c:839
+#: ../src/empathy-event-manager.c:838
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Povabilo v %s"
 
-#: ../src/empathy-event-manager.c:846
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s vas vabi, da se pridružite v %s"
 
-#: ../src/empathy-event-manager.c:854
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
 msgstr "_Odkloni"
 
-#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Pridruži se"
 
-#: ../src/empathy-event-manager.c:886
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s vas je povabil v %s"
 
-#: ../src/empathy-event-manager.c:892
+#: ../src/empathy-event-manager.c:891
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Povabljeni ste v %s"
 
-#: ../src/empathy-event-manager.c:943
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Prihajajo� prenos datoteke od %s"
 
-#: ../src/empathy-event-manager.c:1135
+#: ../src/empathy-event-manager.c:1134
 #: ../src/empathy-main-window.c:375
 msgid "Password required"
 msgstr "Zahtevano geslo"
 
-#: ../src/empathy-event-manager.c:1191
+#: ../src/empathy-event-manager.c:1190
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s želi dovoljenje za pogled dosegljivosti"
 
-#: ../src/empathy-event-manager.c:1195
+#: ../src/empathy-event-manager.c:1194
 #, c-format
 msgid ""
 "\n"
@@ -3716,6 +3841,10 @@ msgstr "Preverjanje celovitosti \"%s\""
 msgid "Hashing \"%s\""
 msgstr "Ustvarjanje razpršila \"%s\""
 
+#: ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "%"
+
 #: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "Datoteka"
@@ -3789,127 +3918,119 @@ msgid "Top up account credit"
 msgstr "Povišaj znesek na ra�unu"
 
 #. top up button
-#: ../src/empathy-main-window.c:1050
+#: ../src/empathy-main-window.c:1046
 msgid "Top Up..."
 msgstr "Povišaj ..."
 
-#: ../src/empathy-main-window.c:1817
+#: ../src/empathy-main-window.c:1789
 msgid "Contact"
 msgstr "Stik"
 
-#: ../src/empathy-main-window.c:2169
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "Seznam stikov"
 
-#: ../src/empathy-main-window.c:2287
-msgid "Show and edit accounts"
-msgstr "Pokaži in uredi ra�une"
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "Stiki na _zemljevidu"
 
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-main-window-menubar.ui.h:2
 msgid "Credit Balance"
 msgstr "Stanje na ra�unu"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "Najdi v _seznamu stikov"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "Pridruži se _priljubljenim"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "Uredi priljubljene"
 
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "_Obi�ajna velikost"
 
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window-menubar.ui.h:7
 #: ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "Nov _klic ..."
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "Obi�ajna velikost s _podobami"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "_Možnosti"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "Pokaži _protokole"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "Razvrsti po _imenu"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "Razvrsti po _stanju"
 
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Ra�uni"
 
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "_Blokirani stiki"
 
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "_Skr�en pogled"
 
-#: ../src/empathy-main-window.ui.h:19
-msgid "_Debug"
-msgstr "_Razhroš�evanje"
-
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "Prenosi _datotek"
 
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "_Pridruži se"
 
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window-menubar.ui.h:24
 #: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "_Nov pogovor ..."
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "Nepri_sotni stiki"
 
-#: ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "_Osebni podatki"
 
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "_Klepetalnica"
 
-#: ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-main-window-menubar.ui.h:29
 msgid "_Search for Contacts…"
 msgstr "Iskanje _stikov ..."
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Klepetelnica"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "ÄŒlani"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:623
 #, c-format
 msgid ""
 "%s\n"
@@ -3922,16 +4043,16 @@ msgstr ""
 "Zahtevano geslo: %s\n"
 "ÄŒlani: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:625
+#: ../src/empathy-new-chatroom-dialog.c:626
 msgid "No"
 msgstr "Ne"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:654
 msgid "Could not start room listing"
 msgstr "Seznama klepetalnic ni bilo mogo�e za�eti"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:664
 msgid "Could not stop room listing"
 msgstr "Seznama klepetalnic ni bilo mogo�e dokon�ati"
 
@@ -3959,79 +4080,79 @@ msgstr "Seznam klepetalnic"
 msgid "_Room:"
 msgstr "_Klepetalnica:"
 
-#: ../src/empathy-preferences.c:156
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr "Sporo�ilo je bilo prejeto"
 
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr "Sporo�ilo je bilo poslano"
 
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
 msgstr "Nov pogovor"
 
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
 msgstr "Stik se je povezal"
 
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
 msgstr "Stik se je odjavil"
 
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
 msgstr "Povezava z ra�unom je vzpostavljena"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
 msgstr "Povezava z ra�unom je prekinjena"
 
-#: ../src/empathy-preferences.c:459
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr "Jezik"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:709
+#: ../src/empathy-preferences.c:734
 msgid "Juliet"
 msgstr "Julija"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:716
+#: ../src/empathy-preferences.c:741
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:722
+#: ../src/empathy-preferences.c:747
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "O, Romeo, Romeo, zakaj li Romeo?!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:750
 msgid "Deny thy father and refuse thy name;"
 msgstr "Odreci se rodu, odvrzi ime,"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:728
+#: ../src/empathy-preferences.c:753
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "�e ne, prisezi ve�no mi ljubezen,"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:731
+#: ../src/empathy-preferences.c:756
 msgid "And I'll no longer be a Capulet."
 msgstr "in dlje nisem Kapuletova."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:759
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Al' bi poslušal še, al govoril? "
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:737
+#: ../src/empathy-preferences.c:762
 msgid "Juliet has disconnected"
 msgstr "Julija je prekinila povezavo."
 
-#: ../src/empathy-preferences.c:1135
+#: ../src/empathy-preferences.c:1166
 msgid "Preferences"
 msgstr "Možnosti"
 
@@ -4039,132 +4160,144 @@ msgstr "Možnosti"
 msgid "Appearance"
 msgstr "Videz"
 
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
 msgstr "Obnašanje"
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
 msgid "Chat Th_eme:"
 msgstr "T_ema klepetanja:"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
 msgid "Disable notifications when _away or busy"
 msgstr "Onemogo�i obvestila  ob _odsotnosti ali zaposlenosti"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
 msgid "Disable sounds when _away or busy"
 msgstr "Onemogo�i zvok ob _odsotnosti ali zaposlenosti"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Prikaz prihajajo�ih dogodkov v obvestilnem podro�ju"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
+msgid "Echo cancellation helps to make your voice sound clearer to the other person, but may cause problems on some computers. If you or the other person hear strange noises or glitches during calls, try turning echo cancellation off and restarting the call."
+msgstr "Odpravljanje odmevov omogo�i �istejši zvok glasu med klicanjem, vendar pa se lahko na nekaterih sistemih pojavijo težave. V primeru, da med pogovorom zaslišite nenavadne zvoke ali šume, onemogo�ite odpravljanje odmevov in ponovno vzpostavite klic."
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "Omogo�i obvestila ob prijavah stikov"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "Omogo�i obvestila ob odjavah stikov"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Omogo�i obvestila, kadar _klepetalno okno ni v žariš�u"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "Omogo�i preverjanje �rkovanja za jezike:"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "Splošno"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input level:"
+msgstr "Vhodna raven:"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "Vhodna glasnost:"
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "Mesta virov:"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "Beleži pogovore"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "Obvestila"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Predvajaj zvoke ob dogodkih"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "Zasebnost"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:23
 msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published.  GPS coordinates will be accurate to 1 decimal place."
 msgstr "Zmanjšana natan�nost mesta pomeni, da ne bo objavljenih podatkov natan�nejših od mesta in države. Koordinate GPS bodo natan�ne na eno decimalno mesto."
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "Pokaži _smeške kot slike"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "Pokaži _seznam stikov v klepetalnicah"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "Zvoki"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "Preverjanje �rkovanja"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:28
 msgid "The list of languages reflects only the languages for which you have a dictionary installed."
 msgstr "Na seznamu jezikov so le tisti, za katere imate nameš�ene slovarje."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "Teme"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "Razli�ica:"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "Samodejno _poveži ob zagonu "
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Mobilni telefon"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "_Omogo�i obvestila v obla�kih"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "_Omogo�i zvo�na obvestila"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Omrežje (IP, Wifi)"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "N_ove klepete odpiraj v lo�enih oknih"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "O_bjavi mesto mojim stikom"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "_Zmanjšaj natan�nost mesta"
 
@@ -4176,6 +4309,10 @@ msgstr "Stanje"
 msgid "_Quit"
 msgstr "_Kon�aj"
 
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "Znova pokli�i stik"
+
 #: ../src/empathy-streamed-media-window.ui.h:3
 msgid "Camera Off"
 msgstr "Kamera ni omogo�ena"
@@ -4200,6 +4337,10 @@ msgstr "Omogo�i kamero, vendar ne pošlji videa"
 msgid "Preview"
 msgstr "Predogled"
 
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "Ponovno pokli�i"
+
 #: ../src/empathy-streamed-media-window.ui.h:19
 msgid "V_ideo"
 msgstr "V_ideo"
@@ -4220,77 +4361,77 @@ msgstr "Predogled videa"
 msgid "Contact Map View"
 msgstr "Prikaz zemljevida stikov"
 
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
 msgid "Save"
 msgstr "Shrani"
 
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
 msgstr "Razhroš�evalno okno"
 
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
 msgstr "Premor"
 
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
 msgstr "Raven"
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
 msgid "Debug"
 msgstr "Razhroš�evanje"
 
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
 msgid "Info"
 msgstr "Podrobnosti"
 
-#: ../src/empathy-debug-window.c:1520
-#: ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561
+#: ../src/empathy-debug-window.c:1610
 msgid "Message"
 msgstr "Sporo�ilo"
 
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
 msgid "Critical"
 msgstr "Kriti�no"
 
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
 msgid "Error"
 msgstr "Napaka"
 
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
 msgid "Time"
 msgstr "ÄŒas"
 
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
 msgid "Domain"
 msgstr "Domena"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
 msgstr "Kategorija"
 
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "Raven"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
 msgid "The selected connection manager does not support the remote debugging extension."
 msgstr "Izbrani upravljalnik povezav ne podpira razširitve za oddaljeno razhroš�evanje."
 
-#: ../src/empathy-invite-participant-dialog.c:429
-#: ../src/empathy-invite-participant-dialog.c:477
+#: ../src/empathy-invite-participant-dialog.c:179
+#: ../src/empathy-invite-participant-dialog.c:205
 msgid "Invite Participant"
 msgstr "Povabi udeležence"
 
-#: ../src/empathy-invite-participant-dialog.c:430
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Izbor stika za povabilo v pogovor:"
 
-#: ../src/empathy-invite-participant-dialog.c:473
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "Povabi"
 
@@ -4318,7 +4459,15 @@ msgstr "- Empathy ra�uni"
 msgid "Empathy Accounts"
 msgstr "Empathy ra�uni"
 
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr "Pokaži posebno storitev"
+
+#: ../src/empathy-debugger.c:75
+msgid "- Empathy Debugger"
+msgstr "- razhroš�evalnik Empathy"
+
+#: ../src/empathy-debugger.c:114
 msgid "Empathy Debugger"
 msgstr "Empathy razhroš�evalnik"
 
@@ -4331,11 +4480,13 @@ msgid "Respond"
 msgstr "Odgovori"
 
 #: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1459
 msgid "Reject"
 msgstr "Zavrni"
 
 #: ../src/empathy-notifications-approver.c:222
 #: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1460
 msgid "Answer"
 msgstr "Odgovori"
 
@@ -4353,137 +4504,193 @@ msgstr "Odkloni"
 msgid "Accept"
 msgstr "Sprejmi"
 
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
 #: ../src/empathy-notifications-approver.c:260
 msgid "Provide"
 msgstr "Zagotovi"
 
-#: ../src/empathy-call-observer.c:135
+#: ../src/empathy-call-observer.c:134
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s je klical med drugim pogovorom."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:787
-#: ../src/empathy-call-window.c:801
+#: ../src/empathy-call-window.c:1088
+#: ../src/empathy-call-window.c:1111
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:1257
-#, c-format
-msgid "Call with %d participants"
-msgstr "Klepet ve�ih (%d) uporabnikov"
+#: ../src/empathy-call-window.c:2775
+msgid "On hold"
+msgstr "Zadržano"
+
+#: ../src/empathy-call-window.c:2778
+msgid "Mute"
+msgstr "Utišaj"
+
+#: ../src/empathy-call-window.c:2780
+msgid "Duration"
+msgstr "Trajanje"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2104
+#: ../src/empathy-call-window.c:2783
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:2105
-msgid "On hold"
-msgstr "Zadržano"
-
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "_Upoštevaj velikost �rk"
 
+#~ msgid "Find Next"
+#~ msgstr "Najdi naslednje"
+
+#~ msgid "Find Previous"
+#~ msgstr "Najdi predhodne"
+
+#~ msgid "Show and edit accounts"
+#~ msgstr "Pokaži in uredi ra�une"
+
+#~ msgid "Call with %d participants"
+#~ msgstr "Klepet ve�ih (%d) uporabnikov"
+
 #~ msgid "_Dialpad"
 #~ msgstr "Š_tevil�nica"
+
 #~ msgid "Enter Custom Message"
 #~ msgstr "Vnos sporo�ila po meri"
+
 #~ msgid "Save _New Status Message"
 #~ msgstr "Shrani _nova sporo�ila stanja"
+
 #~ msgid "Saved Status Messages"
 #~ msgstr "Shranjena sporo�ila stanja"
+
 #~ msgid "All"
 #~ msgstr "Vse"
+
 #~ msgid "Date"
 #~ msgstr "Datum"
+
 #~ msgid "Conversations"
 #~ msgstr "Pogovori"
+
 #~ msgid "Previous Conversations"
 #~ msgstr "Predhodni pogovori"
+
 #~ msgid "_For:"
 #~ msgstr "_Za:"
+
 #~ msgid "_Enabled"
 #~ msgstr "_Omogo�i"
+
 #~ msgid "%s is now offline."
 #~ msgstr "%s ni povezan."
+
 #~ msgid "%s is now online."
 #~ msgstr "%s je povezan."
+
 #~ msgid "Context"
 #~ msgstr "Vsebina"
+
 #~ msgid "Add _New Preset"
 #~ msgstr "Dodaj novo _predlogo"
+
 #~ msgid "Saved Presets"
 #~ msgstr "Shranjene predloge"
+
 #~ msgid "The hash of the received file and the sent one do not match"
 #~ msgstr "Razpršili prejete in poslane datoteke se ne skladata"
+
 #~ msgid "Subscription requested by %s"
 #~ msgstr "%s zahteva naro�ilo"
+
 #~ msgid "Empathy has asked about importing accounts"
 #~ msgstr "Program Empathy zahteva podrobnosti o uvozu ra�unov"
+
 #~ msgid ""
 #~ "Whether Empathy has asked about importing accounts from other programs."
 #~ msgstr ""
 #~ "Ali naj program Empathy zahteva podrobnosti o uvozu ra�unov iz drugih "
 #~ "programov."
+
 #~ msgid "Use _Yahoo! Japan"
 #~ msgstr "Uporabi _Yahoo! Japan"
 #~ msgctxt "Link individual (contextual menu)"
+
 #~ msgid "_Link…"
 #~ msgstr "_Poveži ..."
+
 #~ msgid "_Character set:"
 #~ msgstr "_Znakovni nabor:"
+
 #~ msgid "_E-mail address:"
 #~ msgstr "_Elektronski naslov:"
+
 #~ msgid "_Nickname:"
 #~ msgstr "_Vzdevek:"
+
 #~ msgid "<b>Location</b>, "
 #~ msgstr "<b>Mesto</b>, "
+
 #~ msgid "Your contact list is empty"
 #~ msgstr "Seznam stikov je prazen"
+
 #~ msgid "Send and receive messages"
 #~ msgstr "Pošiljanje in prejemanje hipnih sporo�il"
+
 #~ msgid "Failed to reconnect this chat"
 #~ msgstr "Ponovna povezava s tem klepetom ni bila uspešna"
+
 #~ msgid "Failed to join chat room"
 #~ msgstr "Napaka med pridruževanjem klepetalnici"
+
 #~ msgid "Select a destination"
 #~ msgstr "Izbor cilja"
+
 #~ msgid "Important Room"
 #~ msgstr "Pomembna klepetalnica"
+
 #~ msgid "MC 4 accounts have been imported"
 #~ msgstr "MC 4 ra�uni so boli uvoženi"
+
 #~ msgid "MC 4 accounts have been imported."
 #~ msgstr "MC 4 ra�uni so bili uvoženi."
+
 #~ msgid "Hostname of the proxy for outbound requests."
 #~ msgstr "Ime gostitelja posredniškega strežnika odhodnih zahtev."
+
 #~ msgid ""
 #~ "Look up the DNS SRV record at the service's domain for the host name of a "
 #~ "STUN server."
 #~ msgstr ""
 #~ "Preglej vpis DNS SRV domene storitve  za ime gostitelja strežnika STUN."
+
 #~ msgid "Port of the proxy for outbound requests."
 #~ msgstr "Ime gostitelja posredniškega strežnika odhodnih zahtev."
+
 #~ msgid ""
 #~ "The username for SIP authentication, if different from the SIP URI\n"
 #~ "username."
 #~ msgstr ""
 #~ "Uporabniško ime za SIP overitev v kolikor, da je druga�no od SIP URI\n"
 #~ "uporabniškega imena."
+
 #~ msgid ""
 #~ "Update the registration binding if the external address for the client is "
 #~ "discovered to be different from the local binding."
 #~ msgstr ""
 #~ "Posodobi povezavo vpisnika v primeru, da je zunanji naslov odjemalca "
 #~ "druga�en od  krajevne povezave."
+
 #~ msgid ""
 #~ "Use the loose routing behavior and the Route header as recommended in RFC "
 #~ "3261."
 #~ msgstr ""
 #~ "Uporabi ohlapno usmerjanje in glavo usmerjevalnika kot priporo�a RFC 3261."
+
 #~ msgid "%s account"
 #~ msgstr "%s ra�un"
-
diff --git a/po/sr.po b/po/sr.po
index 39ffcef2a..693635676 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,40 +1,39 @@
 # Serbian translation of Empathy
 # Courtesy of Prevod.org team (http://prevod.org/) -- 2003-2009.
-#
 # This file is distributed under the same license as the Empathy package.
-#
 # From Pidgin translation:
-#
-#   Danilo Segan <dsegan@gmx.net>, 2003, 2004, 2005.
-#   Aleksandar Urosevic <urke@users.sourceforge.net>, 2003, 2004.
-#   Filip Miletic <f.miletic@ewi.tudelft.nl>, 2004.
-#   Nikola Kotur <kotnik@ns-linux.org>, 2006.
-#   Милош Поповић <gpopac@gmail.com>, 2007, 2008.
-#
+# Danilo Segan <dsegan@gmx.net>, 2003, 2004, 2005.
+# Aleksandar Urosevic <urke@users.sourceforge.net>, 2003, 2004.
+# Filip Miletic <f.miletic@ewi.tudelft.nl>, 2004.
+# Nikola Kotur <kotnik@ns-linux.org>, 2006.
+# Милош Поповић <gpopac@gmail.com>, 2007, 2008.
 # Maintainer: Бранко Кокановић <branko.kokanovic@gmail.com>, 2010.
 # Reviewed on 11.05.2009 by Милош Поповић <gpopac@gmail.com>
 # Милош Поповић <gpopac@gmail.com>, 2010.
 # Бранко Кокановић <branko.kokanovic@gmail.com>, 2011.
-#
+# Миро�лав �иколић <miroslavnikolic@rocketmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=empathy&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-03-30 09:19+0000\n"
-"PO-Revision-Date: 2011-03-19 14:12+0100\n"
-"Last-Translator: Бранко Кокановић <branko.kokanovic@gmail.com>\n"
-"Language-Team: Serbian <gnome@prevod.org>\n"
+"product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2011-09-19 19:10+0000\n"
+"PO-Revision-Date: 2011-09-19 11:52+0200\n"
+"Last-Translator: Миро�лав �иколић <miroslavnikolic@rocketmail.com>\n"
+"Language-Team: Serbian <gnom@prevod.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 :    n%"
+"10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Virtaal 0.6.1\n"
+"X-Project-Style: gnome\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
 msgstr ""
-"Ћа�кајте на Google Talk-у, Феј�буку, MSN-у и на многим другим �ерви�има за "
+"Ћа�кајте на Гугл разговору, Феј�буку, МС�-у и на многим другим �ерви�има за "
 "ћа�кање"
 
 #: ../data/empathy.desktop.in.in.h:2
@@ -51,286 +50,330 @@ msgstr "Програм за брзе поруке"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
-msgstr "Увек отвори по�ебан прозор за нова ћа�кања."
+msgstr "Увек отвара по�ебан прозор за нова ћа�кања."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr "Јачина звука позива"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr "Јачина звука позива, у процентима."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Camera device"
+msgstr "Уређај камерице"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "Положај камерице"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
-"Карактер за додавање по�ле надимка када �е кори�ти аутомат�ко довршавање "
-"надимка (таб) у групним ћа�кањима."
+"Знак за додавање по�ле надимка када �е кори�ти аутомат�ко довршавање надимка "
+"(таб) у групним ћа�кањима."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "Тема прозора за ћа�кање"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+msgid "Chat window theme variant"
+msgstr "Варијанта теме прозора за ћа�кање"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
-"Ли�та језика одвојена зарезима коју кори�ти провера правопи�а (нпр. „sr, en, "
+"Спи�ак језика одвојен зарезима које кори�ти провера правопи�а (нпр. „sr, en, "
 "fr“)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "Збијени �пи�ак пријатеља"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
-msgstr "Да ли да �е кори�ти управник мрежом"
+msgstr "Да ли ће бити коришћен управник мрежом"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "Критеријум за �ортирање пријатеља"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr ""
+"О�новна видео камерица која ће бити коришћена у видео позивима, нпр. „/dev/"
+"video0“."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
-msgstr "Подразумевана фа�цикла за избор �лика"
+msgstr "Подразумевана фа�цикла за избор �лике"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
-msgstr "И�кључује и�качућа обавештења када �ам од�утан"
+msgstr "И�кључује и�качућа обавештења када �мо од�утни"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
-msgstr "Онемогућава звукове када �ам од�утан"
+msgstr "Онемогућава звуке када �мо од�утни"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
-msgstr "Прикажи долазне догађаје у �тату�ној линији"
+msgstr "Приказује долазне догађаје на линији �тања"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
 msgstr ""
-"Прикажи долазне догађаје у �тату�ној линији. �ко није по�тављено, одмах их "
+"Приказује долазне догађаје на линији �тања. �ко није по�тављено, одмах их "
 "приказује кори�нику."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+msgid "Echo cancellation support"
+msgstr "Подршка за уклањање одјека"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr "Да ли Пи�моноша �ме да објављује локацију кори�ника"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Да ли Пи�моноша �ме да кори�ти ГПС да погоди локацију"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Да ли Пи�моноша �ме да кори�ти мобилну мрежу да погоди локацију"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr "Да ли Пи�моноша �ме да кори�ти мрежу да погоди локацију"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr "Пи�моношина подразумевана фа�цикла за преузимања"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
 msgstr "Пи�моноша је пребацио дневнике из лептира"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
-msgstr "Да ли да Пи�моноша пређе у �тање аутомат�ког од�у�тва у мировању"
+msgstr "Да ли Пи�моноша да пређе у �тање аутомат�ког од�у�тва у мировању"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
-msgstr "Да ли да Пи�моноша �ам у�по�тавити везу по покретању"
+msgstr "Да ли Пи�моноша да �ам у�по�тавити везу по покретању"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
-msgstr "Да ли да Пи�моноша умањи прецизно�т локације"
+msgstr "Да ли Пи�моноша да умањи прецизно�т локације"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
-"Да ли да Пи�моноша кори�ти �лику пријатеља као икону прозора за ћа�кање"
+"Да ли Пи�моноша да кори�ти �лику пријатеља као иконицу прозора за ћа�кање"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
-msgstr "Омогућава WebKit алатке за програмере"
+msgstr "Омогућава Веб кит развојне алате"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "Омогућава и�качућа обавештења за нове поруке"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "Омогућава проверу пи�ања"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "Сакрива главни прозор"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "Сакрива главни прозор програма."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
-msgstr "Карактер за довршавање надимка"
+msgstr "Знак за довршавање надимка"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "Отвара нова ћа�кања у различитим прозорима"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "Путања до �дијум теме за коришћење"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
 "Путања до �дијум теме за коришћење, ако �е кори�ти �дијум тема за ћа�кање."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Пушта звук за долазеће поруке"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "Пушта звук за нове разговоре"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Пушта звук за одлазеће поруке"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "Пушта звук када �е пријатељ пријави"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "Пушта звук када �е пријатељ одјави"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "Пушта звук када �е ја пријавим"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "Пушта звук када �е ја одјавим"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
-msgstr "И�пи�уј обавештења ако ћа�кање није у фоку�у"
+msgstr "И�пи�ује обавештења ако ћа�кање није у фоку�у"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
-msgstr "И�пи�уј обавештења када �е пријатељ пријави"
+msgstr "И�пи�ује обавештења када �е пријатељ пријави"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
-msgstr "И�пи�уј обавештења када �е пријатељ одјави"
+msgstr "И�пи�ује обавештења када �е пријатељ одјави"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr "Положај приказа камерице за време позива."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+msgid "Show Balance in contact list"
+msgstr "Приказује готовину на �пи�ку пријатеља"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "Приказује �лике"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "Приказује �пи�ак пријатеља у �обама"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr "Приказује �авет у вези затварања главног прозора"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
-msgstr "Приказује пријатеље који ни�у на вези"
+msgstr "Приказује пријатеље ван мреже"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
-msgstr "Прикажи протоколе"
+msgstr "Приказује протоколе"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "Језици за проверу пи�ања"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr "Подразумевана фа�цикла за чување прене�ених датотека."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
-msgstr "По�ледња фа�цикла из које изабрана �лика."
+msgstr "По�ледња фа�цикла из које је изабрана �лика."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
-msgstr "Позиција бочне површи прозора за ћа�кање"
+msgstr "Положај бочне површи прозора за ћа�кање"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "Сачувана позиција (у пик�елима) бочне површи прозора за ћа�кање."
+msgstr "Сачуван положај (у тачкама) бочне површи прозора за ћа�кање."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Тема за приказ разговора у прозору ћа�кања."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "Варијанта теме која �е кори�ти за приказ разговора у прозору ћа�кања."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Приказује �личицу �а �мешком"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "Кори�ти звукове за обавештења"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "Кори�ти теме за �обе ћа�кања"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Да ли да Пи�моноша објављује локацију кори�ника његовим пријатељима."
+msgstr "Да ли Пи�моноша да објављује локацију кори�ника његовим пријатељима."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Да ли Пи�моноша �ме да кори�ти ГПС да погоди локацију."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Да ли Пи�моноша �ме да кори�ти мобилну мрежу да погоди локацију."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Да ли Пи�моноша �ме да кори�ти мрежу да погоди локацију."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "Да ли је Пи�моноша пребацио дневнике из лептира."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Да ли да �е Пи�моноша �ам пријави на по�тојеће налоге након покретања."
+msgstr "Да ли Пи�моноша да �е �ам пријави на по�тојеће налоге након покретања."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "Да ли да  Пи�моноша аутомат�ки пређе у �тање од�у�тва у мировању."
+msgstr ""
+"Да ли Пи�моноша да аутомат�ки пређе у �тање од�у�тва приликом мировања."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
-"Да ли да Пи�моноша умањи прецизно�т локације због повећане приватно�ти."
+"Да ли Пи�моноша да умањи прецизно�т локације због повећане приватно�ти."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
-"Да ли да Пи�моноша кори�ти �лику пријатеља као икону у прозору ћа�кања."
+"Да ли Пи�моноша да кори�ти �лику пријатеља као икону у прозору ћа�кања."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
-"Да ли да �е омогуће WebKit алати за програмере, као што је Веб Ин�пектор."
+"Да ли ће бити омогућени Веб кит развојни алати, као што је Веб Ин�пектор."
 
 # �ије connect већ disconnect!!! ~Милош
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
@@ -338,100 +381,110 @@ msgstr ""
 "Да ли треба кори�тити управника мреже за аутомат�ко прекидање и поновно "
 "у�по�тављање везе."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "Да ли да проверава пи�ање речи за изабране језике."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "Да ли да приказује �мешке као �личице унутар разговора."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Да ли ће бити укључен филтер Пул�е аудиа за уклањање одјека."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "Да ли да пу�ти обавештајни звук када �е пријатељи пријаве на мрежу."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "Да ли да пу�ти обавештајни звук када �е пријатељи одјаве �а мреже."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "Да ли да пу�ти обавештајни звук за догађаје."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Да ли да пу�ти обавештајни звук када вам �тигне порука."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Да ли да пу�ти обавештајни звук на нови разговор."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Да ли да пу�ти обавештајни звук када пошаљете поруку."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "Да ли да пу�ти звук када �е пријавите на мрежу."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Да ли да пу�ти звук када �е одјавите �а мреже."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr "Да ли да пу�ти обавештајни звук када по�танете заузети или од�утни."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Да ли да приказује и�качући прозор када �е пријатељ одјави �а мреже."
+msgstr ""
+"Да ли да приказује облачић обавештења када �е пријатељ одјави �а мреже."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
-msgstr "Да ли да приказује и�качући прозор када �е пријатељ пријави на мрежу."
+msgstr ""
+"Да ли да приказује облачић обавештења када �е пријатељ пријави на мрежу."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
 msgstr ""
-"Да ли да приказује и�качући прозор �а при�тиглим порукама чак и када је "
+"Да ли да приказује облачић обавештења �а при�тиглим порукама чак и када је "
 "прозор за ћа�кање отворен, али није у фоку�у."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Да ли да приказује и�качући прозор када примите нову поруку."
+msgstr "Да ли да приказује облачић обавештења када примите нову поруку."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+msgid "Whether to show account balances in the contact list."
+msgstr "Да ли да приказује изно� готовине налога у �пи�ку пријатеља."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 "Да ли да приказује �лике за пријатеље у �пи�ку пријатеља и прозору ћа�кања."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "Да ли да приказује неповезане пријатеље у �пи�ку пријатеља."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
-msgstr "Да ли да приказује и�качући прозор када �те заузети или од�утни."
+msgstr "Да ли да приказује облачић обавештења када �те заузети или од�утни."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr ""
 "Да ли да приказује �лике за пријатеље у �пи�ку пријатеља и прозору ћа�кања."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Да ли да приказује �пи�ак пријатеља у �обама за ћа�кање."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "Да ли да приказује �пи�ак пријатеља у збијеном режиму."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -439,11 +492,11 @@ msgstr ""
 "Да ли да приказује поруку о затварању главног прозора када га затворите на "
 "„x“ дугме."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "Да ли да кори�ти тему за �обе разговора."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -455,33 +508,49 @@ msgstr ""
 
 #: ../data/empathy-accounts.desktop.in.in.h:1
 msgid "Manage Messaging and VoIP accounts"
-msgstr "Управљај налозима за брзе поруке и VoIP"
+msgstr "Управљајте налозима за допи�ивање и ВоИП"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2269
+#: ../src/empathy-accounts-dialog.c:2324
 msgid "Messaging and VoIP Accounts"
-msgstr "�алози за брзе поруке и VoIP"
+msgstr "�алози за допи�ивање и VoIP"
 
 #: ../libempathy/empathy-ft-handler.c:825
 msgid "File transfer completed, but the file was corrupted"
-msgstr "Прено� датотеке завршен, али је датотека оштећена"
+msgstr "Прено� датотеке је завршен, али је датотека оштећена"
 
-#: ../libempathy/empathy-ft-handler.c:1113
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
 msgstr "Друга �трана не подржава прено� датотека"
 
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is not a regular file"
 msgstr "Изабрана датотека није обична датотека"
 
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1176
 msgid "The selected file is empty"
 msgstr "Изабрана датотека је празна"
 
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#, c-format
+msgid "Missed call from %s"
+msgstr "Пропуштен позив од %s"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, c-format
+msgid "Called %s"
+msgstr "Позив кори�ника %s"
+
+#: ../libempathy/empathy-message.c:422
+#, c-format
+msgid "Call from %s"
+msgstr "Позив од %s"
+
 #: ../libempathy/empathy-tp-file.c:268
 msgid "Socket type not supported"
-msgstr "Тип �окета није подржан"
+msgstr "Вр�та прикључка није подржана"
 
 #: ../libempathy/empathy-tp-file.c:387
 msgid "No reason was specified"
@@ -507,148 +576,141 @@ msgstr "Грешка приликом прено�а датотеке"
 msgid "The other participant is unable to transfer the file"
 msgstr "Друга �трана није у могућно�ти да прене�е датотеку"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:383
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
 msgid "Unknown reason"
 msgstr "�епознат разлог"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:232
 msgid "Available"
 msgstr "До�тупан"
 
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:234
 msgid "Busy"
 msgstr "Заузет"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:237
 msgid "Away"
 msgstr "Од�утан"
 
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:239
 msgid "Invisible"
 msgstr "�евидљив"
 
-#: ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-utils.c:241
 msgid "Offline"
 msgstr "�еповезан"
 
 #. translators: presence type is unknown
-#. translators: encoding video codec is unknown
-#. translators: encoding audio codec is unknown
-#. translators: decoding video codec is unknown
-#. translators: decoding audio codec is unknown
-#: ../libempathy/empathy-utils.c:316
-#: ../src/empathy-streamed-media-window.c:1905
-#: ../src/empathy-streamed-media-window.c:1907
-#: ../src/empathy-streamed-media-window.c:1909
-#: ../src/empathy-streamed-media-window.c:1911
-#: ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:244
+msgctxt "presence"
 msgid "Unknown"
 msgstr "�епознато"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:284
 msgid "No reason specified"
 msgstr "�ије наведен разлог"
 
-#: ../libempathy/empathy-utils.c:357 ../libempathy/empathy-utils.c:413
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
 msgid "Status is set to offline"
 msgstr "Стање је по�тављено на „неповезан“"
 
-#: ../libempathy/empathy-utils.c:359 ../libempathy/empathy-utils.c:393
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "Грешка у мрежи"
 
-#: ../libempathy/empathy-utils.c:361 ../libempathy/empathy-utils.c:395
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
 msgid "Authentication failed"
 msgstr "�еу�пешна пријава"
 
-#: ../libempathy/empathy-utils.c:363 ../libempathy/empathy-utils.c:397
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
 msgid "Encryption error"
 msgstr "Грешка при шифровању"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:294
 msgid "Name in use"
 msgstr "Име је у употреби"
 
-#: ../libempathy/empathy-utils.c:367 ../libempathy/empathy-utils.c:399
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate not provided"
 msgstr "Сертификат није про�леђен"
 
-#: ../libempathy/empathy-utils.c:369 ../libempathy/empathy-utils.c:401
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate untrusted"
 msgstr "Сертификат није од поверења"
 
-#: ../libempathy/empathy-utils.c:371 ../libempathy/empathy-utils.c:403
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
 msgid "Certificate expired"
 msgstr "Сертификат је и�текао"
 
-#: ../libempathy/empathy-utils.c:373 ../libempathy/empathy-utils.c:405
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
 msgid "Certificate not activated"
 msgstr "Сертификат није активиран"
 
-#: ../libempathy/empathy-utils.c:375 ../libempathy/empathy-utils.c:407
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
 msgid "Certificate hostname mismatch"
 msgstr "Име домаћина �ертификата �е не поклапа"
 
-#: ../libempathy/empathy-utils.c:377 ../libempathy/empathy-utils.c:409
+#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
 msgid "Certificate fingerprint mismatch"
 msgstr "Оти�ак �ертификата �е не поклапа"
 
-#: ../libempathy/empathy-utils.c:379 ../libempathy/empathy-utils.c:411
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
 msgid "Certificate self-signed"
 msgstr "Сертификат је �амопотпи�ан"
 
-#: ../libempathy/empathy-utils.c:381
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate error"
 msgstr "Грешка у �ертификату"
 
-#: ../libempathy/empathy-utils.c:415
+#: ../libempathy/empathy-utils.c:344
 msgid "Encryption is not available"
 msgstr "Шифровање није до�тупно"
 
-#: ../libempathy/empathy-utils.c:417
+#: ../libempathy/empathy-utils.c:346
 msgid "Certificate is invalid"
 msgstr "Сертификат није и�праван"
 
-#: ../libempathy/empathy-utils.c:419
+#: ../libempathy/empathy-utils.c:348
 msgid "Connection has been refused"
 msgstr "Веза је одбијена"
 
-#: ../libempathy/empathy-utils.c:421
+#: ../libempathy/empathy-utils.c:350
 msgid "Connection can't be established"
 msgstr "Веза не може да �е у�по�тави"
 
-#: ../libempathy/empathy-utils.c:423
+#: ../libempathy/empathy-utils.c:352
 msgid "Connection has been lost"
 msgstr "Веза је изгубљена"
 
-#: ../libempathy/empathy-utils.c:425
+#: ../libempathy/empathy-utils.c:354
 msgid "This resource is already connected to the server"
 msgstr "Овај ре�ур� је већ повезан �а �ервером"
 
-#: ../libempathy/empathy-utils.c:427
+#: ../libempathy/empathy-utils.c:356
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Веза је замењена новом везом кори�тећи и�ти ре�ур�"
 
-#: ../libempathy/empathy-utils.c:430
+#: ../libempathy/empathy-utils.c:359
 msgid "The account already exists on the server"
 msgstr "Овај налог већ по�тоји на �ерверу"
 
-#: ../libempathy/empathy-utils.c:432
+#: ../libempathy/empathy-utils.c:361
 msgid "Server is currently too busy to handle the connection"
 msgstr "Сервер је тренутно превише заузет да би у�по�тавио везу"
 
-#: ../libempathy/empathy-utils.c:434
+#: ../libempathy/empathy-utils.c:363
 msgid "Certificate has been revoked"
 msgstr "Сертификат је опозван"
 
-#: ../libempathy/empathy-utils.c:436
+#: ../libempathy/empathy-utils.c:365
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Сертификат кори�ти небезбедни алгоритам шифровања или је криптограф�ки �лаб"
 
-#: ../libempathy/empathy-utils.c:439
+#: ../libempathy/empathy-utils.c:368
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -656,158 +718,156 @@ msgstr ""
 "Дужина �ертификата �ервера, или дубина ланца �ертификата �ервера премашује "
 "границе библиотеке за шифровање"
 
-#: ../libempathy/empathy-utils.c:602
+#: ../libempathy/empathy-utils.c:529
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "Људи у околини"
 
-#: ../libempathy/empathy-utils.c:607
+#: ../libempathy/empathy-utils.c:534
 msgid "Yahoo! Japan"
 msgstr "Јаху! Јапан"
 
-#: ../libempathy/empathy-utils.c:636
+#: ../libempathy/empathy-utils.c:563
 msgid "Google Talk"
-msgstr "Google Talk"
+msgstr "Гугл разговор"
 
-#: ../libempathy/empathy-utils.c:637
+#: ../libempathy/empathy-utils.c:564
 msgid "Facebook Chat"
 msgstr "Феј�бук ћа�кање"
 
-#: ../libempathy/empathy-time.c:137
+#: ../libempathy/empathy-time.c:88
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "Пре %d �екунде"
 msgstr[1] "Пре %d �екунде"
 msgstr[2] "Пре %d �екунди"
+msgstr[3] "Пре једне �екунде"
 
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:93
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "Пре %d минута"
 msgstr[1] "Пре %d минута"
 msgstr[2] "Пре %d минута"
+msgstr[3] "Пре једног минута"
 
-#: ../libempathy/empathy-time.c:147
+#: ../libempathy/empathy-time.c:98
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "Пре %d �ата"
 msgstr[1] "Пре %d �ата"
 msgstr[2] "Пре %d �ати"
+msgstr[3] "Пре једног �ата"
 
-#: ../libempathy/empathy-time.c:152
+#: ../libempathy/empathy-time.c:103
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "Пре %d дана"
 msgstr[1] "Пре %d дана"
 msgstr[2] "Пре %d дана"
+msgstr[3] "Пре једног дана"
 
-#: ../libempathy/empathy-time.c:157
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "Пре %d недеље"
 msgstr[1] "Пре %d недеље"
 msgstr[2] "Пре %d недеља"
+msgstr[3] "Пре једне недеље"
 
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:113
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "Пре %d ме�еца"
 msgstr[1] "Пре %d ме�еца"
 msgstr[2] "Пре %d ме�еци"
+msgstr[3] "Пре једног ме�еца"
 
-#: ../libempathy/empathy-time.c:167
+#: ../libempathy/empathy-time.c:136
 msgid "in the future"
 msgstr "у будућно�ти"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:491
-msgid "All"
-msgstr "Све"
+#: ../libempathy-gtk/empathy-account-chooser.c:540
+msgid "All accounts"
+msgstr "Сви налози"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../libempathy-gtk/empathy-log-window.c:643
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "�алог"
 
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "Лозинка"
 
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Сервер"
 
-#: ../libempathy-gtk/empathy-account-widget.c:685
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Порт"
 
-#: ../libempathy-gtk/empathy-account-widget.c:757
-#: ../libempathy-gtk/empathy-account-widget.c:814
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1166
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "Моји веб налози"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "�алог %s је измењен преко Мојих Веб �алога."
+msgid "The account %s is edited via %s."
+msgstr "�алог %s је измењен путем %s."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1172
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "�алог %s не може бити уређиван из Пи�моноше."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
-msgstr "Покрени Моје Веб �алоге"
+msgstr "Покрени Моје веб налоге"
+
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "Измени %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1530
+#: ../libempathy-gtk/empathy-account-widget.c:1591
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Кори�ничко име:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1897
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
-msgstr "П_римени"
+msgstr "_Примени"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1927
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
-msgstr "_Пријави ме"
+msgstr "Пријави _ме"
 
-#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1993
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:520
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1481
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "�алог:"
-
-#. translators: this is the label of a checkbox used to enable/disable IM
-#. * accounts
-#: ../libempathy-gtk/empathy-account-widget.c:2006
-msgid "_Enabled"
-msgstr "_Омогућено"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2071
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "Овај налог већ по�тоји на �ерверу"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2074
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "�аправи нови налог на �ерверу"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2266
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "По_ништи"
 
@@ -816,19 +876,19 @@ msgstr "По_ништи"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2563
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s на %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2589
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "%s налог"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2593
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "�ови налог"
 
@@ -840,6 +900,7 @@ msgstr "<b>Пример:</b> Мој�адимак"
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -853,17 +914,17 @@ msgstr "�апредно"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "Pass_word:"
-msgstr "_Лозинка"
+msgstr "_Лозинка:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
 msgid "Remember Password"
 msgstr "Запамти лозинку"
 
@@ -873,7 +934,7 @@ msgstr "Запамти лозинку"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 #: ../libempathy-gtk/empathy-password-dialog.c:311
 msgid "Remember password"
@@ -907,7 +968,7 @@ msgstr "_Порт:"
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
 #: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
-msgstr "Се_рвер:"
+msgstr "_Сервер:"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
@@ -918,15 +979,15 @@ msgstr "<b>Пример:</b> кори�ничко_име"
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "Login I_D:"
-msgstr "Кори�ничко име:"
+msgstr "_Кори�ничко име:"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
 msgid "What is your GroupWise User ID?"
-msgstr "Који је ваш GroupWise кори�нички ИД?"
+msgstr "Који је ваш Гроуп Вајз кори�нички ИБ?"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise password?"
-msgstr "Која је ваша GroupWise лозинка?"
+msgstr "Која је ваша Гроуп Вајз лозинка?"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
 msgid "<b>Example:</b> 123456789"
@@ -939,86 +1000,94 @@ msgstr "Кодни р_а�поред:"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
 msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
+msgstr "ИЦКу _КИБ:"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
 msgid "What is your ICQ UIN?"
-msgstr "Који је ваш ICQ UIN?"
+msgstr "Који је ваш ИЦКу КИБ?"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ password?"
-msgstr "Која је ваша ICQ лозинка?"
+msgstr "Која је ваша ИЦКу лозинка?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:183
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "�уто"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
-msgstr "UDP"
+msgstr "УДП"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
-msgstr "TCP"
+msgstr "ТЦП"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
-msgstr "TLS"
+msgstr "ТЛС"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:221
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "Реги�труј"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:226
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "Опције"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "�ишта"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Character set:"
 msgstr "Кодни ра�поред:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"Већина ИРЦ �ервера не тражи лозинку, зато ако ни�те �игурни, немојте је "
+"уно�ити."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Network"
 msgstr "Мрежа"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Network:"
 msgstr "Мрежа:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "�адимак:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "Порука за крај:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "Право име:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Servers"
 msgstr "Сервери"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "What is your IRC nickname?"
 msgstr "Који је ваш ИРЦ надимак?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Која ИРЦ мрежа?"
 
@@ -1032,11 +1101,11 @@ msgstr "<b>Пример:</b> korisnik@jabber.org"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
 msgid "Encr_yption required (TLS/SSL)"
-msgstr "Захт_ева �е шифровање(TLS/SSL)"
+msgstr "Захтева �е _шифровање(TLS/SSL)"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
 msgid "I_gnore SSL certificate errors"
-msgstr "_Игнориши грешке SSL �ертификата"
+msgstr "_Занемари грешке ССЛ �ертификата"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Override server settings"
@@ -1044,11 +1113,11 @@ msgstr "Превазиђи по�тавке �ервера"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
 msgid "Priori_ty:"
-msgstr "При_оритет:"
+msgstr "_Приоритет:"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 msgid "Reso_urce:"
-msgstr "Ре�_ур�:"
+msgstr "_Ре�ур�:"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
@@ -1065,7 +1134,7 @@ msgstr ""
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "Use old SS_L"
-msgstr "Кори�ти �тари SS_L"
+msgstr "Кори�ти �тари СС_Л"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
 msgid "What is your Facebook password?"
@@ -1077,7 +1146,7 @@ msgstr "Које је ваше Феј�бук кори�ничко име?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 msgid "What is your Google ID?"
-msgstr "Који је ваш Гугл ИД?"
+msgstr "Који је ваш Гугл ИБ?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 msgid "What is your Google password?"
@@ -1085,7 +1154,7 @@ msgstr "Која је ваша Гугл лозинка?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
 msgid "What is your Jabber ID?"
-msgstr "Који је ваш �абер ИД?"
+msgstr "Који је ваш �абер ИБ?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
 msgid "What is your Jabber password?"
@@ -1093,7 +1162,7 @@ msgstr "Која је ваша �абер лозинка?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your desired Jabber ID?"
-msgstr "Који је ваш жељени �абер ИД?"
+msgstr "Који је ваш жељени �абер ИБ?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber password?"
@@ -1105,15 +1174,15 @@ msgstr "<b>Пример:</b> korisnik@hotmail.com"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
 msgid "What is your Windows Live ID?"
-msgstr "Која је ваша Windows Live идентификација?"
+msgstr "Који је ваш Виндоуз Уживо ИБ ?"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live password?"
-msgstr "Која је ваша Windows Live лозинка?"
+msgstr "Која је ваша Виндоуз Уживо лозинка?"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
 msgid "E-_mail address:"
-msgstr "�дре�а е-_поште:"
+msgstr "�дре�а _е-поште:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "Nic_kname:"
@@ -1121,11 +1190,11 @@ msgstr "_�адимак:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
 msgid "_First Name:"
-msgstr "И_ме:"
+msgstr "_Име:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
-msgstr "�а_бер ИД:"
+msgstr "_�абер ИД:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
 msgid "_Last Name:"
@@ -1133,7 +1202,7 @@ msgstr "_Презиме:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
 msgid "_Published Name:"
-msgstr "Име за о_бјаву:"
+msgstr "Име за _објаву:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
 msgid "<b>Example:</b> user@my.sip.server"
@@ -1145,71 +1214,80 @@ msgstr "Кори�ничко име за пријаву:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
 msgid "Discover Binding"
-msgstr "Откривај повезивања"
+msgstr "Откриј повезивања"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "Discover the STUN server automatically"
-msgstr "�утомат�ки откривај STUN �ервер"
+msgstr "�утомат�ки откриј СТУ� �ервер"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Interval (seconds)"
-msgstr "Интервал (у �екундама)"
+msgid "Ignore TLS Errors"
+msgstr "Занемари ТЛС грешке"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+msgid "Interval (seconds)"
+msgstr "Период (у �екундама)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
 msgid "Keep-Alive Options"
 msgstr "Опције за одржавање �талне везе"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
 msgid "Loose Routing"
 msgstr "Слабо рутирање"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Mechanism:"
 msgstr "Механизам:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
 msgid "Miscellaneous Options"
 msgstr "Разне опције"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 msgid "NAT Traversal Options"
 msgstr "Опције прола�ка кроз ��Т"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 msgid "Port:"
 msgstr "Порт:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 msgid "Proxy Options"
-msgstr "Опције прок�ија"
+msgstr "Опције по�редника"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "STUN Server:"
-msgstr "СТУ� Сервер:"
+msgstr "СТУ� �ервер:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.c:347
 msgid "Server:"
 msgstr "Сервер:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid "Transport:"
 msgstr "Тран�порт:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Кори�ти овај налог за позиве _линиј�ких и мобилних телефона"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "Која је лозинка за ваш СИП налог?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Која је идентификација за СИП пријаву?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "_Кори�ничко име:"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
 msgid "I_gnore conference and chat room invitations"
-msgstr "Занемар_и позивнице за причаонице и конференције"
+msgstr "_Занемари позивнице за причаонице и конференције"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "What is your Yahoo! ID?"
@@ -1221,202 +1299,255 @@ msgstr "Која је ваша Јаху! лозинка?"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
 msgid "Yahoo! I_D:"
-msgstr "Јаху И_Б:"
+msgstr "Јаху! И_Б:"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "_Room List locale:"
 msgstr "Лок_ални �пи�ак �оба:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:448
-#: ../libempathy-gtk/empathy-avatar-chooser.c:524
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "�е могу да претворим �лику"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "�иједан од прихваћених формата �лика није подржан на вашем �и�тему"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:930
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+msgid "Couldn't save picture to file"
+msgstr "�е могу да �ачувам �лику у датотеку"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "Изаберите вашу �лику"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
+msgid "Take a picture..."
+msgstr "Изаберите �лику..."
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "Без �лике"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:995
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "Слике"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:999
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "Све датотеке"
 
 #: ../libempathy-gtk/empathy-avatar-image.c:322
 msgid "Click to enlarge"
-msgstr "Кликните за увећање"
+msgstr "Кликните да увећате"
+
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
+msgid "There was an error starting the call"
+msgstr "Дошло је до грешке приликом позивања"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact doesn't support calls"
+msgstr "�аведени контакт не подржава позиве"
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is offline"
+msgstr "�аведени контакт није на вези"
 
-#: ../libempathy-gtk/empathy-chat.c:652
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "The specified contact is not valid"
+msgstr "�аведени контакт није и�праван"
+
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "Emergency calls are not supported on this protocol"
+msgstr "Овај протокол не подржава хитне позиве"
+
+#: ../libempathy-gtk/empathy-chat.c:704
 msgid "Failed to open private chat"
-msgstr "�ије у�пело отварање приватног ћа�кања"
+msgstr "�и�ам у�пео да отворим приватно ћа�кање"
 
-#: ../libempathy-gtk/empathy-chat.c:717
+#: ../libempathy-gtk/empathy-chat.c:765
 msgid "Topic not supported on this conversation"
 msgstr "Теме ни�у подржане у овом разговору"
 
-#: ../libempathy-gtk/empathy-chat.c:723
+#: ../libempathy-gtk/empathy-chat.c:771
 msgid "You are not allowed to change the topic"
 msgstr "�ије вам дозвољено да промените тему"
 
-#: ../libempathy-gtk/empathy-chat.c:906
+#: ../libempathy-gtk/empathy-chat.c:975
+#, c-format
+msgid "“%s� is not a valid contact ID"
+msgstr "„%s“ није и�праван ИБ контакта"
+
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: чи�ти �ве поруке из овог разговора"
 
-#: ../libempathy-gtk/empathy-chat.c:909
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <тема>: по�тавља тему тренутног разговора"
 
-#: ../libempathy-gtk/empathy-chat.c:912
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ИБ �обе>: прикључује �е новој �оби за ћа�кање"
 
-#: ../libempathy-gtk/empathy-chat.c:915
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ИБ �обе>: прикључује �е новој �оби за ћа�кање"
 
-#: ../libempathy-gtk/empathy-chat.c:920
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr ""
-"/part [<ИБ �обе>] [<разлог>]: напу�ти �обу за ћа�кање, подразумевано тренутну"
+"/part [<ИБ �обе>] [<разлог>]: напушта �обу за ћа�кање, подразумевано тренутну"
 
-#: ../libempathy-gtk/empathy-chat.c:925
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ИБ пријатеља> [<порука>]: отвара приватно ћа�кање"
 
-#: ../libempathy-gtk/empathy-chat.c:928
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ИБ пријатеља> <порука>: отвара приватно ћа�кање"
 
-#: ../libempathy-gtk/empathy-chat.c:931
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <надимак>: мења ваш надимак на тренутном �ерверу"
 
-#: ../libempathy-gtk/empathy-chat.c:934
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/me <message>: send an ACTION message to the current conversation"
-msgstr "/me <порука>: шаље ACTION поруку на тренутни разговор"
+msgstr "/me <порука>: шаље поруку Р�ДЊ� на тренутни разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:937
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 msgstr ""
 "/say <порука>: шаље <порука> на тренутни разговор. Ово �е кори�ти за �лање "
-"порука које почињу �а „/“. �а пример: \"/say /join �е кори�ти за "
-"прикључивање у нову �обу за ћа�кање"
+"порука које почињу �а „/“. �а пример: „/say /join �е кори�ти за прикључивање "
+"у нову �обу за ћа�кање“"
+
+#: ../libempathy-gtk/empathy-chat.c:1094
+msgid "/whois <contact ID>: display information about a contact"
+msgstr "/whois <ИБ контакта>: приказује податке о контакту"
 
-#: ../libempathy-gtk/empathy-chat.c:942
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr ""
-"/help [<команда>]: приказује �ве подржане команде. �ко �е да и конкретна "
-"<команда>, приказује њено упут�тво за употребу."
+"/help [<команда>]: приказује �ве подржане наредбе. �ко �е да и конкретна "
+"<наредба>, приказује њено упут�тво за употребу."
 
-#: ../libempathy-gtk/empathy-chat.c:952
+#: ../libempathy-gtk/empathy-chat.c:1114
 #, c-format
 msgid "Usage: %s"
 msgstr "Коришћење: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:991
+#: ../libempathy-gtk/empathy-chat.c:1159
 msgid "Unknown command"
-msgstr "�епозната команда"
+msgstr "�епозната наредба"
 
-#: ../libempathy-gtk/empathy-chat.c:1117
+#: ../libempathy-gtk/empathy-chat.c:1285
 msgid "Unknown command; see /help for the available commands"
-msgstr "�епозната команда; погледајте /help за до�тупне команде"
+msgstr "�епозната наредба; погледајте /help за до�тупне наредбе"
 
-#: ../libempathy-gtk/empathy-chat.c:1254
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1455
+msgid "insufficient balance to send message"
+msgstr "нема довољно готовине за �лање поруке"
+
+#: ../libempathy-gtk/empathy-chat.c:1457
+msgid "not capable"
+msgstr "не�по�обан"
+
+#: ../libempathy-gtk/empathy-chat.c:1464
 msgid "offline"
 msgstr "неповезан"
 
-#: ../libempathy-gtk/empathy-chat.c:1257
+#: ../libempathy-gtk/empathy-chat.c:1467
 msgid "invalid contact"
 msgstr "неи�праван пријатељ"
 
-#: ../libempathy-gtk/empathy-chat.c:1260
+#: ../libempathy-gtk/empathy-chat.c:1470
 msgid "permission denied"
 msgstr "при�туп је забрањен"
 
-#: ../libempathy-gtk/empathy-chat.c:1263
+#: ../libempathy-gtk/empathy-chat.c:1473
 msgid "too long message"
-msgstr "порука је предугачка"
+msgstr "порука је предуга"
 
-#: ../libempathy-gtk/empathy-chat.c:1266
+#: ../libempathy-gtk/empathy-chat.c:1476
 msgid "not implemented"
 msgstr "није подржано"
 
-#: ../libempathy-gtk/empathy-chat.c:1270
+#: ../libempathy-gtk/empathy-chat.c:1480
 msgid "unknown"
 msgstr "непознато"
 
-#: ../libempathy-gtk/empathy-chat.c:1274
+#: ../libempathy-gtk/empathy-chat.c:1486
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Грешка при �лању поруке „%s“: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1335 ../src/empathy-chat-window.c:717
+#: ../libempathy-gtk/empathy-chat.c:1490
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Грешка при �лању поруке: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Тема:"
 
-#: ../libempathy-gtk/empathy-chat.c:1347
+#: ../libempathy-gtk/empathy-chat.c:1563
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Тема је по�тављена на: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1349
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "No topic defined"
 msgstr "Тема није по�тављена"
 
-#: ../libempathy-gtk/empathy-chat.c:1848
+#: ../libempathy-gtk/empathy-chat.c:2074
 msgid "(No Suggestions)"
-msgstr "(�ема предлога)"
+msgstr "(нема предлога)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1916
+#: ../libempathy-gtk/empathy-chat.c:2142
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Додај „%s“ у речник"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1953
+#: ../libempathy-gtk/empathy-chat.c:2179
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Додај „%s“ у речник за %s језик"
 
-#: ../libempathy-gtk/empathy-chat.c:2010
+#: ../libempathy-gtk/empathy-chat.c:2249
 msgid "Insert Smiley"
 msgstr "Убаци �мешак"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2028
-#: ../libempathy-gtk/empathy-ui-utils.c:1808
+#: ../libempathy-gtk/empathy-chat.c:2267
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "_Пошаљи"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2063
+#: ../libempathy-gtk/empathy-chat.c:2321
 msgid "_Spelling Suggestions"
 msgstr "Предлози правопи_�а"
 
-#: ../libempathy-gtk/empathy-chat.c:2152
+#: ../libempathy-gtk/empathy-chat.c:2410
 msgid "Failed to retrieve recent logs"
-msgstr "�ије у�пело преузимање �корашњих дневника"
+msgstr "�и�ам у�пео да преузмем �корашње дневнике"
 
-#: ../libempathy-gtk/empathy-chat.c:2263
+#: ../libempathy-gtk/empathy-chat.c:2547
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s је отишао �а везе"
@@ -1424,12 +1555,12 @@ msgstr "%s је отишао �а везе"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2270
+#: ../libempathy-gtk/empathy-chat.c:2554
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s је избацио кори�ника %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2273
+#: ../libempathy-gtk/empathy-chat.c:2557
 #, c-format
 msgid "%s was kicked"
 msgstr "%s је избачен"
@@ -1437,17 +1568,17 @@ msgstr "%s је избачен"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2281
+#: ../libempathy-gtk/empathy-chat.c:2565
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s је забранио при�туп кори�нику %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2284
+#: ../libempathy-gtk/empathy-chat.c:2568
 #, c-format
 msgid "%s was banned"
 msgstr "Кори�нику %s је забрањен при�туп"
 
-#: ../libempathy-gtk/empathy-chat.c:2288
+#: ../libempathy-gtk/empathy-chat.c:2572
 #, c-format
 msgid "%s has left the room"
 msgstr "%s је напу�тио(ла) причаоницу"
@@ -1457,112 +1588,144 @@ msgstr "%s је напу�тио(ла) причаоницу"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2297
+#: ../libempathy-gtk/empathy-chat.c:2581
 #, c-format
 msgid " (%s)"
-msgstr " (%s)�"
+msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2322
+#: ../libempathy-gtk/empathy-chat.c:2606
 #, c-format
 msgid "%s has joined the room"
-msgstr "%s је ушао(ла) у причаоницу"
+msgstr "%s је при�тупио(ла) причаоници"
 
-#: ../libempathy-gtk/empathy-chat.c:2347
+#: ../libempathy-gtk/empathy-chat.c:2631
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s је �ада познат као %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2486
-#: ../src/empathy-streamed-media-window.c:1953
-#: ../src/empathy-event-manager.c:1125
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2784
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
+#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
 msgid "Disconnected"
 msgstr "Веза је прекинута"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3116
+#: ../libempathy-gtk/empathy-chat.c:3428
 msgid "Would you like to store this password?"
-msgstr "Желите ли да запамтите лозинку?"
+msgstr "Да ли желите да запамтите ову лозинку?"
 
-#: ../libempathy-gtk/empathy-chat.c:3122
+#: ../libempathy-gtk/empathy-chat.c:3434
 msgid "Remember"
 msgstr "Запамти"
 
-#: ../libempathy-gtk/empathy-chat.c:3132
+#: ../libempathy-gtk/empathy-chat.c:3444
 msgid "Not now"
 msgstr "�е �ада"
 
-#: ../libempathy-gtk/empathy-chat.c:3176
+#: ../libempathy-gtk/empathy-chat.c:3488
 msgid "Retry"
 msgstr "Покушај поново"
 
-#: ../libempathy-gtk/empathy-chat.c:3180
+#: ../libempathy-gtk/empathy-chat.c:3492
 msgid "Wrong password; please try again:"
 msgstr "Погрешна лозинка, покушајте поново:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3297
+#: ../libempathy-gtk/empathy-chat.c:3622
 msgid "This room is protected by a password:"
 msgstr "Ова �оба је заштићена лозинком:"
 
-#: ../libempathy-gtk/empathy-chat.c:3324
+#: ../libempathy-gtk/empathy-chat.c:3649
 msgid "Join"
 msgstr "Прикључи �е"
 
-#: ../libempathy-gtk/empathy-chat.c:3494 ../src/empathy-event-manager.c:1145
+#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "Повезан"
 
-#: ../libempathy-gtk/empathy-chat.c:3547
-#: ../libempathy-gtk/empathy-log-window.c:650
+#: ../libempathy-gtk/empathy-chat.c:3906
 msgid "Conversation"
 msgstr "Разговор"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:422
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:3911
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (СМС)"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
 msgid "Unknown or invalid identifier"
 msgstr "�епознати или неи�праван идентификатор"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
 msgid "Contact blocking temporarily unavailable"
-msgstr "Блокирање пријатеља тренутно недо�тупно"
+msgstr "Блокирање пријатеља је тренутно недо�тупно"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
 msgid "Contact blocking unavailable"
-msgstr "Блокирање пријатеља недо�тупно"
+msgstr "Блокирање пријатеља није до�тупно"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
 msgid "Permission Denied"
 msgstr "При�туп је забрањен"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
 msgid "Could not block contact"
 msgstr "�е могу да блокирам пријатеља"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:701
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
 msgid "Edit Blocked Contacts"
 msgstr "Измени блокиране пријатеље"
 
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Account:"
+msgstr "�алог:"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "Блокирани пријатељи"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Уклони"
+
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:794
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Умножи адре�у везе"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:801
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Отвори везу"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:420
+#: ../libempathy-gtk/empathy-chat-text-view.c:415
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:299
 #: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
 msgid "Edit Contact Information"
-msgstr "Измени податке о пријатељу"
+msgstr "Измени податке контакта"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:350
 msgid "Personal Information"
@@ -1574,30 +1737,31 @@ msgid "New Contact"
 msgstr "�ови пријатељ"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:199
+#: ../libempathy-gtk/empathy-individual-dialogs.c:200
 #, c-format
 msgid "Block %s?"
 msgstr "Блокирати %s?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:247
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr ""
 "Да ли �те �игурни да желите да блокирате да ва� „%s“ више не контактира?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
 msgid "_Block"
 msgstr "_Блокирај"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:278
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "П_ријави овај контакт за злоупотребу"
 msgstr[1] "П_ријави ове контакте за злоупотребу"
 msgstr[2] "П_ријави ове контакте за злоупотребу"
+msgstr[3] "П_ријави овај контакт за злоупотребу"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
@@ -1619,301 +1783,331 @@ msgstr "�егрупи�ано"
 msgid "Favorite People"
 msgstr "Омиљени људи"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2001
-#: ../libempathy-gtk/empathy-individual-view.c:2336
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Да ли �те �игурни да желите да уклоните групу „%s“?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2003
-#: ../libempathy-gtk/empathy-individual-view.c:2339
+#: ../libempathy-gtk/empathy-contact-list-view.c:1988
+#: ../libempathy-gtk/empathy-individual-view.c:2379
 msgid "Removing group"
 msgstr "Уклањам групу"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2052
-#: ../libempathy-gtk/empathy-contact-list-view.c:2129
-#: ../libempathy-gtk/empathy-individual-view.c:2394
-#: ../libempathy-gtk/empathy-individual-view.c:2588
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../libempathy-gtk/empathy-contact-list-view.c:2037
+#: ../libempathy-gtk/empathy-contact-list-view.c:2114
+#: ../libempathy-gtk/empathy-individual-view.c:2434
+#: ../libempathy-gtk/empathy-individual-view.c:2637
 msgid "_Remove"
 msgstr "_Уклони"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2082
-#: ../libempathy-gtk/empathy-individual-view.c:2458
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
+#: ../libempathy-gtk/empathy-individual-view.c:2501
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Да ли �те �игурни да желите да уклоните пријатеља „%s“?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2084
-#: ../libempathy-gtk/empathy-individual-view.c:2479
+#: ../libempathy-gtk/empathy-contact-list-view.c:2069
+#: ../libempathy-gtk/empathy-individual-view.c:2522
 msgid "Removing contact"
 msgstr "Уклањам пријатеља"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:219
-#: ../src/empathy-main-window.ui.h:13
+#: ../libempathy-gtk/empathy-contact-menu.c:220
+#: ../src/empathy-main-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "Дод_ај пријатеља…"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:299
+#: ../libempathy-gtk/empathy-contact-menu.c:300
 msgid "_Block Contact"
 msgstr "_Блокирај контакт"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:328
-#: ../libempathy-gtk/empathy-individual-menu.c:517
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:329
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "Ћа_�кање"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:359
-#: ../libempathy-gtk/empathy-individual-menu.c:560
+#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_�удио позив"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:390
-#: ../libempathy-gtk/empathy-individual-menu.c:602
+#: ../libempathy-gtk/empathy-contact-menu.c:394
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Видео позив"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:436
-#: ../libempathy-gtk/empathy-individual-menu.c:645
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:440
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "_Претходни разговори"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:458
-#: ../libempathy-gtk/empathy-individual-menu.c:686
+#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "Пошаљи датотеку"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:481
-#: ../libempathy-gtk/empathy-individual-menu.c:728
+#: ../libempathy-gtk/empathy-contact-menu.c:485
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
-msgstr "Подели моју радну површину"
+msgstr "Подели моју радну површ"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:521
-#: ../libempathy-gtk/empathy-contact-widget.c:1763
-#: ../libempathy-gtk/empathy-individual-menu.c:763
+#: ../libempathy-gtk/empathy-contact-menu.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:1886
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
 #: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "Омиљени"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:550
-#: ../libempathy-gtk/empathy-individual-menu.c:791
+#: ../libempathy-gtk/empathy-contact-menu.c:554
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "_Подаци"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:596
+#: ../libempathy-gtk/empathy-contact-menu.c:600
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "Изм_ени"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:650
-#: ../libempathy-gtk/empathy-individual-menu.c:972
-#: ../src/empathy-chat-window.c:935
+#: ../libempathy-gtk/empathy-contact-menu.c:654
+#: ../libempathy-gtk/empathy-individual-menu.c:1284
+#: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "Позивам ва� у ову �обу"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:681
-#: ../libempathy-gtk/empathy-individual-menu.c:1019
+#: ../libempathy-gtk/empathy-contact-menu.c:685
+#: ../libempathy-gtk/empathy-individual-menu.c:1330
 msgid "_Invite to Chat Room"
 msgstr "Позов_и у �обу за ћа�кање"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:513
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
 msgid "Search contacts"
 msgstr "Претражи контакте"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:543
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
 msgid "Search: "
 msgstr "Претрага:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:601
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
 msgid "_Add Contact"
 msgstr "Дод_ај пријатеља"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:619
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
 msgid "No contacts found"
 msgstr "�ије пронађен ниједан пријатељ"
 
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr "Порука која ва� пред�тавља:"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
+msgstr "Молим ва� обаве�тите не када �те на мрежи. Хвала!"
+
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "Изаберите пријатеља"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:295
+#: ../libempathy-gtk/empathy-contact-widget.c:336
 #: ../libempathy-gtk/empathy-individual-widget.c:153
 msgid "Full name:"
 msgstr "Пуно име:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:296
+#: ../libempathy-gtk/empathy-contact-widget.c:337
 #: ../libempathy-gtk/empathy-individual-widget.c:154
 msgid "Phone number:"
 msgstr "Број телефона:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:297
+#: ../libempathy-gtk/empathy-contact-widget.c:338
 #: ../libempathy-gtk/empathy-individual-widget.c:155
 msgid "E-mail address:"
 msgstr "�дре�а е-поште:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:298
+#: ../libempathy-gtk/empathy-contact-widget.c:339
 #: ../libempathy-gtk/empathy-individual-widget.c:156
 msgid "Website:"
 msgstr "Веб �траница:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:299
+#: ../libempathy-gtk/empathy-contact-widget.c:340
 #: ../libempathy-gtk/empathy-individual-widget.c:157
 msgid "Birthday:"
 msgstr "Рођендан:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:346
+msgid "Last seen:"
+msgstr "Виђен пре:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:348
+msgid "Connected from:"
+msgstr "Повезан �а:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:353
+msgid "Away message:"
+msgstr "Порука за од�утно�т:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+msgid "Channels:"
+msgstr "Канали:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
 msgstr "ИСО код државе:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Country:"
 msgstr "Држава:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "State:"
-msgstr "Савезна јединица:"
+msgstr "Република:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:768
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "City:"
 msgstr "Град:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:770
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Area:"
 msgstr "Обла�т:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:772
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
 msgstr "Поштан�ки код:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:774
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Street:"
 msgstr "Улица:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:776
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
 msgstr "Зграда:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:778
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Floor:"
 msgstr "Спрат:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:780
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Room:"
 msgstr "Соба:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:782
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Text:"
 msgstr "Тек�т:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:784
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Description:"
 msgstr "Опи�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:786
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
 msgstr "�дре�а:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
 msgstr "�иво тачно�ти:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:790
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr "Грешка:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:792
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
-msgstr "Вертикална грешка (у метрима):"
+msgstr "У�правна грешка (у метрима):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:794
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
-msgstr "Хоризонтална грешка (у метрима):"
+msgstr "Водоравна грешка (у метрима):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr "Брзина:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Bearing:"
 msgstr "Правац:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:800
-#: ../libempathy-gtk/empathy-individual-widget.c:526
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
 msgstr "Брзина пењања:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:802
-#: ../libempathy-gtk/empathy-individual-widget.c:528
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
 msgstr "По�ледњи пут ажурирано:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:804
-#: ../libempathy-gtk/empathy-individual-widget.c:530
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
 msgstr "Географ�ка дужина:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:806
-#: ../libempathy-gtk/empathy-individual-widget.c:532
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
 msgstr "Географ�ка ширина:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:808
-#: ../libempathy-gtk/empathy-individual-widget.c:534
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
 msgstr "Ви�ина:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:871
-#: ../libempathy-gtk/empathy-contact-widget.c:888
-#: ../libempathy-gtk/empathy-individual-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:633
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "Локација"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:890
-#: ../libempathy-gtk/empathy-individual-widget.c:635
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:942
-#: ../libempathy-gtk/empathy-individual-widget.c:684
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e.%d.%Y у %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1024
-#: ../libempathy-gtk/empathy-individual-widget.c:919
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
 msgid "Save Avatar"
 msgstr "Сачувај �лику"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1080
-#: ../libempathy-gtk/empathy-individual-widget.c:977
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
 msgid "Unable to save avatar"
 msgstr "�е могу да �ачувам �лику"
 
@@ -1923,7 +2117,7 @@ msgstr "<b>Локација</b> у (датум)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1307
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr "�адимак:"
 
@@ -1943,7 +2137,7 @@ msgstr "Детаљи о пријатељу"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "Идентификатор:"
 
@@ -1960,11 +2154,11 @@ msgstr "ОС:"
 msgid "Version:"
 msgstr "Издање:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:332
+#: ../libempathy-gtk/empathy-groups-widget.c:333
 msgid "Groups"
 msgstr "Групе"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:344
+#: ../libempathy-gtk/empathy-groups-widget.c:345
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -1972,91 +2166,125 @@ msgstr ""
 "Изаберите групе у којима желите да �е пријатељ налази.  Приметите да можете "
 "да одаберете и више група као и ниједну."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:363
+#: ../libempathy-gtk/empathy-groups-widget.c:364
 msgid "_Add Group"
 msgstr "Дод_ај групу"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:398
+#: ../libempathy-gtk/empathy-groups-widget.c:399
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Изабери"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1436
+#: ../libempathy-gtk/empathy-groups-widget.c:409
+#: ../src/empathy-main-window.c:1807
 msgid "Group"
 msgstr "Група"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Следећи идентитет ће бити блокиран:"
 msgstr[1] "Следећи идентитети ће бити блокирани:"
 msgstr[2] "Следећи идентитети ће бити блокирани:"
+msgstr[3] "Следећи идентитет ће бити блокиран:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:259
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Следећи идентитет не може бити блокиран:"
 msgstr[1] "Следећи идентитети не могу бити блокирани:"
 msgstr[2] "Следећи идентитети не могу бити блокирани:"
+msgstr[3] "Следећи идентитет не може бити блокиран:"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
 msgstr "Повезани пријатељи"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:354
+#: ../libempathy-gtk/empathy-individual-linker.c:370
 msgid "Select contacts to link"
 msgstr "Изаберите пријатеља за повезивање"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:428
+#: ../libempathy-gtk/empathy-individual-linker.c:444
 msgid "New contact preview"
 msgstr "Преглед новог пријатеља"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:472
+#: ../libempathy-gtk/empathy-individual-linker.c:488
 msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Означени пријатељи на �пи�ку лево ће бити увезани"
+msgstr "Означени пријатељи на �пи�ку лево ће бити увезани заједно."
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:131
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:839
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "Изаберите налог који ће бити коришћен за позив"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "Позив"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+msgid "Mobile"
+msgstr "Мобилни"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "По�ао"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "КУЋ�"
+
+#. add an SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+msgid "_SMS"
+msgstr "_СМС"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1142
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Уреди"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:865
+#: ../libempathy-gtk/empathy-individual-menu.c:1168
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
-msgstr "_Повежи пријатеље"
+msgstr "_Повежи контакте…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2301
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 msgid "Delete and _Block"
 msgstr "Избриши и _блокирај"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2467
+#: ../libempathy-gtk/empathy-individual-view.c:2510
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
 "remove all the contacts which make up this linked contact."
 msgstr ""
-"Да ли �тварно желите да уклоните увезаног пријатеља „%s“? Ово ће уклонити и "
-"�ве контакте који �у везани за овог пријатеља."
+"Да ли �тварно желите да уклоните увезани контакт „%s“? Ово ће уклонити и �ве "
+"контакте који �у везани за овај контакт."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
-msgstr[0] "Увезани пријатељ �адржи %u контаката"
-msgstr[1] "Увезани пријатељ �адржи %u контаката"
+msgstr[0] "Увезани пријатељ �адржи %u контакт"
+msgstr[1] "Увезани пријатељ �адржи %u контакта"
 msgstr[2] "Увезани пријатељ �адржи %u контаката"
+msgstr[3] "Увезани пријатељ �адржи један контакт"
 
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:1
 msgid "<b>Location</b> at (date)"
@@ -2089,7 +2317,7 @@ msgstr "нови �ервер"
 
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:535
 msgid "SSL"
-msgstr "SSL"
+msgstr "ССЛ"
 
 #. Translators: this is the title of the linking dialogue (reached by
 #. * right-clicking on a contact and selecting "Link…"). "Link" in this title
@@ -2101,12 +2329,12 @@ msgstr "Повежи пријатеље"
 #: ../libempathy-gtk/empathy-linking-dialog.c:120
 msgctxt "Unlink individual (button)"
 msgid "_Unlink…"
-msgstr "_Одвежи…"
+msgstr "_Развежи…"
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:121
 msgid ""
 "Completely split the displayed linked contacts into the separate contacts."
-msgstr "Разбија увезане контакте у по�ебне пријатеље."
+msgstr "Раздваја увезане контакте у по�ебне пријатеље."
 
 #. Add button
 #. Translators: this is an action button in the linking dialogue. "Link" is
@@ -2114,85 +2342,226 @@ msgstr "Разбија увезане контакте у поÑ�ебне приÑ
 #. * meta-contact".
 #: ../libempathy-gtk/empathy-linking-dialog.c:136
 msgid "_Link"
-msgstr "_Повежи"
+msgstr "_Увежи"
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:183
 #, c-format
 msgid "Unlink linked contacts '%s'?"
-msgstr "Одвежи увезаног пријатеља „%s“?"
+msgstr "Да развежем увезаног пријатеља „%s“?"
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:186
 msgid ""
 "Are you sure you want to unlink these linked contacts? This will completely "
 "split the linked contacts into separate contacts."
 msgstr ""
-"Да ли �те �игурни да желите да одвежете увезаног пријатеља? Овим ћете "
-"разбити увезане контакте у по�ебне пријатеље."
+"Да ли �те �игурни да желите да развежете увезаног пријатеља? Овим ћете "
+"раздвојити увезане контакте у по�ебне пријатеље."
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:190
 msgctxt "Unlink individual (button)"
 msgid "_Unlink"
-msgstr "_Одвежи"
+msgstr "_Развежи"
 
-#: ../libempathy-gtk/empathy-log-window.c:660
-msgid "Date"
-msgstr "Датум"
+#: ../libempathy-gtk/empathy-log-window.c:634
+msgid "History"
+msgstr "И�торијат"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
-msgstr "Разговори"
+#: ../libempathy-gtk/empathy-log-window.c:689
+msgid "Show"
+msgstr "Прикажи"
+
+#: ../libempathy-gtk/empathy-log-window.c:711
+msgid "Search"
+msgstr "Потражи"
+
+#: ../libempathy-gtk/empathy-log-window.c:1159
+#, c-format
+msgid "Chat in %s"
+msgstr "Ћа�кање у %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1161
+#, c-format
+msgid "Chat with %s"
+msgstr "Ћа�кање �а %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%A, %e %B %Y %X"
+
+#. Translators: this is an emote: '* Danielle waves'
+#: ../libempathy-gtk/empathy-log-window.c:1300
+#, c-format
+msgid "<i>* %s %s</i>"
+msgstr "<i>* %s %s</i>"
+
+#. Translators: this is a message: 'Danielle: hello'
+#. * The string in bold is the sender's name
+#: ../libempathy-gtk/empathy-log-window.c:1306
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1382
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s �екунде"
+msgstr[1] "%s �екунде"
+msgstr[2] "%s �екунди"
+msgstr[3] "једне �екунде"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s минута"
+msgstr[1] "%s минута"
+msgstr[2] "%s минута"
+msgstr[3] "једног минута"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "Позив је започет %s, а завршен је %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1729
+msgid "Today"
+msgstr "Дана�"
+
+#: ../libempathy-gtk/empathy-log-window.c:1733
+msgid "Yesterday"
+msgstr "Јуче"
+
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
+msgid "%e %B %Y"
+msgstr "%e. %B %Y."
+
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3444
+msgid "Anytime"
+msgstr "Било кад"
+
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2372
+msgid "Anyone"
+msgstr "Било ко"
+
+#: ../libempathy-gtk/empathy-log-window.c:2685
+msgid "Who"
+msgstr "Ко"
+
+#: ../libempathy-gtk/empathy-log-window.c:2889
+msgid "When"
+msgstr "Када"
+
+#: ../libempathy-gtk/empathy-log-window.c:3005
+msgid "Anything"
+msgstr "Било шта"
+
+#: ../libempathy-gtk/empathy-log-window.c:3007
+msgid "Text chats"
+msgstr "Пи�ана ћа�кања"
+
+#: ../libempathy-gtk/empathy-log-window.c:3009
+#: ../src/empathy-preferences.ui.h:4
+msgid "Calls"
+msgstr "Позиви"
+
+#: ../libempathy-gtk/empathy-log-window.c:3014
+msgid "Incoming calls"
+msgstr "Долазни позиви"
+
+#: ../libempathy-gtk/empathy-log-window.c:3015
+msgid "Outgoing calls"
+msgstr "Одлазећи позиви"
+
+#: ../libempathy-gtk/empathy-log-window.c:3016
+msgid "Missed calls"
+msgstr "Пропуштени позиви"
+
+#: ../libempathy-gtk/empathy-log-window.c:3038
+msgid "What"
+msgstr "Шта"
+
+#: ../libempathy-gtk/empathy-log-window.c:3747
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr ""
+"Да ли �те �игурни да желите да обришете �ве дневнике претходних разговора?"
+
+#: ../libempathy-gtk/empathy-log-window.c:3751
+msgid "Clear All"
+msgstr "Очи�ти �ве"
+
+#: ../libempathy-gtk/empathy-log-window.c:3758
+msgid "Delete from:"
+msgstr "Обриши од:"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Учитавам...</span>"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "�ађи �ледеће"
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Chat"
+msgstr "Ћа�кање"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "�ађи претходно"
+msgid "Delete All History..."
+msgstr "Обриши �ав и�торијат..."
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr "Претходни разговори"
+msgid "Profile"
+msgstr "Профил"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Video"
+msgstr "Видео"
 
-#. Tab Label
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "Тражи"
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:20
+msgid "_Edit"
+msgstr "Изм_ени"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "_File"
+msgstr "_Датотека"
 
-#. Searching *for* something
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "_За:"
+msgid "page 2"
+msgstr "�трана 2"
 
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
 msgid "Contact ID:"
-msgstr "ИД пријатеља:"
+msgstr "ИБ пријатеља:"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:171
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
 msgid "C_hat"
 msgstr "Ћ_а�кај"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:181
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
 msgstr "�ови разговор"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:253
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
 msgid "Send _Video"
 msgstr "Пошаљи _видео"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:261
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
 msgid "C_all"
 msgstr "_Позови"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:271
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "New Call"
 msgstr "�ови позив"
 
@@ -2211,34 +2580,34 @@ msgstr ""
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Message…"
 msgstr "Произвољна порука…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messages…"
 msgstr "Уреди произвољне поруке…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
-msgstr "Кликните да уклоните ову �тату�ну поруку из омиљених"
+msgstr "Кликните да уклоните ову поруку �тања из омиљених"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
-msgstr "Кликните да �тавите ову �тату�ну поруку као омиљену"
+msgstr "Кликните да по�тавите ову поруку �тања као омиљену"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
 msgstr "По�тави �тање"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:946
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
 msgid "Set your presence and current status"
-msgstr "По�тави ваше при�у�тво и тренутно �тање"
+msgstr "По�тавите ваше при�у�тво и тренутно �тање"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1134
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
 msgid "Custom messages…"
 msgstr "Произвољне поруке…"
 
@@ -2251,17 +2620,25 @@ msgstr "Произвољне поруке…"
 msgid "New %s account"
 msgstr "�ови %s налог"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "Тражи:"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Mat_ch case"
+msgstr "_Упореди величину �лова"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+msgid "Phrase not found"
+msgstr "Израз није пронађен"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "Поклопи велика и мала �лова"
+msgid "_Next"
+msgstr "_Следеће"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "Phrase not found"
-msgstr "Израз није нађен"
+msgid "_Previous"
+msgstr "_Претходно"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2273,7 +2650,7 @@ msgstr "По�лата је брза порука"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:55
 msgid "Incoming chat request"
-msgstr "Долазећи захтев за ћа�кање"
+msgstr "Долазни захтев за ћа�кање"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:57
 msgid "Contact connected"
@@ -2285,7 +2662,7 @@ msgstr "Пријатељ је отишао �а везе"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:61
 msgid "Connected to server"
-msgstr "�а вези �а �ервером"
+msgstr "Повезан �а �ервером"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:63
 msgid "Disconnected from server"
@@ -2293,55 +2670,52 @@ msgstr "И�кључен �а �ервера"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:65
 msgid "Incoming voice call"
-msgstr "Долазећи позив"
+msgstr "Долазни позив за разговор"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:67
 msgid "Outgoing voice call"
-msgstr "Одлазећи позив"
+msgstr "Одлазни позив за разговор"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:69
 msgid "Voice call ended"
-msgstr "Позив је завршен"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "Уне�и произвољну поруку"
+msgstr "Позив за разговор је завршен"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
 msgstr "Уреди произвољне поруке"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr "Сачувај _нову поруку �тања"
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#, c-format
+msgid "Message edited at %s"
+msgstr "Порука је уређена %s"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Status Messages"
-msgstr "Снимљене поруке �тања"
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
+msgid "Normal"
+msgstr "�ормално"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "Кла�ично"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "Про�то"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "Чи�то"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "Плаво"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:150
 msgid "The identity provided by the chat server cannot be verified."
-msgstr "Идентитет �ервера за ћа�кање �е не може проверити."
+msgstr "Идентитет �ервера за ћа�кање не може бити проверен."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:157
 msgid "The certificate is not signed by a Certification Authority."
-msgstr "Сертификат није потпи�ао �уторитет за �ертификате."
+msgstr "Сертификат није потпи�ао Издавач уверења."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:161
 msgid "The certificate has expired."
@@ -2367,7 +2741,7 @@ msgstr "Сертификат је �амопотпи�ан."
 #: ../libempathy-gtk/empathy-tls-dialog.c:177
 msgid ""
 "The certificate has been revoked by the issuing Certification Authority."
-msgstr "Сертификат је повукао �уторитет за �ертификате који га је и издао."
+msgstr "Сертификат је повукао Издавач уверења који га је и издао."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:181
 msgid "The certificate is cryptographically weak."
@@ -2407,28 +2781,28 @@ msgstr "Запамти овај избор за наредне везе"
 msgid "Certificate Details"
 msgstr "Детаљи �ертификата"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1705
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
 msgstr "�е могу да отворим адре�у"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1800
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
 msgstr "Изаберите датотеку"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
 msgid "Insufficient free space to save file"
 msgstr "�ема довољно �лободног ме�та за чување датотеке"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr ""
-"Потребно је %s ме�та за �нимање ове датотеке, али је до�тупно �амо %s. "
-"Одаберите друго ме�то за �нимање."
+"Потребно је %s за �нимање ове датотеке, али је до�тупно �амо %s. Одаберите "
+"друго ме�то за �нимање."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1924
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Долазећа датотека од %s"
@@ -2610,30 +2984,30 @@ msgstr "Изабрани пријатељ није на вези."
 
 #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
 msgid "No error message"
-msgstr "�ема порука �а грешком"
+msgstr "�ема порука о грешкама"
 
 #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
 msgid "Instant Message (Empathy)"
 msgstr "Брза порука (Пи�моноша)"
 
-#: ../src/empathy.c:308
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "�е повезуј �е по покретању"
 
-#: ../src/empathy.c:312
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr ""
 "�е приказуј �пи�ак пријатеља нити било које друго прозорче по покретању"
 
-#: ../src/empathy.c:320
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
-msgstr "- Интернет пи�моноша за брзе поруке"
+msgstr "— Интернет пи�моноша за брзе поруке"
 
-#: ../src/empathy.c:499
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
 msgstr "Грешка при комуникацији �а Управником налога"
 
-#: ../src/empathy.c:501
+#: ../src/empathy.c:639
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2641,7 +3015,7 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"Де�ила �е грешка при повезивању на Управник налога Телепатије. Грешка је "
+"Дошло је до грешке при повезивању �а Управником налога Телепатије. Грешка је "
 "била:\n"
 "\n"
 "%s"
@@ -2655,7 +3029,7 @@ msgid ""
 msgstr ""
 "Интернет пи�моноша је �лободан �офтвер; можете га ра�подељивати и/или га "
 "мењати под у�ловима Г�У Опште Јавне Лиценце (GNU GPL) како је објављује "
-"Задужбина за Слободни Софтвер (FSF); било верзије 2 те Лиценце, било (по "
+"Задужбина за Слободни Софтвер (FSF); било верзије 2 те Лиценце, или (по "
 "вашем нахођењу) било које новије верзије."
 
 #: ../src/empathy-about-dialog.c:85
@@ -2677,8 +3051,9 @@ msgid ""
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
 msgstr ""
 "Требали �те да примите примерак Г�У Опште Јавне Лиценце уз Интернет "
-"пи�моношу; ако ни�те, пишите Задужбини за Слободни Софтвер (Free Software "
-"Foundation, Inc.), 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA"
+"пи�моношу; ако ни�те, пишите Задужбини за Слободни Софтвер на �ледећу "
+"адре�у: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
+"Boston, MA 02110-1301 USA"
 
 #: ../src/empathy-about-dialog.c:107
 msgid "An Instant Messaging client for GNOME"
@@ -2687,7 +3062,7 @@ msgstr "Гномов програм за брзе поруке"
 #: ../src/empathy-about-dialog.c:113
 msgid "translator-credits"
 msgstr ""
-"Данило Шерган <dsegan@gmx.net>\n"
+"Данило Шеган <dsegan@gmx.net>\n"
 "�лек�андар Урошевић <urke@users.sourceforge.net>\n"
 "Филип Милетић <f.miletic@ewi.tudelft.nl>\n"
 "�икола Котур <kotnik@ns-linux.org>\n"
@@ -2723,12 +3098,12 @@ msgid ""
 "this assistant and add accounts later from the Edit menu."
 msgstr ""
 "Можете �е или вратити и пробати да поново уне�ете детаље налога или да "
-"затворите а�и�тента и додате налоге ка�није из менија „Измени“."
+"затворите помоћника и додате налоге ка�није из менија „Измени“."
 
 #: ../src/empathy-account-assistant.c:220
 #: ../src/empathy-account-assistant.c:1271
 msgid "An error occurred"
-msgstr "Догодила �е грешка"
+msgstr "Дошло је до грешке"
 
 #: ../src/empathy-account-assistant.c:467
 msgid "What kind of chat account do you have?"
@@ -2762,7 +3137,7 @@ msgid ""
 "calls."
 msgstr ""
 "Са Интернет Пи�моношом можете ћа�кати и �а људима у близини и �а пријатељима "
-"и колегама који кори�те Google Talk, �ИМ, Windows Live и многе друге "
+"и колегама који кори�те Гугл разговор, �ИМ, Виндоуз уживо и многе друге "
 "програме за ћа�кање. Са микрофоном и камером такође можете да обављате и "
 "аудио и видео позиве."
 
@@ -2792,8 +3167,8 @@ msgid "Select the accounts you want to import:"
 msgstr "Изаберите налоге које желите да увезете:"
 
 #: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "Yes"
 msgstr "Да"
 
@@ -2820,7 +3195,7 @@ msgstr "Измени->�алози"
 
 #: ../src/empathy-account-assistant.c:1107
 msgid "I do _not want to enable this feature for now"
-msgstr "За �ада не желим да кори�тим ову могућно�т"
+msgstr "За �ада _не желим да кори�тим ову могућно�т"
 
 #: ../src/empathy-account-assistant.c:1143
 msgid ""
@@ -2829,9 +3204,9 @@ msgid ""
 "install the telepathy-salut package and create a People Nearby account from "
 "the Accounts dialog"
 msgstr ""
-"�е могу да ћа�кам �а људима повезаним у вашу локалну мрежу јер telepathy-"
-"salut није ин�талиран. �ко желите да омогућите ово, ин�талирајте telepathy-"
-"salut пакет и направите налог „Људи у околини“ из прозорчета „�алози“."
+"�е могу да ћа�кам �а људима повезаним на вашу локалну мрежу јер telepathy-"
+"salut није ин�талиран. �ко желите да омогућите ово, ин�талирајте пакет "
+"telepathy-salut и направите налог „Људи у околини“ из прозорчета „�алози“."
 
 #: ../src/empathy-account-assistant.c:1149
 msgid "telepathy-salut not installed"
@@ -2839,7 +3214,7 @@ msgstr "telepathy-salut није ин�талиран"
 
 #: ../src/empathy-account-assistant.c:1195
 msgid "Messaging and VoIP Accounts Assistant"
-msgstr "��и�тент налога за брзе поруке и VoIP"
+msgstr "��и�тент налога за брзе поруке и ВоИП"
 
 #: ../src/empathy-account-assistant.c:1229
 msgid "Welcome to Empathy"
@@ -2866,34 +3241,35 @@ msgstr "ПоÑ�тоје неÑ�ачуване измене на вашем налÐ
 msgid "Your new account has not been saved yet."
 msgstr "Ваш нови налог још није �ачуван."
 
-#: ../src/empathy-accounts-dialog.c:286
-#: ../src/empathy-streamed-media-window.c:809
+#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1216
 msgid "Connecting…"
 msgstr "Повезујем �е…"
 
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:386
 #, c-format
 msgid "Offline — %s"
 msgstr "�еповезан — %s"
 
-#: ../src/empathy-accounts-dialog.c:339
+#: ../src/empathy-accounts-dialog.c:398
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Веза је прекинута — %s"
 
-#: ../src/empathy-accounts-dialog.c:350
+#: ../src/empathy-accounts-dialog.c:409
 msgid "Offline — No Network Connection"
 msgstr "�еповезан — �ема мрежне конекције"
 
-#: ../src/empathy-accounts-dialog.c:357
+#: ../src/empathy-accounts-dialog.c:416
 msgid "Unknown Status"
 msgstr "�епознато �тање"
 
-#: ../src/empathy-accounts-dialog.c:369
+#: ../src/empathy-accounts-dialog.c:428
 msgid "Offline — Account Disabled"
 msgstr "�еповезан — �алог је онемогућен"
 
-#: ../src/empathy-accounts-dialog.c:772
+#: ../src/empathy-accounts-dialog.c:831
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2901,16 +3277,16 @@ msgstr ""
 "Овим ћете направити нови налог, занемаривши унете измене.\n"
 "Да ли �игурно желите да на�тавите?"
 
-#: ../src/empathy-accounts-dialog.c:1133
+#: ../src/empathy-accounts-dialog.c:1192
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Да ли �те �игурни да желите да уклоните „%s“ �а вашег рачунара?"
 
-#: ../src/empathy-accounts-dialog.c:1137
+#: ../src/empathy-accounts-dialog.c:1196
 msgid "This will not remove your account on the server."
 msgstr "Ово неће уклонити ваш налог на �ерверу."
 
-#: ../src/empathy-accounts-dialog.c:1375
+#: ../src/empathy-accounts-dialog.c:1432
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2919,15 +3295,15 @@ msgstr ""
 "Да ли �игурно желите да на�тавите?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1593
+#: ../src/empathy-accounts-dialog.c:1643
 msgid "_Enable"
 msgstr "_Омогући"
 
-#: ../src/empathy-accounts-dialog.c:1594
+#: ../src/empathy-accounts-dialog.c:1644
 msgid "_Disable"
 msgstr "О_немогући"
 
-#: ../src/empathy-accounts-dialog.c:2113
+#: ../src/empathy-accounts-dialog.c:2154
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2936,38 +3312,38 @@ msgstr ""
 "Да ли �игурно желите да на�тавите?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Додај…"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
 msgid "Loading account information"
 msgstr "Учитавам податке о налогу"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "No protocol installed"
 msgstr "�иједан протокол није ин�талиран"
 
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Protocol:"
 msgstr "Протокол:"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr ""
-"Да би�те додали нови налог, прво морате да ин�талирате прикључке за �ве "
-"протоколе које желите да кори�тите."
+"Да додате нови налог, прво морате да ин�талирате прикључке за �ве протоколе "
+"које желите да кори�тите."
 
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add…"
-msgstr "Дод_ај…"
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Import…"
 msgstr "_Увези…"
 
-#: ../src/empathy-auth-client.c:250
+#: ../src/empathy-auth-client.c:249
 msgid " - Empathy authentication client"
-msgstr " - Интернет пи�моноша клијент пријаве"
+msgstr " — Интернет пи�моноша клијент пријаве"
 
-#: ../src/empathy-auth-client.c:266
+#: ../src/empathy-auth-client.c:265
 msgid "Empathy authentication client"
 msgstr "Интернет пи�моноша клијент пријаве"
 
@@ -2975,108 +3351,132 @@ msgstr "Интернет пи�моноша клијент пријаве"
 msgid "People nearby"
 msgstr "Људи у околини"
 
-#: ../src/empathy-av.c:118
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
-msgstr "- Интернет пи�моноша �удио/Видео клијент"
+msgstr "— Интернет пи�моноша �удио/Видео клијент"
 
-#: ../src/empathy-av.c:134
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "Интернет пи�моноша �удио/Видео клијент"
 
-#: ../src/empathy-streamed-media-window.c:479
+#: ../src/empathy-streamed-media-window.c:431
 msgid "Contrast"
 msgstr "Контра�т"
 
-#: ../src/empathy-streamed-media-window.c:482
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Brightness"
 msgstr "О�ветљено�т"
 
-#: ../src/empathy-streamed-media-window.c:485
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Gamma"
 msgstr "Гама"
 
-#: ../src/empathy-streamed-media-window.c:590
+#: ../src/empathy-streamed-media-window.c:542
 msgid "Volume"
 msgstr "Јачина звука"
 
-#: ../src/empathy-streamed-media-window.c:1166
+#: ../src/empathy-streamed-media-window.c:1110
 msgid "_Sidebar"
 msgstr "_Бочна површ"
 
-#: ../src/empathy-streamed-media-window.c:1186
+#: ../src/empathy-streamed-media-window.c:1130
 msgid "Audio input"
 msgstr "Звучни улаз"
 
-#: ../src/empathy-streamed-media-window.c:1190
+#: ../src/empathy-streamed-media-window.c:1134
 msgid "Video input"
 msgstr "Видео улаз"
 
-#: ../src/empathy-streamed-media-window.c:1194
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Dialpad"
 msgstr "Бројчаник"
 
-#: ../src/empathy-streamed-media-window.c:1205
+#: ../src/empathy-streamed-media-window.c:1151
 msgid "Details"
 msgstr "Детаљи"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1274
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1825
 #, c-format
 msgid "Call with %s"
 msgstr "Позив �а кори�ником %s"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-streamed-media-window.c:1353
-msgid "Call"
-msgstr "Позив"
-
-#: ../src/empathy-streamed-media-window.c:1507
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:2069
 msgid "The IP address as seen by the machine"
 msgstr "ИП адре�а како је види овај рачунар"
 
-#: ../src/empathy-streamed-media-window.c:1509
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:2071
 msgid "The IP address as seen by a server on the Internet"
 msgstr "ИП адре�а како је види �ервер на интернету"
 
-#: ../src/empathy-streamed-media-window.c:1511
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:2073
 msgid "The IP address of the peer as seen by the other side"
 msgstr "ИП адре�а вршњака како је види друга �трана"
 
-#: ../src/empathy-streamed-media-window.c:1513
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:2075
 msgid "The IP address of a relay server"
 msgstr "ИП адре�а релејног �ервера"
 
-#: ../src/empathy-streamed-media-window.c:1515
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:2077
 msgid "The IP address of the multicast group"
 msgstr "ИП адре�а групе за више�труко емитовање"
 
+#: ../src/empathy-streamed-media-window.c:1843
+msgctxt "encoding video codec"
+msgid "Unknown"
+msgstr "�епознато"
+
+#: ../src/empathy-streamed-media-window.c:1846
+msgctxt "encoding audio codec"
+msgid "Unknown"
+msgstr "�епознато"
+
+#: ../src/empathy-streamed-media-window.c:1849
+msgctxt "decoding video codec"
+msgid "Unknown"
+msgstr "�епознато"
+
+#: ../src/empathy-streamed-media-window.c:1852
+msgctxt "decoding audio codec"
+msgid "Unknown"
+msgstr "�епознато"
+
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2270
+#: ../src/empathy-streamed-media-window.c:2144
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Повезан — %d:%02dм"
 
-#: ../src/empathy-streamed-media-window.c:2331
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2846
 msgid "Technical Details"
 msgstr "Технички детаљи"
 
-#: ../src/empathy-streamed-media-window.c:2369
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2884
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "Програм %s не разуме ниједан звучни формат који подржава ваш рачунар"
 
-#: ../src/empathy-streamed-media-window.c:2374
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2889
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "Програм %s не разуме ниједан видео формат који подржава ваш рачунар"
 
-#: ../src/empathy-streamed-media-window.c:2380
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2895
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3085,23 +3485,27 @@ msgstr ""
 "�е могу да у�по�тавим везу �а %s. Можда је неко од ва� двоје на мрежи која "
 "не дозвољава директне везе."
 
-#: ../src/empathy-streamed-media-window.c:2386
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2901
 msgid "There was a failure on the network"
 msgstr "Дошло је до грешке у мрежи"
 
-#: ../src/empathy-streamed-media-window.c:2390
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2905
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Звучни формати потребни за овај позив ни�у ин�талирани на вашем рачунару"
 
-#: ../src/empathy-streamed-media-window.c:2393
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2908
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Видео формати потребни за овај позив ни�у ин�талирани на вашем рачунару"
 
-#: ../src/empathy-streamed-media-window.c:2403
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2920
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3112,153 +3516,212 @@ msgstr ""
 "\">ову грешку</a> и прикачите дневнике покупљене из прозора „Отклањање "
 "грешака“ у менију „Помоћ“."
 
-#: ../src/empathy-streamed-media-window.c:2411
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2929
 msgid "There was a failure in the call engine"
 msgstr "Дошло је до грешке у мотору за позиве"
 
-#: ../src/empathy-streamed-media-window.c:2414
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2932
 msgid "The end of the stream was reached"
 msgstr "До�тигнут је крај тока"
 
-#: ../src/empathy-streamed-media-window.c:2454
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2972
 msgid "Can't establish audio stream"
 msgstr "�е могу да у�по�тавим звучни ток"
 
-#: ../src/empathy-streamed-media-window.c:2464
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2982
 msgid "Can't establish video stream"
 msgstr "�е могу да у�по�тавим видео ток"
 
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "Audio"
 msgstr "�удио"
 
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Позови пријатеља поново"
-
 #: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "И�кљ. камеру"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "Кодек за декодирање:"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "Укљ. камеру"
+msgid "Disable camera"
+msgstr "И�кључите камерицу"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Кодек за декодирање:"
+msgid "Display the dialpad"
+msgstr "Прикажите бројчаник"
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Онемогући камеру и пре�тани да шаљеш видео"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "Кодек за кодирање:"
 
 #: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Омогући камеру и шаљи видео"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Hang up"
+msgstr "Прекини"
 
 #: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Омогући камеру, али не шаљи видео"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Hang up current call"
+msgstr "Прекините тренутни позив"
 
 #: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Кодек за кодирање:"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "Локални кандидат:"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "Спу�ти"
+msgid "Maximise me"
+msgstr "Увећај ме"
 
 #: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Спу�ти тренутни позив"
+msgid "Minimise me"
+msgstr "Умањи ме"
 
 #: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Локални кандидат:"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "Удаљени кандидат:"
 
 #: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "Преглед"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Send Audio"
+msgstr "Пошаљи звук"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "Поново зови"
+msgid "Send Video"
+msgstr "Пошаљи видео"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Удаљени кандидат:"
+msgid "Show dialpad"
+msgstr "Прикажи бројчаник"
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "Пошаљи звук"
+msgid "Start a video call"
+msgstr "Започните видео позив"
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Укључи/и�кључи прено� звука"
+msgid "Start an audio call"
+msgstr "Започните аудио позив"
+
+#: ../src/empathy-call-window.ui.h:18
+msgid "Swap camera"
+msgstr "Размени камеру"
 
 #: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "В_идео"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr "Укључи/и�кључи прено� звука"
 
 #: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "Видео"
+msgid "Toggle video transmission"
+msgstr "Укључи/и�кључи прено� видеа"
 
 #: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "И�кљ. видео"
-
-#: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "Укљ. видео"
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
+#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
+msgid "Unknown"
+msgstr "�епознато"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "Преглед видеа"
+msgid "Video call"
+msgstr "Видео позив"
 
 #: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "_Позови"
 
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:25
+msgid "_Camera"
+msgstr "_Камерица"
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:18
+msgid "_Contents"
+msgstr "_Садржај"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
+msgid "_Debug"
+msgstr "Отклањање _грешака"
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:22
+msgid "_Help"
+msgstr "По_моћ"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Microphone"
+msgstr "Ми_крофон"
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "_Settings"
+msgstr "По_дешавања"
+
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
-msgstr "_Преглед"
+msgstr "Пре_глед"
 
-#: ../src/empathy-chat-window.c:474 ../src/empathy-chat-window.c:494
+#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d непрочитана)"
 msgstr[1] "%s (%d непрочитане)"
 msgstr[2] "%s (%d непрочитаних)"
+msgstr[3] "%s (једна непрочитана)"
 
-#: ../src/empathy-chat-window.c:486
+#: ../src/empathy-chat-window.c:493
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
-msgstr[0] "%s (и %u о�тала)"
-msgstr[1] "%s (и %u о�тале)"
-msgstr[2] "%s (и %u о�талих)"
+msgstr[0] "%s (и %u друга)"
+msgstr[1] "%s (и %u друге)"
+msgstr[2] "%s (и %u других)"
+msgstr[3] "%s (и једна друга)"
 
-#: ../src/empathy-chat-window.c:502
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d непрочитана од о�талих)"
 msgstr[1] "%s (%d непрочитане од о�талих)"
 msgstr[2] "%s (%d непрочитаних од о�талих)"
+msgstr[3] "%s (једна непрочитана од о�талих)"
 
-#: ../src/empathy-chat-window.c:511
+#: ../src/empathy-chat-window.c:518
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d непрочитана од �вих)"
 msgstr[1] "%s (%d непрочитане од �вих)"
 msgstr[2] "%s (%d непрочитаних од �вих)"
+msgstr[3] "%s (једна непрочитана од �вих)"
+
+#: ../src/empathy-chat-window.c:733
+msgid "SMS:"
+msgstr "СМС:"
 
-#: ../src/empathy-chat-window.c:721
+#: ../src/empathy-chat-window.c:743
+#, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "Шаљем %d поруку."
+msgstr[1] "Шаљем %d поруке."
+msgstr[2] "Шаљем %d порука."
+msgstr[3] "Шаљем једну поруку"
+
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
-msgstr "Куца поруку."
+msgstr "Пише поруку."
 
 #: ../src/empathy-chat-window.ui.h:1
 msgid "C_lear"
@@ -3268,10 +3731,6 @@ msgstr "_Очи�ти"
 msgid "C_ontact"
 msgstr "_Пријатељ"
 
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Ћа�кање"
-
 #: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
 msgstr "Убаци _�мешак"
@@ -3292,10 +3751,6 @@ msgstr "Преме�ти језичак _де�но"
 msgid "Notify for All Messages"
 msgstr "Обаве�ти за �ве поруке"
 
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
-msgid "_Contents"
-msgstr "_Садржај"
-
 #: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "_Разговор"
@@ -3304,17 +3759,9 @@ msgstr "_Разговор"
 msgid "_Detach Tab"
 msgstr "_Откачи ли�т"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
-msgid "_Edit"
-msgstr "Изм_ени"
-
 #: ../src/empathy-chat-window.ui.h:13
 msgid "_Favorite Chat Room"
-msgstr "О_миљена �оба за ћа�кање"
-
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
-msgid "_Help"
-msgstr "_Помоћ"
+msgstr "Омиљена �оба за _ћа�кање"
 
 #: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
@@ -3322,7 +3769,7 @@ msgstr "_Следећи ли�т"
 
 #: ../src/empathy-chat-window.ui.h:16
 msgid "_Previous Tab"
-msgstr "П_ретходни ли�т"
+msgstr "_Претходни ли�т"
 
 #: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
 msgid "_Show Contact List"
@@ -3336,15 +3783,15 @@ msgstr "_Ли�тови"
 msgid "_Undo Close Tab"
 msgstr "_Опозови затварање језичка"
 
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "Име"
 
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
 msgstr "Соба"
 
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "�утомат�ко повезивање"
 
@@ -3352,90 +3799,96 @@ msgstr "�утомат�ко повезивање"
 msgid "Manage Favorite Rooms"
 msgstr "Уреди омиљене �обе"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming video call"
-msgstr "Долазећи видео позив"
+msgstr "Долазни видео позив"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
 msgid "Incoming call"
 msgstr "Долазни позив"
 
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:525
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s ва� зове видео позивом. Желите ли да �е јавите?"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s ва� зове. Желите ли да �е јавите?"
 
-#: ../src/empathy-event-manager.c:515 ../src/empathy-event-manager.c:667
+#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Долазни позив од %s"
 
-#: ../src/empathy-event-manager.c:540
+#: ../src/empathy-event-manager.c:554
 msgid "_Reject"
 msgstr "_Одбаци"
 
-#: ../src/empathy-event-manager.c:546
+#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
 msgid "_Answer"
 msgstr "_Јави �е"
 
-#: ../src/empathy-event-manager.c:667
+#: ../src/empathy-event-manager.c:570
+msgid "_Answer with video"
+msgstr "Одговори �а _видеом"
+
+#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Долазни видео позив од %s"
 
-#: ../src/empathy-event-manager.c:744
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
 msgstr "Позивнице за �обу"
 
-#: ../src/empathy-event-manager.c:746
+#: ../src/empathy-event-manager.c:838
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Позивница да �е придружите у %s"
 
-#: ../src/empathy-event-manager.c:753
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s ва� позива да �е придружите %s"
 
-#: ../src/empathy-event-manager.c:761
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
 msgstr "_Одбиј"
 
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Прикључи �е"
 
-#: ../src/empathy-event-manager.c:793
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
-msgstr "%s ва� је позвао(ла) да �е придружите %s"
+msgstr "%s ва� позива да �е придружите %s"
 
-#: ../src/empathy-event-manager.c:799
+#: ../src/empathy-event-manager.c:891
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Позвани �те да �е придружите у %s"
 
-#: ../src/empathy-event-manager.c:850
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Долазни прено� датотеке од %s"
 
-#: ../src/empathy-event-manager.c:1020 ../src/empathy-main-window.c:370
+#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
 msgid "Password required"
 msgstr "Захтевана је лозинка"
 
-#: ../src/empathy-event-manager.c:1076
+#: ../src/empathy-event-manager.c:1190
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s тражи одобрење да види када �те на вези"
 
-#: ../src/empathy-event-manager.c:1080
+#: ../src/empathy-event-manager.c:1194
 #, c-format
 msgid ""
 "\n"
@@ -3445,105 +3898,105 @@ msgstr ""
 "Порука: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:100
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:102
+#: ../src/empathy-ft-manager.c:103
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:179
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "�епознато"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s at %s/s"
-msgstr "%s од %s у %s/s"
+msgstr "%s од %s при %s/s"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:275
 #, c-format
 msgid "%s of %s"
 msgstr "%s од %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:305
+#: ../src/empathy-ft-manager.c:306
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Примам „%s“ од %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:309
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Шаљем „%s“ за %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:338
+#: ../src/empathy-ft-manager.c:339
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Грешка при примању „%s“ од %s"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:342
 msgid "Error receiving a file"
 msgstr "Грешка при примању датотеке"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:347
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Грешка при �лању „%s“ за %s"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:350
 msgid "Error sending a file"
 msgstr "Грешка при �лању датотеке"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:489
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "„%s“ је примљен од %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:493
+#: ../src/empathy-ft-manager.c:494
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr " „%s“ је по�лат за %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:497
 msgid "File transfer completed"
-msgstr "Прено� датотеке завршен"
+msgstr "Прено� датотеке је завршен"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
 msgid "Waiting for the other participant's response"
 msgstr "Чекам на одговор друге �тране"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Проверавам интегритет датотеке „%s“"
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Тражим хеш датотеке „%s“"
 
-#: ../src/empathy-ft-manager.c:1016
+#: ../src/empathy-ft-manager.c:1026
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1028
+#: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "Датотека"
 
-#: ../src/empathy-ft-manager.c:1050
+#: ../src/empathy-ft-manager.c:1060
 msgid "Remaining"
 msgstr "Прео�тало"
 
@@ -3553,7 +4006,7 @@ msgstr "Прено�и датотека"
 
 #: ../src/empathy-ft-manager.ui.h:2
 msgid "Remove completed, canceled and failed file transfers from the list"
-msgstr "Уклони завршене, отказане и неу�пешне прено�е датотека из ли�те"
+msgstr "Уклони завршене, отказане и неу�пешне прено�е датотека �а �пи�ка"
 
 #: ../src/empathy-import-dialog.c:84
 msgid ""
@@ -3580,133 +4033,146 @@ msgstr "Протокол"
 msgid "Source"
 msgstr "Извор"
 
-#: ../src/empathy-main-window.c:387
+#: ../src/empathy-main-window.c:392
 msgid "Provide Password"
 msgstr "Уне�ите лозинку"
 
-#: ../src/empathy-main-window.c:393
+#: ../src/empathy-main-window.c:398
 msgid "Disconnect"
 msgstr "Веза је прекинута"
 
-#: ../src/empathy-main-window.c:533
+#: ../src/empathy-main-window.c:622
 msgid "No match found"
-msgstr "�ема ниједно поклапање"
+msgstr "�ема поклапања"
 
-#: ../src/empathy-main-window.c:688
+#: ../src/empathy-main-window.c:777
 msgid "Reconnect"
 msgstr "Поново �е повежи"
 
-#: ../src/empathy-main-window.c:694
+#: ../src/empathy-main-window.c:783
 msgid "Edit Account"
 msgstr "Измени налог"
 
-#: ../src/empathy-main-window.c:700
+#: ../src/empathy-main-window.c:789
 msgid "Close"
 msgstr "Затвори"
 
-#: ../src/empathy-main-window.c:1418
+#. Translators: this string will be something like:
+#. *   Top up My Account ($1.23)..."
+#: ../src/empathy-main-window.c:928
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr "Допуни %s (%s)..."
+
+#: ../src/empathy-main-window.c:975
+msgid "Top up account credit"
+msgstr "Допуните кредит налога"
+
+#. top up button
+#: ../src/empathy-main-window.c:1046
+msgid "Top Up..."
+msgstr "Допуни..."
+
+#: ../src/empathy-main-window.c:1789
 msgid "Contact"
 msgstr "Пријатељ"
 
-#: ../src/empathy-main-window.c:1765
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "Спи�ак пријатеља"
 
-#: ../src/empathy-main-window.c:1881
-msgid "Show and edit accounts"
-msgstr "Прикажи и измени налоге"
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "Пријатељи на _мапи"
 
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-main-window-menubar.ui.h:2
+msgid "Credit Balance"
+msgstr "Изно� готовине"
+
+#: ../src/empathy-main-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "Пронађи у _�пи�ку пријатеља"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
-msgstr "П_ридружи �е омиљеним"
+msgstr "Придружи �е _омиљеним"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "Уреди омиљене"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "�_ормална величина"
 
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
-msgstr "�ови по_зив…"
+msgstr "�ови _позив…"
 
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "�ормална величина �а _аватарима"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "_По�тавке"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:10
 msgid "Show P_rotocols"
-msgstr "Прикажи п_ротоколе"
+msgstr "Прикажи _протоколе"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
-msgstr "Сортирај по име_ну"
+msgstr "Поређај према _имену"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
-msgstr "Сортирај по _�тању"
+msgstr "Поређај према _�тању"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "�_алози"
 
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "_Блокирани пријатељи"
 
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "_Компактна величина"
 
-#: ../src/empathy-main-window.ui.h:18
-msgid "_Debug"
-msgstr "Отклањање _грешака"
-
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "Прено�и _датотека"
 
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "_Прикључи �е…"
 
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "_�ови разговор…"
 
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
-msgstr "�еп_овезане пријатељи"
+msgstr "�еп_овезани пријатељи"
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "Лични _подаци"
 
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "_Соба"
 
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window-menubar.ui.h:29
 msgid "_Search for Contacts…"
 msgstr "_Тражи пријатеље…"
 
 #: ../src/empathy-new-chatroom-dialog.c:337
 msgid "Chat Room"
-msgstr "Собе за ћа�кање"
+msgstr "Соба за ћа�кање"
 
 #: ../src/empathy-new-chatroom-dialog.c:353
 msgid "Members"
@@ -3714,7 +4180,7 @@ msgstr "Чланови"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:560
+#: ../src/empathy-new-chatroom-dialog.c:553
 #, c-format
 msgid ""
 "%s\n"
@@ -3727,16 +4193,16 @@ msgstr ""
 "Потребна лозинка: %s\n"
 "Чланови: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "No"
 msgstr "�е"
 
-#: ../src/empathy-new-chatroom-dialog.c:591
+#: ../src/empathy-new-chatroom-dialog.c:584
 msgid "Could not start room listing"
 msgstr "�е могу да покренем ли�тање �пи�ка �оба"
 
-#: ../src/empathy-new-chatroom-dialog.c:601
+#: ../src/empathy-new-chatroom-dialog.c:594
 msgid "Could not stop room listing"
 msgstr "�е могу да зау�тавим ли�тање �пи�ка �оба"
 
@@ -3748,7 +4214,7 @@ msgstr "�е могу да учитам �пи�ак �оба"
 msgid ""
 "Enter the room name to join here or click on one or more rooms in the list."
 msgstr ""
-"Овде уне�ите име �обе за придруживање или кликните на неку од �оба у ли�ти."
+"Овде уне�ите име �обе за придруживање или кликните на неку од �оба на �пи�ку."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
 msgid ""
@@ -3770,39 +4236,79 @@ msgstr "Спи�ак �оба"
 msgid "_Room:"
 msgstr "_Соба:"
 
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr "Порука је примљена"
 
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr "Порука је по�лата"
 
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
 msgstr "�ови разговор"
 
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
 msgstr "Пријатељ �е пријавио"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
 msgstr "Пријатељ �е одјавио"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
 msgstr "�алог је на вези"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
 msgstr "�алог није на вези"
 
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr "Језик"
 
-#: ../src/empathy-preferences.c:875
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:734
+msgid "Juliet"
+msgstr "Паја"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:741
+msgid "Romeo"
+msgstr "Јаре"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:747
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr "Јао, куме, готов �ам!! Ја �ам бивши човек!!!"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:750
+msgid "Deny thy father and refuse thy name;"
+msgstr "Пајо, шта је било, Пајооо??"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:753
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr "Како шта је било?? �ема је више, украли �у ми је!!"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:756
+msgid "And I'll no longer be a Capulet."
+msgstr "Шта �у ти украли, Пајо?? Штаааа??"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:759
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr "Како шта?? �ма лађу, украли �у ми лађу!! Јао мени!!!"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:762
+msgid "Juliet has disconnected"
+msgstr "Сав очајан, Паја је прекинуо везу."
+
+#: ../src/empathy-preferences.c:1166
 msgid "Preferences"
 msgstr "По�тавке"
 
@@ -3810,92 +4316,112 @@ msgstr "По�тавке"
 msgid "Appearance"
 msgstr "Изглед"
 
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
 msgstr "Понашање"
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
 msgid "Chat Th_eme:"
-msgstr "Тема ћа�кања:"
+msgstr "_Тема ћа�кања:"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
 msgid "Disable notifications when _away or busy"
-msgstr "И�кључи обавештења када �ам од�утан или заузет"
+msgstr "И�кључи обавештења када �ам _од�утан или заузет"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
 msgid "Disable sounds when _away or busy"
-msgstr "И�кључи звукове када �ам од�утан или заузет"
+msgstr "И�кључи звуке када �ам _од�утан или заузет"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Прикажи долазне догађаје у обавештајној зони"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"Уклањање одјека чини да ваш гла� другој о�оби звучи ја�није, али може да "
+"изазове проблеме на неким рачунарима. �ко ви или ваш �аговорник чујете чудне "
+"шумове или крчање за време позива, покушајте да и�кључите уклањање одјека и "
+"поново покрените позив."
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "Омогући обавештења када пријатељ дође на мрежу"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "Омогући обавештења када пријатељ оде �а мреже"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
-msgstr "Омогући обавештења када ћа�кања ни�у у фоку�у"
+msgstr "Омогући обавештења када _ћа�кања ни�у у фоку�у"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "Омогући проверу правопи�а за �ледеће језике:"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "Опште"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input level:"
+msgstr "Улазни ниво:"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "Јачина улазног звука:"
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "Извори локација:"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
-msgstr "Бележи разговоре"
+msgstr "Забележи разговоре"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "Обавештења"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Пу�ти звук за догађаје"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "Приватно�т"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
 "decimal place."
 msgstr ""
-"Умањена прецизно�т локације подразумева да ће најпрецизнији подаци о вашој "
+"Умањена тачно�т локације значи да ће најтачнији објављени подаци о вашој "
 "локацији бити град и држава.  ГПС координате ће бити тачне до 1. децимале."
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "Прикажи �лике _�мешака"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
-msgstr "Прикажи _�пи�ак пријатеља у �обама"
+msgstr "Прикажи �пи�ак _пријатеља у �обама"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
-msgstr "Звукови"
+msgstr "Звуци"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "Провера пи�ања"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
@@ -3903,44 +4429,48 @@ msgstr ""
 "Овај �пи�ак језика пред�тавља �амо оне језике за које имате ин�талиране "
 "речнике."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "Теме"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:30
+msgid "Variant:"
+msgstr "Варијанта:"
+
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
-msgstr "_�утомат�ки �е повежи по покретању "
+msgstr "_Сам �е повежи након покретања"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Мобилни телефон"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
-msgstr "Омогући обав_ештења у облачићима"
+msgstr "_Омогући обавештења у облачићима"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
-msgstr "Омогући звуковна обав_ештења"
+msgstr "Омогући _звучна обавештења"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_ГПС"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Мрежа (ИП, бежична)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "_Отварај ћа�кања у новим прозорима"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
-msgstr "Објави локацији мојим _пријатељима"
+msgstr "Објави локацију мојим _пријатељима"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "Умањи _тачно�т локације"
 
@@ -3952,82 +4482,131 @@ msgstr "Стање"
 msgid "_Quit"
 msgstr "_Изађи"
 
-#: ../src/empathy-map-view.c:442
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "Позови пријатеља поново"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "И�кљ. камеру"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "Укљ. камеру"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "Онемогући камеру и пре�тани да шаљеш видео"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "Омогући камеру и шаљи видео"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "Омогући камеру, али не шаљи видео"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "Преглед"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "Поново зови"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "В_идео"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "И�кљ. видео"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "Укљ. видео"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "Преглед видеа"
+
+#: ../src/empathy-map-view.c:448
 msgid "Contact Map View"
 msgstr "Мапа пријатеља"
 
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
 msgid "Save"
 msgstr "Сачувај"
 
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
 msgstr "Прозор за отклањање грешака"
 
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
-msgstr "�иво"
+msgstr "�иво: "
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
 msgid "Debug"
 msgstr "Отклањање грешака"
 
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
 msgid "Info"
-msgstr "Информација"
+msgstr "Информације"
 
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
 msgid "Message"
 msgstr "Порука"
 
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
 msgid "Warning"
 msgstr "Упозорење"
 
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
 msgid "Critical"
-msgstr "Критична"
+msgstr "Критичан"
 
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
 msgid "Error"
 msgstr "Грешка"
 
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
 msgid "Time"
 msgstr "Време"
 
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
 msgid "Domain"
 msgstr "Домен"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
 msgstr "Категорија"
 
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "�иво"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
-msgstr "Изабрани управник везе нема проширење за удаљено отклањање грешака."
+msgstr ""
+"Изабрани управник везе не подржава проширење за удаљено отклањање грешака."
 
-#: ../src/empathy-invite-participant-dialog.c:34
-#: ../src/empathy-invite-participant-dialog.c:48
+#: ../src/empathy-invite-participant-dialog.c:179
+#: ../src/empathy-invite-participant-dialog.c:205
 msgid "Invite Participant"
 msgstr "Позови уче�нике"
 
-#: ../src/empathy-invite-participant-dialog.c:35
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Изаберите пријатеља за позивање у овај разговор:"
 
-#: ../src/empathy-invite-participant-dialog.c:45
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "Позови"
 
@@ -4040,7 +4619,7 @@ msgstr ""
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
-"�е приказуј ниједно прозорче уколико не по�тоје �амо „Људи у близини\" налози"
+"�е приказуј ниједно прозорче о�им ако не по�тоје �амо налози „Људи у близини“"
 
 #: ../src/empathy-accounts.c:191
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
@@ -4053,52 +4632,133 @@ msgstr "<идентификација налога>"
 
 #: ../src/empathy-accounts.c:198
 msgid "- Empathy Accounts"
-msgstr "- Пи�моношини налози"
+msgstr "— �алози Пи�моноше"
 
 #: ../src/empathy-accounts.c:237
 msgid "Empathy Accounts"
-msgstr "Пи�моношини налози"
+msgstr "�алози Пи�моноше"
 
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr "Прикажи по�ебну у�лугу"
+
+#: ../src/empathy-debugger.c:75
+msgid "- Empathy Debugger"
+msgstr "— Отклањање грешака Пи�моноше"
+
+#: ../src/empathy-debugger.c:114
 msgid "Empathy Debugger"
-msgstr "Пи�моношино отклањање грешака"
+msgstr "Отклањање грешака Пи�моноше"
 
 #: ../src/empathy-chat.c:107
 msgid "- Empathy Chat Client"
-msgstr "- Пи�моноша за брзе поруке"
+msgstr "— Пи�моноша програм за ћа�кање"
 
-#: ../src/empathy-notifications-approver.c:184
+#: ../src/empathy-notifications-approver.c:203
 msgid "Respond"
 msgstr "Одговори"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1459
 msgid "Reject"
 msgstr "Одбаци"
 
-#: ../src/empathy-notifications-approver.c:194
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1460
 msgid "Answer"
 msgstr "Јави �е"
 
-#: ../src/empathy-notifications-approver.c:201
-#: ../src/empathy-notifications-approver.c:211
+#: ../src/empathy-notifications-approver.c:227
+msgid "Answer with video"
+msgstr "Одговори �а видеом"
+
+#: ../src/empathy-notifications-approver.c:235
+#: ../src/empathy-notifications-approver.c:245
 msgid "Decline"
 msgstr "Одбиј"
 
-#: ../src/empathy-notifications-approver.c:205
-#: ../src/empathy-notifications-approver.c:216
+#: ../src/empathy-notifications-approver.c:239
+#: ../src/empathy-notifications-approver.c:250
 msgid "Accept"
 msgstr "Прихвати"
 
-#: ../src/empathy-call-observer.c:130
-#, c-format
-msgid "Missed call from %s"
-msgstr "Пропуштен позив од %s"
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:260
+msgid "Provide"
+msgstr "Обезбеди"
 
-#: ../src/empathy-call-observer.c:133
+#: ../src/empathy-call-observer.c:134
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s је покушао да ва� зове, али �те ви били на другој вези."
 
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+msgid "i"
+msgstr "и"
+
+#: ../src/empathy-call-window.c:2775
+msgid "On hold"
+msgstr "�а чекању"
+
+#: ../src/empathy-call-window.c:2778
+msgid "Mute"
+msgstr "Утишај"
+
+#: ../src/empathy-call-window.c:2780
+msgid "Duration"
+msgstr "Трајање"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2783
+#, c-format
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02dm"
+
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "_Упореди величину �лова"
+
+#~ msgid "All"
+#~ msgstr "Све"
+
+#~ msgid "_Enabled"
+#~ msgstr "_Омогућено"
+
+#~ msgid "Date"
+#~ msgstr "Датум"
+
+#~ msgid "Conversations"
+#~ msgstr "Разговори"
+
+#~ msgid "Find Next"
+#~ msgstr "�ађи �ледеће"
+
+#~ msgid "Find Previous"
+#~ msgstr "�ађи претходно"
+
+#~ msgid "Previous Conversations"
+#~ msgstr "Претходни разговори"
+
+#~ msgid "_For:"
+#~ msgstr "_За:"
+
+#~ msgid "Enter Custom Message"
+#~ msgstr "Уне�и произвољну поруку"
+
+#~ msgid "Save _New Status Message"
+#~ msgstr "Сачувај _нову поруку �тања"
+
+#~ msgid "Saved Status Messages"
+#~ msgstr "Снимљене поруке �тања"
+
+#~ msgid "Show and edit accounts"
+#~ msgstr "Прикажи и измени налоге"
+
 #~ msgid "Empathy has asked about importing accounts"
 #~ msgstr "Да ли да Пи�моноша пита за увоз налога"
 
diff --git a/po/sr@latin.po b/po/sr@latin.po
index 90060205e..4c3713bbf 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -1,40 +1,39 @@
 # Serbian translation of Empathy
 # Courtesy of Prevod.org team (http://prevod.org/) -- 2003-2009.
-#
 # This file is distributed under the same license as the Empathy package.
-#
 # From Pidgin translation:
-#
-#   Danilo Segan <dsegan@gmx.net>, 2003, 2004, 2005.
-#   Aleksandar Urosevic <urke@users.sourceforge.net>, 2003, 2004.
-#   Filip Miletic <f.miletic@ewi.tudelft.nl>, 2004.
-#   Nikola Kotur <kotnik@ns-linux.org>, 2006.
-#   Miloš Popović <gpopac@gmail.com>, 2007, 2008.
-#
+# Danilo Segan <dsegan@gmx.net>, 2003, 2004, 2005.
+# Aleksandar Urosevic <urke@users.sourceforge.net>, 2003, 2004.
+# Filip Miletic <f.miletic@ewi.tudelft.nl>, 2004.
+# Nikola Kotur <kotnik@ns-linux.org>, 2006.
+# Miloš Popović <gpopac@gmail.com>, 2007, 2008.
 # Maintainer: Branko Kokanović <branko.kokanovic@gmail.com>, 2010.
 # Reviewed on 11.05.2009 by Miloš Popović <gpopac@gmail.com>
 # Miloš Popović <gpopac@gmail.com>, 2010.
 # Branko Kokanović <branko.kokanovic@gmail.com>, 2011.
-#
+# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=empathy&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-03-30 09:19+0000\n"
-"PO-Revision-Date: 2011-03-19 14:12+0100\n"
-"Last-Translator: Branko Kokanović <branko.kokanovic@gmail.com>\n"
-"Language-Team: Serbian <gnome@prevod.org>\n"
+"product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2011-09-19 19:10+0000\n"
+"PO-Revision-Date: 2011-09-19 11:52+0200\n"
+"Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
+"Language-Team: Serbian <gnom@prevod.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 :    n%"
+"10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Virtaal 0.6.1\n"
+"X-Project-Style: gnome\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
 msgstr ""
-"Ćaskajte na Google Talk-u, Fejsbuku, MSN-u i na mnogim drugim servisima za "
+"Ćaskajte na Gugl razgovoru, Fejsbuku, MSN-u i na mnogim drugim servisima za "
 "ćaskanje"
 
 #: ../data/empathy.desktop.in.in.h:2
@@ -51,286 +50,330 @@ msgstr "Program za brze poruke"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
-msgstr "Uvek otvori poseban prozor za nova ćaskanja."
+msgstr "Uvek otvara poseban prozor za nova ćaskanja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr "Ja�ina zvuka poziva"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr "Ja�ina zvuka poziva, u procentima."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Camera device"
+msgstr "Uređaj kamerice"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "Položaj kamerice"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
-"Karakter za dodavanje posle nadimka kada se koristi automatsko dovršavanje "
-"nadimka (tab) u grupnim ćaskanjima."
+"Znak za dodavanje posle nadimka kada se koristi automatsko dovršavanje nadimka "
+"(tab) u grupnim ćaskanjima."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "Tema prozora za ćaskanje"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+msgid "Chat window theme variant"
+msgstr "Varijanta teme prozora za ćaskanje"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
-"Lista jezika odvojena zarezima koju koristi provera pravopisa (npr. „sr, en, "
+"Spisak jezika odvojen zarezima koje koristi provera pravopisa (npr. „sr, en, "
 "fr“)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "Zbijeni spisak prijatelja"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
-msgstr "Da li da se koristi upravnik mrežom"
+msgstr "Da li će biti korišćen upravnik mrežom"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "Kriterijum za sortiranje prijatelja"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr ""
+"Osnovna video kamerica koja će biti korišćena u video pozivima, npr. „/dev/"
+"video0“."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
-msgstr "Podrazumevana fascikla za izbor slika"
+msgstr "Podrazumevana fascikla za izbor slike"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
-msgstr "Isklju�uje iska�uća obaveštenja kada sam odsutan"
+msgstr "Isklju�uje iska�uća obaveštenja kada smo odsutni"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
-msgstr "Onemogućava zvukove kada sam odsutan"
+msgstr "Onemogućava zvuke kada smo odsutni"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
-msgstr "Prikaži dolazne događaje u statusnoj liniji"
+msgstr "Prikazuje dolazne događaje na liniji stanja"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
 msgstr ""
-"Prikaži dolazne događaje u statusnoj liniji. Ako nije postavljeno, odmah ih "
+"Prikazuje dolazne događaje na liniji stanja. Ako nije postavljeno, odmah ih "
 "prikazuje korisniku."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+msgid "Echo cancellation support"
+msgstr "Podrška za uklanjanje odjeka"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr "Da li Pismonoša sme da objavljuje lokaciju korisnika"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Da li Pismonoša sme da koristi GPS da pogodi lokaciju"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Da li Pismonoša sme da koristi mobilnu mrežu da pogodi lokaciju"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr "Da li Pismonoša sme da koristi mrežu da pogodi lokaciju"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr "Pismonošina podrazumevana fascikla za preuzimanja"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
 msgstr "Pismonoša je prebacio dnevnike iz leptira"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
-msgstr "Da li da Pismonoša pređe u stanje automatskog odsustva u mirovanju"
+msgstr "Da li Pismonoša da pređe u stanje automatskog odsustva u mirovanju"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
-msgstr "Da li da Pismonoša sam uspostaviti vezu po pokretanju"
+msgstr "Da li Pismonoša da sam uspostaviti vezu po pokretanju"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
-msgstr "Da li da Pismonoša umanji preciznost lokacije"
+msgstr "Da li Pismonoša da umanji preciznost lokacije"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
-"Da li da Pismonoša koristi sliku prijatelja kao ikonu prozora za ćaskanje"
+"Da li Pismonoša da koristi sliku prijatelja kao ikonicu prozora za ćaskanje"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
-msgstr "Omogućava WebKit alatke za programere"
+msgstr "Omogućava Veb kit razvojne alate"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "Omogućava iska�uća obaveštenja za nove poruke"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "Omogućava proveru pisanja"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "Sakriva glavni prozor"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "Sakriva glavni prozor programa."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
-msgstr "Karakter za dovršavanje nadimka"
+msgstr "Znak za dovršavanje nadimka"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "Otvara nova ćaskanja u razli�itim prozorima"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "Putanja do Adijum teme za korišćenje"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
 "Putanja do Adijum teme za korišćenje, ako se koristi Adijum tema za ćaskanje."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Pušta zvuk za dolazeće poruke"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "Pušta zvuk za nove razgovore"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Pušta zvuk za odlazeće poruke"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "Pušta zvuk kada se prijatelj prijavi"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "Pušta zvuk kada se prijatelj odjavi"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "Pušta zvuk kada se ja prijavim"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "Pušta zvuk kada se ja odjavim"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
-msgstr "Ispisuj obaveštenja ako ćaskanje nije u fokusu"
+msgstr "Ispisuje obaveštenja ako ćaskanje nije u fokusu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
-msgstr "Ispisuj obaveštenja kada se prijatelj prijavi"
+msgstr "Ispisuje obaveštenja kada se prijatelj prijavi"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
-msgstr "Ispisuj obaveštenja kada se prijatelj odjavi"
+msgstr "Ispisuje obaveštenja kada se prijatelj odjavi"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr "Položaj prikaza kamerice za vreme poziva."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+msgid "Show Balance in contact list"
+msgstr "Prikazuje gotovinu na spisku prijatelja"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "Prikazuje slike"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "Prikazuje spisak prijatelja u sobama"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr "Prikazuje savet u vezi zatvaranja glavnog prozora"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
-msgstr "Prikazuje prijatelje koji nisu na vezi"
+msgstr "Prikazuje prijatelje van mreže"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
-msgstr "Prikaži protokole"
+msgstr "Prikazuje protokole"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "Jezici za proveru pisanja"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr "Podrazumevana fascikla za �uvanje prenesenih datoteka."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
-msgstr "Poslednja fascikla iz koje izabrana slika."
+msgstr "Poslednja fascikla iz koje je izabrana slika."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
-msgstr "Pozicija bo�ne površi prozora za ćaskanje"
+msgstr "Položaj bo�ne površi prozora za ćaskanje"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "Sa�uvana pozicija (u pikselima) bo�ne površi prozora za ćaskanje."
+msgstr "Sa�uvan položaj (u ta�kama) bo�ne površi prozora za ćaskanje."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Tema za prikaz razgovora u prozoru ćaskanja."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "Varijanta teme koja se koristi za prikaz razgovora u prozoru ćaskanja."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Prikazuje sli�icu sa smeškom"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "Koristi zvukove za obaveštenja"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "Koristi teme za sobe ćaskanja"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Da li da Pismonoša objavljuje lokaciju korisnika njegovim prijateljima."
+msgstr "Da li Pismonoša da objavljuje lokaciju korisnika njegovim prijateljima."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Da li Pismonoša sme da koristi GPS da pogodi lokaciju."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Da li Pismonoša sme da koristi mobilnu mrežu da pogodi lokaciju."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Da li Pismonoša sme da koristi mrežu da pogodi lokaciju."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "Da li je Pismonoša prebacio dnevnike iz leptira."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Da li da se Pismonoša sam prijavi na postojeće naloge nakon pokretanja."
+msgstr "Da li Pismonoša da se sam prijavi na postojeće naloge nakon pokretanja."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "Da li da  Pismonoša automatski pređe u stanje odsustva u mirovanju."
+msgstr ""
+"Da li Pismonoša da automatski pređe u stanje odsustva prilikom mirovanja."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
-"Da li da Pismonoša umanji preciznost lokacije zbog povećane privatnosti."
+"Da li Pismonoša da umanji preciznost lokacije zbog povećane privatnosti."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
-"Da li da Pismonoša koristi sliku prijatelja kao ikonu u prozoru ćaskanja."
+"Da li Pismonoša da koristi sliku prijatelja kao ikonu u prozoru ćaskanja."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
-"Da li da se omoguće WebKit alati za programere, kao što je Veb Inspektor."
+"Da li će biti omogućeni Veb kit razvojni alati, kao što je Veb Inspektor."
 
 # Nije connect već disconnect!!! ~Miloš
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
@@ -338,100 +381,110 @@ msgstr ""
 "Da li treba koristiti upravnika mreže za automatsko prekidanje i ponovno "
 "uspostavljanje veze."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "Da li da proverava pisanje re�i za izabrane jezike."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "Da li da prikazuje smeške kao sli�ice unutar razgovora."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Da li će biti uklju�en filter Pulse audia za uklanjanje odjeka."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "Da li da pusti obaveštajni zvuk kada se prijatelji prijave na mrežu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "Da li da pusti obaveštajni zvuk kada se prijatelji odjave sa mreže."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "Da li da pusti obaveštajni zvuk za događaje."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Da li da pusti obaveštajni zvuk kada vam stigne poruka."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Da li da pusti obaveštajni zvuk na novi razgovor."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Da li da pusti obaveštajni zvuk kada pošaljete poruku."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "Da li da pusti zvuk kada se prijavite na mrežu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Da li da pusti zvuk kada se odjavite sa mreže."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr "Da li da pusti obaveštajni zvuk kada postanete zauzeti ili odsutni."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Da li da prikazuje iska�ući prozor kada se prijatelj odjavi sa mreže."
+msgstr ""
+"Da li da prikazuje obla�ić obaveštenja kada se prijatelj odjavi sa mreže."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
-msgstr "Da li da prikazuje iska�ući prozor kada se prijatelj prijavi na mrežu."
+msgstr ""
+"Da li da prikazuje obla�ić obaveštenja kada se prijatelj prijavi na mrežu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
 msgstr ""
-"Da li da prikazuje iska�ući prozor sa pristiglim porukama �ak i kada je "
+"Da li da prikazuje obla�ić obaveštenja sa pristiglim porukama �ak i kada je "
 "prozor za ćaskanje otvoren, ali nije u fokusu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Da li da prikazuje iska�ući prozor kada primite novu poruku."
+msgstr "Da li da prikazuje obla�ić obaveštenja kada primite novu poruku."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+msgid "Whether to show account balances in the contact list."
+msgstr "Da li da prikazuje iznos gotovine naloga u spisku prijatelja."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 "Da li da prikazuje slike za prijatelje u spisku prijatelja i prozoru ćaskanja."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "Da li da prikazuje nepovezane prijatelje u spisku prijatelja."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
-msgstr "Da li da prikazuje iska�ući prozor kada ste zauzeti ili odsutni."
+msgstr "Da li da prikazuje obla�ić obaveštenja kada ste zauzeti ili odsutni."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr ""
 "Da li da prikazuje slike za prijatelje u spisku prijatelja i prozoru ćaskanja."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Da li da prikazuje spisak prijatelja u sobama za ćaskanje."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "Da li da prikazuje spisak prijatelja u zbijenom režimu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -439,11 +492,11 @@ msgstr ""
 "Da li da prikazuje poruku o zatvaranju glavnog prozora kada ga zatvorite na "
 "„x“ dugme."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "Da li da koristi temu za sobe razgovora."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -455,33 +508,49 @@ msgstr ""
 
 #: ../data/empathy-accounts.desktop.in.in.h:1
 msgid "Manage Messaging and VoIP accounts"
-msgstr "Upravljaj nalozima za brze poruke i VoIP"
+msgstr "Upravljajte nalozima za dopisivanje i VoIP"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2269
+#: ../src/empathy-accounts-dialog.c:2324
 msgid "Messaging and VoIP Accounts"
-msgstr "Nalozi za brze poruke i VoIP"
+msgstr "Nalozi za dopisivanje i VoIP"
 
 #: ../libempathy/empathy-ft-handler.c:825
 msgid "File transfer completed, but the file was corrupted"
-msgstr "Prenos datoteke završen, ali je datoteka oštećena"
+msgstr "Prenos datoteke je završen, ali je datoteka oštećena"
 
-#: ../libempathy/empathy-ft-handler.c:1113
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
 msgstr "Druga strana ne podržava prenos datoteka"
 
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is not a regular file"
 msgstr "Izabrana datoteka nije obi�na datoteka"
 
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1176
 msgid "The selected file is empty"
 msgstr "Izabrana datoteka je prazna"
 
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#, c-format
+msgid "Missed call from %s"
+msgstr "Propušten poziv od %s"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, c-format
+msgid "Called %s"
+msgstr "Poziv korisnika %s"
+
+#: ../libempathy/empathy-message.c:422
+#, c-format
+msgid "Call from %s"
+msgstr "Poziv od %s"
+
 #: ../libempathy/empathy-tp-file.c:268
 msgid "Socket type not supported"
-msgstr "Tip soketa nije podržan"
+msgstr "Vrsta priklju�ka nije podržana"
 
 #: ../libempathy/empathy-tp-file.c:387
 msgid "No reason was specified"
@@ -507,148 +576,141 @@ msgstr "Greška prilikom prenosa datoteke"
 msgid "The other participant is unable to transfer the file"
 msgstr "Druga strana nije u mogućnosti da prenese datoteku"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:383
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
 msgid "Unknown reason"
 msgstr "Nepoznat razlog"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:232
 msgid "Available"
 msgstr "Dostupan"
 
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:234
 msgid "Busy"
 msgstr "Zauzet"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:237
 msgid "Away"
 msgstr "Odsutan"
 
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:239
 msgid "Invisible"
 msgstr "Nevidljiv"
 
-#: ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-utils.c:241
 msgid "Offline"
 msgstr "Nepovezan"
 
 #. translators: presence type is unknown
-#. translators: encoding video codec is unknown
-#. translators: encoding audio codec is unknown
-#. translators: decoding video codec is unknown
-#. translators: decoding audio codec is unknown
-#: ../libempathy/empathy-utils.c:316
-#: ../src/empathy-streamed-media-window.c:1905
-#: ../src/empathy-streamed-media-window.c:1907
-#: ../src/empathy-streamed-media-window.c:1909
-#: ../src/empathy-streamed-media-window.c:1911
-#: ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:244
+msgctxt "presence"
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:284
 msgid "No reason specified"
 msgstr "Nije naveden razlog"
 
-#: ../libempathy/empathy-utils.c:357 ../libempathy/empathy-utils.c:413
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
 msgid "Status is set to offline"
 msgstr "Stanje je postavljeno na „nepovezan“"
 
-#: ../libempathy/empathy-utils.c:359 ../libempathy/empathy-utils.c:393
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "Greška u mreži"
 
-#: ../libempathy/empathy-utils.c:361 ../libempathy/empathy-utils.c:395
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
 msgid "Authentication failed"
 msgstr "Neuspešna prijava"
 
-#: ../libempathy/empathy-utils.c:363 ../libempathy/empathy-utils.c:397
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
 msgid "Encryption error"
 msgstr "Greška pri šifrovanju"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:294
 msgid "Name in use"
 msgstr "Ime je u upotrebi"
 
-#: ../libempathy/empathy-utils.c:367 ../libempathy/empathy-utils.c:399
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate not provided"
 msgstr "Sertifikat nije prosleđen"
 
-#: ../libempathy/empathy-utils.c:369 ../libempathy/empathy-utils.c:401
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate untrusted"
 msgstr "Sertifikat nije od poverenja"
 
-#: ../libempathy/empathy-utils.c:371 ../libempathy/empathy-utils.c:403
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
 msgid "Certificate expired"
 msgstr "Sertifikat je istekao"
 
-#: ../libempathy/empathy-utils.c:373 ../libempathy/empathy-utils.c:405
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
 msgid "Certificate not activated"
 msgstr "Sertifikat nije aktiviran"
 
-#: ../libempathy/empathy-utils.c:375 ../libempathy/empathy-utils.c:407
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
 msgid "Certificate hostname mismatch"
 msgstr "Ime domaćina sertifikata se ne poklapa"
 
-#: ../libempathy/empathy-utils.c:377 ../libempathy/empathy-utils.c:409
+#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
 msgid "Certificate fingerprint mismatch"
 msgstr "Otisak sertifikata se ne poklapa"
 
-#: ../libempathy/empathy-utils.c:379 ../libempathy/empathy-utils.c:411
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
 msgid "Certificate self-signed"
 msgstr "Sertifikat je samopotpisan"
 
-#: ../libempathy/empathy-utils.c:381
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate error"
 msgstr "Greška u sertifikatu"
 
-#: ../libempathy/empathy-utils.c:415
+#: ../libempathy/empathy-utils.c:344
 msgid "Encryption is not available"
 msgstr "Å ifrovanje nije dostupno"
 
-#: ../libempathy/empathy-utils.c:417
+#: ../libempathy/empathy-utils.c:346
 msgid "Certificate is invalid"
 msgstr "Sertifikat nije ispravan"
 
-#: ../libempathy/empathy-utils.c:419
+#: ../libempathy/empathy-utils.c:348
 msgid "Connection has been refused"
 msgstr "Veza je odbijena"
 
-#: ../libempathy/empathy-utils.c:421
+#: ../libempathy/empathy-utils.c:350
 msgid "Connection can't be established"
 msgstr "Veza ne može da se uspostavi"
 
-#: ../libempathy/empathy-utils.c:423
+#: ../libempathy/empathy-utils.c:352
 msgid "Connection has been lost"
 msgstr "Veza je izgubljena"
 
-#: ../libempathy/empathy-utils.c:425
+#: ../libempathy/empathy-utils.c:354
 msgid "This resource is already connected to the server"
 msgstr "Ovaj resurs je već povezan sa serverom"
 
-#: ../libempathy/empathy-utils.c:427
+#: ../libempathy/empathy-utils.c:356
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Veza je zamenjena novom vezom koristeći isti resurs"
 
-#: ../libempathy/empathy-utils.c:430
+#: ../libempathy/empathy-utils.c:359
 msgid "The account already exists on the server"
 msgstr "Ovaj nalog već postoji na serveru"
 
-#: ../libempathy/empathy-utils.c:432
+#: ../libempathy/empathy-utils.c:361
 msgid "Server is currently too busy to handle the connection"
 msgstr "Server je trenutno previše zauzet da bi uspostavio vezu"
 
-#: ../libempathy/empathy-utils.c:434
+#: ../libempathy/empathy-utils.c:363
 msgid "Certificate has been revoked"
 msgstr "Sertifikat je opozvan"
 
-#: ../libempathy/empathy-utils.c:436
+#: ../libempathy/empathy-utils.c:365
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Sertifikat koristi nebezbedni algoritam Å¡ifrovanja ili je kriptografski slab"
 
-#: ../libempathy/empathy-utils.c:439
+#: ../libempathy/empathy-utils.c:368
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -656,158 +718,156 @@ msgstr ""
 "Dužina sertifikata servera, ili dubina lanca sertifikata servera premašuje "
 "granice biblioteke za Å¡ifrovanje"
 
-#: ../libempathy/empathy-utils.c:602
+#: ../libempathy/empathy-utils.c:529
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "Ljudi u okolini"
 
-#: ../libempathy/empathy-utils.c:607
+#: ../libempathy/empathy-utils.c:534
 msgid "Yahoo! Japan"
 msgstr "Jahu! Japan"
 
-#: ../libempathy/empathy-utils.c:636
+#: ../libempathy/empathy-utils.c:563
 msgid "Google Talk"
-msgstr "Google Talk"
+msgstr "Gugl razgovor"
 
-#: ../libempathy/empathy-utils.c:637
+#: ../libempathy/empathy-utils.c:564
 msgid "Facebook Chat"
 msgstr "Fejsbuk ćaskanje"
 
-#: ../libempathy/empathy-time.c:137
+#: ../libempathy/empathy-time.c:88
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "Pre %d sekunde"
 msgstr[1] "Pre %d sekunde"
 msgstr[2] "Pre %d sekundi"
+msgstr[3] "Pre jedne sekunde"
 
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:93
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "Pre %d minuta"
 msgstr[1] "Pre %d minuta"
 msgstr[2] "Pre %d minuta"
+msgstr[3] "Pre jednog minuta"
 
-#: ../libempathy/empathy-time.c:147
+#: ../libempathy/empathy-time.c:98
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "Pre %d sata"
 msgstr[1] "Pre %d sata"
 msgstr[2] "Pre %d sati"
+msgstr[3] "Pre jednog sata"
 
-#: ../libempathy/empathy-time.c:152
+#: ../libempathy/empathy-time.c:103
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "Pre %d dana"
 msgstr[1] "Pre %d dana"
 msgstr[2] "Pre %d dana"
+msgstr[3] "Pre jednog dana"
 
-#: ../libempathy/empathy-time.c:157
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "Pre %d nedelje"
 msgstr[1] "Pre %d nedelje"
 msgstr[2] "Pre %d nedelja"
+msgstr[3] "Pre jedne nedelje"
 
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:113
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "Pre %d meseca"
 msgstr[1] "Pre %d meseca"
 msgstr[2] "Pre %d meseci"
+msgstr[3] "Pre jednog meseca"
 
-#: ../libempathy/empathy-time.c:167
+#: ../libempathy/empathy-time.c:136
 msgid "in the future"
 msgstr "u budućnosti"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:491
-msgid "All"
-msgstr "Sve"
+#: ../libempathy-gtk/empathy-account-chooser.c:540
+msgid "All accounts"
+msgstr "Svi nalozi"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../libempathy-gtk/empathy-log-window.c:643
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "Nalog"
 
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "Lozinka"
 
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:685
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:757
-#: ../libempathy-gtk/empathy-account-widget.c:814
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1166
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "Moji veb nalozi"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "Nalog %s je izmenjen preko Mojih Veb Naloga."
+msgid "The account %s is edited via %s."
+msgstr "Nalog %s je izmenjen putem %s."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1172
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "Nalog %s ne može biti uređivan iz Pismonoše."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
-msgstr "Pokreni Moje Veb Naloge"
+msgstr "Pokreni Moje veb naloge"
+
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "Izmeni %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1530
+#: ../libempathy-gtk/empathy-account-widget.c:1591
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Korisni�ko ime:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1897
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
-msgstr "P_rimeni"
+msgstr "_Primeni"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1927
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
-msgstr "_Prijavi me"
+msgstr "Prijavi _me"
 
-#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1993
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:520
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1481
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "Nalog:"
-
-#. translators: this is the label of a checkbox used to enable/disable IM
-#. * accounts
-#: ../libempathy-gtk/empathy-account-widget.c:2006
-msgid "_Enabled"
-msgstr "_Omogućeno"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2071
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "Ovaj nalog već postoji na serveru"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2074
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "Napravi novi nalog na serveru"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2266
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "Po_ništi"
 
@@ -816,19 +876,19 @@ msgstr "Po_ništi"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2563
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s na %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2589
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "%s nalog"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2593
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "Novi nalog"
 
@@ -840,6 +900,7 @@ msgstr "<b>Primer:</b> MojNadimak"
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -853,17 +914,17 @@ msgstr "Napredno"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "Pass_word:"
-msgstr "_Lozinka"
+msgstr "_Lozinka:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
 msgid "Remember Password"
 msgstr "Zapamti lozinku"
 
@@ -873,7 +934,7 @@ msgstr "Zapamti lozinku"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 #: ../libempathy-gtk/empathy-password-dialog.c:311
 msgid "Remember password"
@@ -907,7 +968,7 @@ msgstr "_Port:"
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
 #: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
-msgstr "Se_rver:"
+msgstr "_Server:"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
@@ -918,15 +979,15 @@ msgstr "<b>Primer:</b> korisni�ko_ime"
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "Login I_D:"
-msgstr "Korisni�ko ime:"
+msgstr "_Korisni�ko ime:"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
 msgid "What is your GroupWise User ID?"
-msgstr "Koji je vaš GroupWise korisni�ki ID?"
+msgstr "Koji je vaš Group Vajz korisni�ki IB?"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise password?"
-msgstr "Koja je vaša GroupWise lozinka?"
+msgstr "Koja je vaša Group Vajz lozinka?"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
 msgid "<b>Example:</b> 123456789"
@@ -939,86 +1000,94 @@ msgstr "Kodni r_aspored:"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
 msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
+msgstr "ICKu _KIB:"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
 msgid "What is your ICQ UIN?"
-msgstr "Koji je vaš ICQ UIN?"
+msgstr "Koji je vaš ICKu KIB?"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ password?"
-msgstr "Koja je vaša ICQ lozinka?"
+msgstr "Koja je vaša ICKu lozinka?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:183
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "Auto"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:221
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "Registruj"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:226
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "Opcije"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "Ništa"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Character set:"
 msgstr "Kodni raspored:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"Većina IRC servera ne traži lozinku, zato ako niste sigurni, nemojte je "
+"unositi."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Network"
 msgstr "Mreža"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Network:"
 msgstr "Mreža:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Nadimak:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "Poruka za kraj:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "Pravo ime:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Servers"
 msgstr "Serveri"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "What is your IRC nickname?"
 msgstr "Koji je vaš IRC nadimak?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Koja IRC mreža?"
 
@@ -1032,11 +1101,11 @@ msgstr "<b>Primer:</b> korisnik@jabber.org"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
 msgid "Encr_yption required (TLS/SSL)"
-msgstr "Zaht_eva se Å¡ifrovanje(TLS/SSL)"
+msgstr "Zahteva se _Å¡ifrovanje(TLS/SSL)"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
 msgid "I_gnore SSL certificate errors"
-msgstr "_Ignoriši greške SSL sertifikata"
+msgstr "_Zanemari greške SSL sertifikata"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Override server settings"
@@ -1044,11 +1113,11 @@ msgstr "Prevaziđi postavke servera"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
 msgid "Priori_ty:"
-msgstr "Pri_oritet:"
+msgstr "_Prioritet:"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 msgid "Reso_urce:"
-msgstr "Res_urs:"
+msgstr "_Resurs:"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
@@ -1077,7 +1146,7 @@ msgstr "Koje je vaše Fejsbuk korisni�ko ime?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 msgid "What is your Google ID?"
-msgstr "Koji je vaš Gugl ID?"
+msgstr "Koji je vaš Gugl IB?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 msgid "What is your Google password?"
@@ -1085,7 +1154,7 @@ msgstr "Koja je vaša Gugl lozinka?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
 msgid "What is your Jabber ID?"
-msgstr "Koji je vaš Džaber ID?"
+msgstr "Koji je vaš Džaber IB?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
 msgid "What is your Jabber password?"
@@ -1093,7 +1162,7 @@ msgstr "Koja je vaša Džaber lozinka?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your desired Jabber ID?"
-msgstr "Koji je vaš željeni Džaber ID?"
+msgstr "Koji je vaš željeni Džaber IB?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber password?"
@@ -1105,15 +1174,15 @@ msgstr "<b>Primer:</b> korisnik@hotmail.com"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
 msgid "What is your Windows Live ID?"
-msgstr "Koja je vaša Windows Live identifikacija?"
+msgstr "Koji je vaš Vindouz Uživo IB ?"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live password?"
-msgstr "Koja je vaša Windows Live lozinka?"
+msgstr "Koja je vaša Vindouz Uživo lozinka?"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
 msgid "E-_mail address:"
-msgstr "Adresa e-_pošte:"
+msgstr "Adresa _e-pošte:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "Nic_kname:"
@@ -1121,11 +1190,11 @@ msgstr "_Nadimak:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
 msgid "_First Name:"
-msgstr "I_me:"
+msgstr "_Ime:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
-msgstr "Dža_ber ID:"
+msgstr "_Džaber ID:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
 msgid "_Last Name:"
@@ -1133,7 +1202,7 @@ msgstr "_Prezime:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
 msgid "_Published Name:"
-msgstr "Ime za o_bjavu:"
+msgstr "Ime za _objavu:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
 msgid "<b>Example:</b> user@my.sip.server"
@@ -1145,71 +1214,80 @@ msgstr "Korisni�ko ime za prijavu:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
 msgid "Discover Binding"
-msgstr "Otkrivaj povezivanja"
+msgstr "Otkrij povezivanja"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "Discover the STUN server automatically"
-msgstr "Automatski otkrivaj STUN server"
+msgstr "Automatski otkrij STUN server"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Interval (seconds)"
-msgstr "Interval (u sekundama)"
+msgid "Ignore TLS Errors"
+msgstr "Zanemari TLS greške"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+msgid "Interval (seconds)"
+msgstr "Period (u sekundama)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
 msgid "Keep-Alive Options"
 msgstr "Opcije za održavanje stalne veze"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
 msgid "Loose Routing"
 msgstr "Slabo rutiranje"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Mechanism:"
 msgstr "Mehanizam:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
 msgid "Miscellaneous Options"
 msgstr "Razne opcije"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 msgid "NAT Traversal Options"
 msgstr "Opcije prolaska kroz NAT"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 msgid "Port:"
 msgstr "Port:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 msgid "Proxy Options"
-msgstr "Opcije proksija"
+msgstr "Opcije posrednika"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "STUN Server:"
-msgstr "STUN Server:"
+msgstr "STUN server:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.c:347
 msgid "Server:"
 msgstr "Server:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid "Transport:"
 msgstr "Transport:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Koristi ovaj nalog za pozive _linijskih i mobilnih telefona"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "Koja je lozinka za vaš SIP nalog?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Koja je identifikacija za SIP prijavu?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "_Korisni�ko ime:"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
 msgid "I_gnore conference and chat room invitations"
-msgstr "Zanemar_i pozivnice za pri�aonice i konferencije"
+msgstr "_Zanemari pozivnice za pri�aonice i konferencije"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "What is your Yahoo! ID?"
@@ -1221,202 +1299,255 @@ msgstr "Koja je vaša Jahu! lozinka?"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
 msgid "Yahoo! I_D:"
-msgstr "Jahu I_B:"
+msgstr "Jahu! I_B:"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "_Room List locale:"
 msgstr "Lok_alni spisak soba:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:448
-#: ../libempathy-gtk/empathy-avatar-chooser.c:524
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "Ne mogu da pretvorim sliku"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "Nijedan od prihvaćenih formata slika nije podržan na vašem sistemu"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:930
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+msgid "Couldn't save picture to file"
+msgstr "Ne mogu da sa�uvam sliku u datoteku"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "Izaberite vašu sliku"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
+msgid "Take a picture..."
+msgstr "Izaberite sliku..."
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "Bez slike"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:995
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "Slike"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:999
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "Sve datoteke"
 
 #: ../libempathy-gtk/empathy-avatar-image.c:322
 msgid "Click to enlarge"
-msgstr "Kliknite za uvećanje"
+msgstr "Kliknite da uvećate"
+
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
+msgid "There was an error starting the call"
+msgstr "Došlo je do greške prilikom pozivanja"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact doesn't support calls"
+msgstr "Navedeni kontakt ne podržava pozive"
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is offline"
+msgstr "Navedeni kontakt nije na vezi"
 
-#: ../libempathy-gtk/empathy-chat.c:652
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "The specified contact is not valid"
+msgstr "Navedeni kontakt nije ispravan"
+
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "Emergency calls are not supported on this protocol"
+msgstr "Ovaj protokol ne podržava hitne pozive"
+
+#: ../libempathy-gtk/empathy-chat.c:704
 msgid "Failed to open private chat"
-msgstr "Nije uspelo otvaranje privatnog ćaskanja"
+msgstr "Nisam uspeo da otvorim privatno ćaskanje"
 
-#: ../libempathy-gtk/empathy-chat.c:717
+#: ../libempathy-gtk/empathy-chat.c:765
 msgid "Topic not supported on this conversation"
 msgstr "Teme nisu podržane u ovom razgovoru"
 
-#: ../libempathy-gtk/empathy-chat.c:723
+#: ../libempathy-gtk/empathy-chat.c:771
 msgid "You are not allowed to change the topic"
 msgstr "Nije vam dozvoljeno da promenite temu"
 
-#: ../libempathy-gtk/empathy-chat.c:906
+#: ../libempathy-gtk/empathy-chat.c:975
+#, c-format
+msgid "“%s� is not a valid contact ID"
+msgstr "„%s“ nije ispravan IB kontakta"
+
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: �isti sve poruke iz ovog razgovora"
 
-#: ../libempathy-gtk/empathy-chat.c:909
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <tema>: postavlja temu trenutnog razgovora"
 
-#: ../libempathy-gtk/empathy-chat.c:912
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <IB sobe>: priklju�uje se novoj sobi za ćaskanje"
 
-#: ../libempathy-gtk/empathy-chat.c:915
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <IB sobe>: priklju�uje se novoj sobi za ćaskanje"
 
-#: ../libempathy-gtk/empathy-chat.c:920
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr ""
-"/part [<IB sobe>] [<razlog>]: napusti sobu za ćaskanje, podrazumevano trenutnu"
+"/part [<IB sobe>] [<razlog>]: napušta sobu za ćaskanje, podrazumevano trenutnu"
 
-#: ../libempathy-gtk/empathy-chat.c:925
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <IB prijatelja> [<poruka>]: otvara privatno ćaskanje"
 
-#: ../libempathy-gtk/empathy-chat.c:928
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <IB prijatelja> <poruka>: otvara privatno ćaskanje"
 
-#: ../libempathy-gtk/empathy-chat.c:931
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nadimak>: menja vaš nadimak na trenutnom serveru"
 
-#: ../libempathy-gtk/empathy-chat.c:934
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/me <message>: send an ACTION message to the current conversation"
-msgstr "/me <poruka>: Å¡alje ACTION poruku na trenutni razgovor"
+msgstr "/me <poruka>: Å¡alje poruku RADNJA na trenutni razgovor"
 
-#: ../libempathy-gtk/empathy-chat.c:937
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 msgstr ""
 "/say <poruka>: Å¡alje <poruka> na trenutni razgovor. Ovo se koristi za slanje "
-"poruka koje po�inju sa „/“. Na primer: \"/say /join se koristi za "
-"priklju�ivanje u novu sobu za ćaskanje"
+"poruka koje po�inju sa „/“. Na primer: „/say /join se koristi za priklju�ivanje "
+"u novu sobu za ćaskanje“"
+
+#: ../libempathy-gtk/empathy-chat.c:1094
+msgid "/whois <contact ID>: display information about a contact"
+msgstr "/whois <IB kontakta>: prikazuje podatke o kontaktu"
 
-#: ../libempathy-gtk/empathy-chat.c:942
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr ""
-"/help [<komanda>]: prikazuje sve podržane komande. Ako se da i konkretna "
-"<komanda>, prikazuje njeno uputstvo za upotrebu."
+"/help [<komanda>]: prikazuje sve podržane naredbe. Ako se da i konkretna "
+"<naredba>, prikazuje njeno uputstvo za upotrebu."
 
-#: ../libempathy-gtk/empathy-chat.c:952
+#: ../libempathy-gtk/empathy-chat.c:1114
 #, c-format
 msgid "Usage: %s"
 msgstr "Korišćenje: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:991
+#: ../libempathy-gtk/empathy-chat.c:1159
 msgid "Unknown command"
-msgstr "Nepoznata komanda"
+msgstr "Nepoznata naredba"
 
-#: ../libempathy-gtk/empathy-chat.c:1117
+#: ../libempathy-gtk/empathy-chat.c:1285
 msgid "Unknown command; see /help for the available commands"
-msgstr "Nepoznata komanda; pogledajte /help za dostupne komande"
+msgstr "Nepoznata naredba; pogledajte /help za dostupne naredbe"
 
-#: ../libempathy-gtk/empathy-chat.c:1254
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1455
+msgid "insufficient balance to send message"
+msgstr "nema dovoljno gotovine za slanje poruke"
+
+#: ../libempathy-gtk/empathy-chat.c:1457
+msgid "not capable"
+msgstr "nesposoban"
+
+#: ../libempathy-gtk/empathy-chat.c:1464
 msgid "offline"
 msgstr "nepovezan"
 
-#: ../libempathy-gtk/empathy-chat.c:1257
+#: ../libempathy-gtk/empathy-chat.c:1467
 msgid "invalid contact"
 msgstr "neispravan prijatelj"
 
-#: ../libempathy-gtk/empathy-chat.c:1260
+#: ../libempathy-gtk/empathy-chat.c:1470
 msgid "permission denied"
 msgstr "pristup je zabranjen"
 
-#: ../libempathy-gtk/empathy-chat.c:1263
+#: ../libempathy-gtk/empathy-chat.c:1473
 msgid "too long message"
-msgstr "poruka je preduga�ka"
+msgstr "poruka je preduga"
 
-#: ../libempathy-gtk/empathy-chat.c:1266
+#: ../libempathy-gtk/empathy-chat.c:1476
 msgid "not implemented"
 msgstr "nije podržano"
 
-#: ../libempathy-gtk/empathy-chat.c:1270
+#: ../libempathy-gtk/empathy-chat.c:1480
 msgid "unknown"
 msgstr "nepoznato"
 
-#: ../libempathy-gtk/empathy-chat.c:1274
+#: ../libempathy-gtk/empathy-chat.c:1486
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Greška pri slanju poruke „%s“: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1335 ../src/empathy-chat-window.c:717
+#: ../libempathy-gtk/empathy-chat.c:1490
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Greška pri slanju poruke: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Tema:"
 
-#: ../libempathy-gtk/empathy-chat.c:1347
+#: ../libempathy-gtk/empathy-chat.c:1563
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Tema je postavljena na: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1349
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "No topic defined"
 msgstr "Tema nije postavljena"
 
-#: ../libempathy-gtk/empathy-chat.c:1848
+#: ../libempathy-gtk/empathy-chat.c:2074
 msgid "(No Suggestions)"
-msgstr "(Nema predloga)"
+msgstr "(nema predloga)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1916
+#: ../libempathy-gtk/empathy-chat.c:2142
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Dodaj „%s“ u re�nik"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1953
+#: ../libempathy-gtk/empathy-chat.c:2179
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Dodaj „%s“ u re�nik za %s jezik"
 
-#: ../libempathy-gtk/empathy-chat.c:2010
+#: ../libempathy-gtk/empathy-chat.c:2249
 msgid "Insert Smiley"
 msgstr "Ubaci smešak"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2028
-#: ../libempathy-gtk/empathy-ui-utils.c:1808
+#: ../libempathy-gtk/empathy-chat.c:2267
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "_Pošalji"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2063
+#: ../libempathy-gtk/empathy-chat.c:2321
 msgid "_Spelling Suggestions"
 msgstr "Predlozi pravopi_sa"
 
-#: ../libempathy-gtk/empathy-chat.c:2152
+#: ../libempathy-gtk/empathy-chat.c:2410
 msgid "Failed to retrieve recent logs"
-msgstr "Nije uspelo preuzimanje skorašnjih dnevnika"
+msgstr "Nisam uspeo da preuzmem skorašnje dnevnike"
 
-#: ../libempathy-gtk/empathy-chat.c:2263
+#: ../libempathy-gtk/empathy-chat.c:2547
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s je otišao sa veze"
@@ -1424,12 +1555,12 @@ msgstr "%s je otišao sa veze"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2270
+#: ../libempathy-gtk/empathy-chat.c:2554
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s je izbacio korisnika %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2273
+#: ../libempathy-gtk/empathy-chat.c:2557
 #, c-format
 msgid "%s was kicked"
 msgstr "%s je izba�en"
@@ -1437,17 +1568,17 @@ msgstr "%s je izba�en"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2281
+#: ../libempathy-gtk/empathy-chat.c:2565
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s je zabranio pristup korisniku %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2284
+#: ../libempathy-gtk/empathy-chat.c:2568
 #, c-format
 msgid "%s was banned"
 msgstr "Korisniku %s je zabranjen pristup"
 
-#: ../libempathy-gtk/empathy-chat.c:2288
+#: ../libempathy-gtk/empathy-chat.c:2572
 #, c-format
 msgid "%s has left the room"
 msgstr "%s je napustio(la) pri�aonicu"
@@ -1457,112 +1588,144 @@ msgstr "%s je napustio(la) pri�aonicu"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2297
+#: ../libempathy-gtk/empathy-chat.c:2581
 #, c-format
 msgid " (%s)"
-msgstr " (%s)s"
+msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2322
+#: ../libempathy-gtk/empathy-chat.c:2606
 #, c-format
 msgid "%s has joined the room"
-msgstr "%s je ušao(la) u pri�aonicu"
+msgstr "%s je pristupio(la) pri�aonici"
 
-#: ../libempathy-gtk/empathy-chat.c:2347
+#: ../libempathy-gtk/empathy-chat.c:2631
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je sada poznat kao %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2486
-#: ../src/empathy-streamed-media-window.c:1953
-#: ../src/empathy-event-manager.c:1125
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2784
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
+#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
 msgid "Disconnected"
 msgstr "Veza je prekinuta"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3116
+#: ../libempathy-gtk/empathy-chat.c:3428
 msgid "Would you like to store this password?"
-msgstr "Želite li da zapamtite lozinku?"
+msgstr "Da li želite da zapamtite ovu lozinku?"
 
-#: ../libempathy-gtk/empathy-chat.c:3122
+#: ../libempathy-gtk/empathy-chat.c:3434
 msgid "Remember"
 msgstr "Zapamti"
 
-#: ../libempathy-gtk/empathy-chat.c:3132
+#: ../libempathy-gtk/empathy-chat.c:3444
 msgid "Not now"
 msgstr "Ne sada"
 
-#: ../libempathy-gtk/empathy-chat.c:3176
+#: ../libempathy-gtk/empathy-chat.c:3488
 msgid "Retry"
 msgstr "Pokušaj ponovo"
 
-#: ../libempathy-gtk/empathy-chat.c:3180
+#: ../libempathy-gtk/empathy-chat.c:3492
 msgid "Wrong password; please try again:"
 msgstr "Pogrešna lozinka, pokušajte ponovo:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3297
+#: ../libempathy-gtk/empathy-chat.c:3622
 msgid "This room is protected by a password:"
 msgstr "Ova soba je zaštićena lozinkom:"
 
-#: ../libempathy-gtk/empathy-chat.c:3324
+#: ../libempathy-gtk/empathy-chat.c:3649
 msgid "Join"
 msgstr "Priklju�i se"
 
-#: ../libempathy-gtk/empathy-chat.c:3494 ../src/empathy-event-manager.c:1145
+#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "Povezan"
 
-#: ../libempathy-gtk/empathy-chat.c:3547
-#: ../libempathy-gtk/empathy-log-window.c:650
+#: ../libempathy-gtk/empathy-chat.c:3906
 msgid "Conversation"
 msgstr "Razgovor"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:422
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:3911
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (SMS)"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
 msgid "Unknown or invalid identifier"
 msgstr "Nepoznati ili neispravan identifikator"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
 msgid "Contact blocking temporarily unavailable"
-msgstr "Blokiranje prijatelja trenutno nedostupno"
+msgstr "Blokiranje prijatelja je trenutno nedostupno"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
 msgid "Contact blocking unavailable"
-msgstr "Blokiranje prijatelja nedostupno"
+msgstr "Blokiranje prijatelja nije dostupno"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
 msgid "Permission Denied"
 msgstr "Pristup je zabranjen"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
 msgid "Could not block contact"
 msgstr "Ne mogu da blokiram prijatelja"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:701
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
 msgid "Edit Blocked Contacts"
 msgstr "Izmeni blokirane prijatelje"
 
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Account:"
+msgstr "Nalog:"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "Blokirani prijatelji"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Ukloni"
+
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:794
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Umnoži adresu veze"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:801
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Otvori vezu"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:420
+#: ../libempathy-gtk/empathy-chat-text-view.c:415
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:299
 #: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
 msgid "Edit Contact Information"
-msgstr "Izmeni podatke o prijatelju"
+msgstr "Izmeni podatke kontakta"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:350
 msgid "Personal Information"
@@ -1574,30 +1737,31 @@ msgid "New Contact"
 msgstr "Novi prijatelj"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:199
+#: ../libempathy-gtk/empathy-individual-dialogs.c:200
 #, c-format
 msgid "Block %s?"
 msgstr "Blokirati %s?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:247
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr ""
 "Da li ste sigurni da želite da blokirate da vas „%s“ više ne kontaktira?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
 msgid "_Block"
 msgstr "_Blokiraj"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:278
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "P_rijavi ovaj kontakt za zloupotrebu"
 msgstr[1] "P_rijavi ove kontakte za zloupotrebu"
 msgstr[2] "P_rijavi ove kontakte za zloupotrebu"
+msgstr[3] "P_rijavi ovaj kontakt za zloupotrebu"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
@@ -1619,301 +1783,331 @@ msgstr "Negrupisano"
 msgid "Favorite People"
 msgstr "Omiljeni ljudi"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2001
-#: ../libempathy-gtk/empathy-individual-view.c:2336
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Da li ste sigurni da želite da uklonite grupu „%s“?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2003
-#: ../libempathy-gtk/empathy-individual-view.c:2339
+#: ../libempathy-gtk/empathy-contact-list-view.c:1988
+#: ../libempathy-gtk/empathy-individual-view.c:2379
 msgid "Removing group"
 msgstr "Uklanjam grupu"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2052
-#: ../libempathy-gtk/empathy-contact-list-view.c:2129
-#: ../libempathy-gtk/empathy-individual-view.c:2394
-#: ../libempathy-gtk/empathy-individual-view.c:2588
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../libempathy-gtk/empathy-contact-list-view.c:2037
+#: ../libempathy-gtk/empathy-contact-list-view.c:2114
+#: ../libempathy-gtk/empathy-individual-view.c:2434
+#: ../libempathy-gtk/empathy-individual-view.c:2637
 msgid "_Remove"
 msgstr "_Ukloni"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2082
-#: ../libempathy-gtk/empathy-individual-view.c:2458
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
+#: ../libempathy-gtk/empathy-individual-view.c:2501
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Da li ste sigurni da želite da uklonite prijatelja „%s“?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2084
-#: ../libempathy-gtk/empathy-individual-view.c:2479
+#: ../libempathy-gtk/empathy-contact-list-view.c:2069
+#: ../libempathy-gtk/empathy-individual-view.c:2522
 msgid "Removing contact"
 msgstr "Uklanjam prijatelja"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:219
-#: ../src/empathy-main-window.ui.h:13
+#: ../libempathy-gtk/empathy-contact-menu.c:220
+#: ../src/empathy-main-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "Dod_aj prijatelja…"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:299
+#: ../libempathy-gtk/empathy-contact-menu.c:300
 msgid "_Block Contact"
 msgstr "_Blokiraj kontakt"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:328
-#: ../libempathy-gtk/empathy-individual-menu.c:517
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:329
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "Ća_skanje"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:359
-#: ../libempathy-gtk/empathy-individual-menu.c:560
+#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Audio poziv"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:390
-#: ../libempathy-gtk/empathy-individual-menu.c:602
+#: ../libempathy-gtk/empathy-contact-menu.c:394
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Video poziv"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:436
-#: ../libempathy-gtk/empathy-individual-menu.c:645
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:440
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "_Prethodni razgovori"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:458
-#: ../libempathy-gtk/empathy-individual-menu.c:686
+#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "Pošalji datoteku"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:481
-#: ../libempathy-gtk/empathy-individual-menu.c:728
+#: ../libempathy-gtk/empathy-contact-menu.c:485
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
-msgstr "Podeli moju radnu površinu"
+msgstr "Podeli moju radnu površ"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:521
-#: ../libempathy-gtk/empathy-contact-widget.c:1763
-#: ../libempathy-gtk/empathy-individual-menu.c:763
+#: ../libempathy-gtk/empathy-contact-menu.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:1886
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
 #: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "Omiljeni"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:550
-#: ../libempathy-gtk/empathy-individual-menu.c:791
+#: ../libempathy-gtk/empathy-contact-menu.c:554
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "_Podaci"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:596
+#: ../libempathy-gtk/empathy-contact-menu.c:600
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "Izm_eni"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:650
-#: ../libempathy-gtk/empathy-individual-menu.c:972
-#: ../src/empathy-chat-window.c:935
+#: ../libempathy-gtk/empathy-contact-menu.c:654
+#: ../libempathy-gtk/empathy-individual-menu.c:1284
+#: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "Pozivam vas u ovu sobu"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:681
-#: ../libempathy-gtk/empathy-individual-menu.c:1019
+#: ../libempathy-gtk/empathy-contact-menu.c:685
+#: ../libempathy-gtk/empathy-individual-menu.c:1330
 msgid "_Invite to Chat Room"
 msgstr "Pozov_i u sobu za ćaskanje"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:513
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
 msgid "Search contacts"
 msgstr "Pretraži kontakte"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:543
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
 msgid "Search: "
 msgstr "Pretraga:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:601
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
 msgid "_Add Contact"
 msgstr "Dod_aj prijatelja"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:619
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
 msgid "No contacts found"
 msgstr "Nije pronađen nijedan prijatelj"
 
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr "Poruka koja vas predstavlja:"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
+msgstr "Molim vas obavestite ne kada ste na mreži. Hvala!"
+
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "Izaberite prijatelja"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:295
+#: ../libempathy-gtk/empathy-contact-widget.c:336
 #: ../libempathy-gtk/empathy-individual-widget.c:153
 msgid "Full name:"
 msgstr "Puno ime:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:296
+#: ../libempathy-gtk/empathy-contact-widget.c:337
 #: ../libempathy-gtk/empathy-individual-widget.c:154
 msgid "Phone number:"
 msgstr "Broj telefona:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:297
+#: ../libempathy-gtk/empathy-contact-widget.c:338
 #: ../libempathy-gtk/empathy-individual-widget.c:155
 msgid "E-mail address:"
 msgstr "Adresa e-pošte:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:298
+#: ../libempathy-gtk/empathy-contact-widget.c:339
 #: ../libempathy-gtk/empathy-individual-widget.c:156
 msgid "Website:"
 msgstr "Veb stranica:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:299
+#: ../libempathy-gtk/empathy-contact-widget.c:340
 #: ../libempathy-gtk/empathy-individual-widget.c:157
 msgid "Birthday:"
 msgstr "Rođendan:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:346
+msgid "Last seen:"
+msgstr "Viđen pre:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:348
+msgid "Connected from:"
+msgstr "Povezan sa:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:353
+msgid "Away message:"
+msgstr "Poruka za odsutnost:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+msgid "Channels:"
+msgstr "Kanali:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
 msgstr "ISO kod države:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Country:"
 msgstr "Država:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "State:"
-msgstr "Savezna jedinica:"
+msgstr "Republika:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:768
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "City:"
 msgstr "Grad:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:770
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Area:"
 msgstr "Oblast:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:772
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
 msgstr "Poštanski kod:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:774
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Street:"
 msgstr "Ulica:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:776
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
 msgstr "Zgrada:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:778
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Floor:"
 msgstr "Sprat:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:780
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Room:"
 msgstr "Soba:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:782
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Text:"
 msgstr "Tekst:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:784
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:786
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
 msgstr "Adresa:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
 msgstr "Nivo ta�nosti:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:790
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr "Greška:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:792
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
-msgstr "Vertikalna greška (u metrima):"
+msgstr "Uspravna greška (u metrima):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:794
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
-msgstr "Horizontalna greška (u metrima):"
+msgstr "Vodoravna greška (u metrima):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr "Brzina:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Bearing:"
 msgstr "Pravac:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:800
-#: ../libempathy-gtk/empathy-individual-widget.c:526
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
 msgstr "Brzina penjanja:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:802
-#: ../libempathy-gtk/empathy-individual-widget.c:528
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
 msgstr "Poslednji put ažurirano:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:804
-#: ../libempathy-gtk/empathy-individual-widget.c:530
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
 msgstr "Geografska dužina:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:806
-#: ../libempathy-gtk/empathy-individual-widget.c:532
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
 msgstr "Geografska Å¡irina:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:808
-#: ../libempathy-gtk/empathy-individual-widget.c:534
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
 msgstr "Visina:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:871
-#: ../libempathy-gtk/empathy-contact-widget.c:888
-#: ../libempathy-gtk/empathy-individual-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:633
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "Lokacija"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:890
-#: ../libempathy-gtk/empathy-individual-widget.c:635
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:942
-#: ../libempathy-gtk/empathy-individual-widget.c:684
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e.%d.%Y u %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1024
-#: ../libempathy-gtk/empathy-individual-widget.c:919
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
 msgid "Save Avatar"
 msgstr "Sa�uvaj sliku"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1080
-#: ../libempathy-gtk/empathy-individual-widget.c:977
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
 msgid "Unable to save avatar"
 msgstr "Ne mogu da sa�uvam sliku"
 
@@ -1923,7 +2117,7 @@ msgstr "<b>Lokacija</b> u (datum)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1307
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr "Nadimak:"
 
@@ -1943,7 +2137,7 @@ msgstr "Detalji o prijatelju"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "Identifikator:"
 
@@ -1960,11 +2154,11 @@ msgstr "OS:"
 msgid "Version:"
 msgstr "Izdanje:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:332
+#: ../libempathy-gtk/empathy-groups-widget.c:333
 msgid "Groups"
 msgstr "Grupe"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:344
+#: ../libempathy-gtk/empathy-groups-widget.c:345
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -1972,91 +2166,125 @@ msgstr ""
 "Izaberite grupe u kojima želite da se prijatelj nalazi.  Primetite da možete "
 "da odaberete i više grupa kao i nijednu."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:363
+#: ../libempathy-gtk/empathy-groups-widget.c:364
 msgid "_Add Group"
 msgstr "Dod_aj grupu"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:398
+#: ../libempathy-gtk/empathy-groups-widget.c:399
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Izaberi"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1436
+#: ../libempathy-gtk/empathy-groups-widget.c:409
+#: ../src/empathy-main-window.c:1807
 msgid "Group"
 msgstr "Grupa"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Sledeći identitet će biti blokiran:"
 msgstr[1] "Sledeći identiteti će biti blokirani:"
 msgstr[2] "Sledeći identiteti će biti blokirani:"
+msgstr[3] "Sledeći identitet će biti blokiran:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:259
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Sledeći identitet ne može biti blokiran:"
 msgstr[1] "Sledeći identiteti ne mogu biti blokirani:"
 msgstr[2] "Sledeći identiteti ne mogu biti blokirani:"
+msgstr[3] "Sledeći identitet ne može biti blokiran:"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
 msgstr "Povezani prijatelji"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:354
+#: ../libempathy-gtk/empathy-individual-linker.c:370
 msgid "Select contacts to link"
 msgstr "Izaberite prijatelja za povezivanje"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:428
+#: ../libempathy-gtk/empathy-individual-linker.c:444
 msgid "New contact preview"
 msgstr "Pregled novog prijatelja"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:472
+#: ../libempathy-gtk/empathy-individual-linker.c:488
 msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Ozna�eni prijatelji na spisku levo će biti uvezani"
+msgstr "Ozna�eni prijatelji na spisku levo će biti uvezani zajedno."
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:131
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:839
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "Izaberite nalog koji će biti korišćen za poziv"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "Poziv"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+msgid "Mobile"
+msgstr "Mobilni"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "Posao"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "KUĆA"
+
+#. add an SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+msgid "_SMS"
+msgstr "_SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1142
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Uredi"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:865
+#: ../libempathy-gtk/empathy-individual-menu.c:1168
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
-msgstr "_Poveži prijatelje"
+msgstr "_Poveži kontakte…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2301
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 msgid "Delete and _Block"
 msgstr "Izbriši i _blokiraj"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2467
+#: ../libempathy-gtk/empathy-individual-view.c:2510
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
 "remove all the contacts which make up this linked contact."
 msgstr ""
-"Da li stvarno želite da uklonite uvezanog prijatelja „%s“? Ovo će ukloniti i "
-"sve kontakte koji su vezani za ovog prijatelja."
+"Da li stvarno želite da uklonite uvezani kontakt „%s“? Ovo će ukloniti i sve "
+"kontakte koji su vezani za ovaj kontakt."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
-msgstr[0] "Uvezani prijatelj sadrži %u kontakata"
-msgstr[1] "Uvezani prijatelj sadrži %u kontakata"
+msgstr[0] "Uvezani prijatelj sadrži %u kontakt"
+msgstr[1] "Uvezani prijatelj sadrži %u kontakta"
 msgstr[2] "Uvezani prijatelj sadrži %u kontakata"
+msgstr[3] "Uvezani prijatelj sadrži jedan kontakt"
 
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:1
 msgid "<b>Location</b> at (date)"
@@ -2101,12 +2329,12 @@ msgstr "Poveži prijatelje"
 #: ../libempathy-gtk/empathy-linking-dialog.c:120
 msgctxt "Unlink individual (button)"
 msgid "_Unlink…"
-msgstr "_Odveži…"
+msgstr "_Razveži…"
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:121
 msgid ""
 "Completely split the displayed linked contacts into the separate contacts."
-msgstr "Razbija uvezane kontakte u posebne prijatelje."
+msgstr "Razdvaja uvezane kontakte u posebne prijatelje."
 
 #. Add button
 #. Translators: this is an action button in the linking dialogue. "Link" is
@@ -2114,85 +2342,226 @@ msgstr "Razbija uvezane kontakte u posebne prijatelje."
 #. * meta-contact".
 #: ../libempathy-gtk/empathy-linking-dialog.c:136
 msgid "_Link"
-msgstr "_Poveži"
+msgstr "_Uveži"
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:183
 #, c-format
 msgid "Unlink linked contacts '%s'?"
-msgstr "Odveži uvezanog prijatelja „%s“?"
+msgstr "Da razvežem uvezanog prijatelja „%s“?"
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:186
 msgid ""
 "Are you sure you want to unlink these linked contacts? This will completely "
 "split the linked contacts into separate contacts."
 msgstr ""
-"Da li ste sigurni da želite da odvežete uvezanog prijatelja? Ovim ćete "
-"razbiti uvezane kontakte u posebne prijatelje."
+"Da li ste sigurni da želite da razvežete uvezanog prijatelja? Ovim ćete "
+"razdvojiti uvezane kontakte u posebne prijatelje."
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:190
 msgctxt "Unlink individual (button)"
 msgid "_Unlink"
-msgstr "_Odveži"
+msgstr "_Razveži"
 
-#: ../libempathy-gtk/empathy-log-window.c:660
-msgid "Date"
-msgstr "Datum"
+#: ../libempathy-gtk/empathy-log-window.c:634
+msgid "History"
+msgstr "Istorijat"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
-msgstr "Razgovori"
+#: ../libempathy-gtk/empathy-log-window.c:689
+msgid "Show"
+msgstr "Prikaži"
+
+#: ../libempathy-gtk/empathy-log-window.c:711
+msgid "Search"
+msgstr "Potraži"
+
+#: ../libempathy-gtk/empathy-log-window.c:1159
+#, c-format
+msgid "Chat in %s"
+msgstr "Ćaskanje u %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1161
+#, c-format
+msgid "Chat with %s"
+msgstr "Ćaskanje sa %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%A, %e %B %Y %X"
+
+#. Translators: this is an emote: '* Danielle waves'
+#: ../libempathy-gtk/empathy-log-window.c:1300
+#, c-format
+msgid "<i>* %s %s</i>"
+msgstr "<i>* %s %s</i>"
+
+#. Translators: this is a message: 'Danielle: hello'
+#. * The string in bold is the sender's name
+#: ../libempathy-gtk/empathy-log-window.c:1306
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1382
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s sekunde"
+msgstr[1] "%s sekunde"
+msgstr[2] "%s sekundi"
+msgstr[3] "jedne sekunde"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s minuta"
+msgstr[1] "%s minuta"
+msgstr[2] "%s minuta"
+msgstr[3] "jednog minuta"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "Poziv je zapo�et %s, a završen je %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1729
+msgid "Today"
+msgstr "Danas"
+
+#: ../libempathy-gtk/empathy-log-window.c:1733
+msgid "Yesterday"
+msgstr "Ju�e"
+
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
+msgid "%e %B %Y"
+msgstr "%e. %B %Y."
+
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3444
+msgid "Anytime"
+msgstr "Bilo kad"
+
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2372
+msgid "Anyone"
+msgstr "Bilo ko"
+
+#: ../libempathy-gtk/empathy-log-window.c:2685
+msgid "Who"
+msgstr "Ko"
+
+#: ../libempathy-gtk/empathy-log-window.c:2889
+msgid "When"
+msgstr "Kada"
+
+#: ../libempathy-gtk/empathy-log-window.c:3005
+msgid "Anything"
+msgstr "Bilo Å¡ta"
+
+#: ../libempathy-gtk/empathy-log-window.c:3007
+msgid "Text chats"
+msgstr "Pisana ćaskanja"
+
+#: ../libempathy-gtk/empathy-log-window.c:3009
+#: ../src/empathy-preferences.ui.h:4
+msgid "Calls"
+msgstr "Pozivi"
+
+#: ../libempathy-gtk/empathy-log-window.c:3014
+msgid "Incoming calls"
+msgstr "Dolazni pozivi"
+
+#: ../libempathy-gtk/empathy-log-window.c:3015
+msgid "Outgoing calls"
+msgstr "Odlazeći pozivi"
+
+#: ../libempathy-gtk/empathy-log-window.c:3016
+msgid "Missed calls"
+msgstr "Propušteni pozivi"
+
+#: ../libempathy-gtk/empathy-log-window.c:3038
+msgid "What"
+msgstr "Å ta"
+
+#: ../libempathy-gtk/empathy-log-window.c:3747
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr ""
+"Da li ste sigurni da želite da obrišete sve dnevnike prethodnih razgovora?"
+
+#: ../libempathy-gtk/empathy-log-window.c:3751
+msgid "Clear All"
+msgstr "O�isti sve"
+
+#: ../libempathy-gtk/empathy-log-window.c:3758
+msgid "Delete from:"
+msgstr "Obriši od:"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">U�itavam...</span>"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "Nađi sledeće"
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Chat"
+msgstr "Ćaskanje"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "Nađi prethodno"
+msgid "Delete All History..."
+msgstr "Obriši sav istorijat..."
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr "Prethodni razgovori"
+msgid "Profile"
+msgstr "Profil"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Video"
+msgstr "Video"
 
-#. Tab Label
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "Traži"
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:20
+msgid "_Edit"
+msgstr "Izm_eni"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "_File"
+msgstr "_Datoteka"
 
-#. Searching *for* something
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "_Za:"
+msgid "page 2"
+msgstr "strana 2"
 
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
 msgid "Contact ID:"
-msgstr "ID prijatelja:"
+msgstr "IB prijatelja:"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:171
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
 msgid "C_hat"
 msgstr "Ć_askaj"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:181
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
 msgstr "Novi razgovor"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:253
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
 msgid "Send _Video"
 msgstr "Pošalji _video"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:261
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
 msgid "C_all"
 msgstr "_Pozovi"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:271
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "New Call"
 msgstr "Novi poziv"
 
@@ -2211,34 +2580,34 @@ msgstr ""
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Message…"
 msgstr "Proizvoljna poruka…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messages…"
 msgstr "Uredi proizvoljne poruke…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
-msgstr "Kliknite da uklonite ovu statusnu poruku iz omiljenih"
+msgstr "Kliknite da uklonite ovu poruku stanja iz omiljenih"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
-msgstr "Kliknite da stavite ovu statusnu poruku kao omiljenu"
+msgstr "Kliknite da postavite ovu poruku stanja kao omiljenu"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
 msgstr "Postavi stanje"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:946
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
 msgid "Set your presence and current status"
-msgstr "Postavi vaše prisustvo i trenutno stanje"
+msgstr "Postavite vaše prisustvo i trenutno stanje"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1134
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
 msgid "Custom messages…"
 msgstr "Proizvoljne poruke…"
 
@@ -2251,17 +2620,25 @@ msgstr "Proizvoljne poruke…"
 msgid "New %s account"
 msgstr "Novi %s nalog"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "Traži:"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Mat_ch case"
+msgstr "_Uporedi veli�inu slova"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+msgid "Phrase not found"
+msgstr "Izraz nije pronađen"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "Poklopi velika i mala slova"
+msgid "_Next"
+msgstr "_Sledeće"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "Phrase not found"
-msgstr "Izraz nije nađen"
+msgid "_Previous"
+msgstr "_Prethodno"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2273,7 +2650,7 @@ msgstr "Poslata je brza poruka"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:55
 msgid "Incoming chat request"
-msgstr "Dolazeći zahtev za ćaskanje"
+msgstr "Dolazni zahtev za ćaskanje"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:57
 msgid "Contact connected"
@@ -2285,7 +2662,7 @@ msgstr "Prijatelj je otišao sa veze"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:61
 msgid "Connected to server"
-msgstr "Na vezi sa serverom"
+msgstr "Povezan sa serverom"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:63
 msgid "Disconnected from server"
@@ -2293,55 +2670,52 @@ msgstr "Isklju�en sa servera"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:65
 msgid "Incoming voice call"
-msgstr "Dolazeći poziv"
+msgstr "Dolazni poziv za razgovor"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:67
 msgid "Outgoing voice call"
-msgstr "Odlazeći poziv"
+msgstr "Odlazni poziv za razgovor"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:69
 msgid "Voice call ended"
-msgstr "Poziv je završen"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "Unesi proizvoljnu poruku"
+msgstr "Poziv za razgovor je završen"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
 msgstr "Uredi proizvoljne poruke"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr "Sa�uvaj _novu poruku stanja"
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#, c-format
+msgid "Message edited at %s"
+msgstr "Poruka je uređena %s"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Status Messages"
-msgstr "Snimljene poruke stanja"
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
+msgid "Normal"
+msgstr "Normalno"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "Klasi�no"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "Prosto"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "ÄŒisto"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "Plavo"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:150
 msgid "The identity provided by the chat server cannot be verified."
-msgstr "Identitet servera za ćaskanje se ne može proveriti."
+msgstr "Identitet servera za ćaskanje ne može biti proveren."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:157
 msgid "The certificate is not signed by a Certification Authority."
-msgstr "Sertifikat nije potpisao Autoritet za sertifikate."
+msgstr "Sertifikat nije potpisao Izdava� uverenja."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:161
 msgid "The certificate has expired."
@@ -2367,7 +2741,7 @@ msgstr "Sertifikat je samopotpisan."
 #: ../libempathy-gtk/empathy-tls-dialog.c:177
 msgid ""
 "The certificate has been revoked by the issuing Certification Authority."
-msgstr "Sertifikat je povukao Autoritet za sertifikate koji ga je i izdao."
+msgstr "Sertifikat je povukao Izdava� uverenja koji ga je i izdao."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:181
 msgid "The certificate is cryptographically weak."
@@ -2407,28 +2781,28 @@ msgstr "Zapamti ovaj izbor za naredne veze"
 msgid "Certificate Details"
 msgstr "Detalji sertifikata"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1705
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
 msgstr "Ne mogu da otvorim adresu"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1800
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
 msgstr "Izaberite datoteku"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
 msgid "Insufficient free space to save file"
 msgstr "Nema dovoljno slobodnog mesta za �uvanje datoteke"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr ""
-"Potrebno je %s mesta za snimanje ove datoteke, ali je dostupno samo %s. "
-"Odaberite drugo mesto za snimanje."
+"Potrebno je %s za snimanje ove datoteke, ali je dostupno samo %s. Odaberite "
+"drugo mesto za snimanje."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1924
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Dolazeća datoteka od %s"
@@ -2610,30 +2984,30 @@ msgstr "Izabrani prijatelj nije na vezi."
 
 #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
 msgid "No error message"
-msgstr "Nema poruka sa greškom"
+msgstr "Nema poruka o greškama"
 
 #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
 msgid "Instant Message (Empathy)"
 msgstr "Brza poruka (Pismonoša)"
 
-#: ../src/empathy.c:308
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "Ne povezuj se po pokretanju"
 
-#: ../src/empathy.c:312
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr ""
 "Ne prikazuj spisak prijatelja niti bilo koje drugo prozor�e po pokretanju"
 
-#: ../src/empathy.c:320
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
-msgstr "- Internet pismonoša za brze poruke"
+msgstr "— Internet pismonoša za brze poruke"
 
-#: ../src/empathy.c:499
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
 msgstr "Greška pri komunikaciji sa Upravnikom naloga"
 
-#: ../src/empathy.c:501
+#: ../src/empathy.c:639
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2641,7 +3015,7 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"Desila se greška pri povezivanju na Upravnik naloga Telepatije. Greška je "
+"Došlo je do greške pri povezivanju sa Upravnikom naloga Telepatije. Greška je "
 "bila:\n"
 "\n"
 "%s"
@@ -2655,7 +3029,7 @@ msgid ""
 msgstr ""
 "Internet pismonoša je slobodan softver; možete ga raspodeljivati i/ili ga "
 "menjati pod uslovima GNU Opšte Javne Licence (GNU GPL) kako je objavljuje "
-"Zadužbina za Slobodni Softver (FSF); bilo verzije 2 te Licence, bilo (po "
+"Zadužbina za Slobodni Softver (FSF); bilo verzije 2 te Licence, ili (po "
 "vašem nahođenju) bilo koje novije verzije."
 
 #: ../src/empathy-about-dialog.c:85
@@ -2677,8 +3051,9 @@ msgid ""
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
 msgstr ""
 "Trebali ste da primite primerak GNU Opšte Javne Licence uz Internet "
-"pismonošu; ako niste, pišite Zadužbini za Slobodni Softver (Free Software "
-"Foundation, Inc.), 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA"
+"pismonošu; ako niste, pišite Zadužbini za Slobodni Softver na sledeću "
+"adresu: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
+"Boston, MA 02110-1301 USA"
 
 #: ../src/empathy-about-dialog.c:107
 msgid "An Instant Messaging client for GNOME"
@@ -2687,7 +3062,7 @@ msgstr "Gnomov program za brze poruke"
 #: ../src/empathy-about-dialog.c:113
 msgid "translator-credits"
 msgstr ""
-"Danilo Å ergan <dsegan@gmx.net>\n"
+"Danilo Å egan <dsegan@gmx.net>\n"
 "Aleksandar Urošević <urke@users.sourceforge.net>\n"
 "Filip Miletić <f.miletic@ewi.tudelft.nl>\n"
 "Nikola Kotur <kotnik@ns-linux.org>\n"
@@ -2723,12 +3098,12 @@ msgid ""
 "this assistant and add accounts later from the Edit menu."
 msgstr ""
 "Možete se ili vratiti i probati da ponovo unesete detalje naloga ili da "
-"zatvorite asistenta i dodate naloge kasnije iz menija „Izmeni“."
+"zatvorite pomoćnika i dodate naloge kasnije iz menija „Izmeni“."
 
 #: ../src/empathy-account-assistant.c:220
 #: ../src/empathy-account-assistant.c:1271
 msgid "An error occurred"
-msgstr "Dogodila se greška"
+msgstr "Došlo je do greške"
 
 #: ../src/empathy-account-assistant.c:467
 msgid "What kind of chat account do you have?"
@@ -2762,7 +3137,7 @@ msgid ""
 "calls."
 msgstr ""
 "Sa Internet Pismonošom možete ćaskati i sa ljudima u blizini i sa prijateljima "
-"i kolegama koji koriste Google Talk, AIM, Windows Live i mnoge druge "
+"i kolegama koji koriste Gugl razgovor, AIM, Vindouz uživo i mnoge druge "
 "programe za ćaskanje. Sa mikrofonom i kamerom takođe možete da obavljate i "
 "audio i video pozive."
 
@@ -2792,8 +3167,8 @@ msgid "Select the accounts you want to import:"
 msgstr "Izaberite naloge koje želite da uvezete:"
 
 #: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "Yes"
 msgstr "Da"
 
@@ -2820,7 +3195,7 @@ msgstr "Izmeni->Nalozi"
 
 #: ../src/empathy-account-assistant.c:1107
 msgid "I do _not want to enable this feature for now"
-msgstr "Za sada ne želim da koristim ovu mogućnost"
+msgstr "Za sada _ne želim da koristim ovu mogućnost"
 
 #: ../src/empathy-account-assistant.c:1143
 msgid ""
@@ -2829,9 +3204,9 @@ msgid ""
 "install the telepathy-salut package and create a People Nearby account from "
 "the Accounts dialog"
 msgstr ""
-"Ne mogu da ćaskam sa ljudima povezanim u vašu lokalnu mrežu jer telepathy-"
-"salut nije instaliran. Ako želite da omogućite ovo, instalirajte telepathy-"
-"salut paket i napravite nalog „Ljudi u okolini“ iz prozor�eta „Nalozi“."
+"Ne mogu da ćaskam sa ljudima povezanim na vašu lokalnu mrežu jer telepathy-"
+"salut nije instaliran. Ako želite da omogućite ovo, instalirajte paket "
+"telepathy-salut i napravite nalog „Ljudi u okolini“ iz prozor�eta „Nalozi“."
 
 #: ../src/empathy-account-assistant.c:1149
 msgid "telepathy-salut not installed"
@@ -2866,34 +3241,35 @@ msgstr "Postoje nesa�uvane izmene na vašem nalogu %s."
 msgid "Your new account has not been saved yet."
 msgstr "Vaš novi nalog još nije sa�uvan."
 
-#: ../src/empathy-accounts-dialog.c:286
-#: ../src/empathy-streamed-media-window.c:809
+#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1216
 msgid "Connecting…"
 msgstr "Povezujem se…"
 
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:386
 #, c-format
 msgid "Offline — %s"
 msgstr "Nepovezan — %s"
 
-#: ../src/empathy-accounts-dialog.c:339
+#: ../src/empathy-accounts-dialog.c:398
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Veza je prekinuta — %s"
 
-#: ../src/empathy-accounts-dialog.c:350
+#: ../src/empathy-accounts-dialog.c:409
 msgid "Offline — No Network Connection"
 msgstr "Nepovezan — Nema mrežne konekcije"
 
-#: ../src/empathy-accounts-dialog.c:357
+#: ../src/empathy-accounts-dialog.c:416
 msgid "Unknown Status"
 msgstr "Nepoznato stanje"
 
-#: ../src/empathy-accounts-dialog.c:369
+#: ../src/empathy-accounts-dialog.c:428
 msgid "Offline — Account Disabled"
 msgstr "Nepovezan — Nalog je onemogućen"
 
-#: ../src/empathy-accounts-dialog.c:772
+#: ../src/empathy-accounts-dialog.c:831
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2901,16 +3277,16 @@ msgstr ""
 "Ovim ćete napraviti novi nalog, zanemarivši unete izmene.\n"
 "Da li sigurno želite da nastavite?"
 
-#: ../src/empathy-accounts-dialog.c:1133
+#: ../src/empathy-accounts-dialog.c:1192
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Da li ste sigurni da želite da uklonite „%s“ sa vašeg ra�unara?"
 
-#: ../src/empathy-accounts-dialog.c:1137
+#: ../src/empathy-accounts-dialog.c:1196
 msgid "This will not remove your account on the server."
 msgstr "Ovo neće ukloniti vaš nalog na serveru."
 
-#: ../src/empathy-accounts-dialog.c:1375
+#: ../src/empathy-accounts-dialog.c:1432
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2919,15 +3295,15 @@ msgstr ""
 "Da li sigurno želite da nastavite?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1593
+#: ../src/empathy-accounts-dialog.c:1643
 msgid "_Enable"
 msgstr "_Omogući"
 
-#: ../src/empathy-accounts-dialog.c:1594
+#: ../src/empathy-accounts-dialog.c:1644
 msgid "_Disable"
 msgstr "O_nemogući"
 
-#: ../src/empathy-accounts-dialog.c:2113
+#: ../src/empathy-accounts-dialog.c:2154
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2936,38 +3312,38 @@ msgstr ""
 "Da li sigurno želite da nastavite?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Dodaj…"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
 msgid "Loading account information"
 msgstr "U�itavam podatke o nalogu"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "No protocol installed"
 msgstr "Nijedan protokol nije instaliran"
 
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr ""
-"Da biste dodali novi nalog, prvo morate da instalirate priklju�ke za sve "
-"protokole koje želite da koristite."
+"Da dodate novi nalog, prvo morate da instalirate priklju�ke za sve protokole "
+"koje želite da koristite."
 
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add…"
-msgstr "Dod_aj…"
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Import…"
 msgstr "_Uvezi…"
 
-#: ../src/empathy-auth-client.c:250
+#: ../src/empathy-auth-client.c:249
 msgid " - Empathy authentication client"
-msgstr " - Internet pismonoša klijent prijave"
+msgstr " — Internet pismonoša klijent prijave"
 
-#: ../src/empathy-auth-client.c:266
+#: ../src/empathy-auth-client.c:265
 msgid "Empathy authentication client"
 msgstr "Internet pismonoša klijent prijave"
 
@@ -2975,108 +3351,132 @@ msgstr "Internet pismonoša klijent prijave"
 msgid "People nearby"
 msgstr "Ljudi u okolini"
 
-#: ../src/empathy-av.c:118
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
-msgstr "- Internet pismonoša Audio/Video klijent"
+msgstr "— Internet pismonoša Audio/Video klijent"
 
-#: ../src/empathy-av.c:134
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "Internet pismonoša Audio/Video klijent"
 
-#: ../src/empathy-streamed-media-window.c:479
+#: ../src/empathy-streamed-media-window.c:431
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: ../src/empathy-streamed-media-window.c:482
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Brightness"
 msgstr "Osvetljenost"
 
-#: ../src/empathy-streamed-media-window.c:485
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Gamma"
 msgstr "Gama"
 
-#: ../src/empathy-streamed-media-window.c:590
+#: ../src/empathy-streamed-media-window.c:542
 msgid "Volume"
 msgstr "Ja�ina zvuka"
 
-#: ../src/empathy-streamed-media-window.c:1166
+#: ../src/empathy-streamed-media-window.c:1110
 msgid "_Sidebar"
 msgstr "_Bo�na površ"
 
-#: ../src/empathy-streamed-media-window.c:1186
+#: ../src/empathy-streamed-media-window.c:1130
 msgid "Audio input"
 msgstr "Zvu�ni ulaz"
 
-#: ../src/empathy-streamed-media-window.c:1190
+#: ../src/empathy-streamed-media-window.c:1134
 msgid "Video input"
 msgstr "Video ulaz"
 
-#: ../src/empathy-streamed-media-window.c:1194
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Dialpad"
 msgstr "Broj�anik"
 
-#: ../src/empathy-streamed-media-window.c:1205
+#: ../src/empathy-streamed-media-window.c:1151
 msgid "Details"
 msgstr "Detalji"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1274
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1825
 #, c-format
 msgid "Call with %s"
 msgstr "Poziv sa korisnikom %s"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-streamed-media-window.c:1353
-msgid "Call"
-msgstr "Poziv"
-
-#: ../src/empathy-streamed-media-window.c:1507
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:2069
 msgid "The IP address as seen by the machine"
 msgstr "IP adresa kako je vidi ovaj ra�unar"
 
-#: ../src/empathy-streamed-media-window.c:1509
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:2071
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP adresa kako je vidi server na internetu"
 
-#: ../src/empathy-streamed-media-window.c:1511
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:2073
 msgid "The IP address of the peer as seen by the other side"
 msgstr "IP adresa vršnjaka kako je vidi druga strana"
 
-#: ../src/empathy-streamed-media-window.c:1513
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:2075
 msgid "The IP address of a relay server"
 msgstr "IP adresa relejnog servera"
 
-#: ../src/empathy-streamed-media-window.c:1515
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:2077
 msgid "The IP address of the multicast group"
 msgstr "IP adresa grupe za višestruko emitovanje"
 
+#: ../src/empathy-streamed-media-window.c:1843
+msgctxt "encoding video codec"
+msgid "Unknown"
+msgstr "Nepoznato"
+
+#: ../src/empathy-streamed-media-window.c:1846
+msgctxt "encoding audio codec"
+msgid "Unknown"
+msgstr "Nepoznato"
+
+#: ../src/empathy-streamed-media-window.c:1849
+msgctxt "decoding video codec"
+msgid "Unknown"
+msgstr "Nepoznato"
+
+#: ../src/empathy-streamed-media-window.c:1852
+msgctxt "decoding audio codec"
+msgid "Unknown"
+msgstr "Nepoznato"
+
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2270
+#: ../src/empathy-streamed-media-window.c:2144
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Povezan — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2331
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2846
 msgid "Technical Details"
 msgstr "Tehni�ki detalji"
 
-#: ../src/empathy-streamed-media-window.c:2369
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2884
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "Program %s ne razume nijedan zvu�ni format koji podržava vaš ra�unar"
 
-#: ../src/empathy-streamed-media-window.c:2374
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2889
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "Program %s ne razume nijedan video format koji podržava vaš ra�unar"
 
-#: ../src/empathy-streamed-media-window.c:2380
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2895
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3085,23 +3485,27 @@ msgstr ""
 "Ne mogu da uspostavim vezu sa %s. Možda je neko od vas dvoje na mreži koja "
 "ne dozvoljava direktne veze."
 
-#: ../src/empathy-streamed-media-window.c:2386
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2901
 msgid "There was a failure on the network"
 msgstr "Došlo je do greške u mreži"
 
-#: ../src/empathy-streamed-media-window.c:2390
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2905
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Zvu�ni formati potrebni za ovaj poziv nisu instalirani na vašem ra�unaru"
 
-#: ../src/empathy-streamed-media-window.c:2393
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2908
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Video formati potrebni za ovaj poziv nisu instalirani na vašem ra�unaru"
 
-#: ../src/empathy-streamed-media-window.c:2403
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2920
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3112,153 +3516,212 @@ msgstr ""
 "\">ovu grešku</a> i prika�ite dnevnike pokupljene iz prozora „Otklanjanje "
 "grešaka“ u meniju „Pomoć“."
 
-#: ../src/empathy-streamed-media-window.c:2411
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2929
 msgid "There was a failure in the call engine"
 msgstr "Došlo je do greške u motoru za pozive"
 
-#: ../src/empathy-streamed-media-window.c:2414
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2932
 msgid "The end of the stream was reached"
 msgstr "Dostignut je kraj toka"
 
-#: ../src/empathy-streamed-media-window.c:2454
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2972
 msgid "Can't establish audio stream"
 msgstr "Ne mogu da uspostavim zvu�ni tok"
 
-#: ../src/empathy-streamed-media-window.c:2464
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2982
 msgid "Can't establish video stream"
 msgstr "Ne mogu da uspostavim video tok"
 
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "Audio"
 msgstr "Audio"
 
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Pozovi prijatelja ponovo"
-
 #: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "Isklj. kameru"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "Kodek za dekodiranje:"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "Uklj. kameru"
+msgid "Disable camera"
+msgstr "Isklju�ite kamericu"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Kodek za dekodiranje:"
+msgid "Display the dialpad"
+msgstr "Prikažite broj�anik"
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Onemogući kameru i prestani da šalješ video"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "Kodek za kodiranje:"
 
 #: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Omogući kameru i šalji video"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Hang up"
+msgstr "Prekini"
 
 #: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Omogući kameru, ali ne šalji video"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Hang up current call"
+msgstr "Prekinite trenutni poziv"
 
 #: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Kodek za kodiranje:"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "Lokalni kandidat:"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "Spusti"
+msgid "Maximise me"
+msgstr "Uvećaj me"
 
 #: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Spusti trenutni poziv"
+msgid "Minimise me"
+msgstr "Umanji me"
 
 #: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Lokalni kandidat:"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "Udaljeni kandidat:"
 
 #: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "Pregled"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Send Audio"
+msgstr "Pošalji zvuk"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "Ponovo zovi"
+msgid "Send Video"
+msgstr "Pošalji video"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Udaljeni kandidat:"
+msgid "Show dialpad"
+msgstr "Prikaži broj�anik"
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "Pošalji zvuk"
+msgid "Start a video call"
+msgstr "Zapo�nite video poziv"
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Uklju�i/isklju�i prenos zvuka"
+msgid "Start an audio call"
+msgstr "Zapo�nite audio poziv"
+
+#: ../src/empathy-call-window.ui.h:18
+msgid "Swap camera"
+msgstr "Razmeni kameru"
 
 #: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ideo"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr "Uklju�i/isklju�i prenos zvuka"
 
 #: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "Video"
+msgid "Toggle video transmission"
+msgstr "Uklju�i/isklju�i prenos videa"
 
 #: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "Isklj. video"
-
-#: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "Uklj. video"
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
+#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
+msgid "Unknown"
+msgstr "Nepoznato"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "Pregled videa"
+msgid "Video call"
+msgstr "Video poziv"
 
 #: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "_Pozovi"
 
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:25
+msgid "_Camera"
+msgstr "_Kamerica"
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:18
+msgid "_Contents"
+msgstr "_Sadržaj"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
+msgid "_Debug"
+msgstr "Otklanjanje _grešaka"
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:22
+msgid "_Help"
+msgstr "Po_moć"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Microphone"
+msgstr "Mi_krofon"
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "_Settings"
+msgstr "Po_dešavanja"
+
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
-msgstr "_Pregled"
+msgstr "Pre_gled"
 
-#: ../src/empathy-chat-window.c:474 ../src/empathy-chat-window.c:494
+#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d nepro�itana)"
 msgstr[1] "%s (%d nepro�itane)"
 msgstr[2] "%s (%d nepro�itanih)"
+msgstr[3] "%s (jedna nepro�itana)"
 
-#: ../src/empathy-chat-window.c:486
+#: ../src/empathy-chat-window.c:493
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
-msgstr[0] "%s (i %u ostala)"
-msgstr[1] "%s (i %u ostale)"
-msgstr[2] "%s (i %u ostalih)"
+msgstr[0] "%s (i %u druga)"
+msgstr[1] "%s (i %u druge)"
+msgstr[2] "%s (i %u drugih)"
+msgstr[3] "%s (i jedna druga)"
 
-#: ../src/empathy-chat-window.c:502
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d nepro�itana od ostalih)"
 msgstr[1] "%s (%d nepro�itane od ostalih)"
 msgstr[2] "%s (%d nepro�itanih od ostalih)"
+msgstr[3] "%s (jedna nepro�itana od ostalih)"
 
-#: ../src/empathy-chat-window.c:511
+#: ../src/empathy-chat-window.c:518
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d nepro�itana od svih)"
 msgstr[1] "%s (%d nepro�itane od svih)"
 msgstr[2] "%s (%d nepro�itanih od svih)"
+msgstr[3] "%s (jedna nepro�itana od svih)"
+
+#: ../src/empathy-chat-window.c:733
+msgid "SMS:"
+msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:721
+#: ../src/empathy-chat-window.c:743
+#, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "Å aljem %d poruku."
+msgstr[1] "Å aljem %d poruke."
+msgstr[2] "Å aljem %d poruka."
+msgstr[3] "Å aljem jednu poruku"
+
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
-msgstr "Kuca poruku."
+msgstr "Piše poruku."
 
 #: ../src/empathy-chat-window.ui.h:1
 msgid "C_lear"
@@ -3268,10 +3731,6 @@ msgstr "_O�isti"
 msgid "C_ontact"
 msgstr "_Prijatelj"
 
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Ćaskanje"
-
 #: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
 msgstr "Ubaci _smešak"
@@ -3292,10 +3751,6 @@ msgstr "Premesti jezi�ak _desno"
 msgid "Notify for All Messages"
 msgstr "Obavesti za sve poruke"
 
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
-msgid "_Contents"
-msgstr "_Sadržaj"
-
 #: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "_Razgovor"
@@ -3304,17 +3759,9 @@ msgstr "_Razgovor"
 msgid "_Detach Tab"
 msgstr "_Otka�i list"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
-msgid "_Edit"
-msgstr "Izm_eni"
-
 #: ../src/empathy-chat-window.ui.h:13
 msgid "_Favorite Chat Room"
-msgstr "O_miljena soba za ćaskanje"
-
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
-msgid "_Help"
-msgstr "_Pomoć"
+msgstr "Omiljena soba za _ćaskanje"
 
 #: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
@@ -3322,7 +3769,7 @@ msgstr "_Sledeći list"
 
 #: ../src/empathy-chat-window.ui.h:16
 msgid "_Previous Tab"
-msgstr "P_rethodni list"
+msgstr "_Prethodni list"
 
 #: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
 msgid "_Show Contact List"
@@ -3336,15 +3783,15 @@ msgstr "_Listovi"
 msgid "_Undo Close Tab"
 msgstr "_Opozovi zatvaranje jezi�ka"
 
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "Ime"
 
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
 msgstr "Soba"
 
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "Automatsko povezivanje"
 
@@ -3352,90 +3799,96 @@ msgstr "Automatsko povezivanje"
 msgid "Manage Favorite Rooms"
 msgstr "Uredi omiljene sobe"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming video call"
-msgstr "Dolazeći video poziv"
+msgstr "Dolazni video poziv"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
 msgid "Incoming call"
 msgstr "Dolazni poziv"
 
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:525
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s vas zove video pozivom. Želite li da se javite?"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s vas zove. Želite li da se javite?"
 
-#: ../src/empathy-event-manager.c:515 ../src/empathy-event-manager.c:667
+#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Dolazni poziv od %s"
 
-#: ../src/empathy-event-manager.c:540
+#: ../src/empathy-event-manager.c:554
 msgid "_Reject"
 msgstr "_Odbaci"
 
-#: ../src/empathy-event-manager.c:546
+#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
 msgid "_Answer"
 msgstr "_Javi se"
 
-#: ../src/empathy-event-manager.c:667
+#: ../src/empathy-event-manager.c:570
+msgid "_Answer with video"
+msgstr "Odgovori sa _videom"
+
+#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Dolazni video poziv od %s"
 
-#: ../src/empathy-event-manager.c:744
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
 msgstr "Pozivnice za sobu"
 
-#: ../src/empathy-event-manager.c:746
+#: ../src/empathy-event-manager.c:838
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Pozivnica da se pridružite u %s"
 
-#: ../src/empathy-event-manager.c:753
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s vas poziva da se pridružite %s"
 
-#: ../src/empathy-event-manager.c:761
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
 msgstr "_Odbij"
 
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Priklju�i se"
 
-#: ../src/empathy-event-manager.c:793
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
-msgstr "%s vas je pozvao(la) da se pridružite %s"
+msgstr "%s vas poziva da se pridružite %s"
 
-#: ../src/empathy-event-manager.c:799
+#: ../src/empathy-event-manager.c:891
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Pozvani ste da se pridružite u %s"
 
-#: ../src/empathy-event-manager.c:850
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Dolazni prenos datoteke od %s"
 
-#: ../src/empathy-event-manager.c:1020 ../src/empathy-main-window.c:370
+#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
 msgid "Password required"
 msgstr "Zahtevana je lozinka"
 
-#: ../src/empathy-event-manager.c:1076
+#: ../src/empathy-event-manager.c:1190
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s traži odobrenje da vidi kada ste na vezi"
 
-#: ../src/empathy-event-manager.c:1080
+#: ../src/empathy-event-manager.c:1194
 #, c-format
 msgid ""
 "\n"
@@ -3445,105 +3898,105 @@ msgstr ""
 "Poruka: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:100
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:102
+#: ../src/empathy-ft-manager.c:103
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:179
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s at %s/s"
-msgstr "%s od %s u %s/s"
+msgstr "%s od %s pri %s/s"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:275
 #, c-format
 msgid "%s of %s"
 msgstr "%s od %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:305
+#: ../src/empathy-ft-manager.c:306
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Primam „%s“ od %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:309
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Šaljem „%s“ za %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:338
+#: ../src/empathy-ft-manager.c:339
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Greška pri primanju „%s“ od %s"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:342
 msgid "Error receiving a file"
 msgstr "Greška pri primanju datoteke"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:347
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Greška pri slanju „%s“ za %s"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:350
 msgid "Error sending a file"
 msgstr "Greška pri slanju datoteke"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:489
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "„%s“ je primljen od %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:493
+#: ../src/empathy-ft-manager.c:494
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr " „%s“ je poslat za %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:497
 msgid "File transfer completed"
-msgstr "Prenos datoteke završen"
+msgstr "Prenos datoteke je završen"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
 msgid "Waiting for the other participant's response"
 msgstr "ÄŒekam na odgovor druge strane"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Proveravam integritet datoteke „%s“"
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Tražim heš datoteke „%s“"
 
-#: ../src/empathy-ft-manager.c:1016
+#: ../src/empathy-ft-manager.c:1026
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1028
+#: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "Datoteka"
 
-#: ../src/empathy-ft-manager.c:1050
+#: ../src/empathy-ft-manager.c:1060
 msgid "Remaining"
 msgstr "Preostalo"
 
@@ -3553,7 +4006,7 @@ msgstr "Prenosi datoteka"
 
 #: ../src/empathy-ft-manager.ui.h:2
 msgid "Remove completed, canceled and failed file transfers from the list"
-msgstr "Ukloni završene, otkazane i neuspešne prenose datoteka iz liste"
+msgstr "Ukloni završene, otkazane i neuspešne prenose datoteka sa spiska"
 
 #: ../src/empathy-import-dialog.c:84
 msgid ""
@@ -3580,133 +4033,146 @@ msgstr "Protokol"
 msgid "Source"
 msgstr "Izvor"
 
-#: ../src/empathy-main-window.c:387
+#: ../src/empathy-main-window.c:392
 msgid "Provide Password"
 msgstr "Unesite lozinku"
 
-#: ../src/empathy-main-window.c:393
+#: ../src/empathy-main-window.c:398
 msgid "Disconnect"
 msgstr "Veza je prekinuta"
 
-#: ../src/empathy-main-window.c:533
+#: ../src/empathy-main-window.c:622
 msgid "No match found"
-msgstr "Nema nijedno poklapanje"
+msgstr "Nema poklapanja"
 
-#: ../src/empathy-main-window.c:688
+#: ../src/empathy-main-window.c:777
 msgid "Reconnect"
 msgstr "Ponovo se poveži"
 
-#: ../src/empathy-main-window.c:694
+#: ../src/empathy-main-window.c:783
 msgid "Edit Account"
 msgstr "Izmeni nalog"
 
-#: ../src/empathy-main-window.c:700
+#: ../src/empathy-main-window.c:789
 msgid "Close"
 msgstr "Zatvori"
 
-#: ../src/empathy-main-window.c:1418
+#. Translators: this string will be something like:
+#. *   Top up My Account ($1.23)..."
+#: ../src/empathy-main-window.c:928
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr "Dopuni %s (%s)..."
+
+#: ../src/empathy-main-window.c:975
+msgid "Top up account credit"
+msgstr "Dopunite kredit naloga"
+
+#. top up button
+#: ../src/empathy-main-window.c:1046
+msgid "Top Up..."
+msgstr "Dopuni..."
+
+#: ../src/empathy-main-window.c:1789
 msgid "Contact"
 msgstr "Prijatelj"
 
-#: ../src/empathy-main-window.c:1765
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "Spisak prijatelja"
 
-#: ../src/empathy-main-window.c:1881
-msgid "Show and edit accounts"
-msgstr "Prikaži i izmeni naloge"
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "Prijatelji na _mapi"
 
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-main-window-menubar.ui.h:2
+msgid "Credit Balance"
+msgstr "Iznos gotovine"
+
+#: ../src/empathy-main-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "Pronađi u _spisku prijatelja"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
-msgstr "P_ridruži se omiljenim"
+msgstr "Pridruži se _omiljenim"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "Uredi omiljene"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "N_ormalna veli�ina"
 
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
-msgstr "Novi po_ziv…"
+msgstr "Novi _poziv…"
 
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "Normalna veli�ina sa _avatarima"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "_Postavke"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:10
 msgid "Show P_rotocols"
-msgstr "Prikaži p_rotokole"
+msgstr "Prikaži _protokole"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
-msgstr "Sortiraj po ime_nu"
+msgstr "Poređaj prema _imenu"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
-msgstr "Sortiraj po _stanju"
+msgstr "Poređaj prema _stanju"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "N_alozi"
 
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "_Blokirani prijatelji"
 
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "_Kompaktna veli�ina"
 
-#: ../src/empathy-main-window.ui.h:18
-msgid "_Debug"
-msgstr "Otklanjanje _grešaka"
-
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "Prenosi _datoteka"
 
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "_Priklju�i se…"
 
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "_Novi razgovor…"
 
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
-msgstr "Nep_ovezane prijatelji"
+msgstr "Nep_ovezani prijatelji"
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "Li�ni _podaci"
 
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "_Soba"
 
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window-menubar.ui.h:29
 msgid "_Search for Contacts…"
 msgstr "_Traži prijatelje…"
 
 #: ../src/empathy-new-chatroom-dialog.c:337
 msgid "Chat Room"
-msgstr "Sobe za ćaskanje"
+msgstr "Soba za ćaskanje"
 
 #: ../src/empathy-new-chatroom-dialog.c:353
 msgid "Members"
@@ -3714,7 +4180,7 @@ msgstr "ÄŒlanovi"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:560
+#: ../src/empathy-new-chatroom-dialog.c:553
 #, c-format
 msgid ""
 "%s\n"
@@ -3727,16 +4193,16 @@ msgstr ""
 "Potrebna lozinka: %s\n"
 "ÄŒlanovi: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "No"
 msgstr "Ne"
 
-#: ../src/empathy-new-chatroom-dialog.c:591
+#: ../src/empathy-new-chatroom-dialog.c:584
 msgid "Could not start room listing"
 msgstr "Ne mogu da pokrenem listanje spiska soba"
 
-#: ../src/empathy-new-chatroom-dialog.c:601
+#: ../src/empathy-new-chatroom-dialog.c:594
 msgid "Could not stop room listing"
 msgstr "Ne mogu da zaustavim listanje spiska soba"
 
@@ -3748,7 +4214,7 @@ msgstr "Ne mogu da u�itam spisak soba"
 msgid ""
 "Enter the room name to join here or click on one or more rooms in the list."
 msgstr ""
-"Ovde unesite ime sobe za pridruživanje ili kliknite na neku od soba u listi."
+"Ovde unesite ime sobe za pridruživanje ili kliknite na neku od soba na spisku."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
 msgid ""
@@ -3770,39 +4236,79 @@ msgstr "Spisak soba"
 msgid "_Room:"
 msgstr "_Soba:"
 
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr "Poruka je primljena"
 
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr "Poruka je poslata"
 
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
 msgstr "Novi razgovor"
 
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
 msgstr "Prijatelj se prijavio"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
 msgstr "Prijatelj se odjavio"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
 msgstr "Nalog je na vezi"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
 msgstr "Nalog nije na vezi"
 
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr "Jezik"
 
-#: ../src/empathy-preferences.c:875
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:734
+msgid "Juliet"
+msgstr "Paja"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:741
+msgid "Romeo"
+msgstr "Jare"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:747
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr "Jao, kume, gotov sam!! Ja sam bivši �ovek!!!"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:750
+msgid "Deny thy father and refuse thy name;"
+msgstr "Pajo, Å¡ta je bilo, Pajooo??"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:753
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr "Kako šta je bilo?? Nema je više, ukrali su mi je!!"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:756
+msgid "And I'll no longer be a Capulet."
+msgstr "Å ta su ti ukrali, Pajo?? Å taaaa??"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:759
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr "Kako šta?? Ama lađu, ukrali su mi lađu!! Jao meni!!!"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:762
+msgid "Juliet has disconnected"
+msgstr "Sav o�ajan, Paja je prekinuo vezu."
+
+#: ../src/empathy-preferences.c:1166
 msgid "Preferences"
 msgstr "Postavke"
 
@@ -3810,92 +4316,112 @@ msgstr "Postavke"
 msgid "Appearance"
 msgstr "Izgled"
 
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
 msgstr "Ponašanje"
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
 msgid "Chat Th_eme:"
-msgstr "Tema ćaskanja:"
+msgstr "_Tema ćaskanja:"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
 msgid "Disable notifications when _away or busy"
-msgstr "Isklju�i obaveštenja kada sam odsutan ili zauzet"
+msgstr "Isklju�i obaveštenja kada sam _odsutan ili zauzet"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
 msgid "Disable sounds when _away or busy"
-msgstr "Isklju�i zvukove kada sam odsutan ili zauzet"
+msgstr "Isklju�i zvuke kada sam _odsutan ili zauzet"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Prikaži dolazne događaje u obaveštajnoj zoni"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"Uklanjanje odjeka �ini da vaš glas drugoj osobi zvu�i jasnije, ali može da "
+"izazove probleme na nekim ra�unarima. Ako vi ili vaš sagovornik �ujete �udne "
+"šumove ili kr�anje za vreme poziva, pokušajte da isklju�ite uklanjanje odjeka i "
+"ponovo pokrenite poziv."
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "Omogući obaveštenja kada prijatelj dođe na mrežu"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "Omogući obaveštenja kada prijatelj ode sa mreže"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
-msgstr "Omogući obaveštenja kada ćaskanja nisu u fokusu"
+msgstr "Omogući obaveštenja kada _ćaskanja nisu u fokusu"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "Omogući proveru pravopisa za sledeće jezike:"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "Opšte"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input level:"
+msgstr "Ulazni nivo:"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "Ja�ina ulaznog zvuka:"
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "Izvori lokacija:"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
-msgstr "Beleži razgovore"
+msgstr "Zabeleži razgovore"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "Obaveštenja"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Pusti zvuk za događaje"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "Privatnost"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
 "decimal place."
 msgstr ""
-"Umanjena preciznost lokacije podrazumeva da će najprecizniji podaci o vašoj "
+"Umanjena ta�nost lokacije zna�i da će najta�niji objavljeni podaci o vašoj "
 "lokaciji biti grad i država.  GPS koordinate će biti ta�ne do 1. decimale."
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "Prikaži slike _smešaka"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
-msgstr "Prikaži _spisak prijatelja u sobama"
+msgstr "Prikaži spisak _prijatelja u sobama"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
-msgstr "Zvukovi"
+msgstr "Zvuci"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "Provera pisanja"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
@@ -3903,44 +4429,48 @@ msgstr ""
 "Ovaj spisak jezika predstavlja samo one jezike za koje imate instalirane "
 "re�nike."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "Teme"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:30
+msgid "Variant:"
+msgstr "Varijanta:"
+
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
-msgstr "_Automatski se poveži po pokretanju "
+msgstr "_Sam se poveži nakon pokretanja"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Mobilni telefon"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
-msgstr "Omogući obav_eštenja u obla�ićima"
+msgstr "_Omogući obaveštenja u obla�ićima"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
-msgstr "Omogući zvukovna obav_eštenja"
+msgstr "Omogući _zvu�na obaveštenja"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Mreža (IP, beži�na)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "_Otvaraj ćaskanja u novim prozorima"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
-msgstr "Objavi lokaciji mojim _prijateljima"
+msgstr "Objavi lokaciju mojim _prijateljima"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "Umanji _ta�nost lokacije"
 
@@ -3952,82 +4482,131 @@ msgstr "Stanje"
 msgid "_Quit"
 msgstr "_Izađi"
 
-#: ../src/empathy-map-view.c:442
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "Pozovi prijatelja ponovo"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "Isklj. kameru"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "Uklj. kameru"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "Onemogući kameru i prestani da šalješ video"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "Omogući kameru i šalji video"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "Omogući kameru, ali ne šalji video"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "Pregled"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "Ponovo zovi"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "V_ideo"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "Isklj. video"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "Uklj. video"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "Pregled videa"
+
+#: ../src/empathy-map-view.c:448
 msgid "Contact Map View"
 msgstr "Mapa prijatelja"
 
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
 msgid "Save"
 msgstr "Sa�uvaj"
 
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
 msgstr "Prozor za otklanjanje grešaka"
 
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
 msgstr "Pauza"
 
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
-msgstr "Nivo"
+msgstr "Nivo: "
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
 msgid "Debug"
 msgstr "Otklanjanje grešaka"
 
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
 msgid "Info"
-msgstr "Informacija"
+msgstr "Informacije"
 
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
 msgid "Message"
 msgstr "Poruka"
 
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
 msgid "Critical"
-msgstr "Kriti�na"
+msgstr "Kriti�an"
 
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
 msgid "Error"
 msgstr "Greška"
 
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
 msgid "Time"
 msgstr "Vreme"
 
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
 msgid "Domain"
 msgstr "Domen"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
 msgstr "Kategorija"
 
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "Nivo"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
-msgstr "Izabrani upravnik veze nema proširenje za udaljeno otklanjanje grešaka."
+msgstr ""
+"Izabrani upravnik veze ne podržava proširenje za udaljeno otklanjanje grešaka."
 
-#: ../src/empathy-invite-participant-dialog.c:34
-#: ../src/empathy-invite-participant-dialog.c:48
+#: ../src/empathy-invite-participant-dialog.c:179
+#: ../src/empathy-invite-participant-dialog.c:205
 msgid "Invite Participant"
 msgstr "Pozovi u�esnike"
 
-#: ../src/empathy-invite-participant-dialog.c:35
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Izaberite prijatelja za pozivanje u ovaj razgovor:"
 
-#: ../src/empathy-invite-participant-dialog.c:45
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "Pozovi"
 
@@ -4040,7 +4619,7 @@ msgstr ""
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
-"Ne prikazuj nijedno prozor�e ukoliko ne postoje samo „Ljudi u blizini\" nalozi"
+"Ne prikazuj nijedno prozor�e osim ako ne postoje samo nalozi „Ljudi u blizini“"
 
 #: ../src/empathy-accounts.c:191
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
@@ -4053,52 +4632,133 @@ msgstr "<identifikacija naloga>"
 
 #: ../src/empathy-accounts.c:198
 msgid "- Empathy Accounts"
-msgstr "- Pismonošini nalozi"
+msgstr "— Nalozi Pismonoše"
 
 #: ../src/empathy-accounts.c:237
 msgid "Empathy Accounts"
-msgstr "Pismonošini nalozi"
+msgstr "Nalozi Pismonoše"
 
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr "Prikaži posebnu uslugu"
+
+#: ../src/empathy-debugger.c:75
+msgid "- Empathy Debugger"
+msgstr "— Otklanjanje grešaka Pismonoše"
+
+#: ../src/empathy-debugger.c:114
 msgid "Empathy Debugger"
-msgstr "Pismonošino otklanjanje grešaka"
+msgstr "Otklanjanje grešaka Pismonoše"
 
 #: ../src/empathy-chat.c:107
 msgid "- Empathy Chat Client"
-msgstr "- Pismonoša za brze poruke"
+msgstr "— Pismonoša program za ćaskanje"
 
-#: ../src/empathy-notifications-approver.c:184
+#: ../src/empathy-notifications-approver.c:203
 msgid "Respond"
 msgstr "Odgovori"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1459
 msgid "Reject"
 msgstr "Odbaci"
 
-#: ../src/empathy-notifications-approver.c:194
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1460
 msgid "Answer"
 msgstr "Javi se"
 
-#: ../src/empathy-notifications-approver.c:201
-#: ../src/empathy-notifications-approver.c:211
+#: ../src/empathy-notifications-approver.c:227
+msgid "Answer with video"
+msgstr "Odgovori sa videom"
+
+#: ../src/empathy-notifications-approver.c:235
+#: ../src/empathy-notifications-approver.c:245
 msgid "Decline"
 msgstr "Odbij"
 
-#: ../src/empathy-notifications-approver.c:205
-#: ../src/empathy-notifications-approver.c:216
+#: ../src/empathy-notifications-approver.c:239
+#: ../src/empathy-notifications-approver.c:250
 msgid "Accept"
 msgstr "Prihvati"
 
-#: ../src/empathy-call-observer.c:130
-#, c-format
-msgid "Missed call from %s"
-msgstr "Propušten poziv od %s"
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:260
+msgid "Provide"
+msgstr "Obezbedi"
 
-#: ../src/empathy-call-observer.c:133
+#: ../src/empathy-call-observer.c:134
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s je pokušao da vas zove, ali ste vi bili na drugoj vezi."
 
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+msgid "i"
+msgstr "i"
+
+#: ../src/empathy-call-window.c:2775
+msgid "On hold"
+msgstr "Na �ekanju"
+
+#: ../src/empathy-call-window.c:2778
+msgid "Mute"
+msgstr "Utišaj"
+
+#: ../src/empathy-call-window.c:2780
+msgid "Duration"
+msgstr "Trajanje"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2783
+#, c-format
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02dm"
+
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "_Uporedi veli�inu slova"
+
+#~ msgid "All"
+#~ msgstr "Sve"
+
+#~ msgid "_Enabled"
+#~ msgstr "_Omogućeno"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
+#~ msgid "Conversations"
+#~ msgstr "Razgovori"
+
+#~ msgid "Find Next"
+#~ msgstr "Nađi sledeće"
+
+#~ msgid "Find Previous"
+#~ msgstr "Nađi prethodno"
+
+#~ msgid "Previous Conversations"
+#~ msgstr "Prethodni razgovori"
+
+#~ msgid "_For:"
+#~ msgstr "_Za:"
+
+#~ msgid "Enter Custom Message"
+#~ msgstr "Unesi proizvoljnu poruku"
+
+#~ msgid "Save _New Status Message"
+#~ msgstr "Sa�uvaj _novu poruku stanja"
+
+#~ msgid "Saved Status Messages"
+#~ msgstr "Snimljene poruke stanja"
+
+#~ msgid "Show and edit accounts"
+#~ msgstr "Prikaži i izmeni naloge"
+
 #~ msgid "Empathy has asked about importing accounts"
 #~ msgstr "Da li da Pismonoša pita za uvoz naloga"
 
diff --git a/po/sv.po b/po/sv.po
index 534865dd9..165ad3e01 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-01 12:43+0200\n"
-"PO-Revision-Date: 2011-09-01 12:47+0100\n"
+"POT-Creation-Date: 2011-10-09 20:42+0200\n"
+"PO-Revision-Date: 2011-10-09 20:43+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -85,57 +85,57 @@ msgid "Contact list sort criterion"
 msgstr "Sorteringskriteria för kontaktlista"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "Sökväg för D-Bus-objektet för senaste kontot valt för att gå in i ett rum."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr "Standardenhet för kamera att använda i videosamtal, t.ex. /dev/video0."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Default directory to select an avatar image from"
 msgstr "Standardkatalog att välja en profilbild från"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable popup notifications when away"
 msgstr "Inaktivera popupnotifieringar under frånvaro"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Disable sounds when away"
 msgstr "Inaktivera ljud under frånvaro"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Display incoming events in the status area"
 msgstr "Visa inkommande händelser i statusytan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Display incoming events in the status area. If false, present them to the user immediately."
 msgstr "Visa inkommande händelser i statusytan. Om false, visa dem direkt för användaren."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Echo cancellation support"
 msgstr "Stöd för ekosläckning"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can publish the user's location"
 msgstr "Empathy kan publicera användarens plats"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy kan använda GPS:en för att gissa platsen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy kan använda mobiltelefonnätet för att gissa platsen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy kan använda nätverket för att gissa platsen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy default download folder"
 msgstr "Standardhämtningsmapp för Empathy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "Empathy har migrerat butterfly-loggar"
-
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy ska ställa in automatiskt frånvaro vid inaktivitet"
@@ -177,149 +177,149 @@ msgid "Hide the main window."
 msgstr "Dölj huvudfönstret."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+msgid "Last account selected in Join Room dialog"
+msgstr "Senast kontot valt i GÃ¥ in i rum-dialogen"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Nick completed character"
 msgstr "Tecken för smeknamnskomplettering"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Open new chats in separate windows"
 msgstr "Öppna nya chattar i separata fönster"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use"
 msgstr "Sökväg för Adium-temat att använda"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "Sökväg för Adium-temat som ska användas om temat som används för chatt är Adium."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for incoming messages"
 msgstr "Spela upp ljud för inkommande meddelanden"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for new conversations"
 msgstr "Spela upp ett ljud för nya samtal"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound for outgoing messages"
 msgstr "Spela upp ljud för utgående meddelanden"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs in"
 msgstr "Spela upp ljud när en kontakt loggar in"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when a contact logs out"
 msgstr "Spela upp ett ljud när en kontakt loggar ut"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log in"
 msgstr "Spela upp ljud när vi loggar in"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Play a sound when we log out"
 msgstr "Spela upp ljud när vi loggar ut"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Visa popupnotifieringar om chatten inte är fokuserad"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs in"
 msgstr "Visa popupnotifieringar när en kontakt loggar in"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "Pop up notifications when a contact logs out"
 msgstr "Visa popupnotifieringar när en kontakt loggar ut"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Position the camera preview should be during a call."
 msgstr "Positionera kameravisningen som den ska vara under ett samtal."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show Balance in contact list"
 msgstr "Visa saldo i kontaktlista"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show avatars"
 msgstr "Visa profilbilder"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show contact list in rooms"
 msgstr "Visa kontaktlista i rum"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show hint about closing the main window"
 msgstr "Visa tips om att stänga huvudfönstret"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show offline contacts"
 msgstr "Visa frånkopplade kontakter"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Show protocols"
 msgstr "Visa protokoll"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Spell checking languages"
 msgstr "Rättstavningsspråk"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The default folder to save file transfers in."
 msgstr "Standardmappen att spara filöverföringar i."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Den senaste katalogen som en profilbild valdes från."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The position for the chat window side pane"
 msgstr "Positionen för chattfönstrets sidopanel"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "Den lagrade positionen (i bildpunkter) för chattfönstrets sidopanel."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Det tema som används för att visa samtal i chattfönster."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "The theme variant that is used to display the conversation in chat windows."
 msgstr "Den temavariant som används för att visa samtalet i chattfönster."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use graphical smileys"
 msgstr "Använd grafiska smilisar"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use notification sounds"
 msgstr "Använd notifieringsljud"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Use theme for chat rooms"
 msgstr "Använd tema för chattrum"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Huruvida Empathy kan publicera användarens plats till sina kontakter."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Huruvida Empathy kan använda GPS för att gissa platsen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Huruvida Empathy kan använda mobiltelefonnätet för att gissa platsen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Huruvida Empathy kan använda nätverket för att gissa platsen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Huruvida Empathy har migrerat butterfly-loggar."
-
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Huruvida Empathy automatiskt ska logga in med dina konton vid uppstart."
@@ -458,19 +458,19 @@ msgstr "Hantera konton för meddelanden och VoIP"
 msgid "Messaging and VoIP Accounts"
 msgstr "Meddelande och VoIP-konton"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:838
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Filöverföringen är färdig men filen blev skadad"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1124
 msgid "File transfer not supported by remote contact"
 msgstr "Filöverföringar stöds inte fjärrkontakten"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1180
 msgid "The selected file is not a regular file"
 msgstr "Den valda filen är inte en vanlig fil"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1189
 msgid "The selected file is empty"
 msgstr "Den valda filen är tom"
 
@@ -491,195 +491,195 @@ msgstr "Ringde %s"
 msgid "Call from %s"
 msgstr "Samtal från %s"
 
-#: ../libempathy/empathy-tp-file.c:268
+#: ../libempathy/empathy-tp-file.c:258
 msgid "Socket type not supported"
 msgstr "Uttagstypen stöds inte"
 
-#: ../libempathy/empathy-tp-file.c:387
+#: ../libempathy/empathy-tp-file.c:377
 msgid "No reason was specified"
 msgstr "Ingen anledning angavs"
 
-#: ../libempathy/empathy-tp-file.c:390
+#: ../libempathy/empathy-tp-file.c:380
 msgid "The change in state was requested"
 msgstr "Ändring i tillstånd begärdes"
 
-#: ../libempathy/empathy-tp-file.c:393
+#: ../libempathy/empathy-tp-file.c:383
 msgid "You canceled the file transfer"
 msgstr "Du avbröt filöverföringen"
 
-#: ../libempathy/empathy-tp-file.c:396
+#: ../libempathy/empathy-tp-file.c:386
 msgid "The other participant canceled the file transfer"
 msgstr "Den andra deltagaren avbröt filöverföringen"
 
-#: ../libempathy/empathy-tp-file.c:399
+#: ../libempathy/empathy-tp-file.c:389
 msgid "Error while trying to transfer the file"
 msgstr "Fel vid försök att överföra filen"
 
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-tp-file.c:392
 msgid "The other participant is unable to transfer the file"
 msgstr "Den andra deltagaren kunde inte överföra filen"
 
-#: ../libempathy/empathy-tp-file.c:405
-#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-tp-file.c:395
+#: ../libempathy/empathy-utils.c:312
 msgid "Unknown reason"
 msgstr "Okänd anledning"
 
-#: ../libempathy/empathy-utils.c:222
+#: ../libempathy/empathy-utils.c:232
 msgid "Available"
 msgstr "Tillgänglig"
 
-#: ../libempathy/empathy-utils.c:224
+#: ../libempathy/empathy-utils.c:234
 msgid "Busy"
 msgstr "Upptagen"
 
-#: ../libempathy/empathy-utils.c:227
+#: ../libempathy/empathy-utils.c:237
 msgid "Away"
 msgstr "Frånvarande"
 
-#: ../libempathy/empathy-utils.c:229
+#: ../libempathy/empathy-utils.c:239
 msgid "Invisible"
 msgstr "Osynlig"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:241
 msgid "Offline"
 msgstr "Frånkopplad"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:244
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Okänt"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:284
 msgid "No reason specified"
 msgstr "Ingen anledning angavs"
 
-#: ../libempathy/empathy-utils.c:276
-#: ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:286
+#: ../libempathy/empathy-utils.c:342
 msgid "Status is set to offline"
 msgstr "Status är inställd till frånkopplad"
 
-#: ../libempathy/empathy-utils.c:278
-#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:322
 #: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "Nätverksfel"
 
-#: ../libempathy/empathy-utils.c:280
-#: ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:290
+#: ../libempathy/empathy-utils.c:324
 msgid "Authentication failed"
 msgstr "Autentisering misslyckades"
 
-#: ../libempathy/empathy-utils.c:282
-#: ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:326
 msgid "Encryption error"
 msgstr "Krypteringsfel"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:294
 msgid "Name in use"
 msgstr "Namnet används"
 
-#: ../libempathy/empathy-utils.c:286
-#: ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:296
+#: ../libempathy/empathy-utils.c:328
 msgid "Certificate not provided"
 msgstr "Certifikat inte tillhandahållet"
 
-#: ../libempathy/empathy-utils.c:288
-#: ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:298
+#: ../libempathy/empathy-utils.c:330
 msgid "Certificate untrusted"
 msgstr "Certifikatet är inte betrott"
 
-#: ../libempathy/empathy-utils.c:290
-#: ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:332
 msgid "Certificate expired"
 msgstr "Certifikatet har gått ut"
 
-#: ../libempathy/empathy-utils.c:292
-#: ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:334
 msgid "Certificate not activated"
 msgstr "Certifikatet är inte aktiverat"
 
-#: ../libempathy/empathy-utils.c:294
-#: ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:336
 msgid "Certificate hostname mismatch"
 msgstr "Värdnamnet i certifikatet stämmer inte"
 
-#: ../libempathy/empathy-utils.c:296
-#: ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:338
 msgid "Certificate fingerprint mismatch"
 msgstr "Certifikatets fingeravtryck stämmer inte"
 
-#: ../libempathy/empathy-utils.c:298
-#: ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:308
+#: ../libempathy/empathy-utils.c:340
 msgid "Certificate self-signed"
 msgstr "Självsignerat certifikat"
 
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate error"
 msgstr "Certifikatfel"
 
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:344
 msgid "Encryption is not available"
 msgstr "Kryptering är inte tillgängligt"
 
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:346
 msgid "Certificate is invalid"
 msgstr "Certifikatet är ogiltigt"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:348
 msgid "Connection has been refused"
 msgstr "Anslutningen vägrades"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:350
 msgid "Connection can't be established"
 msgstr "Anslutningen kunde inte etableras"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:352
 msgid "Connection has been lost"
 msgstr "Anslutningen förlorades"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:354
 msgid "This resource is already connected to the server"
 msgstr "Denna resurs är redan ansluten till servern"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:356
 msgid "Connection has been replaced by a new connection using the same resource"
 msgstr "Anslutningen har ersatts av en ny anslutning med samma resurs"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:359
 msgid "The account already exists on the server"
 msgstr "Kontot finns redan på servern"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:361
 msgid "Server is currently too busy to handle the connection"
 msgstr "Servern är för tillfället för upptagen för att hantera anslutningen"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:363
 msgid "Certificate has been revoked"
 msgstr "Certifikatet har spärrats"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:365
 msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "Certifikatet använder en osäker skifferalgoritm eller är kryptografiskt svag"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:368
 msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
 msgstr "Längd på servercertifikatet, eller djup för servercertifikatkedjan, överstiger begränsningen för krypteringsbiblioteket"
 
-#: ../libempathy/empathy-utils.c:519
+#: ../libempathy/empathy-utils.c:529
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "Personer i närheten"
 
-#: ../libempathy/empathy-utils.c:524
+#: ../libempathy/empathy-utils.c:534
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:553
+#: ../libempathy/empathy-utils.c:563
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:554
+#: ../libempathy/empathy-utils.c:564
 msgid "Facebook Chat"
 msgstr "Facebook-chatt"
 
@@ -729,7 +729,7 @@ msgstr[1] "%d månader sedan"
 msgid "in the future"
 msgstr "i framtiden"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:539
+#: ../libempathy-gtk/empathy-account-chooser.c:540
 msgid "All accounts"
 msgstr "Alla konton"
 
@@ -758,42 +758,52 @@ msgstr "Port"
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1167
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "Mina webbkonton"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1209
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "Kontot %s är redigerbart via Mina webbkonton."
+msgid "The account %s is edited via %s."
+msgstr "Kontot %s redigeras via %s."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1173
+#: ../libempathy-gtk/empathy-account-widget.c:1215
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "Kontot %s kan inte redigeras i Empathy."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1193
+#: ../libempathy-gtk/empathy-account-widget.c:1234
 msgid "Launch My Web Accounts"
 msgstr "Starta Mina webbkonton"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1533
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1242
+#, c-format
+msgid "Edit %s"
+msgstr "Redigera %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1592
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Användarnamn:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1851
+#: ../libempathy-gtk/empathy-account-widget.c:1910
 msgid "A_pply"
 msgstr "V_erkställ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1881
+#: ../libempathy-gtk/empathy-account-widget.c:1940
 msgid "L_og in"
 msgstr "L_ogga in"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1955
+#: ../libempathy-gtk/empathy-account-widget.c:2014
 msgid "This account already exists on the server"
 msgstr "Detta konto finns redan på servern"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1958
+#: ../libempathy-gtk/empathy-account-widget.c:2017
 msgid "Create a new account on the server"
 msgstr "Skapa ett nytt konto på servern"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2150
+#: ../libempathy-gtk/empathy-account-widget.c:2209
 msgid "Ca_ncel"
 msgstr "Av_bryt"
 
@@ -802,19 +812,19 @@ msgstr "Av_bryt"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2428
+#: ../libempathy-gtk/empathy-account-widget.c:2487
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s på %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2454
+#: ../libempathy-gtk/empathy-account-widget.c:2513
 #, c-format
 msgid "%s Account"
 msgstr "%s-konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2458
+#: ../libempathy-gtk/empathy-account-widget.c:2517
 msgid "New account"
 msgstr "Nytt konto"
 
@@ -1225,36 +1235,36 @@ msgstr "Yahoo!-I_D:"
 msgid "_Room List locale:"
 msgstr "Lokalanpassning för _rumslista:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:470
-#: ../libempathy-gtk/empathy-avatar-chooser.c:555
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "Kunde inte konvertera bild"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "Inget av de accepterade bildformaten stöds på ditt system"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:818
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
 msgid "Couldn't save picture to file"
 msgstr "Kunde inte spara bilden till fil"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:934
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "Välj din profilbild"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
 msgstr "Ta en bild..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:941
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "Ingen bild"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "Bilder"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "Alla filer"
 
@@ -1283,179 +1293,179 @@ msgstr "Den valda kontakten är inte giltig"
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Nödsamtal stöds inte med detta protokollet"
 
-#: ../libempathy-gtk/empathy-chat.c:702
+#: ../libempathy-gtk/empathy-chat.c:704
 msgid "Failed to open private chat"
 msgstr "Misslyckades med att öppna privat chatt"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:765
 msgid "Topic not supported on this conversation"
 msgstr "Ämne stöds inte för detta samtal"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:771
 msgid "You are not allowed to change the topic"
 msgstr "Du tillåts inte att ändra ämnet"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:975
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "\"%s\" är inte ett giltigt kontakt-id"
 
-#: ../libempathy-gtk/empathy-chat.c:1030
+#: ../libempathy-gtk/empathy-chat.c:1070
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: töm alla meddelanden från det aktuella samtalet"
 
-#: ../libempathy-gtk/empathy-chat.c:1033
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <ämne>: ställ in ämnet för det aktuella samtalet"
 
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1076
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <chattrummets ID>: gå in i ett nytt chattrum"
 
-#: ../libempathy-gtk/empathy-chat.c:1039
+#: ../libempathy-gtk/empathy-chat.c:1079
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <chattrummets ID>: gå in i ett nytt chattrum"
 
-#: ../libempathy-gtk/empathy-chat.c:1043
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one"
 msgstr "/part [<chattrummets ID>] [<anledning>]: lämna chattrummet, det aktuella som standard"
 
-#: ../libempathy-gtk/empathy-chat.c:1047
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <kontaktens ID> [<meddelande>]: öppna en privat chatt"
 
-#: ../libempathy-gtk/empathy-chat.c:1050
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <kontaktens ID> <meddelande>: öppna en privat chatt"
 
-#: ../libempathy-gtk/empathy-chat.c:1053
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <smeknamn>: ändra ditt smeknamn på aktuell server"
 
-#: ../libempathy-gtk/empathy-chat.c:1056
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <meddelande>: skicka ett ACTION-meddelande till aktuellt samtal"
 
-#: ../libempathy-gtk/empathy-chat.c:1059
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid "/say <message>: send <message> to the current conversation. This is used to send a message starting with a '/'. For example: \"/say /join is used to join a new chat room\""
 msgstr "/say <meddelande>: skicka <meddelande> till det aktuella samtalet. Detta används för att skicka ett meddelande som börjar med ett \"/\". Till exempel: \"/say /join används för att gå in i ett nytt chattrum\""
 
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <kontakt-id>: visa information om en kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
 msgstr "/help [<kommando>]: visa alla kommandon som stöds. Om <kommando> har definierats, visa dess användning."
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1126
 #, c-format
 msgid "Usage: %s"
 msgstr "Användning: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1116
+#: ../libempathy-gtk/empathy-chat.c:1171
 msgid "Unknown command"
 msgstr "Okänt kommando"
 
-#: ../libempathy-gtk/empathy-chat.c:1242
+#: ../libempathy-gtk/empathy-chat.c:1297
 msgid "Unknown command; see /help for the available commands"
 msgstr "Okänt kommando; se /help för tillgängliga kommandon"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1412
+#: ../libempathy-gtk/empathy-chat.c:1467
 msgid "insufficient balance to send message"
 msgstr "otillräckliga medel på kontot för att skicka meddelande"
 
-#: ../libempathy-gtk/empathy-chat.c:1414
+#: ../libempathy-gtk/empathy-chat.c:1469
 msgid "not capable"
 msgstr "inte kapabel"
 
-#: ../libempathy-gtk/empathy-chat.c:1421
+#: ../libempathy-gtk/empathy-chat.c:1476
 msgid "offline"
 msgstr "frånkopplad"
 
-#: ../libempathy-gtk/empathy-chat.c:1424
+#: ../libempathy-gtk/empathy-chat.c:1479
 msgid "invalid contact"
 msgstr "ogiltig kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1427
+#: ../libempathy-gtk/empathy-chat.c:1482
 msgid "permission denied"
 msgstr "Ã¥tkomst nekad"
 
-#: ../libempathy-gtk/empathy-chat.c:1430
+#: ../libempathy-gtk/empathy-chat.c:1485
 msgid "too long message"
 msgstr "för långt meddelande"
 
-#: ../libempathy-gtk/empathy-chat.c:1433
+#: ../libempathy-gtk/empathy-chat.c:1488
 msgid "not implemented"
 msgstr "inte implementerat"
 
-#: ../libempathy-gtk/empathy-chat.c:1437
+#: ../libempathy-gtk/empathy-chat.c:1492
 msgid "unknown"
 msgstr "okänt"
 
-#: ../libempathy-gtk/empathy-chat.c:1443
+#: ../libempathy-gtk/empathy-chat.c:1498
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Fel vid sändning av meddelandet \"%s\": %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1447
+#: ../libempathy-gtk/empathy-chat.c:1502
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Fel vid sändning av meddelande: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1508
+#: ../libempathy-gtk/empathy-chat.c:1563
 #: ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Ämne:"
 
-#: ../libempathy-gtk/empathy-chat.c:1520
+#: ../libempathy-gtk/empathy-chat.c:1575
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Ämnet inställt till: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1577
 msgid "No topic defined"
 msgstr "Inget ämne definierat"
 
-#: ../libempathy-gtk/empathy-chat.c:2031
+#: ../libempathy-gtk/empathy-chat.c:2086
 msgid "(No Suggestions)"
 msgstr "(Inga förslag)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2099
+#: ../libempathy-gtk/empathy-chat.c:2154
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Lägg till \"%s\" till ordbok"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2136
+#: ../libempathy-gtk/empathy-chat.c:2191
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Lägg till \"%s\" till %s-ordboken"
 
-#: ../libempathy-gtk/empathy-chat.c:2206
+#: ../libempathy-gtk/empathy-chat.c:2261
 msgid "Insert Smiley"
 msgstr "Infoga smilis"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2224
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2279
+#: ../libempathy-gtk/empathy-ui-utils.c:1840
 msgid "_Send"
 msgstr "_Skicka"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2278
+#: ../libempathy-gtk/empathy-chat.c:2333
 msgid "_Spelling Suggestions"
 msgstr "Sta_vningsförslag"
 
-#: ../libempathy-gtk/empathy-chat.c:2367
+#: ../libempathy-gtk/empathy-chat.c:2422
 msgid "Failed to retrieve recent logs"
 msgstr "Misslyckades med att hämta senaste loggar"
 
-#: ../libempathy-gtk/empathy-chat.c:2504
+#: ../libempathy-gtk/empathy-chat.c:2559
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s har kopplat från"
@@ -1463,12 +1473,12 @@ msgstr "%s har kopplat från"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2511
+#: ../libempathy-gtk/empathy-chat.c:2566
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s sparkades ut av %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2514
+#: ../libempathy-gtk/empathy-chat.c:2569
 #, c-format
 msgid "%s was kicked"
 msgstr "%s sparkades ut"
@@ -1476,17 +1486,17 @@ msgstr "%s sparkades ut"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2522
+#: ../libempathy-gtk/empathy-chat.c:2577
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s blev bannlyst av %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2525
+#: ../libempathy-gtk/empathy-chat.c:2580
 #, c-format
 msgid "%s was banned"
 msgstr "%s blev bannlyst"
 
-#: ../libempathy-gtk/empathy-chat.c:2529
+#: ../libempathy-gtk/empathy-chat.c:2584
 #, c-format
 msgid "%s has left the room"
 msgstr "%s har lämnat rummet"
@@ -1496,70 +1506,75 @@ msgstr "%s har lämnat rummet"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2538
+#: ../libempathy-gtk/empathy-chat.c:2593
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2618
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s har gått in i rummet"
 
-#: ../libempathy-gtk/empathy-chat.c:2588
+#: ../libempathy-gtk/empathy-chat.c:2643
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s är nu känd som %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2727
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2796
 #: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240
-#: ../src/empathy-call-window.c:2355
+#: ../src/empathy-event-manager.c:1260
+#: ../src/empathy-call-window.c:1546
+#: ../src/empathy-call-window.c:1596
+#: ../src/empathy-call-window.c:2641
 msgid "Disconnected"
 msgstr "Frånkopplad"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3374
+#: ../libempathy-gtk/empathy-chat.c:3440
 msgid "Would you like to store this password?"
 msgstr "Vill du lagra detta lösenord?"
 
-#: ../libempathy-gtk/empathy-chat.c:3380
+#: ../libempathy-gtk/empathy-chat.c:3446
 msgid "Remember"
 msgstr "Kom ihåg"
 
-#: ../libempathy-gtk/empathy-chat.c:3390
+#: ../libempathy-gtk/empathy-chat.c:3456
 msgid "Not now"
 msgstr "Inte nu"
 
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3500
 msgid "Retry"
 msgstr "Försök igen"
 
-#: ../libempathy-gtk/empathy-chat.c:3438
+#: ../libempathy-gtk/empathy-chat.c:3504
 msgid "Wrong password; please try again:"
 msgstr "Felaktigt lösenord. Försök igen:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3568
+#: ../libempathy-gtk/empathy-chat.c:3634
 msgid "This room is protected by a password:"
 msgstr "Detta rum är skyddat med ett lösenord:"
 
-#: ../libempathy-gtk/empathy-chat.c:3595
+#: ../libempathy-gtk/empathy-chat.c:3661
 msgid "Join"
 msgstr "GÃ¥ in"
 
-#: ../libempathy-gtk/empathy-chat.c:3797
-#: ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:3863
+#: ../src/empathy-event-manager.c:1281
 msgid "Connected"
 msgstr "Ansluten"
 
-#: ../libempathy-gtk/empathy-chat.c:3852
+#: ../libempathy-gtk/empathy-chat.c:3918
 msgid "Conversation"
 msgstr "Samtal"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3857
+#: ../libempathy-gtk/empathy-chat.c:3923
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1592,7 +1607,7 @@ msgstr "Redigera blockerade kontakter"
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:512
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1485
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
@@ -1686,33 +1701,33 @@ msgstr "Ogrupperade"
 msgid "Favorite People"
 msgstr "Favoritpersoner"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
+#: ../libempathy-gtk/empathy-contact-list-view.c:1985
+#: ../libempathy-gtk/empathy-individual-view.c:2375
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Vill du verkligen ta bort gruppen \"%s\"?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
+#: ../libempathy-gtk/empathy-contact-list-view.c:1987
+#: ../libempathy-gtk/empathy-individual-view.c:2378
 msgid "Removing group"
 msgstr "Tar bort grupp"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
+#: ../libempathy-gtk/empathy-contact-list-view.c:2036
+#: ../libempathy-gtk/empathy-contact-list-view.c:2113
+#: ../libempathy-gtk/empathy-individual-view.c:2433
+#: ../libempathy-gtk/empathy-individual-view.c:2636
 msgid "_Remove"
 msgstr "_Ta bort"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
+#: ../libempathy-gtk/empathy-contact-list-view.c:2066
+#: ../libempathy-gtk/empathy-individual-view.c:2500
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Vill du verkligen ta bort kontakten \"%s\"?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
+#: ../libempathy-gtk/empathy-contact-list-view.c:2068
+#: ../libempathy-gtk/empathy-individual-view.c:2521
 msgid "Removing contact"
 msgstr "Tar bort kontakt"
 
@@ -1760,9 +1775,9 @@ msgid "Share My Desktop"
 msgstr "Dela ut mitt skrivbord"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
+#: ../libempathy-gtk/empathy-contact-widget.c:1887
 #: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1373
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "Favorit"
 
@@ -1777,13 +1792,13 @@ msgid "_Edit"
 msgstr "R_edigera"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1283
+#: ../libempathy-gtk/empathy-individual-menu.c:1284
 #: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "Bjuder in dig till detta rum"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1329
+#: ../libempathy-gtk/empathy-individual-menu.c:1330
 msgid "_Invite to Chat Room"
 msgstr "_Bjud in till chattrum"
 
@@ -1812,10 +1827,6 @@ msgstr "Introducera dig själv:"
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Jag skulle vilja kunna se när du är ansluten. Tack!"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "Välj en kontakt"
-
 #: ../libempathy-gtk/empathy-contact-widget.c:336
 #: ../libempathy-gtk/empathy-individual-widget.c:153
 msgid "Full name:"
@@ -1989,7 +2000,7 @@ msgstr "Höjd:"
 #: ../libempathy-gtk/empathy-contact-widget.c:1011
 #: ../libempathy-gtk/empathy-individual-widget.c:607
 #: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "Plats"
 
@@ -2041,7 +2052,7 @@ msgstr "Kontaktuppgifter"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1515
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "Identifierare:"
 
@@ -2076,7 +2087,7 @@ msgid "Select"
 msgstr "Välj"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../src/empathy-main-window.c:1833
 msgid "Group"
 msgstr "Grupp"
 
@@ -2148,28 +2159,28 @@ msgstr "HEM"
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1141
+#: ../libempathy-gtk/empathy-individual-menu.c:1142
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "R_edigera"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1167
+#: ../libempathy-gtk/empathy-individual-menu.c:1168
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "_Länka kontakter..."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-view.c:2340
 msgid "Delete and _Block"
 msgstr "Ta bort och _blockera"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2509
 #, c-format
 msgid "Do you really want to remove the linked contact '%s'? Note that this will remove all the contacts which make up this linked contact."
 msgstr "Vill du verkligen ta bort den länkade kontakten \"%s\"? Observera att detta kommer att ta bort alla kontakter som denna länkade kontakt innehåller."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1662
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2247,128 +2258,136 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "Av_länka"
 
-#: ../libempathy-gtk/empathy-log-window.c:633
+#: ../libempathy-gtk/empathy-log-window.c:634
 msgid "History"
 msgstr "Historik"
 
-#: ../libempathy-gtk/empathy-log-window.c:685
+#: ../libempathy-gtk/empathy-log-window.c:689
 msgid "Show"
 msgstr "Visa"
 
-#: ../libempathy-gtk/empathy-log-window.c:707
+#: ../libempathy-gtk/empathy-log-window.c:711
 msgid "Search"
 msgstr "Sök"
 
-#: ../libempathy-gtk/empathy-log-window.c:1155
+#: ../libempathy-gtk/empathy-log-window.c:1159
 #, c-format
 msgid "Chat in %s"
 msgstr "Chatt i %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1157
+#: ../libempathy-gtk/empathy-log-window.c:1161
 #, c-format
 msgid "Chat with %s"
 msgstr "Chatt med %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1207
-#: ../libempathy-gtk/empathy-log-window.c:1354
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1296
+#: ../libempathy-gtk/empathy-log-window.c:1300
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1302
+#: ../libempathy-gtk/empathy-log-window.c:1306
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
-#: ../libempathy-gtk/empathy-log-window.c:1375
-#: ../src/empathy-ft-manager.c:1026
-msgid "%"
-msgstr "%"
-
 #: ../libempathy-gtk/empathy-log-window.c:1382
 #, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s sekund"
+msgstr[1] "%s sekunder"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s minut"
+msgstr[1] "%s minuter"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
+#, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Samtalet tog %s, avslutades %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1714
+#: ../libempathy-gtk/empathy-log-window.c:1729
 msgid "Today"
 msgstr "Idag"
 
 # "Web site" är "webbplats". "Web page" är "webbsida".
-#: ../libempathy-gtk/empathy-log-window.c:1718
+#: ../libempathy-gtk/empathy-log-window.c:1733
 msgid "Yesterday"
 msgstr "Igår"
 
-#: ../libempathy-gtk/empathy-log-window.c:1734
-msgctxt "A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
 msgid "%e %B %Y"
-msgstr "%e %B %Y"
+msgstr "%B %e %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1815
-#: ../libempathy-gtk/empathy-log-window.c:3396
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3444
 msgid "Anytime"
 msgstr "När som helst"
 
-#: ../libempathy-gtk/empathy-log-window.c:1895
-#: ../libempathy-gtk/empathy-log-window.c:2325
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2372
 msgid "Anyone"
 msgstr "Vem som helst"
 
-#: ../libempathy-gtk/empathy-log-window.c:2637
+#: ../libempathy-gtk/empathy-log-window.c:2685
 msgid "Who"
 msgstr "Vem"
 
-#: ../libempathy-gtk/empathy-log-window.c:2841
+#: ../libempathy-gtk/empathy-log-window.c:2889
 msgid "When"
 msgstr "När"
 
-#: ../libempathy-gtk/empathy-log-window.c:2957
+#: ../libempathy-gtk/empathy-log-window.c:3005
 msgid "Anything"
 msgstr "Allting"
 
-#: ../libempathy-gtk/empathy-log-window.c:2959
+#: ../libempathy-gtk/empathy-log-window.c:3007
 msgid "Text chats"
 msgstr "Textchattar"
 
-#: ../libempathy-gtk/empathy-log-window.c:2961
+#: ../libempathy-gtk/empathy-log-window.c:3009
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "Samtal"
 
-#: ../libempathy-gtk/empathy-log-window.c:2966
+#: ../libempathy-gtk/empathy-log-window.c:3014
 msgid "Incoming calls"
 msgstr "Inkommande samtal"
 
-#: ../libempathy-gtk/empathy-log-window.c:2967
+#: ../libempathy-gtk/empathy-log-window.c:3015
 msgid "Outgoing calls"
 msgstr "Utgående samtal"
 
-#: ../libempathy-gtk/empathy-log-window.c:2968
+#: ../libempathy-gtk/empathy-log-window.c:3016
 msgid "Missed calls"
 msgstr "Missade samtal"
 
-#: ../libempathy-gtk/empathy-log-window.c:2990
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "What"
 msgstr "Vad"
 
-#: ../libempathy-gtk/empathy-log-window.c:3699
+#: ../libempathy-gtk/empathy-log-window.c:3747
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Är du säker på att du vill ta bort alla loggar för tidigare samtal?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3703
+#: ../libempathy-gtk/empathy-log-window.c:3751
 msgid "Clear All"
 msgstr "Töm allt"
 
-#: ../libempathy-gtk/empathy-log-window.c:3710
+#: ../libempathy-gtk/empathy-log-window.c:3758
 msgid "Delete from:"
 msgstr "Ta bort från:"
 
@@ -2558,12 +2577,12 @@ msgstr "Röstsamtal avslutat"
 msgid "Edit Custom Messages"
 msgstr "Redigera anpassade meddelanden"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1030
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
 #, c-format
 msgid "Message edited at %s"
 msgstr "Meddelandet redigerat %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1720
+#: ../libempathy-gtk/empathy-theme-adium.c:1740
 msgid "Normal"
 msgstr "Normal"
 
@@ -2658,20 +2677,20 @@ msgstr "Certifikatinformation"
 msgid "Unable to open URI"
 msgstr "Kunde inte öppna uri"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1832
 msgid "Select a file"
 msgstr "Välj en fil"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1904
 msgid "Insufficient free space to save file"
 msgstr "Otillräckligt med ledigt utrymme för att spara filen"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1912
 #, c-format
 msgid "%s of free space are required to save this file, but only %s is available. Please choose another location."
 msgstr "%s ledigt utrymme krävs för att spara denna fil men endast %s finns tillgängligt. Välj en annan plats."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1956
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Inkommande fil från %s"
@@ -2844,39 +2863,31 @@ msgstr "Västlig"
 msgid "Vietnamese"
 msgstr "Vietnamesisk"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "Den valda kontakten kan inte ta emot filer."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "Den valda kontakten är frånkopplad."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:203
 msgid "No error message"
 msgstr "Inget felmeddelande"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:276
 msgid "Instant Message (Empathy)"
 msgstr "Snabbmeddelanden (Empathy)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:434
 msgid "Don't connect on startup"
 msgstr "Anslut inte vid uppstart"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:438
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Visa inte kontaktlistan eller några andra dialogrutor vid uppstart"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:453
 msgid "- Empathy IM Client"
 msgstr "- Empathy snabbmeddelandeklient"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:640
 msgid "Error contacting the Account Manager"
 msgstr "Fel vid anslutning till kontohanteraren"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:642
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. The error was:\n"
@@ -2996,8 +3007,8 @@ msgid "Select the accounts you want to import:"
 msgstr "Välj de konton som du vill importera:"
 
 #: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:625
+#: ../src/empathy-new-chatroom-dialog.c:626
 msgid "Yes"
 msgstr "Ja"
 
@@ -3057,7 +3068,7 @@ msgstr "Ditt nya konto har inte sparats än."
 
 #: ../src/empathy-accounts-dialog.c:345
 #: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1164
+#: ../src/empathy-call-window.c:1330
 msgid "Connecting…"
 msgstr "Ansluter..."
 
@@ -3162,12 +3173,12 @@ msgid "People nearby"
 msgstr "Personer i närheten"
 
 #: ../src/empathy-av.c:118
-#: ../src/empathy-call.c:127
+#: ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr "- Ljud/Videoklienten Empathy"
 
 #: ../src/empathy-av.c:134
-#: ../src/empathy-call.c:152
+#: ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "Ljud/Videoklienten Empathy"
 
@@ -3210,53 +3221,41 @@ msgstr "Detaljer"
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1672
+#: ../src/empathy-call-window.c:1939
 #, c-format
 msgid "Call with %s"
 msgstr "Ring med %s"
 
 #: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:1916
+#: ../src/empathy-call-window.c:2183
 msgid "The IP address as seen by the machine"
 msgstr "IP-adressen som den ses av datorn"
 
 #: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:1918
+#: ../src/empathy-call-window.c:2185
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP-adressen som den ses av en server på Internet"
 
 #: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:1920
+#: ../src/empathy-call-window.c:2187
 msgid "The IP address of the peer as seen by the other side"
 msgstr "IP-adressen för klienten som den ses av andra sidan"
 
 #: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:1922
+#: ../src/empathy-call-window.c:2189
 msgid "The IP address of a relay server"
 msgstr "IP-adressen för en reläserver"
 
 #: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:1924
+#: ../src/empathy-call-window.c:2191
 msgid "The IP address of the multicast group"
 msgstr "IP-adressen för multicast-gruppen"
 
 #: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "Okänt"
-
 #: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "Okänt"
-
 #: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "Okänt"
-
 #: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+msgctxt "codec"
 msgid "Unknown"
 msgstr "Okänt"
 
@@ -3267,66 +3266,66 @@ msgid "Connected — %d:%02dm"
 msgstr "Ansluten — %d:%02dm"
 
 #: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2674
+#: ../src/empathy-call-window.c:2960
 msgid "Technical Details"
 msgstr "Tekniska detaljer"
 
 #: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2712
+#: ../src/empathy-call-window.c:2998
 #, c-format
 msgid "%s's software does not understand any of the audio formats supported by your computer"
 msgstr "Programvaran hos %s förstår inte något av de ljudformat som stöds av din dator"
 
 #: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2717
+#: ../src/empathy-call-window.c:3003
 #, c-format
 msgid "%s's software does not understand any of the video formats supported by your computer"
 msgstr "Programvaran hos %s förstår inte något av de videoformat som stöds av din dator"
 
 #: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2723
+#: ../src/empathy-call-window.c:3009
 #, c-format
 msgid "Can't establish a connection to %s. One of you might be on a network that does not allow direct connections."
 msgstr "Kan inte etablera en anslutning till %s. Någon av er kanske befinner er på ett nätverk som inte tillåter direktanslutningar."
 
 #: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2729
+#: ../src/empathy-call-window.c:3015
 msgid "There was a failure on the network"
 msgstr "Det inträffade ett fel på nätverket"
 
 #: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2733
+#: ../src/empathy-call-window.c:3019
 msgid "The audio formats necessary for this call are not installed on your computer"
 msgstr "Ljudformaten som krävs för detta samtal är inte installerade på din dator"
 
 #: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2736
+#: ../src/empathy-call-window.c:3022
 msgid "The video formats necessary for this call are not installed on your computer"
 msgstr "Videoformaten som krävs för detta samtal är inte installerade på din dator"
 
 #: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2748
+#: ../src/empathy-call-window.c:3034
 #, c-format
 msgid "Something unexpected happened in a Telepathy component. Please <a href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' window in the Help menu."
 msgstr "Någonting oväntat hände i en Telepathy-komponent. <a href=\"%s\">Rapportera detta fel</a> och bifoga loggarna som samlats in från \"Felsök\"-fönstret i Hjälp-menyn."
 
 #: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2757
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure in the call engine"
 msgstr "Det uppstod ett fel i samtalsmotorn"
 
 #: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2760
+#: ../src/empathy-call-window.c:3046
 msgid "The end of the stream was reached"
 msgstr "Slutet på strömmen nåddes"
 
 #: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2800
+#: ../src/empathy-call-window.c:3086
 msgid "Can't establish audio stream"
 msgstr "Kan inte etablera ljudström"
 
 #: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2810
+#: ../src/empathy-call-window.c:3096
 msgid "Can't establish video stream"
 msgstr "Kan inte etablera videoström"
 
@@ -3418,10 +3417,10 @@ msgstr "Växla videoöverföring"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2307
-#: ../src/empathy-call-window.c:2308
-#: ../src/empathy-call-window.c:2309
-#: ../src/empathy-call-window.c:2310
+#: ../src/empathy-call-window.c:2590
+#: ../src/empathy-call-window.c:2591
+#: ../src/empathy-call-window.c:2592
+#: ../src/empathy-call-window.c:2593
 msgid "Unknown"
 msgstr "Okänt"
 
@@ -3595,6 +3594,7 @@ msgid "Incoming video call"
 msgstr "Inkommande videosamtal"
 
 #: ../src/empathy-event-manager.c:521
+#: ../src/empathy-call-window.c:1563
 msgid "Incoming call"
 msgstr "Inkommande samtal"
 
@@ -3611,6 +3611,7 @@ msgstr "%s ringer dig. Vill du svara?"
 #: ../src/empathy-event-manager.c:529
 #: ../src/empathy-event-manager.c:730
 #: ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1569
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Inkommande samtal från %s"
@@ -3630,6 +3631,7 @@ msgstr "S_vara med video"
 
 #: ../src/empathy-event-manager.c:730
 #: ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1569
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Inkommande videosamtal från %s"
@@ -3672,17 +3674,17 @@ msgstr "Du har blivit inbjuden att gå med i %s"
 msgid "Incoming file transfer from %s"
 msgstr "Inkommande filöverföring från %s"
 
-#: ../src/empathy-event-manager.c:1134
-#: ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1145
+#: ../src/empathy-main-window.c:378
 msgid "Password required"
 msgstr "Lösenord krävs"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1210
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s vill ha behörighet att se när du är ansluten"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1214
 #, c-format
 msgid ""
 "\n"
@@ -3785,6 +3787,10 @@ msgstr "Kontrollerar integritet för \"%s\""
 msgid "Hashing \"%s\""
 msgstr "Hashar \"%s\""
 
+#: ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "%"
+
 #: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "Fil"
@@ -3822,51 +3828,51 @@ msgstr "Protokoll"
 msgid "Source"
 msgstr "Källa"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-main-window.c:395
 msgid "Provide Password"
 msgstr "Ange lösenord"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-main-window.c:401
 msgid "Disconnect"
 msgstr "Koppla ifrån"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-main-window.c:642
 msgid "No match found"
 msgstr "Ingen träff hittades"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-main-window.c:803
 msgid "Reconnect"
 msgstr "Anslut igen"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-main-window.c:809
 msgid "Edit Account"
 msgstr "Redigera konto"
 
-#: ../src/empathy-main-window.c:789
+#: ../src/empathy-main-window.c:815
 msgid "Close"
 msgstr "Stäng"
 
 #. Translators: this string will be something like:
 #. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#: ../src/empathy-main-window.c:954
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Fyll på %s (%s)..."
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-main-window.c:1001
 msgid "Top up account credit"
 msgstr "Fyll på kontot"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-main-window.c:1072
 msgid "Top Up..."
 msgstr "Fyll på..."
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-main-window.c:1815
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../src/empathy-main-window.c:2119
+#: ../src/empathy-main-window.c:2190
 msgid "Contact List"
 msgstr "Kontaktlista"
 
@@ -3962,17 +3968,17 @@ msgstr "_Rum"
 msgid "_Search for Contacts…"
 msgstr "_Sök efter kontakter..."
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Chattrum"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "Medlemmar"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:623
 #, c-format
 msgid ""
 "%s\n"
@@ -3985,16 +3991,16 @@ msgstr ""
 "Lösenord krävs: %s\n"
 "Medlemmar: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:625
+#: ../src/empathy-new-chatroom-dialog.c:626
 msgid "No"
 msgstr "Nej"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:654
 msgid "Could not start room listing"
 msgstr "Kunde inte starta rumslistningen"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:664
 msgid "Could not stop room listing"
 msgstr "Kunde inte stoppa rumslistningen"
 
@@ -4123,119 +4129,123 @@ msgid "Display incoming events in the notification area"
 msgstr "Visa inkommande händelser i notifieringsytan"
 
 #: ../src/empathy-preferences.ui.h:9
+msgid "Echo cancellation helps to make your voice sound clearer to the other person, but may cause problems on some computers. If you or the other person hear strange noises or glitches during calls, try turning echo cancellation off and restarting the call."
+msgstr "Ekosläckning hjälper till att göra din röst klarare för den andra personen, men kan orsaka problem på vissa datorer. Om du eller den andra personen hör konstiga oljud eller avbrott under samtal, prova att stänga av ekosläckning och börja om samtalet."
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "Aktivera notifieringar när en kontakt ansluter"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "Aktivera notifieringar när en kontakt kopplar från"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Aktivera notifieringar när _chatten inte är fokuserad"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "Aktivera rättstavning för språk:"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "Allmänt"
 
-#: ../src/empathy-preferences.ui.h:14
-msgid "Input level"
-msgstr "Ingångsnivå"
-
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input volume"
-msgstr "Ingångsvolym"
+msgid "Input level:"
+msgstr "Ingångsnivå:"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "Ingångsvolym:"
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "Platskällor:"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "Logga samtal"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "Notifieringar"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Spela upp ljud för händelser"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "Integritet"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:23
 msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published.  GPS coordinates will be accurate to 1 decimal place."
 msgstr "Minskad precision för platsen betyder att ingenting mer informativt än din stad, län och land kommer att publiceras. GPS-koordinater kommer endast att använda en decimal."
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "Visa _smilisar som bilder"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "Visa kontakt_lista i rum"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "Ljud"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "Stavningskontroll"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
 msgid "The list of languages reflects only the languages for which you have a dictionary installed."
 msgstr "Listan visar endast språk som du har en ordlista installerad för."
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "Teman"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "Variant:"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "Anslut _automatiskt vid uppstart"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Mobiltelefon"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "_Aktivera bubbelnotifieringar"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "_Aktivera ljudnotifieringar"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Nätverk (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "_Öppna nya chattar i separata fönster"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "_Publicera platsen till mina kontakter"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "_Minska precision för plats"
 
@@ -4360,40 +4370,44 @@ msgstr "Nivå"
 msgid "The selected connection manager does not support the remote debugging extension."
 msgstr "Den valda anslutningshanteraren saknar stöd för tillägg för fjärrfelsökning."
 
+#: ../src/empathy-invite-participant-dialog.c:179
 #: ../src/empathy-invite-participant-dialog.c:205
-#: ../src/empathy-invite-participant-dialog.c:231
 msgid "Invite Participant"
 msgstr "Bjud in deltagare"
 
-#: ../src/empathy-invite-participant-dialog.c:206
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Välj en kontakt att bjuda in till samtalet:"
 
-#: ../src/empathy-invite-participant-dialog.c:227
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "Bjud in"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:184
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "Visa inte några dialogrutor; gör valfri åtgärd (t.ex, importera) och avsluta"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:188
 msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "Visa inte några dialogrutor såvida inte det endast finns \"Personer i närheten\"-konton"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:192
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "Välj initiallt angivet konto (t.ex., gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:194
 msgid "<account-id>"
 msgstr "<konto-id>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:197
+msgid "Show account assistant"
+msgstr "Visa kontoguiden"
+
+#: ../src/empathy-accounts.c:203
 msgid "- Empathy Accounts"
 msgstr "- Empathy-konton"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:242
 msgid "Empathy Accounts"
 msgstr "Empathy-konton"
 
@@ -4418,11 +4432,13 @@ msgid "Respond"
 msgstr "Svara"
 
 #: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1573
 msgid "Reject"
 msgstr "Avvisa"
 
 #: ../src/empathy-notifications-approver.c:222
 #: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1574
 msgid "Answer"
 msgstr "Svara"
 
@@ -4440,6 +4456,9 @@ msgstr "Neka"
 msgid "Accept"
 msgstr "Acceptera"
 
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
 #: ../src/empathy-notifications-approver.c:260
 msgid "Provide"
 msgstr "Tillhandahåll"
@@ -4451,25 +4470,25 @@ msgstr "%s försökte just ringa dig men du var upptagen i ett annat samtal."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1036
-#: ../src/empathy-call-window.c:1059
+#: ../src/empathy-call-window.c:1183
+#: ../src/empathy-call-window.c:1206
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2603
+#: ../src/empathy-call-window.c:2889
 msgid "On hold"
 msgstr "Väntar"
 
-#: ../src/empathy-call-window.c:2606
+#: ../src/empathy-call-window.c:2892
 msgid "Mute"
 msgstr "Tyst"
 
-#: ../src/empathy-call-window.c:2608
+#: ../src/empathy-call-window.c:2894
 msgid "Duration"
 msgstr "Längd"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2611
+#: ../src/empathy-call-window.c:2897
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
@@ -4478,6 +4497,28 @@ msgstr "%s — %d:%02dm"
 msgid "_Match case"
 msgstr "_Matcha skiftläge"
 
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Empathy har migrerat butterfly-loggar"
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Huruvida Empathy har migrerat butterfly-loggar."
+#~ msgid "Select a contact"
+#~ msgstr "Välj en kontakt"
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "Den valda kontakten kan inte ta emot filer."
+#~ msgid "The selected contact is offline."
+#~ msgstr "Den valda kontakten är frånkopplad."
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Okänt"
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Okänt"
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Okänt"
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Okänt"
 #~ msgid "Find Next"
 #~ msgstr "Sök nästa"
 #~ msgid "Find Previous"
@@ -4594,8 +4635,6 @@ msgstr "_Matcha skiftläge"
 #~ msgstr "Huruvida Salut-kontot har skapats vid första starten av Empathy."
 #~ msgid " Accounts"
 #~ msgstr " Konton"
-#~ msgid "Show the accounts dialog"
-#~ msgstr "Visa kontodialogrutan"
 #~ msgid "Hidden"
 #~ msgstr "Dold"
 
@@ -5545,8 +5584,6 @@ msgstr "_Matcha skiftläge"
 #~ msgstr "_Kompakt kontaktlista"
 #~ msgid "Show accounts and pending connections"
 #~ msgstr "Visa konton och avvaktande anslutningar"
-#~ msgid "Edit"
-#~ msgstr "Redigera"
 #~ msgid "Perhaps you are trying to connect to the wrong port?"
 #~ msgstr "Försöker du kanske ansluta till fel port?"
 #~ msgid "Perhaps the service is not currently running?"
diff --git a/po/ta.po b/po/ta.po
index 04223fb48..e547c70d8 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy.master.ta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-02 05:48+0530\n"
-"PO-Revision-Date: 2011-09-02 16:03+0530\n"
+"POT-Creation-Date: 2011-09-18 13:57+0530\n"
+"PO-Revision-Date: 2011-09-18 13:59+0530\n"
 "Last-Translator: Dr.T.Vasudevan <agnihot3@gmail.com>\n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
 "Language: ta\n"
@@ -752,7 +752,7 @@ msgstr[1] "%d மாதங�கள� ம�ன�"
 msgid "in the future"
 msgstr "எதிர�காலத�தில�"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:539
+#: ../libempathy-gtk/empathy-account-chooser.c:540
 msgid "All accounts"
 msgstr "அனைத�த� கணக�க�கள�"
 
@@ -781,42 +781,52 @@ msgstr "த�றை"
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1167
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "என� வலை கணக�க�கள� "
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "%s கணக�க� என� வலை கணக�க�கள� வழியாக திர�த�தப�பட வேண�ட�ம�."
+msgid "The account %s is edited via %s."
+msgstr "%s கணக�க� %s வழியாக திர�த�தப�பட வேண�ட�ம�."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1173
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "%s கணக�கை எம�பதிக�க� சேர�க�க�க இயலாத�. "
 
-#: ../libempathy-gtk/empathy-account-widget.c:1193
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
 msgstr "என� வலை கணக�க�கள� � த�வக�க�க. "
 
-#: ../libempathy-gtk/empathy-account-widget.c:1533
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "%s � திர�த�த�"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr " பயனர� பெயர�:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1851
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "_p அமை"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1881
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
 msgstr "(_o) உள�ந�ழை"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1955
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "இந�த கணக�க� �ற�கனவே சேவையகத�தில� உள�ளத�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1958
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "சேவையகத�தில� ஒர� ப�திய கணக�கை த�வக�க�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2150
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "_n ரத�த�செய�க"
 
@@ -825,19 +835,19 @@ msgstr "_n ரத�த�செய�க"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2428
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s மீத�  %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2454
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "%s கணக�க�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2458
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "ப�திய கணக�க�"
 
@@ -1254,36 +1264,36 @@ msgstr "(_I) யாகூ �டி:"
 msgid "_Room List locale:"
 msgstr "(_R) அறை பட�டியல� உள�ளமைவ�:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:470
-#: ../libempathy-gtk/empathy-avatar-chooser.c:555
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "படத�தை மாற�ற ம�டியவில�லை"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "உங�கள� கணினியில� எந�த ஒப�ப�க�கொண�ட பட ஒழ�ங�க�ம� ஆதரிக�கப�படவில�லை"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:818
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
 msgid "Couldn't save picture to file"
 msgstr "படத�தை கோப�ப�க�க� சேமிக�க ம�டியவில�லை"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:934
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "உங�க அவதார படத�தை தேர�வ� செய�க"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
 msgstr "ஒர� பட�டத�தை எட�..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:941
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "படம� இல�லை"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "பிம�பங�கள�"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "அனைத�த� கோப�ப�கள�"
 
@@ -1329,23 +1339,23 @@ msgstr "தலைப�பை மாற�ற அன�மதி உங�கள
 msgid "“%s� is not a valid contact ID"
 msgstr "“%s�  செல�ல�படியாகாத தொடர�ப� �டி"
 
-#: ../libempathy-gtk/empathy-chat.c:1030
+#: ../libempathy-gtk/empathy-chat.c:1058
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: நடப�ப� உரையாடலில� இர�ந�த� எல�லா செய�திகளைய�ம� த�டைக�கவ�ம�"
 
-#: ../libempathy-gtk/empathy-chat.c:1033
+#: ../libempathy-gtk/empathy-chat.c:1061
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topic>: நடப�ப� உரையாடல�க�க� தலைப�பை அமைக�கவ�ம�"
 
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1064
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <chat room ID>: ப�திய அரட�டை அறைக�க� சேரவ�ம�."
 
-#: ../libempathy-gtk/empathy-chat.c:1039
+#: ../libempathy-gtk/empathy-chat.c:1067
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <chat room ID>: ப�திய அரட�டை அறைக�க� சேரவ�ம�."
 
-#: ../libempathy-gtk/empathy-chat.c:1043
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1353,23 +1363,23 @@ msgstr ""
 "/part [<chat room ID>] [<reason>]: அரட�டை அறையில� இர�ந�த� வெளியேற�க, "
 "ம�ன�னிர�ப�பாகநடப�ப� அறை"
 
-#: ../libempathy-gtk/empathy-chat.c:1047
+#: ../libempathy-gtk/empathy-chat.c:1075
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <contact ID> [<message>]: அந�தரங�க அரட�டையை த�வக�கவ�ம�"
 
-#: ../libempathy-gtk/empathy-chat.c:1050
+#: ../libempathy-gtk/empathy-chat.c:1078
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <contact ID> <message>: அந�தரங�க அரட�டையை த�வக�கவ�ம�"
 
-#: ../libempathy-gtk/empathy-chat.c:1053
+#: ../libempathy-gtk/empathy-chat.c:1081
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nickname>: தற�போதைய சேவயகத�தில� உங�கள� செல�லபெயரை மாற�றவ�ம�"
 
-#: ../libempathy-gtk/empathy-chat.c:1056
+#: ../libempathy-gtk/empathy-chat.c:1084
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <message>: நடப�ப� உரையாடலில� ஆக�ஷன� செய�தி ஒன�ற� அன�ப�ப�க"
 
-#: ../libempathy-gtk/empathy-chat.c:1059
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1378,11 +1388,11 @@ msgstr ""
 "/say <message>: send <message> நடப�ப� உரையாடல�க�க�. இத� '/' உடன� த�வங�க�ம� "
 "செய�தியை அன�ப�பப�பயன�பட�ம�.உதாரணமாக: \"/say /join ப�திய அரட�டை அறையில� சேர உதவ�ம�.\""
 
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <contact ID>:  ஒர� தொடர�ப� க�றித�த தகவலை காட�ட�க"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1390,113 +1400,113 @@ msgstr ""
 "/help [<command>]: அனைத�த� ஆதரவ�ள�ள கட�டளைகளைய�ம� காட�ட�க. <command> � அற�தி இட�ட� "
 "இர�ப�பின� பயனை காட�ட�க."
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1112
 #, c-format
 msgid "Usage: %s"
 msgstr "பயன�பாட�: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1116
+#: ../libempathy-gtk/empathy-chat.c:1157
 msgid "Unknown command"
 msgstr "தெரியாத கட�டளை"
 
-#: ../libempathy-gtk/empathy-chat.c:1242
+#: ../libempathy-gtk/empathy-chat.c:1283
 msgid "Unknown command; see /help for the available commands"
 msgstr "தெரியாத கட�டளை. ஆதரவ�ள�ள கட�டளைகள�க�க� /help � பார�க�கவ�ம�"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1412
+#: ../libempathy-gtk/empathy-chat.c:1453
 msgid "insufficient balance to send message"
 msgstr "செய�தி அன�ப�ப போத�மான கட�டண மீதம�  இல�லை"
 
-#: ../libempathy-gtk/empathy-chat.c:1414
+#: ../libempathy-gtk/empathy-chat.c:1455
 msgid "not capable"
 msgstr "இயலாத� "
 
-#: ../libempathy-gtk/empathy-chat.c:1421
+#: ../libempathy-gtk/empathy-chat.c:1462
 msgid "offline"
 msgstr "இணைப�ப� விலகி "
 
-#: ../libempathy-gtk/empathy-chat.c:1424
+#: ../libempathy-gtk/empathy-chat.c:1465
 msgid "invalid contact"
 msgstr "செல�ல�படியாகாத தொடர�ப�"
 
-#: ../libempathy-gtk/empathy-chat.c:1427
+#: ../libempathy-gtk/empathy-chat.c:1468
 msgid "permission denied"
 msgstr "அன�மதி மற�க�கப�பட�டத�"
 
-#: ../libempathy-gtk/empathy-chat.c:1430
+#: ../libempathy-gtk/empathy-chat.c:1471
 msgid "too long message"
 msgstr "மிக நீள செய�தி"
 
-#: ../libempathy-gtk/empathy-chat.c:1433
+#: ../libempathy-gtk/empathy-chat.c:1474
 msgid "not implemented"
 msgstr "அம�லாக�கவில�லை"
 
-#: ../libempathy-gtk/empathy-chat.c:1437
+#: ../libempathy-gtk/empathy-chat.c:1478
 msgid "unknown"
 msgstr "தெரியாத"
 
-#: ../libempathy-gtk/empathy-chat.c:1443
+#: ../libempathy-gtk/empathy-chat.c:1484
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "செய�தி '%s' அன�ப�ப�வதில� பிழை: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1447
+#: ../libempathy-gtk/empathy-chat.c:1488
 #, c-format
 msgid "Error sending message: %s"
 msgstr "செய�தி  அன�ப�ப�வதில� பிழை: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1508 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1549 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "தலைப�ப�:"
 
-#: ../libempathy-gtk/empathy-chat.c:1520
+#: ../libempathy-gtk/empathy-chat.c:1561
 #, c-format
 msgid "Topic set to: %s"
 msgstr "தலைப�ப� இதற�க� அமை: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1563
 msgid "No topic defined"
 msgstr "தலைப�ப� �த�ம� வரையற�க�கப�படவில�லை"
 
-#: ../libempathy-gtk/empathy-chat.c:2031
+#: ../libempathy-gtk/empathy-chat.c:2072
 msgid "(No Suggestions)"
 msgstr "(பரிந�த�ரைகள� இல�லை )"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2099
+#: ../libempathy-gtk/empathy-chat.c:2140
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr " '%s' �  அகராதிக�க� சேர�"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2136
+#: ../libempathy-gtk/empathy-chat.c:2177
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr " '%s' � %s அகராதிக�க� சேர�"
 
-#: ../libempathy-gtk/empathy-chat.c:2206
+#: ../libempathy-gtk/empathy-chat.c:2247
 msgid "Insert Smiley"
 msgstr "சிரிப�பானை சொர�க�"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2224
+#: ../libempathy-gtk/empathy-chat.c:2265
 #: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "அன�ப�ப� (_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2278
+#: ../libempathy-gtk/empathy-chat.c:2319
 msgid "_Spelling Suggestions"
 msgstr "_S எழ�த�தாக�க பரிந�த�ரைகள� "
 
-#: ../libempathy-gtk/empathy-chat.c:2367
+#: ../libempathy-gtk/empathy-chat.c:2408
 msgid "Failed to retrieve recent logs"
 msgstr "சமீபத�திய பதிவேட�ட� உள�ளீட�களை  மீட�க�ம� போத� தோல�வி "
 
-#: ../libempathy-gtk/empathy-chat.c:2504
+#: ../libempathy-gtk/empathy-chat.c:2545
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s தொடர�பை த�ண�டித�தார�"
@@ -1504,12 +1514,12 @@ msgstr "%s தொடர�பை த�ண�டித�தார�"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2511
+#: ../libempathy-gtk/empathy-chat.c:2552
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s %2$sஆல� உதைக�கப�பட�டத�"
 
-#: ../libempathy-gtk/empathy-chat.c:2514
+#: ../libempathy-gtk/empathy-chat.c:2555
 #, c-format
 msgid "%s was kicked"
 msgstr "%s உதைத�த� வெளியேற�றப�பட�டார�"
@@ -1517,17 +1527,17 @@ msgstr "%s உதைதà¯�தà¯� வெளியேறà¯�றபà¯�படà¯�டà®
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2522
+#: ../libempathy-gtk/empathy-chat.c:2563
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s %2$sஆல� தடை செய�யப�பட�டார�"
 
-#: ../libempathy-gtk/empathy-chat.c:2525
+#: ../libempathy-gtk/empathy-chat.c:2566
 #, c-format
 msgid "%s was banned"
 msgstr "%s தடை செய�யப�பட�டார�"
 
-#: ../libempathy-gtk/empathy-chat.c:2529
+#: ../libempathy-gtk/empathy-chat.c:2570
 #, c-format
 msgid "%s has left the room"
 msgstr "%s அறையில� இர�ந�த� வெளியேறினார�"
@@ -1537,68 +1547,72 @@ msgstr "%s அறையிலà¯� இரà¯�நà¯�தà¯� வெளியேறிà
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2538
+#: ../libempathy-gtk/empathy-chat.c:2579
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2604
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s அறையில� சேர�ந�தார�"
 
-#: ../libempathy-gtk/empathy-chat.c:2588
+#: ../libempathy-gtk/empathy-chat.c:2629
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s இப�போத� %s ஆனார�"
 
-#: ../libempathy-gtk/empathy-chat.c:2727
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2768
 #: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:2355
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1391
+#: ../src/empathy-call-window.c:1441 ../src/empathy-call-window.c:2479
 msgid "Disconnected"
 msgstr "த�ண�டிக�கபட�டத�"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3374
+#: ../libempathy-gtk/empathy-chat.c:3415
 msgid "Would you like to store this password?"
 msgstr "இந�த கடவ�ச�சொல�லை நினைவ� கொள�ள வேண�ட�மா?"
 
-#: ../libempathy-gtk/empathy-chat.c:3380
+#: ../libempathy-gtk/empathy-chat.c:3421
 msgid "Remember"
 msgstr "நினைவ� கொள�ளவ�ம�"
 
-#: ../libempathy-gtk/empathy-chat.c:3390
+#: ../libempathy-gtk/empathy-chat.c:3431
 msgid "Not now"
 msgstr "இப�போத� இல�லை"
 
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3475
 msgid "Retry"
 msgstr "மற� ம�யற�சி"
 
-#: ../libempathy-gtk/empathy-chat.c:3438
+#: ../libempathy-gtk/empathy-chat.c:3479
 msgid "Wrong password; please try again:"
 msgstr "தவறான கடவ�ச�சொல�. தயை செய�த� மீண�ட�ம� ம�யற�சிக�கவ�ம�"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3568
+#: ../libempathy-gtk/empathy-chat.c:3609
 msgid "This room is protected by a password:"
 msgstr "இந�த அறை ஒர� கடவ�ச�சொல�லால� பாத�காக�கப�பட�ட�ள�ளத�."
 
-#: ../libempathy-gtk/empathy-chat.c:3595
+#: ../libempathy-gtk/empathy-chat.c:3636
 msgid "Join"
 msgstr "இணை"
 
-#: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:3838 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "இணைக�கப�பட�டத�"
 
-#: ../libempathy-gtk/empathy-chat.c:3852
+#: ../libempathy-gtk/empathy-chat.c:3893
 msgid "Conversation"
 msgstr "உரையாடல�"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3857
+#: ../libempathy-gtk/empathy-chat.c:3898
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1631,7 +1645,7 @@ msgstr "தடà¯�கà¯�கபà¯�படà¯�ட தொடரà¯�பà¯�களை தà
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:512
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1485
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
@@ -1801,7 +1815,7 @@ msgstr "என� மேல�மேசையை பகிர�ந�த� க
 #: ../libempathy-gtk/empathy-contact-menu.c:525
 #: ../libempathy-gtk/empathy-contact-widget.c:1886
 #: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1373
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "பிடித�தமான"
 
@@ -2027,7 +2041,7 @@ msgstr "க�த�த�யரம�:"
 #: ../libempathy-gtk/empathy-contact-widget.c:1011
 #: ../libempathy-gtk/empathy-individual-widget.c:607
 #: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "இடம�"
 
@@ -2079,7 +2093,7 @@ msgstr "தொடர�ப� விவரங�கள�"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1515
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "இனங�காட�டி:"
 
@@ -2215,7 +2229,7 @@ msgstr ""
 "நீங�கள� நிச�சயமாக சங�கிலித� தொடர�ப� '%s' � நீக�க விர�ம�ப�கிறீர�களா? இந�த தொடர�ப�டன�சங�கிலி "
 "போல� இணைந�த அனைத�த� தொடர�ப�கள�ம� நீக�கப�பட�ம� என� அறிக."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1662
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2297,127 +2311,135 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "_U இணைப�பை விலக�க�"
 
-#: ../libempathy-gtk/empathy-log-window.c:633
+#: ../libempathy-gtk/empathy-log-window.c:634
 msgid "History"
 msgstr "வரலாற�"
 
-#: ../libempathy-gtk/empathy-log-window.c:685
+#: ../libempathy-gtk/empathy-log-window.c:689
 msgid "Show"
 msgstr "காட�ட�"
 
-#: ../libempathy-gtk/empathy-log-window.c:707
+#: ../libempathy-gtk/empathy-log-window.c:711
 msgid "Search"
 msgstr "தேட�"
 
-#: ../libempathy-gtk/empathy-log-window.c:1155
+#: ../libempathy-gtk/empathy-log-window.c:1159
 #, c-format
 msgid "Chat in %s"
 msgstr "%s இல� அரட�டை "
 
-#: ../libempathy-gtk/empathy-log-window.c:1157
+#: ../libempathy-gtk/empathy-log-window.c:1161
 #, c-format
 msgid "Chat with %s"
 msgstr "%s உடன� அரட�டை "
 
-#: ../libempathy-gtk/empathy-log-window.c:1207
-#: ../libempathy-gtk/empathy-log-window.c:1354
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1296
+#: ../libempathy-gtk/empathy-log-window.c:1300
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1302
+#: ../libempathy-gtk/empathy-log-window.c:1306
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
-#: ../libempathy-gtk/empathy-log-window.c:1375
-#: ../src/empathy-ft-manager.c:1026
-msgid "%"
-msgstr "%"
-
 #: ../libempathy-gtk/empathy-log-window.c:1382
 #, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s வினாடி"
+msgstr[1] "%s வினாடிகள�"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s நிமிடம�"
+msgstr[1] "%s நிமிடங�கள� "
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
+#, c-format
 msgid "Call took %s, ended at %s"
 msgstr "அழைப�ப� எட�த�த�க�கொண�டத� %s, ம�டிந�தத� %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1714
+#: ../libempathy-gtk/empathy-log-window.c:1729
 msgid "Today"
 msgstr "இன�ற�"
 
-#: ../libempathy-gtk/empathy-log-window.c:1718
+#: ../libempathy-gtk/empathy-log-window.c:1733
 msgid "Yesterday"
 msgstr "நேற�ற�"
 
-#: ../libempathy-gtk/empathy-log-window.c:1734
-msgctxt "A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1815
-#: ../libempathy-gtk/empathy-log-window.c:3396
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3425
 msgid "Anytime"
 msgstr "எப�போத� வேண�ட�மானால�ம�"
 
-#: ../libempathy-gtk/empathy-log-window.c:1895
-#: ../libempathy-gtk/empathy-log-window.c:2325
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2353
 msgid "Anyone"
 msgstr "யார� வேண�ட�மானால�ம�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2637
+#: ../libempathy-gtk/empathy-log-window.c:2666
 msgid "Who"
 msgstr "யார�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2841
+#: ../libempathy-gtk/empathy-log-window.c:2870
 msgid "When"
 msgstr "எப�போத�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2957
+#: ../libempathy-gtk/empathy-log-window.c:2986
 msgid "Anything"
 msgstr "எத� வேண�ட�மானால�ம�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2959
+#: ../libempathy-gtk/empathy-log-window.c:2988
 msgid "Text chats"
 msgstr "உரை அரட�டைகள�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2961
+#: ../libempathy-gtk/empathy-log-window.c:2990
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "அழைப�ப�கள�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2966
+#: ../libempathy-gtk/empathy-log-window.c:2995
 msgid "Incoming calls"
 msgstr "உள�வர�ம� அழைப�ப�கள�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2967
+#: ../libempathy-gtk/empathy-log-window.c:2996
 msgid "Outgoing calls"
 msgstr "வெளி செல�ல�ம� அழைப�ப�கள�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2968
+#: ../libempathy-gtk/empathy-log-window.c:2997
 msgid "Missed calls"
 msgstr "தவறிய அழைப�ப�கள�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2990
+#: ../libempathy-gtk/empathy-log-window.c:3019
 msgid "What"
 msgstr "எத�"
 
-#: ../libempathy-gtk/empathy-log-window.c:3699
+#: ../libempathy-gtk/empathy-log-window.c:3728
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "ம�ந�தைய உரையாடல�கள� பதிவ�கள� அனைத�தைய�ம� நிச�சயம� நீக�க வேண�ட�மா?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3703
+#: ../libempathy-gtk/empathy-log-window.c:3732
 msgid "Clear All"
 msgstr "அனைத�தைய�ம� த�டை"
 
-#: ../libempathy-gtk/empathy-log-window.c:3710
+#: ../libempathy-gtk/empathy-log-window.c:3739
 msgid "Delete from:"
 msgstr "இலிர�ந�த� நீக�க�:"
 
@@ -2606,12 +2628,12 @@ msgstr "க�ரல� அழைப�ப� ம�டிந�தத�"
 msgid "Edit Custom Messages"
 msgstr "தனிப�பயன� செய�திகளை திர�த�த�க"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1030
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
 #, c-format
 msgid "Message edited at %s"
 msgstr "செய�தி திர�த�தப�பட�டத�  %s இல� "
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1720
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
 msgid "Normal"
 msgstr "இயல�பான"
 
@@ -3148,7 +3170,7 @@ msgstr "உங�கள� கணக�க� இன�ன�ம� சேமி
 
 #: ../src/empathy-accounts-dialog.c:345
 #: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1164
+#: ../src/empathy-call-window.c:1175
 msgid "Connecting…"
 msgstr "இணைக�கிறத�"
 
@@ -3256,11 +3278,11 @@ msgstr "- எமà¯�பதி உறà¯�தி செயà¯�தலà¯� சாரà¯�à
 msgid "People nearby"
 msgstr "அர�கில� உள�ள மக�கள�"
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:127
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr "- எம�பதி கேட�பொலி/ வீடியோ சார�ந�தோன�"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:152
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "எம�பதி கேட�பொலி/ வீடியோ சார�ந�தோன�"
 
@@ -3303,33 +3325,33 @@ msgstr "விவரங�கள�"
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1672
+#: ../src/empathy-call-window.c:1782
 #, c-format
 msgid "Call with %s"
 msgstr "%s ஆல� அழை "
 
 #: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:1916
+#: ../src/empathy-call-window.c:2026
 msgid "The IP address as seen by the machine"
 msgstr "கணினி பார�த�தபடி �பி ம�கவரி"
 
 #: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:1918
+#: ../src/empathy-call-window.c:2028
 msgid "The IP address as seen by a server on the Internet"
 msgstr "இணையத�தில� இர�ந�த� சேவயகம� பார�த�தபடி �பி ம�கவரி"
 
 #: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:1920
+#: ../src/empathy-call-window.c:2030
 msgid "The IP address of the peer as seen by the other side"
 msgstr "மற�ற பக�கத�தில� இர�ந�த� பார�த�தபடி பியரின� �பி ம�கவரி"
 
 #: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:1922
+#: ../src/empathy-call-window.c:2032
 msgid "The IP address of a relay server"
 msgstr "மேலன�ப�ப� சேவையகத�தின� �பி ம�கவர�."
 
 #: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:1924
+#: ../src/empathy-call-window.c:2034
 msgid "The IP address of the multicast group"
 msgstr "பல�வெளியீட�ட� க�ழ�வின� �பி ம�கவரி"
 
@@ -3360,12 +3382,12 @@ msgid "Connected — %d:%02dm"
 msgstr "இணைக�கப�பட�டத� — %d:%02dm"
 
 #: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2674
+#: ../src/empathy-call-window.c:2798
 msgid "Technical Details"
 msgstr "தொடர�ப� விவரங�கள�"
 
 #: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2712
+#: ../src/empathy-call-window.c:2836
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3375,7 +3397,7 @@ msgstr ""
 "கொள�ளவில�லை"
 
 #: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2717
+#: ../src/empathy-call-window.c:2841
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3385,7 +3407,7 @@ msgstr ""
 "கொள�ளவில�லை"
 
 #: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2723
+#: ../src/empathy-call-window.c:2847
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3395,22 +3417,22 @@ msgstr ""
 "இர�க�கலாம�."
 
 #: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2729
+#: ../src/empathy-call-window.c:2853
 msgid "There was a failure on the network"
 msgstr "வலைப�பின�னலில� ஒர� தோல�வி"
 
 #: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2733
+#: ../src/empathy-call-window.c:2857
 msgid "The audio formats necessary for this call are not installed on your computer"
 msgstr "இந�த அழைப�ப�க�க� தேவையான ஒலி ஒழ�ங�க�க�க� ஆதரவ� உங�கள� கணினியில� இல�லை."
 
 #: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2736
+#: ../src/empathy-call-window.c:2860
 msgid "The video formats necessary for this call are not installed on your computer"
 msgstr "இந�த அழைப�ப�க�க� தேவையான விடியோ ஒழ�ங�க�க�க� ஆதரவ� உங�கள� கணினியில� இல�லை."
 
 #: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2748
+#: ../src/empathy-call-window.c:2872
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3422,22 +3444,22 @@ msgstr ""
 "உள�ளடக�கத�தை இணைக�கவ�ம�.."
 
 #: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2757
+#: ../src/empathy-call-window.c:2881
 msgid "There was a failure in the call engine"
 msgstr "அழைப�ப� பொறியில� ஒர� தோல�வி"
 
 #: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2760
+#: ../src/empathy-call-window.c:2884
 msgid "The end of the stream was reached"
 msgstr "ஓடையின� இற�தி எட�டப�பட�டத�"
 
 #: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2800
+#: ../src/empathy-call-window.c:2924
 msgid "Can't establish audio stream"
 msgstr "ஒலி ஓடையை நிற�வ ம�டியவில�லை"
 
 #: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2810
+#: ../src/empathy-call-window.c:2934
 msgid "Can't establish video stream"
 msgstr "விடியோ ஓடையை நிற�வ ம�டியவில�லை"
 
@@ -3528,8 +3550,8 @@ msgstr "விடியோ அன�ப�ப�தலை நிலை மாற
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2307 ../src/empathy-call-window.c:2308
-#: ../src/empathy-call-window.c:2309 ../src/empathy-call-window.c:2310
+#: ../src/empathy-call-window.c:2431 ../src/empathy-call-window.c:2432
+#: ../src/empathy-call-window.c:2433 ../src/empathy-call-window.c:2434
 msgid "Unknown"
 msgstr "தெரியாத"
 
@@ -3698,7 +3720,7 @@ msgstr "பிடித�தமான அறைகளை மேலாள"
 msgid "Incoming video call"
 msgstr "உள�வர�ம� விடியோ அழைப�ப�"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1408
 msgid "Incoming call"
 msgstr "உள�வர�ம� அழைப�ப�"
 
@@ -3713,7 +3735,7 @@ msgid "%s is calling you. Do you want to answer?"
 msgstr "%s உங�களை அழைக�கிறார�. நீங�கள� பதில� பேச வேண�ட�மா?"
 
 #: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1414
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s இடமிர�ந�த� உள�வர�ம� அழைப�ப�"
@@ -3731,6 +3753,7 @@ msgid "_Answer with video"
 msgstr "_A வீடியோவால� பதில� கொட�"
 
 #: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1414
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "%s இடமிர�ந�த� உள�வர�ம� விடியோ அழைப�ப�"
@@ -3882,6 +3905,10 @@ msgstr " \"%s\" இனà¯� நமà¯�பகதà¯�தனà¯�மையை சோதà®
 msgid "Hashing \"%s\""
 msgstr " \"%s\" இன� ஹாஷ� மதிப�பை கணக�கிட�கிறத�"
 
+#: ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "%"
+
 #: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "கோப�ப�"
@@ -3969,7 +3996,7 @@ msgstr "நிரப�ப�..."
 msgid "Contact"
 msgstr "தொடர�ப�"
 
-#: ../src/empathy-main-window.c:2119
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "தொடர�ப� பட�டியல�"
 
@@ -4229,54 +4256,65 @@ msgid "Display incoming events in the notification area"
 msgstr "உள�வர�ம� நிகழ�ச�சிகளை அறிவிப�ப� இடத�தில� காட�ட�க."
 
 #: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"எதிரொலி நீக�கம� மற�றவரைவிட உங�கள� பேச�சை த�ல�லியமாக ஆக�க உதவ�கிறத�. அழைப�ப�களின� போத� "
+"நீங�களோ மற�றவரோ வினொபொதமான சத�தங�கள� அலல�த� தடங�கல�களை கேட�க நேர�ந�தால� எதிரொலி நீக�கத�தை "
+"நிற�த�த�ங�கள�; பின� மீண�ட�ம� அழைப�பை த�வக�க�ங�கள�."
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "தொடர�ப� உள� ந�ழைகையில� அறிவிப�ப�களை செயல�பட�த�த�"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "தொடர�ப� இணைப�ப� விலகி செல�கையில� அறிவிப�ப�களை செயல�பட�த�த�"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "(_c) அரட�டை க�விப�பில� இல�லாத போத� அறிவிப�ப�களை செயல�பட�த�த�"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "மொழிகள�க�க� எழ�த�த� பிழை திர�த�தத�தை செயல�பட�த�த�:"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "பொத�"
 
-#: ../src/empathy-preferences.ui.h:14
-msgid "Input level"
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input level:"
 msgstr "உள�ளீட�ட� மட�டம�:"
 
-#: ../src/empathy-preferences.ui.h:15
-msgid "Input volume"
-msgstr "உள�ளீட� ஒலி அளவ�"
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "உள�ளீட� ஒலி அளவ�:"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "இட மூலங�கள�:"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "உரையாடல�களை பதிவேட�டில� க�றி"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "அறிவிப�ப�கள�"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "நிகழ�வ�கள�க�க� ஒலியை இயக�க�"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "அந�தரங�கம�"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -4285,23 +4323,23 @@ msgstr ""
 "க�றைத�த இட க�றிப�ப� எனில� உங�கள� மாநகரம�, மாநிலம�, நாட� தவிர ஒன�ற�ம� வெளியிடப�படாத�. "
 "ஜிபிஎஸ� ஆயத�தொலைவ�கள�க�க� 1 தசம இடம� திர�த�தமாக இர�க�க�ம�."
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "(_s) சிரிப�பான�களை பிம�பங�களாக காட�ட�"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "(_l) அறைகளில� தொடர�ப� பட�டியல� � காட�ட� "
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "ஒலிகள�"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "எழ�த�த� பிழை திர�த�தம�"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
@@ -4309,48 +4347,48 @@ msgstr ""
 "இந�த பட�டியல� நீங�கள� எந�த மொழிகள�க�க� அகராதி நிற�வி இர�க�கிறீர�களோ அவற�றை மட�ட�மே "
 "காட�ட�கிறத�"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "கர�த�த�கள�"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "மாற�ற�:"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "(_A) த�வங�க�ம�போத� தானியங�கியாக இணை"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_C அலைபேசி"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "(_E) பலூனில� அறிவிப�ப�களை செயல�பட�த�த�"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "(_E) ஒலி அறிவிப�ப�களை செயல�பட�த�த�"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "(_G) ஜிபிஎஸ�"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_N வலையமைப�ப� (�பி, வைஃபை)"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "(_O) ப�திய அரட�டைகளை தனி சாளரங�களில� திற"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "(_P) என� தொடர�ப�கள�க�க� இடத�தை வெளியிட�"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "(_R) இடத�தின� க�றிப�பை க�றை"
 
@@ -4476,16 +4514,16 @@ msgid ""
 "extension."
 msgstr "தேர�ந�தெட�த�த இணைப�ப� மேலாளர� தொலை வழ� நீக�கத�தை ஆதரிக�கவில�லை"
 
+#: ../src/empathy-invite-participant-dialog.c:179
 #: ../src/empathy-invite-participant-dialog.c:205
-#: ../src/empathy-invite-participant-dialog.c:231
 msgid "Invite Participant"
 msgstr "பங�கேற�பாளரை அழை"
 
-#: ../src/empathy-invite-participant-dialog.c:206
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "உரையாடலில� பங�க�  கொள�ள ஒ ர� தொடர�பை  தேர�ந�தெட�க�கவ�ம�:"
 
-#: ../src/empathy-invite-participant-dialog.c:227
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "அழை"
 
@@ -4538,11 +4576,13 @@ msgid "Respond"
 msgstr "பதிலளி"
 
 #: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1418
 msgid "Reject"
 msgstr "�ற�காதே"
 
 #: ../src/empathy-notifications-approver.c:222
 #: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1419
 msgid "Answer"
 msgstr "பதிலளி"
 
@@ -4560,6 +4600,9 @@ msgstr "நிராகரி"
 msgid "Accept"
 msgstr "�ற�ற�க�கொள�"
 
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
 #: ../src/empathy-notifications-approver.c:260
 msgid "Provide"
 msgstr "அளி"
@@ -4571,24 +4614,24 @@ msgstr "%s உஙà¯�களை அழைகà¯�க விரà¯�à®®à¯�பினாà
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1036 ../src/empathy-call-window.c:1059
+#: ../src/empathy-call-window.c:1047 ../src/empathy-call-window.c:1070
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2603
+#: ../src/empathy-call-window.c:2727
 msgid "On hold"
 msgstr "தற�காலிக நிற�த�தம�"
 
-#: ../src/empathy-call-window.c:2606
+#: ../src/empathy-call-window.c:2730
 msgid "Mute"
 msgstr "ஒலி நிற�த�தம�"
 
-#: ../src/empathy-call-window.c:2608
+#: ../src/empathy-call-window.c:2732
 msgid "Duration"
 msgstr "கால அளவ�"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2611
+#: ../src/empathy-call-window.c:2735
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
diff --git a/po/th.po b/po/th.po
index f7d6f2d08..f4c0c118f 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=empathy&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-04-22 08:27+0000\n"
-"PO-Revision-Date: 2011-04-25 14:31+0700\n"
-"Last-Translator: Sira Nokyoongtong <gumaraa@gmail.com>\n"
+"product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2011-09-15 13:17+0000\n"
+"PO-Revision-Date: 2011-09-23 01:10+0700\n"
+"Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr ""
+msgstr "สนทนาผ่าน Google Talk, Facebook, MSN �ละบริ�ารสนทนาอื่นอี�มา�มาย"
 
 #: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
@@ -39,381 +39,427 @@ msgid "Always open a separate chat window for new chats."
 msgstr "เปิดหน้าต่างสนทนา�ย��ันสำหรับ�ารสนทนาใหม่"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr "ความดังเสียงคุยสาย"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr "ความดังเสียงคุยสาย เป็นเปอร์เซ็นต์"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Camera device"
+msgstr "�ฟ้มอุป�รณ์ของ�ล้อง"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "ตำ�หน่งภาพ�ล้อง"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr "อั�ขระที่จะเพิ่มต่อท้ายชื่อเรีย�เมื่อใช้�ารเติมชื่อเรีย�อัตโนมัติด้วยปุ่ม�ท็บในห้องสนทนา�ลุ่ม"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "ชุดต��ต่งหน้าต่างสนทนา"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+msgid "Chat window theme variant"
+msgstr "�บบย่อยของชุดต��ต่งหน้าต่างสนทนา"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr "รายชื่อของภาษาที่จะตรวจสอบตัวสะ�ด (เช่น \"en, fr, nl\") คั่นด้วยจุลภาค"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "รายชื่อผู้ติดต่อ�บบ�ระชับ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "ใช้โปร��รมจัด�าร�ารเชื่อมต่อ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "วิธีเรียงลำดับชื่อผู้ติดต่อ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "�ฟ้มอุป�รณ์ของ�ล้องปริยายที่จะใช้สนทนาด้วยวีดิทัศน์ เช่น /dev/video0"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
 msgstr "ไดเร�ทอรีปริยายที่จะใช้เลือ�รูป�ทนตัว"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr "ปิด�ารผุดข้อความ�จ้งเหตุเมื่อไม่อยู่"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr "ปิด�ารใช้เสียงเมื่อไม่อยู่"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
-msgstr ""
+msgstr "�สดงเหตุ�ารณ์ขาเข้าในพื้นที่�สดงสถานะ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
-msgstr ""
+msgstr "�สดงเหตุ�ารณ์ขาเข้าในพื้นที่�สดงสถานะ ถ้าเป็นค่าเท็จ �็จะ�สดงเหตุ�ารณ์ต่อผู้ใช้ทันที"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+msgid "Echo cancellation support"
+msgstr "เปิดใช้�ารตัดเสียงสะท้อน"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr "Empathy สามารถประ�าศตำ�หน่งที่ตั้งของผู้ใช้ได้"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy สามารถใช้ GPS ใน�ารเดาตำ�หน่งที่ตั้ง"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy สามารถใช้เครือข่ายโทรศัพท์มือถือใน�ารเดาตำ�หน่งที่ตั้ง"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy สามารถใช้เครือข่ายใน�ารเดาตำ�หน่งที่ตั้ง"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr "โฟลเดอร์ดาวน์โหลดปริยายของ Empathy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
 msgstr "Empathy ได้ย้ายข้อมูลปูม butterfly �ล้ว"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy ควรเปลี่ยนสถานะเป็นไม่อยู่โดยอัตโนมัติเมื่อเครื่องไม่ได้ใช้งาน"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy ควรเชื่อมต่อโดยอัตโนมัติเมื่อเริ่มทำงาน"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy ควรลดความละเอียดของตำ�หน่งที่ตั้ง"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy ควรใช้รูป�ทนตัวของผู้ติดต่อเป็นไอคอนของหน้าต่างสนทนา"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr "เปิดใช้เครื่องมือพัฒนาของ WebKit"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "เปิดใช้�ารผุดข้อความ�จ้งเหตุสำหรับข้อความใหม่"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "เปิดใช้�ารตรวจตัวสะ�ด"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "ซ่อนหน้าต่างหลั�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "ซ่อนหน้าต่างหลั�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "อั�ขระเติมท้ายชื่อเรีย�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "เปิด�ารสนทนาใหม่ในหน้าต่าง�ย�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "พาธของชุดต��ต่ง Adium ที่จะใช้"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "พาธของชุดต��ต่ง Adium ที่จะใช้ ใน�รณีที่ใช้ชุดต��ต่งสำหรับ�ารสนทนาของ Adium"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "เล่นเสียงเมื่อมีข้อความเข้า"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "เล่นเสียงเมื่อมี�ารสนทนาใหม่"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "เล่นเสียงเมื่อส่งข้อความออ�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "เล่นเสียงเมื่อมีผู้ติดต่อเข้าสู่ระบบ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "เล่นเสียงเมื่อมีผู้ติดต่อออ�จา�ระบบ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "เล่นเสียงเมื่อเราเข้าสู่ระบบ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "เล่นเสียงเมื่อเราออ�จา�ระบบ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "ผุดข้อความ�จ้งเหตุถ้าหน้าต่างสนทนาไม่ได้โฟ�ัส"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "ผุดข้อความ�จ้งเหตุเมื่อมีผู้ติดต่อเข้าสู่ระบบ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "ผุดข้อความ�จ้งเหตุเมื่อมีผู้ติดต่อออ�จา�ระบบ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr "ตำ�หน่ง�ารวางภาพตัวอย่างของ�ล้องขณะสนทนา"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+msgid "Show Balance in contact list"
+msgstr "�สดงยอดเงินคงเหลือในรายชื่อผู้ติดต่อ"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "�สดงรูป�ทนตัว"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "�สดงรายชื่อผู้ติดต่อในห้องต่างๆ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr "�สดงคำ�นะนำวิธีปิดหน้าต่างหลั�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr "�สดงผู้ติดต่อที่ออฟไลน์"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
 msgstr "�สดงโพรโทคอล"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "ภาษาที่ตรวจตัวสะ�ด"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr "โฟลเดอร์ปริยายที่จะบันทึ��ฟ้มที่ถ่ายโอนเข้ามา"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
 msgstr "ไดเร�ทอรีล่าสุดที่ถู�ใช้เลือ�รูป�ทนตัว"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
-msgstr ""
+msgstr "ตำ�หน่งของช่องด้านข้างในหน้าต่างสนทนา"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
-msgstr ""
+msgstr "ตำ�หน่งที่บันทึ�ไว้ (ในหน่วยพิ�เซล) ของช่องด้านข้างในหน้าต่างสนทนา"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "ชุดต��ต่งที่จะใช้�สดง�ารสนทนาในหน้าต่างสนทนา"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "�บบย่อยของชุดต��ต่งที่จะใช้�สดง�ารสนทนาในหน้าต่างสนทนา"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "ใช้รูปสีหน้า�บบ�ราฟิ�ส์"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "ใช้เสียง�จ้งเหตุ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "ใช้ชุดต��ต่ง�ับห้องสนทนา"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "�ำหนดว่า Empathy สามารถประ�าศตำ�หน่งที่ตั้งของผู้ใช้ต่อผู้ติดต่อหรือไม่"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "�ำหนดว่า Empathy สามารถใช้ GPS ใน�ารเดาตำ�หน่งที่ตั้งได้หรือไม่"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "�ำหนดว่า Empathy สามารถใช้เครือข่ายโทรศัพท์มือถือใน�ารเดาตำ�หน่งที่ตั้งได้หรือไม่"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "�ำหนดว่า Empathy สามารถใช้เครือข่ายใน�ารเดาตำ�หน่งที่ตั้งได้หรือไม่"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "�ำหนดว่า Empathy ได้ย้ายข้อมูลปูม butterfly ไป�ล้วหรือยัง"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "�ำหนดว่าจะให้ Empathy เข้าระบบในบั�ชีของคุณโดยอัตโนมัติเมื่อเริ่มทำงานหรือไม่"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-#, fuzzy
-#| msgid ""
-#| "Whether Empathy should go into away mode automatically if user is idle."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr "�ำหนดว่าจะให้ Empathy เปลี่ยนสถานะเป็นไม่อยู่โดยอัตโนมัติเมื่อเครื่องไม่ได้ใช้งานหรือไม่"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "�ำหนดว่า Empathy ควรลดความละเอียดของตำ�หน่งที่ตั้งเพื่อความเป็นส่วนตัวหรือไม่"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "�ำหนดว่าจะให้ Empathy ใช้รูป�ทนตัวของผู้ติดต่อเป็นไอคอนของหน้าต่างสนทนาหรือไม่"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "�ำหนดว่าจะเปิดใช้เครื่องมือพัฒนาของ WebKit เช่น เครื่องมือเ�้าสังเ�ตเว็บ หรือไม่"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr ""
 "�ำหนดว่าจะใช้โปร��รมจัด�าร�ารเชื่อมต่อใน�ารตัด�ารเชื่อมต่อ/เชื่อมต่อใหม่โดยอัตโนมัติหรือไม่"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "�ำหนดว่าจะตรวจตัวสะ�ดของคำที่ป้อนตามภาษาที่คุณต้อง�ารจะตรวจหรือไม่"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "�ำหนดว่าจะ�ปลงข้อความรูปสีหน้า (smiley) เป็นภาพ�ราฟิ�ส์หรือไม่ในหน้าต่างสนทนา"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "�ำหนดว่าจะเปิดใช้ตัว�รองตัดเสียงสะท้อนของ Pulseaudio หรือไม่"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "�ำหนดว่าจะเล่นเสียงเพื่อ�จ้งเมื่อมีผู้ติดต่อเข้าสู่ระบบเครือข่ายหรือไม่"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "�ำหนดว่าจะเล่นเสียงเพื่อ�จ้งเมื่อมีผู้ติดต่อออ�จา�ระบบเครือข่ายหรือไม่"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "�ำหนดว่าจะเล่นเสียงเพื่อ�จ้งเหตุเ�ี่ยว�ับเหตุ�ารณ์ต่างๆ หรือไม่"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "�ำหนดว่าจะเล่นเสียงเพื่อ�จ้งข้อความเข้าหรือไม่"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "�ำหนดว่าจะเล่นเสียงเพื่อ�จ้ง�ารสนทนาใหม่หรือไม่"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "�ำหนดว่าจะเล่นเสียงเพื่อ�จ้ง�ารส่งข้อความออ�หรือไม่"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "�ำหนดว่าจะเล่นเสียงเมื่อเข้าสู่ระบบเครือข่ายหรือไม่"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "�ำหนดว่าจะเล่นเสียงเมื่อออ�จา�ระบบเครือข่ายหรือไม่"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr "�ำหนดว่าจะงดเล่นเสียงเมื่อไม่อยู่หรือไม่ว่างหรือไม่"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "�ำหนดว่าจะผุดข้อความ�จ้งเหตุเมื่อมีผู้ติดต่อออฟไลน์หรือไม่"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "�ำหนดว่าจะผุดข้อความ�จ้งเหตุเมื่อมีผู้ติดต่อออนไลน์หรือไม่"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
 msgstr ""
 "�ำหนดว่าจะผุดข้อความ�จ้งเหตุหรือไม่เมื่อได้รับข้อความใหม่ �ม้หน้าต่างสนทนาจะเปิดอยู่ �ต่ไม่ได้โฟ�ัส"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "�ำหนดว่าจะผุดข้อความ�จ้งเหตุเมื่อได้รับข้อความใหม่หรือไม่"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+msgid "Whether to show account balances in the contact list."
+msgstr "�ำหนดว่าจะ�สดงยอดเงินคงเหลือในรายชื่อผู้ติดต่อหรือไม่"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "�ำหนดว่าจะ�สดงรูป�ทนตัวของผู้ติดต่อในรายชื่อผู้ติดต่อ�ละในหน้าต่างสนทนาหรือไม่"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "�ำหนดว่าจะ�สดงผู้ติดต่อที่ออฟไลน์ในรายชื่อผู้ติดต่อด้วยหรือไม่"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
 msgstr "�ำหนดว่าจะงดผุดข้อความ�จ้งเหตุเมื่อไม่อยู่หรือไม่ว่างหรือไม่"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "�ำหนดว่าจะ�สดงโพรโทคอลของผู้ติดต่อในรายชื่อผู้ติดต่อหรือไม่"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr "�ำหนดว่าจะ�สดงรายชื่อผู้ติดต่อในห้องสนทนาต่างๆ หรือไม่"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "�ำหนดว่าจะ�สดงรายชื่อผู้ติดต่อ�บบ�ระชับหรือไม่"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
 msgstr "�ำหนดว่าจะ�สดง�ล่องข้อความเ�ี่ยว�ับวิธีปิดหน้าต่างหลั�ด้วยปุ่ม 'x' ใน�ถบหัวหน้าต่างหรือไม่"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "�ำหนดว่าจะใช้ชุดต��ต่ง�ับห้องสนทนาหรือไม่"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -428,28 +474,42 @@ msgstr "จัด�ารบั�ชีข้อความทันใจ�
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2271
+#: ../src/empathy-accounts-dialog.c:2324
 msgid "Messaging and VoIP Accounts"
 msgstr "บั�ชีข้อความทันใจ�ละ VoIP"
 
 #: ../libempathy/empathy-ft-handler.c:825
-#, fuzzy
-#| msgid "File transfer completed"
 msgid "File transfer completed, but the file was corrupted"
-msgstr "ถ่ายโอน�ฟ้มเสร็จสมบูรณ์"
+msgstr "ถ่ายโอน�ฟ้มเสร็จสมบูรณ์�ล้ว �ต่�ฟ้มเสียหาย"
 
-#: ../libempathy/empathy-ft-handler.c:1113
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
 msgstr "ผู้ติดต่ออี��ั่งหนึ่งไม่รองรับ�ารถ่ายโอน�ฟ้ม"
 
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is not a regular file"
 msgstr "�ฟ้มที่เลือ�ไม่ใช่�ฟ้มป�ติ"
 
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1176
 msgid "The selected file is empty"
 msgstr "�ฟ้มที่เลือ�ว่างเปล่า"
 
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#, c-format
+msgid "Missed call from %s"
+msgstr "สายที่ไม่ได้รับจา� %s"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, c-format
+msgid "Called %s"
+msgstr "เรีย�สาย %s"
+
+#: ../libempathy/empathy-message.c:422
+#, c-format
+msgid "Call from %s"
+msgstr "สายเรีย�จา� %s"
+
 #: ../libempathy/empathy-tp-file.c:268
 msgid "Socket type not supported"
 msgstr "ไม่รองรับซ็อ�เ�็ตชนิดนี้"
@@ -478,304 +538,279 @@ msgstr "เ�ิดข้อผิดพลาดขณะพยายามถ
 msgid "The other participant is unable to transfer the file"
 msgstr "อี��่ายหนึ่งไม่สามารถถ่ายโอน�ฟ้มได้"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:383
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
 msgid "Unknown reason"
 msgstr "ไม่ทราบสาเหตุ"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:222
 msgid "Available"
 msgstr "อยู่"
 
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:224
 msgid "Busy"
 msgstr "ไม่ว่าง"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:227
 msgid "Away"
 msgstr "ไม่อยู่"
 
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:229
 msgid "Invisible"
 msgstr "ซ่อนตัว"
 
-#: ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-utils.c:231
 msgid "Offline"
 msgstr "ออฟไลน์"
 
 #. translators: presence type is unknown
-#. translators: encoding video codec is unknown
-#. translators: encoding audio codec is unknown
-#. translators: decoding video codec is unknown
-#. translators: decoding audio codec is unknown
-#: ../libempathy/empathy-utils.c:316
-#: ../src/empathy-streamed-media-window.c:1905
-#: ../src/empathy-streamed-media-window.c:1907
-#: ../src/empathy-streamed-media-window.c:1909
-#: ../src/empathy-streamed-media-window.c:1911
-#: ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:234
+msgctxt "presence"
 msgid "Unknown"
 msgstr "ไม่ทราบ"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:274
 msgid "No reason specified"
 msgstr "ไม่มี�ารระบุสาเหตุ"
 
-#: ../libempathy/empathy-utils.c:357 ../libempathy/empathy-utils.c:413
+#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
 msgid "Status is set to offline"
 msgstr "สถานะเปลี่ยนเป็นออฟไลน์"
 
-#: ../libempathy/empathy-utils.c:359 ../libempathy/empathy-utils.c:393
+#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "ข้อผิดพลาดเ�ี่ยว�ับเครือข่าย"
 
-#: ../libempathy/empathy-utils.c:361 ../libempathy/empathy-utils.c:395
+#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
 msgid "Authentication failed"
 msgstr "�ารยืนยันตัวบุคคลไม่ผ่าน"
 
-#: ../libempathy/empathy-utils.c:363 ../libempathy/empathy-utils.c:397
+#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
 msgid "Encryption error"
 msgstr "ข้อผิดพลาดเ�ี่ยว�ับ�ารเข้ารหัสลับ"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:284
 msgid "Name in use"
 msgstr "ชื่อถู�ใช้อยู่"
 
-#: ../libempathy/empathy-utils.c:367 ../libempathy/empathy-utils.c:399
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
 msgid "Certificate not provided"
 msgstr "ไม่มีใบรับรอง"
 
-#: ../libempathy/empathy-utils.c:369 ../libempathy/empathy-utils.c:401
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
 msgid "Certificate untrusted"
 msgstr "ไม่เชื่อถือใบรับรอง"
 
-#: ../libempathy/empathy-utils.c:371 ../libempathy/empathy-utils.c:403
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
 msgid "Certificate expired"
 msgstr "ใบรับรองหมดอายุ�ล้ว"
 
-#: ../libempathy/empathy-utils.c:373 ../libempathy/empathy-utils.c:405
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
 msgid "Certificate not activated"
 msgstr "ใบรับรองยังไม่มี�ารเริ่มใช้"
 
-#: ../libempathy/empathy-utils.c:375 ../libempathy/empathy-utils.c:407
+#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
 msgid "Certificate hostname mismatch"
 msgstr "ชื่อโฮสต์ในใบรับรองไม่ตรง�ัน"
 
-#: ../libempathy/empathy-utils.c:377 ../libempathy/empathy-utils.c:409
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate fingerprint mismatch"
 msgstr "ลายนิ้วมือในใบรับรองไม่ตรง�ัน"
 
-#: ../libempathy/empathy-utils.c:379 ../libempathy/empathy-utils.c:411
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate self-signed"
 msgstr "ใบรับรองเซ็นรับรองตัวเอง"
 
-#: ../libempathy/empathy-utils.c:381
+#: ../libempathy/empathy-utils.c:300
 msgid "Certificate error"
 msgstr "ข้อผิดพลาดเ�ี่ยว�ับใบรับรอง"
 
-#: ../libempathy/empathy-utils.c:415
+#: ../libempathy/empathy-utils.c:334
 msgid "Encryption is not available"
-msgstr ""
+msgstr "ไม่มี�ารเข้ารหัสลับให้ใช้งาน"
 
-#: ../libempathy/empathy-utils.c:417
+#: ../libempathy/empathy-utils.c:336
 msgid "Certificate is invalid"
 msgstr "ใบรับรองไม่ถู�ต้อง"
 
-#: ../libempathy/empathy-utils.c:419
-#, fuzzy
-#| msgid "Connection managers should be used"
+#: ../libempathy/empathy-utils.c:338
 msgid "Connection has been refused"
-msgstr "ใช้โปร��รมจัด�าร�ารเชื่อมต่อ"
+msgstr "�ารเชื่อมต่อถู�ป�ิเสธ"
 
-#: ../libempathy/empathy-utils.c:421
-#, fuzzy
-#| msgid "Connection managers should be used"
+#: ../libempathy/empathy-utils.c:340
 msgid "Connection can't be established"
-msgstr "ใช้โปร��รมจัด�าร�ารเชื่อมต่อ"
+msgstr "เชื่อมต่อไม่สำเร็จ"
 
-#: ../libempathy/empathy-utils.c:423
-#, fuzzy
-#| msgid "Connection managers should be used"
+#: ../libempathy/empathy-utils.c:342
 msgid "Connection has been lost"
-msgstr "ใช้โปร��รมจัด�าร�ารเชื่อมต่อ"
+msgstr "�ารเชื่อมต่อถู�ตัดขาด"
 
-#: ../libempathy/empathy-utils.c:425
-#, fuzzy
-#| msgid "This account already exists on the server"
+#: ../libempathy/empathy-utils.c:344
 msgid "This resource is already connected to the server"
-msgstr "บั�ชีนี้มีอยู่�ล้วที่เซิร์ฟเวอร์"
+msgstr "ทรัพยา�รนี้ได้เชื่อมต่อ�ับเซิร์ฟเวอร์อยู่�่อน�ล้ว"
 
-#: ../libempathy/empathy-utils.c:427
+#: ../libempathy/empathy-utils.c:346
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
-msgstr ""
+msgstr "�ารเชื่อมต่อถู��ทนที่ด้วย�ารเชื่อมต่อใหม่โดยใช้ทรัพยา�รเดียว�ัน"
 
-#: ../libempathy/empathy-utils.c:430
+#: ../libempathy/empathy-utils.c:349
 msgid "The account already exists on the server"
 msgstr "บั�ชีนี้มีอยู่�ล้วที่เซิร์ฟเวอร์"
 
-#: ../libempathy/empathy-utils.c:432
+#: ../libempathy/empathy-utils.c:351
 msgid "Server is currently too busy to handle the connection"
-msgstr ""
+msgstr "เซิร์ฟเวอร์ไม่ว่างพอที่จะจัด�าร�ารเชื่อมต่อ"
 
-#: ../libempathy/empathy-utils.c:434
-#, fuzzy
-#| msgid "Certificate not provided"
+#: ../libempathy/empathy-utils.c:353
 msgid "Certificate has been revoked"
-msgstr "ไม่มีใบรับรอง"
+msgstr "ใบรับรองถู�เพิ�ถอนไป�ล้ว"
 
-#: ../libempathy/empathy-utils.c:436
+#: ../libempathy/empathy-utils.c:355
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
-msgstr ""
+msgstr "ใบรับรองใช้อัล�อริทึม�ารเข้ารหัสลับที่ไม่ปลอดภัยหรืออ่อนเ�ินไป"
 
-#: ../libempathy/empathy-utils.c:439
+#: ../libempathy/empathy-utils.c:358
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr ""
+"ความยาวของใบรับรอง หรือความลึ�ของห่วงโซ่ใบรับรองของเซิร์ฟเวอร์ "
+"มีขนาดเ�ินขีดจำ�ัดที่ไลบรารีระบบเข้ารหัสลับ�ำหนดไว้"
 
-#: ../libempathy/empathy-utils.c:602
+#: ../libempathy/empathy-utils.c:519
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "ผู้คน�ถวนี้"
 
-#: ../libempathy/empathy-utils.c:607
+#: ../libempathy/empathy-utils.c:524
 msgid "Yahoo! Japan"
 msgstr "Yahoo! �ี่ปุ่น"
 
-#: ../libempathy/empathy-utils.c:636
+#: ../libempathy/empathy-utils.c:553
 msgid "Google Talk"
-msgstr ""
+msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:637
+#: ../libempathy/empathy-utils.c:554
 msgid "Facebook Chat"
 msgstr "�ารสนทนา Facebook"
 
-#: ../libempathy/empathy-time.c:137
+#: ../libempathy/empathy-time.c:88
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d วินาที�่อน"
 
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:93
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d นาที�่อน"
 
-#: ../libempathy/empathy-time.c:147
+#: ../libempathy/empathy-time.c:98
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d ชั่วโมง�่อน"
 
-#: ../libempathy/empathy-time.c:152
+#: ../libempathy/empathy-time.c:103
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d วัน�่อน"
 
-#: ../libempathy/empathy-time.c:157
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d สัปดาห์�่อน"
 
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:113
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d เดือน�่อน"
 
-#: ../libempathy/empathy-time.c:167
+#: ../libempathy/empathy-time.c:136
 msgid "in the future"
 msgstr "ในอนาคต"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:491
-msgid "All"
-msgstr "ทั้งหมด"
+#: ../libempathy-gtk/empathy-account-chooser.c:540
+msgid "All accounts"
+msgstr "ทุ�บั�ชี"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../libempathy-gtk/empathy-log-window.c:643
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "บั�ชี"
 
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "รหัสผ่าน"
 
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "เซิร์ฟเวอร์"
 
-#: ../libempathy-gtk/empathy-account-widget.c:685
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "พอร์ต"
 
-#: ../libempathy-gtk/empathy-account-widget.c:757
-#: ../libempathy-gtk/empathy-account-widget.c:814
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1166
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "บั�ชีเว็บของฉัน"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr ""
+msgid "The account %s is edited via %s."
+msgstr "บั�ชี %s มี�าร��้ไขผ่าน %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1172
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
-msgstr ""
+msgstr "บั�ชี %s ไม่สามารถ��้ไขใน Empathy ได้"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
-#, fuzzy
-#| msgid "Empathy Accounts"
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
-msgstr "บั�ชี Empathy"
+msgstr "เรีย� \"บั�ชีเว็บของฉัน\""
+
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "��้ไข %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1530
+#: ../libempathy-gtk/empathy-account-widget.c:1591
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "ชื่อผู้ใช้:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1897
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "เ_ริ่มใช้"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1927
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
 msgstr "เ_ข้าระบบ"
 
-#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1993
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:520
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1481
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "บั�ชี:"
-
-#. translators: this is the label of a checkbox used to enable/disable IM
-#. * accounts
-#: ../libempathy-gtk/empathy-account-widget.c:2006
-msgid "_Enabled"
-msgstr "เ_ปิดใช้"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2071
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "บั�ชีนี้มีอยู่�ล้วที่เซิร์ฟเวอร์"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2074
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "สร้างบั�ชีใหม่ที่เซิร์ฟเวอร์"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2266
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "ย_�เลิ�"
 
@@ -784,19 +819,19 @@ msgstr "ย_�เลิ�"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2563
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s ที่ %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2589
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "บั�ชี %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2593
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "บั�ชีใหม่"
 
@@ -808,6 +843,7 @@ msgstr "<b>ตัวอย่าง:</b> MyScreenName"
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -821,7 +857,7 @@ msgstr "ขั้นสูง"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "Pass_word:"
 msgstr "_รหัสผ่าน:"
@@ -831,7 +867,7 @@ msgstr "_รหัสผ่าน:"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
 msgid "Remember Password"
 msgstr "จำรหัสผ่าน"
 
@@ -841,7 +877,7 @@ msgstr "จำรหัสผ่าน"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 #: ../libempathy-gtk/empathy-password-dialog.c:311
 msgid "Remember password"
@@ -917,76 +953,82 @@ msgstr "UIN ของ ICQ ของคุณคืออะไร?"
 msgid "What is your ICQ password?"
 msgstr "รหัสผ่าน ICQ ของคุณคืออะไร?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:183
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "อัตโนมัติ"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:221
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "Register"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:226
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "ตัวเลือ�"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "ไม่ใช้"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Character set:"
 msgstr "รหัสอั�ขระ:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr "เซิร์ฟเวอร์ IRC ส่วนให�่ไม่ต้องใช้รหัสผ่าน ดังนั้น ถ้าคุณไม่�น่ใจ �็ไม่ต้องป้อนรหัสผ่าน"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Network"
 msgstr "เครือข่าย"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Network:"
 msgstr "เครือข่าย:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "ชื่อเรีย�:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "รหัสผ่าน:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "ข้อความขณะออ�:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "ชื่อจริง:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Servers"
 msgstr "เซิร์ฟเวอร์"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "What is your IRC nickname?"
 msgstr "ชื่อเรีย�ใน IRC ของคุณคืออะไร?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "IRC เครือข่ายไหน?"
 
@@ -1120,58 +1162,67 @@ msgid "Discover the STUN server automatically"
 msgstr "ค้นหาเซิร์ฟเวอร์ STUN โดยอัตโนมัติ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "Ignore TLS Errors"
+msgstr "ละเลยข้อผิดพลาดของ TLS"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Interval (seconds)"
 msgstr "ช่วงเวลา (วินาที)"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
 msgid "Keep-Alive Options"
 msgstr "ตัวเลือ��ารคง�ารเชื่อมต่อ"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
 msgid "Loose Routing"
 msgstr "ใช้�ารจัดเส้นทาง�บบหลวม"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Mechanism:"
 msgstr "�ลไ�:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
 msgid "Miscellaneous Options"
 msgstr "ตัวเลือ�เบ็ตเตล็ด"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 msgid "NAT Traversal Options"
 msgstr "ตัวเลือ�สำหรับเส้นทาง NAT"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 msgid "Port:"
 msgstr "พอร์ต:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 msgid "Proxy Options"
 msgstr "ตัวเลือ�สำหรับพร็อ�ซี"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "STUN Server:"
 msgstr "เซิร์ฟเวอร์ STUN:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.c:347
 msgid "Server:"
 msgstr "เซิร์ฟเวอร์:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid "Transport:"
 msgstr "�ารรับส่งข้อมูล:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "ใช้บั�ชีนี้เรีย�สายโทรศัพท์_บ้าน�ละโทรศัพท์มือถือ"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "รหัสผ่านบั�ชี SIP ของคุณคืออะไร?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "ชื่อบั�ชี SIP ของคุณคืออะไร?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "_ชื่อผู้ใช้:"
 
@@ -1195,28 +1246,36 @@ msgstr "_บั�ชี Yahoo!:"
 msgid "_Room List locale:"
 msgstr "โล�คลของรายชื่อ_ห้อง:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:448
-#: ../libempathy-gtk/empathy-avatar-chooser.c:524
+#: ../libempathy-gtk/empathy-avatar-chooser.c:470
+#: ../libempathy-gtk/empathy-avatar-chooser.c:555
 msgid "Couldn't convert image"
 msgstr "ไม่สามารถ�ปลงรูปภาพได้"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
 msgid "None of the accepted image formats are supported on your system"
 msgstr "ระบบของคุณไม่รองรับฟอร์�มตรูปภาพใดๆ ที่โปร��รมยอมรับเลย"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:930
+#: ../libempathy-gtk/empathy-avatar-chooser.c:818
+msgid "Couldn't save picture to file"
+msgstr "ไม่สามารถบันทึ�รูปภาพลง�ฟ้มได้"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:934
 msgid "Select Your Avatar Image"
 msgstr "เลือ�รูป�ทนตัวของคุณ"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+msgid "Take a picture..."
+msgstr "ถ่ายภาพ..."
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:941
 msgid "No Image"
 msgstr "ไม่มีรูป"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:995
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
 msgid "Images"
 msgstr "รูป"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:999
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
 msgid "All Files"
 msgstr "ทุ��ฟ้ม"
 
@@ -1224,57 +1283,84 @@ msgstr "ทุ��ฟ้ม"
 msgid "Click to enlarge"
 msgstr "คลิ�เพื่อขยาย"
 
-#: ../libempathy-gtk/empathy-chat.c:652
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
+msgid "There was an error starting the call"
+msgstr "เ�ิดข้อผิดพลาดขณะเริ่ม�ารเรีย�สาย"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact doesn't support calls"
+msgstr "�ั่งผู้ติดต่อที่ระบุไม่รองรับ�ารเรีย�สาย"
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is offline"
+msgstr "ผู้ติดต่อที่ระบุออฟไลน์อยู่"
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "The specified contact is not valid"
+msgstr "ผู้ติดต่อที่ระบุใช้�ารไม่ได้"
+
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "Emergency calls are not supported on this protocol"
+msgstr "ไม่รองรับ�ารเรีย�สายฉุ�เฉินในโพรโทคอลนี้"
+
+#: ../libempathy-gtk/empathy-chat.c:702
 msgid "Failed to open private chat"
 msgstr "เปิด�ารสนทนาส่วนตัวไม่สำเร็จ"
 
-#: ../libempathy-gtk/empathy-chat.c:717
+#: ../libempathy-gtk/empathy-chat.c:763
 msgid "Topic not supported on this conversation"
 msgstr "ไม่รองรับ�ารตั้งหัวข้อใน�ารสนทนานี้"
 
-#: ../libempathy-gtk/empathy-chat.c:723
+#: ../libempathy-gtk/empathy-chat.c:769
 msgid "You are not allowed to change the topic"
 msgstr "คุณไม่ได้รับอนุ�าตให้เปลี่ยนหัวข้อได้"
 
-#: ../libempathy-gtk/empathy-chat.c:930
+#: ../libempathy-gtk/empathy-chat.c:973
+#, c-format
+msgid "“%s� is not a valid contact ID"
+msgstr "“%s� ไม่ใช่ชื่อผู้ติดต่อที่ใช้ได้"
+
+#: ../libempathy-gtk/empathy-chat.c:1058
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: ล้างข้อความทั้งหมดออ�จา��ารสนทนาปัจจุบัน"
 
-#: ../libempathy-gtk/empathy-chat.c:933
+#: ../libempathy-gtk/empathy-chat.c:1061
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <หัวข้อ>: ตั้งหัวข้อของ�ารสนทนาปัจจุบัน"
 
-#: ../libempathy-gtk/empathy-chat.c:936
+#: ../libempathy-gtk/empathy-chat.c:1064
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ชื่อห้องสนทนา>: เข้าห้องสนทนาห้องใหม่"
 
-#: ../libempathy-gtk/empathy-chat.c:939
+#: ../libempathy-gtk/empathy-chat.c:1067
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ชื่อห้องสนทนา>: เข้าห้องสนทนาห้องใหม่"
 
-#: ../libempathy-gtk/empathy-chat.c:944
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr ""
+"/part [<ชื่อห้องสนทนา>] [<เหตุผล>]: ออ�จา�ห้องสนทนา โดยปริยายหมายถึงห้องปัจจุบัน"
 
-#: ../libempathy-gtk/empathy-chat.c:949
+#: ../libempathy-gtk/empathy-chat.c:1075
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ชื่อผู้ติดต่อ> [<ข้อความ>]: เปิด�ารสนทนาส่วนตัว"
 
-#: ../libempathy-gtk/empathy-chat.c:952
+#: ../libempathy-gtk/empathy-chat.c:1078
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ชื่อผู้ติดต่อ> <ข้อความ>: เปิด�ารสนทนาส่วนตัว"
 
-#: ../libempathy-gtk/empathy-chat.c:955
+#: ../libempathy-gtk/empathy-chat.c:1081
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <ชื่อเล่น>: เปลี่ยนชื่อเล่นของคุณในเซิร์ฟเวอร์ปัจจุบัน"
 
-#: ../libempathy-gtk/empathy-chat.c:958
+#: ../libempathy-gtk/empathy-chat.c:1084
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <ข้อความ>: ส่งข้อความ ACTION (�าร�ระทำในปัจจุบัน) เข้าไปใน�ารสนทนาปัจจุบัน"
 
-#: ../libempathy-gtk/empathy-chat.c:961
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1283,104 +1369,123 @@ msgstr ""
 "/say <ข้อความ>: ส่ง <ข้อความ> เข้าไปใน�ารสนทนาปัจจุบัน ใช้สำหรับส่งข้อความที่ขึ้นต้นด้วย '/' "
 "ตัวอย่างเช่น \"/say /join ใช้สำหรับเข้าห้องสนทนาห้องใหม่\""
 
-#: ../libempathy-gtk/empathy-chat.c:966
+#: ../libempathy-gtk/empathy-chat.c:1092
+msgid "/whois <contact ID>: display information about a contact"
+msgstr "/whois <ชื่อผู้ติดต่อ>: �สดงข้อมูลเ�ี่ยว�ับผู้ติดต่อ"
+
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr "/help [<คำสั่ง>]: �สดงคำสั่งทั้งหมดที่รองรับ ถ้าระบุ <คำสั่ง> ด้วย �็จะ�สดงวิธีใช้คำสั่งนั้น"
 
-#: ../libempathy-gtk/empathy-chat.c:976
+#: ../libempathy-gtk/empathy-chat.c:1112
 #, c-format
 msgid "Usage: %s"
 msgstr "วิธีใช้: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1015
+#: ../libempathy-gtk/empathy-chat.c:1157
 msgid "Unknown command"
 msgstr "ไม่รู้จั�คำสั่งนี้"
 
-#: ../libempathy-gtk/empathy-chat.c:1141
+#: ../libempathy-gtk/empathy-chat.c:1283
 msgid "Unknown command; see /help for the available commands"
 msgstr "ไม่รู้จั�คำสั่งนี้ ดูคำสั่งที่ใช้ได้ได้จา� /help"
 
-#: ../libempathy-gtk/empathy-chat.c:1278
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1453
+msgid "insufficient balance to send message"
+msgstr "ยอดเงินคงเหลือไม่พอสำหรับส่งข้อความ"
+
+#: ../libempathy-gtk/empathy-chat.c:1455
+msgid "not capable"
+msgstr "ไม่สามารถทำได้"
+
+#: ../libempathy-gtk/empathy-chat.c:1462
 msgid "offline"
 msgstr "ออฟไลน์"
 
-#: ../libempathy-gtk/empathy-chat.c:1281
+#: ../libempathy-gtk/empathy-chat.c:1465
 msgid "invalid contact"
 msgstr "ข้อมูลผู้ติดต่อผิดพลาด"
 
-#: ../libempathy-gtk/empathy-chat.c:1284
+#: ../libempathy-gtk/empathy-chat.c:1468
 msgid "permission denied"
 msgstr "ไม่ได้รับอนุ�าต"
 
-#: ../libempathy-gtk/empathy-chat.c:1287
+#: ../libempathy-gtk/empathy-chat.c:1471
 msgid "too long message"
 msgstr "ข้อความยาวเ�ินไป"
 
-#: ../libempathy-gtk/empathy-chat.c:1290
+#: ../libempathy-gtk/empathy-chat.c:1474
 msgid "not implemented"
-msgstr "ยังไม่ทำ"
+msgstr "ยังไม่รองรับ"
 
-#: ../libempathy-gtk/empathy-chat.c:1294
+#: ../libempathy-gtk/empathy-chat.c:1478
 msgid "unknown"
 msgstr "ไม่ทราบ"
 
-#: ../libempathy-gtk/empathy-chat.c:1298
+#: ../libempathy-gtk/empathy-chat.c:1484
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "เ�ิดข้อผิดพลาดขณะส่งข้อความ '%s': %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1359 ../src/empathy-chat-window.c:717
+#: ../libempathy-gtk/empathy-chat.c:1488
+#, c-format
+msgid "Error sending message: %s"
+msgstr "เ�ิดข้อผิดพลาดขณะส่งข้อความ: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1549 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "หัวข้อ:"
 
-#: ../libempathy-gtk/empathy-chat.c:1371
+#: ../libempathy-gtk/empathy-chat.c:1561
 #, c-format
 msgid "Topic set to: %s"
 msgstr "หัวข้อถู�ตั้งเป็น: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1373
+#: ../libempathy-gtk/empathy-chat.c:1563
 msgid "No topic defined"
 msgstr "ไม่มี�าร�ำหนดหัวข้อ"
 
-#: ../libempathy-gtk/empathy-chat.c:1872
+#: ../libempathy-gtk/empathy-chat.c:2072
 msgid "(No Suggestions)"
 msgstr "(ไม่มีคำ�นะนำ)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1940
+#: ../libempathy-gtk/empathy-chat.c:2140
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "เพิ่ม '%s' เข้าในพจนานุ�รม"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1977
+#: ../libempathy-gtk/empathy-chat.c:2177
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "เพิ่ม '%s' เข้าในพจนานุ�รม %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2034
+#: ../libempathy-gtk/empathy-chat.c:2247
 msgid "Insert Smiley"
 msgstr "�ทร�รูปสีหน้า"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2052
-#: ../libempathy-gtk/empathy-ui-utils.c:1808
+#: ../libempathy-gtk/empathy-chat.c:2265
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "_ส่ง"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2087
+#: ../libempathy-gtk/empathy-chat.c:2319
 msgid "_Spelling Suggestions"
 msgstr "�_นะนำตัวสะ�ด"
 
-#: ../libempathy-gtk/empathy-chat.c:2176
+#: ../libempathy-gtk/empathy-chat.c:2408
 msgid "Failed to retrieve recent logs"
 msgstr "ดึงปูมล่าสุดไม่สำเร็จ"
 
-#: ../libempathy-gtk/empathy-chat.c:2287
+#: ../libempathy-gtk/empathy-chat.c:2545
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s ตัด�ารเชื่อมต่อ�ล้ว"
@@ -1388,12 +1493,12 @@ msgstr "%s ตัด�ารเชื่อมต่อ�ล้ว"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2294
+#: ../libempathy-gtk/empathy-chat.c:2552
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s ถู� %2$s เตะออ�"
 
-#: ../libempathy-gtk/empathy-chat.c:2297
+#: ../libempathy-gtk/empathy-chat.c:2555
 #, c-format
 msgid "%s was kicked"
 msgstr "%s ถู�เตะออ�"
@@ -1401,17 +1506,17 @@ msgstr "%s ถู�เตะออ�"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2305
+#: ../libempathy-gtk/empathy-chat.c:2563
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s ถู� %2$s ห้ามไม่ให้เข้า"
 
-#: ../libempathy-gtk/empathy-chat.c:2308
+#: ../libempathy-gtk/empathy-chat.c:2566
 #, c-format
 msgid "%s was banned"
 msgstr "%s ถู�ห้ามไม่ให้เข้า"
 
-#: ../libempathy-gtk/empathy-chat.c:2312
+#: ../libempathy-gtk/empathy-chat.c:2570
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ออ�จา�ห้อง"
@@ -1421,105 +1526,137 @@ msgstr "%s ออ�จา�ห้อง"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2321
+#: ../libempathy-gtk/empathy-chat.c:2579
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2346
+#: ../libempathy-gtk/empathy-chat.c:2604
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s เข้ามาในห้อง"
 
-#: ../libempathy-gtk/empathy-chat.c:2371
+#: ../libempathy-gtk/empathy-chat.c:2629
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s เปลี่ยนชื่อเป็น %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2510
-#: ../src/empathy-streamed-media-window.c:1953
-#: ../src/empathy-event-manager.c:1126
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2768
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1391
+#: ../src/empathy-call-window.c:1441 ../src/empathy-call-window.c:2479
 msgid "Disconnected"
 msgstr "ตัด�ารเชื่อมต่อ�ล้ว"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3140
+#: ../libempathy-gtk/empathy-chat.c:3415
 msgid "Would you like to store this password?"
 msgstr "คุณต้อง�ารให้จำรหัสผ่านนี้ไว้หรือไม่?"
 
-#: ../libempathy-gtk/empathy-chat.c:3146
+#: ../libempathy-gtk/empathy-chat.c:3421
 msgid "Remember"
 msgstr "จำรหัสผ่าน"
 
-#: ../libempathy-gtk/empathy-chat.c:3156
+#: ../libempathy-gtk/empathy-chat.c:3431
 msgid "Not now"
 msgstr "ไม่ใช่ตอนนี้"
 
-#: ../libempathy-gtk/empathy-chat.c:3200
+#: ../libempathy-gtk/empathy-chat.c:3475
 msgid "Retry"
 msgstr "ลองใหม่"
 
-#: ../libempathy-gtk/empathy-chat.c:3204
+#: ../libempathy-gtk/empathy-chat.c:3479
 msgid "Wrong password; please try again:"
 msgstr "รหัสผ่านไม่ถู�ต้อง �รุณาลองใหม่:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3321
+#: ../libempathy-gtk/empathy-chat.c:3609
 msgid "This room is protected by a password:"
 msgstr "ห้องนี้ใช้รหัสผ่านป้อง�ันไว้:"
 
-#: ../libempathy-gtk/empathy-chat.c:3348
+#: ../libempathy-gtk/empathy-chat.c:3636
 msgid "Join"
 msgstr "เข้าห้อง"
 
-#: ../libempathy-gtk/empathy-chat.c:3518 ../src/empathy-event-manager.c:1147
+#: ../libempathy-gtk/empathy-chat.c:3838 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "เชื่อมต่อ�ล้ว"
 
-#: ../libempathy-gtk/empathy-chat.c:3571
-#: ../libempathy-gtk/empathy-log-window.c:650
+#: ../libempathy-gtk/empathy-chat.c:3893
 msgid "Conversation"
 msgstr "�ารสนทนา"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:422
-msgid "Unknown or invalid identifier"
-msgstr ""
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:3898
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (SMS)"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
-msgid "Contact blocking temporarily unavailable"
-msgstr ""
+msgid "Unknown or invalid identifier"
+msgstr "ไม่รู้จั�ชื่อหรือชื่อไม่ถู�ต้อง"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
-msgid "Contact blocking unavailable"
-msgstr ""
+msgid "Contact blocking temporarily unavailable"
+msgstr "�ารปิด�ั้นผู้ติดต่อใช้�ารไม่ได้ชั่วคราว"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+msgid "Contact blocking unavailable"
+msgstr "�ารปิด�ั้นผู้ติดต่อใช้�ารไม่ได้"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
 msgid "Permission Denied"
 msgstr "ไม่ได้รับอนุ�าต"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
 msgid "Could not block contact"
-msgstr ""
+msgstr "ไม่สามารถปิด�ั้นผู้ติดต่อได้"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:701
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
 msgid "Edit Blocked Contacts"
-msgstr ""
+msgstr "��้ไขราย�ารปิด�ั้นผู้ติดต่อ"
+
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Account:"
+msgstr "บั�ชี:"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "ผู้ติดต่อที่ถู�ปิด�ั้น"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "ลบออ�"
 
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:794
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_คัดลอ�ที่อยู่ลิง�์"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:801
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_เปิดลิง�์"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:420
+#: ../libempathy-gtk/empathy-chat-text-view.c:415
 msgid "%A %B %d %Y"
 msgstr "%A %e %B %Ey"
 
@@ -1538,27 +1675,27 @@ msgid "New Contact"
 msgstr "ผู้ติดต่อใหม่"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:199
+#: ../libempathy-gtk/empathy-individual-dialogs.c:200
 #, c-format
 msgid "Block %s?"
-msgstr ""
+msgstr "จะปิด�ั้น %s หรือไม่?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:247
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
-msgstr ""
+msgstr "คุณ�น่ใจหรือไม่ว่าต้อง�ารปิด�ั้นไม่ให้ '%s' ติดต่อคุณอี�?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
 msgid "_Block"
-msgstr ""
+msgstr "_ปิด�ั้น"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:278
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
-msgstr[0] ""
+msgstr[0] "_รายงานผู้ติดต่อเหล่านี้ว่าใช้งานผิดเงื่อนไข"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
@@ -1570,313 +1707,341 @@ msgstr "ขอสมัคร"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
 msgid "_Block User"
-msgstr ""
+msgstr "_ปิด�ั้นผู้ใช้นี้"
 
 #: ../libempathy-gtk/empathy-contact-list-store.h:71
 msgid "Ungrouped"
-msgstr ""
+msgstr "ไม่จำ�น��ลุ่ม"
 
 #: ../libempathy-gtk/empathy-contact-list-store.h:72
 msgid "Favorite People"
 msgstr "คนโปรด"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1987
-#: ../libempathy-gtk/empathy-individual-view.c:2343
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "ยืนยันที่จะลบ�ลุ่ม '%s' หรือไม่?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1989
-#: ../libempathy-gtk/empathy-individual-view.c:2346
+#: ../libempathy-gtk/empathy-contact-list-view.c:1988
+#: ../libempathy-gtk/empathy-individual-view.c:2379
 msgid "Removing group"
 msgstr "�ำลังจะลบ�ลุ่ม"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2038
-#: ../libempathy-gtk/empathy-contact-list-view.c:2115
-#: ../libempathy-gtk/empathy-individual-view.c:2401
-#: ../libempathy-gtk/empathy-individual-view.c:2594
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../libempathy-gtk/empathy-contact-list-view.c:2037
+#: ../libempathy-gtk/empathy-contact-list-view.c:2114
+#: ../libempathy-gtk/empathy-individual-view.c:2434
+#: ../libempathy-gtk/empathy-individual-view.c:2637
 msgid "_Remove"
 msgstr "_ลบ"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2068
-#: ../libempathy-gtk/empathy-individual-view.c:2465
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
+#: ../libempathy-gtk/empathy-individual-view.c:2501
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "ยืนยันที่จะลบผู้ติดต่อ '%s' หรือไม่?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2070
-#: ../libempathy-gtk/empathy-individual-view.c:2486
+#: ../libempathy-gtk/empathy-contact-list-view.c:2069
+#: ../libempathy-gtk/empathy-individual-view.c:2522
 msgid "Removing contact"
 msgstr "�ำลังจะลบผู้ติดต่อ"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:219
-#: ../src/empathy-main-window.ui.h:13
+#: ../libempathy-gtk/empathy-contact-menu.c:220
+#: ../src/empathy-main-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "เ_พิ่มผู้ติดต่อ…"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:299
-#, fuzzy
-#| msgid "Contact"
+#: ../libempathy-gtk/empathy-contact-menu.c:300
 msgid "_Block Contact"
-msgstr "ผู้ติดต่อ"
+msgstr "_ปิด�ั้นผู้ติดต่อ"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:328
-#: ../libempathy-gtk/empathy-individual-menu.c:517
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:329
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "_สนทนา"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:359
-#: ../libempathy-gtk/empathy-individual-menu.c:560
+#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "เรีย�สายคุยด้วยเสีย_ง"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:390
-#: ../libempathy-gtk/empathy-individual-menu.c:602
+#: ../libempathy-gtk/empathy-contact-menu.c:394
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "เรีย�สายคุยด้วย_ภาพ�ละเสียง"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:436
-#: ../libempathy-gtk/empathy-individual-menu.c:645
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:440
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "�ารสนทนา�่อนห_น้านี้"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:458
-#: ../libempathy-gtk/empathy-individual-menu.c:686
+#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "ส่ง�ฟ้ม"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:481
-#: ../libempathy-gtk/empathy-individual-menu.c:728
+#: ../libempathy-gtk/empathy-contact-menu.c:485
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
 msgstr "เปิดพื้นโต๊ะให้ใช้ร่วม"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:521
-#: ../libempathy-gtk/empathy-contact-widget.c:1763
-#: ../libempathy-gtk/empathy-individual-menu.c:763
+#: ../libempathy-gtk/empathy-contact-menu.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:1886
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
 #: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "คนโปรด"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:550
-#: ../libempathy-gtk/empathy-individual-menu.c:791
+#: ../libempathy-gtk/empathy-contact-menu.c:554
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "_ข้อมูล"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:596
+#: ../libempathy-gtk/empathy-contact-menu.c:600
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "�_�้ไข"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:650
-#: ../libempathy-gtk/empathy-individual-menu.c:972
-#: ../src/empathy-chat-window.c:935
+#: ../libempathy-gtk/empathy-contact-menu.c:654
+#: ../libempathy-gtk/empathy-individual-menu.c:1283
+#: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "เชิ�คุณเข้าห้องนี้"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:681
-#: ../libempathy-gtk/empathy-individual-menu.c:1019
+#: ../libempathy-gtk/empathy-contact-menu.c:685
+#: ../libempathy-gtk/empathy-individual-menu.c:1329
 msgid "_Invite to Chat Room"
 msgstr "เ_ชิ�เข้าห้องสนทนา"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:513
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
 msgid "Search contacts"
 msgstr "ค้นหาผู้ติดต่อ"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:543
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
 msgid "Search: "
 msgstr "ค้นหา:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:601
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
 msgid "_Add Contact"
 msgstr "เ_พิ่มผู้ติดต่อ"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:619
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
 msgid "No contacts found"
 msgstr "ไม่พบผู้ติดต่อ"
 
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr "ข้อความ�นะนำตัวคุณเอง:"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
+msgstr "ขออนุ�าตติดต่อ�ับคุณ�บบออนไลน์ ขอบคุณมา�"
+
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "เลือ�ผู้ติดต่อ"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:295
+#: ../libempathy-gtk/empathy-contact-widget.c:336
 #: ../libempathy-gtk/empathy-individual-widget.c:153
 msgid "Full name:"
 msgstr "ชื่อเต็ม:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:296
+#: ../libempathy-gtk/empathy-contact-widget.c:337
 #: ../libempathy-gtk/empathy-individual-widget.c:154
 msgid "Phone number:"
 msgstr "หมายเลขโทรศัพท์:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:297
+#: ../libempathy-gtk/empathy-contact-widget.c:338
 #: ../libempathy-gtk/empathy-individual-widget.c:155
 msgid "E-mail address:"
 msgstr "ที่อยู่อีเมล:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:298
+#: ../libempathy-gtk/empathy-contact-widget.c:339
 #: ../libempathy-gtk/empathy-individual-widget.c:156
 msgid "Website:"
 msgstr "เว็บไซต์:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:299
+#: ../libempathy-gtk/empathy-contact-widget.c:340
 #: ../libempathy-gtk/empathy-individual-widget.c:157
 msgid "Birthday:"
 msgstr "วันเ�ิด:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:346
+msgid "Last seen:"
+msgstr "ปรา��ตัวล่าสุด:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:348
+msgid "Connected from:"
+msgstr "เชื่อมต่อจา�:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:353
+msgid "Away message:"
+msgstr "ข้อความที่ทิ้งไว้เมื่อไม่อยู่:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+msgid "Channels:"
+msgstr "ห้องสนทนา:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
 msgstr "รหัส ISO ของประเทศ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Country:"
 msgstr "ประเทศ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "State:"
 msgstr "รั�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:768
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "City:"
 msgstr "เมือง:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:770
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Area:"
 msgstr "เขต:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:772
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
 msgstr "รหัสไปรษณีย์:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:774
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Street:"
 msgstr "ถนน:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:776
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
 msgstr "อาคาร:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:778
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Floor:"
 msgstr "ชั้น:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:780
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Room:"
 msgstr "ห้อง:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:782
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Text:"
 msgstr "ข้อความ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:784
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Description:"
 msgstr "คำบรรยาย:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:786
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
 msgstr "ระดับความละเอียด:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:790
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr "ความคลาดเคลื่อน:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:792
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
 msgstr "ความคลาดเคลื่อน�นวตั้ง (เมตร):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:794
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
 msgstr "ความคลาดเคลื่อน�นวนอน (เมตร):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr "อัตราเร็ว:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Bearing:"
 msgstr "ทิศทาง:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:800
-#: ../libempathy-gtk/empathy-individual-widget.c:526
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
 msgstr "อัตราเร็วไต่ระดับ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:802
-#: ../libempathy-gtk/empathy-individual-widget.c:528
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
 msgstr "ปรับข้อมูลล่าสุดเมื่อ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:804
-#: ../libempathy-gtk/empathy-individual-widget.c:530
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
 msgstr "ลองจิจูด:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:806
-#: ../libempathy-gtk/empathy-individual-widget.c:532
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
 msgstr "ละติจูด:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:808
-#: ../libempathy-gtk/empathy-individual-widget.c:534
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
 msgstr "ระดับความสูง:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:871
-#: ../libempathy-gtk/empathy-contact-widget.c:888
-#: ../libempathy-gtk/empathy-individual-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:633
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "ตำ�หน่งที่ตั้ง"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:890
-#: ../libempathy-gtk/empathy-individual-widget.c:635
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:942
-#: ../libempathy-gtk/empathy-individual-widget.c:684
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e %B %Ey เวลา %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1024
-#: ../libempathy-gtk/empathy-individual-widget.c:919
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
 msgid "Save Avatar"
 msgstr "บันทึ�รูป�ทนตัว"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1080
-#: ../libempathy-gtk/empathy-individual-widget.c:977
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
 msgid "Unable to save avatar"
 msgstr "ไม่สามารถบันทึ�รูป�ทนตัว"
 
@@ -1886,7 +2051,7 @@ msgstr "<b>ตำà¹�หน่งที่ตั้ง</b> เมื่อ (วà¸
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1307
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr "นาม��ง:"
 
@@ -1906,7 +2071,7 @@ msgstr "รายละเอียดผู้ติดต่อ"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "ชื่อประจำตัว:"
 
@@ -1923,11 +2088,11 @@ msgstr "OS:"
 msgid "Version:"
 msgstr "รุ่น:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:332
+#: ../libempathy-gtk/empathy-groups-widget.c:333
 msgid "Groups"
 msgstr "�ลุ่ม"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:344
+#: ../libempathy-gtk/empathy-groups-widget.c:345
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -1935,97 +2100,119 @@ msgstr ""
 "เลือ��ลุ่มที่ต้อง�ารจัดให้ผู้ติดต่อนี้อยู่ สังเ�ตว่าคุณสามารถเลือ�ได้มา��ว่าหนึ่ง�ลุ่ม "
 "หรือจะไม่เลือ��ลุ่มเลย�็ได้"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:363
+#: ../libempathy-gtk/empathy-groups-widget.c:364
 msgid "_Add Group"
 msgstr "เ_พิ่ม�ลุ่ม"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:398
+#: ../libempathy-gtk/empathy-groups-widget.c:399
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "เลือ�"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1436
+#: ../libempathy-gtk/empathy-groups-widget.c:409
+#: ../src/empathy-main-window.c:1807
 msgid "Group"
 msgstr "�ลุ่ม"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
-msgstr[0] ""
+msgstr[0] "ชื่อต่อไปนี้จะถู�ปิด�ั้น:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:259
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
-msgstr[0] ""
+msgstr[0] "ชื่อต่อไปนี้ไม่สามารถปิด�ั้นได้:"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
-#, fuzzy
-#| msgid "_Offline Contacts"
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
-msgstr "ผู้ติดต่อที่_ออฟไลน์"
+msgstr "ผู้ติดต่อที่เชื่อมโยง�ัน"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:354
-#, fuzzy
-#| msgid "Select a contact"
+#: ../libempathy-gtk/empathy-individual-linker.c:370
 msgid "Select contacts to link"
-msgstr "เลือ�ผู้ติดต่อ"
+msgstr "เลือ�ผู้ติดต่อที่จะเชื่อมโยง"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:428
-#, fuzzy
-#| msgid "New Contact"
+#: ../libempathy-gtk/empathy-individual-linker.c:444
 msgid "New contact preview"
-msgstr "ผู้ติดต่อใหม่"
+msgstr "ข้อมูลตัวอย่างผู้ติดต่อใหม่"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:472
+#: ../libempathy-gtk/empathy-individual-linker.c:488
 msgid "Contacts selected in the list on the left will be linked together."
-msgstr ""
+msgstr "ผู้ติดต่อต่างๆ ที่เลือ�ในรายชื่อด้านซ้ายจะถู�เชื่อมโยงเข้าด้วย�ัน"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:131
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:839
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "เลือ�บั�ชีที่จะใช้เรีย�สายออ�"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "เรีย�สาย"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+msgid "Mobile"
+msgstr "มือถือ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "ที่ทำงาน"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "บ้าน"
+
+#. add an SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+msgid "_SMS"
+msgstr "_SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1141
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "�_�้ไข"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:865
-#, fuzzy
-#| msgid "_Add Contact…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1167
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
-msgstr "เ_พิ่มผู้ติดต่อ…"
+msgstr "เ_ชื่อมโยงผู้ติดต่อเข้าด้วย�ัน…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2308
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 msgid "Delete and _Block"
-msgstr ""
+msgstr "ลบ�ละ_ปิด�ั้น"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2474
+#: ../libempathy-gtk/empathy-individual-view.c:2510
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
 "remove all the contacts which make up this linked contact."
 msgstr ""
+"ยืนยันที่จะลบ�ลุ่มผู้ติดต่อ '%s' ที่เชื่อมโยง�ันหรือไม่? อย่าลืมว่านี่จะเป็น�ารลบผู้ติดต่อทั้งหมดที่อยู่ใน�ลุ่มนี้"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
-msgstr[0] ""
+msgstr[0] "�ลุ่มผู้ติดต่อที่เชื่อมโยง�ันประ�อบด้วยผู้ติดต่อ %u คน"
 
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:1
-#, fuzzy
-#| msgid "<b>Location</b> at (date)\t"
 msgid "<b>Location</b> at (date)"
-msgstr "<b>ตำ�หน่งที่ตั้ง</b> เมื่อ (วัน-เวลา)\t"
+msgstr "<b>ตำ�หน่งที่ตั้ง</b> เมื่อ (วันที่)"
 
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Online from a phone or mobile device"
@@ -2041,7 +2228,7 @@ msgstr "เลือ�เครือข่าย IRC"
 
 #: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
 msgid "Reset _Networks List"
-msgstr ""
+msgstr "_ล้างค่ารายชื่อเครือข่าย"
 
 #: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
 msgctxt "verb displayed on a button to select an IRC network"
@@ -2099,67 +2286,199 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "_ตัด�ารเชื่อมโยง"
 
-#: ../libempathy-gtk/empathy-log-window.c:660
-msgid "Date"
-msgstr "วันที่"
+#: ../libempathy-gtk/empathy-log-window.c:634
+msgid "History"
+msgstr "ประวัติ"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
-msgstr "�ารสนทนา"
+#: ../libempathy-gtk/empathy-log-window.c:689
+msgid "Show"
+msgstr "�สดง"
+
+#: ../libempathy-gtk/empathy-log-window.c:711
+msgid "Search"
+msgstr "ค้นหา"
+
+#: ../libempathy-gtk/empathy-log-window.c:1159
+#, c-format
+msgid "Chat in %s"
+msgstr "�ารสนทนาใน %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1161
+#, c-format
+msgid "Chat with %s"
+msgstr "�ารสนทนา�ับ %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%A %e %B %Ey %X"
+
+#. Translators: this is an emote: '* Danielle waves'
+#: ../libempathy-gtk/empathy-log-window.c:1300
+#, c-format
+msgid "<i>* %s %s</i>"
+msgstr "<i>* %s %s</i>"
+
+#. Translators: this is a message: 'Danielle: hello'
+#. * The string in bold is the sender's name
+#: ../libempathy-gtk/empathy-log-window.c:1306
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1382
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s วินาที"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s นาที"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "�ารคุยสายใช้เวลา %s วางสายเมื่อ %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1729
+msgid "Today"
+msgstr "วันนี้"
+
+#: ../libempathy-gtk/empathy-log-window.c:1733
+msgid "Yesterday"
+msgstr "เมื่อวานนี้"
+
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
+msgid "%e %B %Y"
+msgstr "%e %B %Ey"
+
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3425
+msgid "Anytime"
+msgstr "ทุ�เวลา"
+
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2353
+msgid "Anyone"
+msgstr "ทุ�คน"
+
+#: ../libempathy-gtk/empathy-log-window.c:2666
+msgid "Who"
+msgstr "ใคร"
+
+#: ../libempathy-gtk/empathy-log-window.c:2870
+msgid "When"
+msgstr "เมื่อไร"
+
+#: ../libempathy-gtk/empathy-log-window.c:2986
+msgid "Anything"
+msgstr "ทุ�อย่าง"
+
+#: ../libempathy-gtk/empathy-log-window.c:2988
+msgid "Text chats"
+msgstr "�ารสนทนาข้อความ"
+
+#: ../libempathy-gtk/empathy-log-window.c:2990
+#: ../src/empathy-preferences.ui.h:4
+msgid "Calls"
+msgstr "�ารคุยสาย"
+
+#: ../libempathy-gtk/empathy-log-window.c:2995
+msgid "Incoming calls"
+msgstr "�ารเรีย�เข้า"
+
+#: ../libempathy-gtk/empathy-log-window.c:2996
+msgid "Outgoing calls"
+msgstr "�ารเรีย�สายออ�"
+
+#: ../libempathy-gtk/empathy-log-window.c:2997
+msgid "Missed calls"
+msgstr "สายที่ไม่ได้รับ"
+
+#: ../libempathy-gtk/empathy-log-window.c:3019
+msgid "What"
+msgstr "อะไร"
+
+#: ../libempathy-gtk/empathy-log-window.c:3728
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr "คุณ�น่ใจหรือไม่ว่าต้อง�ารลบปูม�ารสนทนาเ�่าทั้งหมด?"
+
+#: ../libempathy-gtk/empathy-log-window.c:3732
+msgid "Clear All"
+msgstr "_ล้างทั้งหมด"
+
+#: ../libempathy-gtk/empathy-log-window.c:3739
+msgid "Delete from:"
+msgstr "ลบจา�:"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">�ำลังโหลด...</span>"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr ""
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Chat"
+msgstr "�ารสนทนา"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-#, fuzzy
-#| msgid "Video Preview"
-msgid "Find Previous"
-msgstr "�สดงตัวอย่างวีดิทัศน์"
+msgid "Delete All History..."
+msgstr "ลบประวัติทั้งหมด..."
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr "�ารสนทนา�่อนหน้านี้"
+msgid "Profile"
+msgstr "โพรไฟล์"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Video"
+msgstr "วีดิทัศน์"
 
-#. Tab Label
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "ค้นหา"
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:20
+msgid "_Edit"
+msgstr "�_�้ไข"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "_File"
+msgstr "�_ฟ้ม"
 
-#. Searching *for* something
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "_คำว่า:"
+msgid "page 2"
+msgstr "หน้า 2"
 
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
 msgid "Contact ID:"
 msgstr "ชื่อประจำตัวผู้ติดต่อ:"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:171
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
 msgid "C_hat"
 msgstr "_สนทนา"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:181
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
 msgstr "�ารสนทนาใหม่"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:253
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
 msgid "Send _Video"
 msgstr "ส่งภาพ_วีดิทัศน์"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:261
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
 msgid "C_all"
 msgstr "เ_รีย�สาย"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:271
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "New Call"
 msgstr "�ารเรีย�สายใหม่"
 
@@ -2169,6 +2488,8 @@ msgid ""
 "Enter your password for account\n"
 "<b>%s</b>"
 msgstr ""
+"ป้อนรหัสผ่านสำหรับบั�ชีของคุณที่ชื่อ\n"
+"<b>%s</b>"
 
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
@@ -2176,34 +2497,34 @@ msgstr ""
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Message…"
 msgstr "ข้อความ�ำหนดเอง…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messages…"
 msgstr "��้ไขข้อความ�ำหนดเอง…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
 msgstr "คลิ�เพื่อลบสถานะนี้ออ�จา�สถานะโปรด"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
 msgstr "คลิ�เพื่อทำให้สถานะนี้เป็นสถานะโปรด"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
 msgstr "�ำหนดสถานะ"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:946
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
 msgid "Set your presence and current status"
 msgstr "�ำหนดสถานะอยู่/ไม่อยู่ของคุณ �ละสถานะปัจจุบัน"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1134
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
 msgid "Custom messages…"
 msgstr "ข้อความ�ำหนดเอง…"
 
@@ -2216,18 +2537,26 @@ msgstr "ข้อความ�ำหนดเอง…"
 msgid "New %s account"
 msgstr "บั�ชี %s ใหม่"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "หา:"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "ตัวพิมพ์ให�่-เล็�ตรง�ัน"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Mat_ch case"
+msgstr "ตัว_พิมพ์ให�่-เล็�ตรง�ัน"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
 msgid "Phrase not found"
 msgstr "หาไม่พบ"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "_Next"
+msgstr "_ถัดไป"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+msgid "_Previous"
+msgstr "_�่อนหน้า"
+
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
 msgstr "ได้รับข้อความทันใจ"
@@ -2268,45 +2597,42 @@ msgstr "�ารเรีย�สายออ�เพื่อสนทนา
 msgid "Voice call ended"
 msgstr "จบ�ารสนทนาด้วยเสียง"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "ป้อนข้อความ�ำหนดเอง"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
 msgstr "��้ไขข้อความ�ำหนดเอง"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr "บึนทึ�ข้อความสถานะใ_หม่"
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#, c-format
+msgid "Message edited at %s"
+msgstr "ข้อความ��้ไขเมื่อ %s"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Status Messages"
-msgstr "ข้อความสถานะที่บันทึ�ไว้"
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
+msgid "Normal"
+msgstr "ธรรมดา"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "�บบฉบับ"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "เรียบๆ"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "สะอาด"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "น้ำเงิน"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:150
 msgid "The identity provided by the chat server cannot be verified."
-msgstr ""
+msgstr "ข้อมูลเอ�ลั�ษณ์ที่เซิร์ฟเวอร์สนทนาให้มาไม่สามารถตรวจสอบได้"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:157
 msgid "The certificate is not signed by a Certification Authority."
-msgstr ""
+msgstr "ใบรับรองไม่มี�ารเซ็น�ำ�ับโดยองค์�รออ�ใบรับรอง"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:161
 msgid "The certificate has expired."
@@ -2331,15 +2657,15 @@ msgstr "ใบรับรองเซ็นรับรองตัวเอง
 #: ../libempathy-gtk/empathy-tls-dialog.c:177
 msgid ""
 "The certificate has been revoked by the issuing Certification Authority."
-msgstr ""
+msgstr "ใบรับรองถู�เพิ�ถอนไป�ล้วโดยองค์�รออ�ใบรับรองที่ออ�ให้"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:181
 msgid "The certificate is cryptographically weak."
-msgstr ""
+msgstr "ใบรับรองมี�ารเข้ารหัสลับที่หละหลวม"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:184
 msgid "The certificate length exceeds verifiable limits."
-msgstr ""
+msgstr "ความยาวของใบรับรองเ�ินขีดจำ�ัดที่ตรวจสอบได้"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:188
 msgid "The certificate is malformed."
@@ -2356,49 +2682,44 @@ msgid "Certificate hostname: %s"
 msgstr "ชื่อโฮสต์ในใบรับรอง: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-#, fuzzy
-#| msgid "Context"
 msgid "Continue"
-msgstr "บริบท"
+msgstr "ทำต่อไป"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
 msgid "This connection is untrusted. Would you like to continue anyway?"
-msgstr ""
+msgstr "�ารเชื่อมต่อนี้ไม่น่าเชื่อถือ คุณยังคงต้อง�ารทำต่อไปหรือไม่?"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:297
 msgid "Remember this choice for future connections"
-msgstr ""
+msgstr "จำตัวเลือ�นี้ไว้เพื่อใช้�ับ�ารเชื่อมต่อในอนาคต"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:303
-#, fuzzy
-#| msgid "Certificate expired"
 msgid "Certificate Details"
-msgstr "ใบรับรองหมดอายุ�ล้ว"
+msgstr "รายละเอียดของใบรับรอง"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1705
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
 msgstr "ไม่สามารถเปิด URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1800
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
 msgstr "เลือ��ฟ้ม"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
 msgid "Insufficient free space to save file"
-msgstr ""
+msgstr "เหลือที่ว่างไม่พอที่จะบันทึ��ฟ้ม"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
-msgstr ""
+msgstr "ต้องใช้เนื้อที่ %s เพื่อบันทึ��ฟ้มนี้ �ต่มีเนื้อที่ว่างเพียง %s �รุณาเลือ�ตำ�หน่งอื่น"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1924
-#, fuzzy, c-format
-#| msgid "Incoming call from %s"
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#, c-format
 msgid "Incoming file from %s"
-msgstr "�ารเรีย�เข้าจา� %s"
+msgstr "�ฟ้มส่งเข้ามาจา� %s"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
@@ -2583,31 +2904,33 @@ msgstr "ไม่มีรายละเอียดข้อผิดพลา
 msgid "Instant Message (Empathy)"
 msgstr "ข้อความทันใจ (Empathy)"
 
-#: ../src/empathy.c:308
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "ไม่ต้องเชื่อมต่อขณะเริ่มทำงาน"
 
-#: ../src/empathy.c:312
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "ไม่ต้อง�สดงรายชื่อผู้ติดต่อหรือ�ล่องโต้ตอบอื่นใดขณะเริ่มทำงาน"
 
-#: ../src/empathy.c:320
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr "- ลู�ข่าย IM Empathy"
 
-#: ../src/empathy.c:499
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
-msgstr ""
+msgstr "เ�ิดข้อผิดพลาดขณะติดต่อ�ับเครื่องมือจัด�ารบั�ชี"
 
-#: ../src/empathy.c:501
-#, fuzzy, c-format
-#| msgid "There was an error while parsing the account details."
+#: ../src/empathy.c:639
+#, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
 "The error was:\n"
 "\n"
 "%s"
-msgstr "เ�ิดข้อผิดพลาดขณะ�จงรายละเอียดบั�ชี"
+msgstr ""
+"เ�ิดข้อผิดพลาดขณะพยายามเชื่อมต่อไปยังเครื่องมือจัด�ารบั�ชีของ Telepathy ข้อผิดพลาดคือ:\n"
+"\n"
+"%s"
 
 #: ../src/empathy-about-dialog.c:81
 msgid ""
@@ -2649,7 +2972,7 @@ msgstr "โปร��รมลู�ข่ายข้อความทัน
 #: ../src/empathy-about-dialog.c:113
 msgid "translator-credits"
 msgstr ""
-"เทพพิทั�ษ์ �ารุ�บุ��านันท์\n"
+"Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
 "\n"
 "ถ้ามีเวลาโปรดมาช่วย�ัน�ปล :-)\n"
 "http://gnome-th.sf.net"
@@ -2748,8 +3071,8 @@ msgid "Select the accounts you want to import:"
 msgstr "เลือ�บั�ชีที่คุณต้อง�ารนำเข้า:"
 
 #: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "Yes"
 msgstr "ใช่"
 
@@ -2774,10 +3097,8 @@ msgid "Edit->Accounts"
 msgstr "��้ไข->บั�ชี"
 
 #: ../src/empathy-account-assistant.c:1107
-#, fuzzy
-#| msgid "I don't want to enable this feature for now"
 msgid "I do _not want to enable this feature for now"
-msgstr "ฉันยังไม่ต้อง�ารเปิดใช้ความสามารถนี้ในตอนนี้"
+msgstr "ฉันยังไ_ม่ต้อง�ารเปิดใช้ความสามารถนี้ในตอนนี้"
 
 #: ../src/empathy-account-assistant.c:1143
 msgid ""
@@ -2823,34 +3144,35 @@ msgstr "มี�ารเปลี่ยน�ปลงในบั�ชี %s
 msgid "Your new account has not been saved yet."
 msgstr "บั�ชีใหม่ของคุณยังไม่ได้บันทึ�"
 
-#: ../src/empathy-accounts-dialog.c:286
-#: ../src/empathy-streamed-media-window.c:809
+#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1175
 msgid "Connecting…"
 msgstr "�ำลังเชื่อมต่อ…"
 
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:386
 #, c-format
 msgid "Offline — %s"
 msgstr "ออฟไลน์ — %s"
 
-#: ../src/empathy-accounts-dialog.c:339
+#: ../src/empathy-accounts-dialog.c:398
 #, c-format
 msgid "Disconnected — %s"
 msgstr "ตัด�ารเชื่อมต่อ�ล้ว — %s"
 
-#: ../src/empathy-accounts-dialog.c:350
+#: ../src/empathy-accounts-dialog.c:409
 msgid "Offline — No Network Connection"
 msgstr "ออฟไลน์ — ไม่มี�ารเชื่อมต่อเครือข่าย"
 
-#: ../src/empathy-accounts-dialog.c:357
+#: ../src/empathy-accounts-dialog.c:416
 msgid "Unknown Status"
 msgstr "ไม่ทราบสถานะ"
 
-#: ../src/empathy-accounts-dialog.c:369
+#: ../src/empathy-accounts-dialog.c:428
 msgid "Offline — Account Disabled"
 msgstr "ออฟไลน์ — บั�ชีถู�ระงับ"
 
-#: ../src/empathy-accounts-dialog.c:772
+#: ../src/empathy-accounts-dialog.c:831
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2858,16 +3180,16 @@ msgstr ""
 "คุณ�ำลังจะสร้างบั�ชีใหม่ ซึ่งจะละทิ้ง�ารเปลี่ยน�ปลงต่างๆ ที่คุณทำมา\n"
 "ยืนยันที่จะดำเนิน�ารต่อหรือไม่?"
 
-#: ../src/empathy-accounts-dialog.c:1133
+#: ../src/empathy-accounts-dialog.c:1192
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "คุณต้อง�ารลบ %s ออ�จา�เครื่องของคุณหรือไม่?"
 
-#: ../src/empathy-accounts-dialog.c:1137
+#: ../src/empathy-accounts-dialog.c:1196
 msgid "This will not remove your account on the server."
 msgstr "�ารลบนี้จะไม่ลบบั�ชีของคุณที่เซิร์ฟเวอร์"
 
-#: ../src/empathy-accounts-dialog.c:1375
+#: ../src/empathy-accounts-dialog.c:1432
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2876,15 +3198,15 @@ msgstr ""
 "ยืนยันที่จะดำเนิน�ารต่อหรือไม่?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1593
+#: ../src/empathy-accounts-dialog.c:1643
 msgid "_Enable"
 msgstr "_เปิดใช้งาน"
 
-#: ../src/empathy-accounts-dialog.c:1594
+#: ../src/empathy-accounts-dialog.c:1644
 msgid "_Disable"
 msgstr "ปิ_ดใช้"
 
-#: ../src/empathy-accounts-dialog.c:2115
+#: ../src/empathy-accounts-dialog.c:2154
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2893,155 +3215,169 @@ msgstr ""
 "ยืนยันที่จะดำเนิน�ารต่อหรือไม่?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "เพิ่ม…"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
 msgid "Loading account information"
 msgstr "�ำลังโหลดข้อมูลบั�ชี"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "No protocol installed"
 msgstr "ไม่มีโพรโทคอลติดตั้งอยู่"
 
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Protocol:"
 msgstr "โพรโทคอล:"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr "�่อนที่จะเพิ่มบั�ชีใหม่ คุณต้องติดตั้ง�บ็�เอนด์สำหรับโพรโทคอลที่ต้อง�ารจะใช้เสีย�่อน"
 
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add…"
-msgstr "เ_พิ่ม…"
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Import…"
 msgstr "_นำเข้า…"
 
-#: ../src/empathy-auth-client.c:250
-#, fuzzy
-#| msgid "- Empathy IM Client"
+#: ../src/empathy-auth-client.c:249
 msgid " - Empathy authentication client"
-msgstr "- ลู�ข่าย IM Empathy"
+msgstr " - ลู�ข่าย�ารยืนยันตัวบุคคล Empathy"
 
-#: ../src/empathy-auth-client.c:266
-#, fuzzy
-#| msgid "Authentication failed"
+#: ../src/empathy-auth-client.c:265
 msgid "Empathy authentication client"
-msgstr "�ารยืนยันตัวบุคคลไม่ผ่าน"
+msgstr "ลู�ข่าย�ารยืนยันตัวบุคคล Empathy"
 
 #: ../src/empathy-auto-salut-account-helper.c:83
 msgid "People nearby"
 msgstr "ผู้คน�ถวนี้"
 
-#: ../src/empathy-av.c:118
-#, fuzzy
-#| msgid "- Empathy IM Client"
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
-msgstr "- ลู�ข่าย IM Empathy"
+msgstr "- ลู�ข่ายเสียง/วีดิทัศน์ Empathy"
 
-#: ../src/empathy-av.c:134
-#, fuzzy
-#| msgid "Empathy IM Client"
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
-msgstr "ลู�ข่ายข้อความทันใจ Empathy"
+msgstr "ลู�ข่ายเสียง/วีดิทัศน์ Empathy"
 
-#: ../src/empathy-streamed-media-window.c:479
+#: ../src/empathy-streamed-media-window.c:431
 msgid "Contrast"
 msgstr "ความต่างระดับสี"
 
-#: ../src/empathy-streamed-media-window.c:482
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Brightness"
 msgstr "ความสว่าง"
 
-#: ../src/empathy-streamed-media-window.c:485
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Gamma"
 msgstr "��มมา"
 
-#: ../src/empathy-streamed-media-window.c:590
+#: ../src/empathy-streamed-media-window.c:542
 msgid "Volume"
 msgstr "ความดัง"
 
-#: ../src/empathy-streamed-media-window.c:1166
+#: ../src/empathy-streamed-media-window.c:1110
 msgid "_Sidebar"
 msgstr "�ถบ_ข้าง"
 
-#: ../src/empathy-streamed-media-window.c:1186
+#: ../src/empathy-streamed-media-window.c:1130
 msgid "Audio input"
 msgstr "เสียงเข้า"
 
-#: ../src/empathy-streamed-media-window.c:1190
+#: ../src/empathy-streamed-media-window.c:1134
 msgid "Video input"
 msgstr "ภาพเข้า"
 
-#: ../src/empathy-streamed-media-window.c:1194
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Dialpad"
 msgstr "�ป้นโทรศัพท์"
 
-#: ../src/empathy-streamed-media-window.c:1205
-#, fuzzy
-#| msgid "Contact Details"
+#: ../src/empathy-streamed-media-window.c:1151
 msgid "Details"
-msgstr "รายละเอียดผู้ติดต่อ"
+msgstr "รายละเอียด"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1274
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1782
 #, c-format
 msgid "Call with %s"
 msgstr "�ารคุยสาย�ับ %s"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-streamed-media-window.c:1353
-msgid "Call"
-msgstr "�ารคุยสาย"
-
-#: ../src/empathy-streamed-media-window.c:1507
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:2026
 msgid "The IP address as seen by the machine"
-msgstr ""
+msgstr "ที่อยู่ไอพีตามที่มองเห็นจา�ตัวเครื่อง"
 
-#: ../src/empathy-streamed-media-window.c:1509
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:2028
 msgid "The IP address as seen by a server on the Internet"
-msgstr ""
+msgstr "ที่อยู่ไอพีตามที่มองเห็นจา�เซิร์ฟเวอร์ในอินเทอร์เน็ต"
 
-#: ../src/empathy-streamed-media-window.c:1511
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:2030
 msgid "The IP address of the peer as seen by the other side"
-msgstr ""
+msgstr "ที่อยู่ไอพีของ peer ตามที่มองเห็นจา��ั่งโน้น"
 
-#: ../src/empathy-streamed-media-window.c:1513
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:2032
 msgid "The IP address of a relay server"
-msgstr ""
+msgstr "ที่อยู่ไอพีของเซิร์ฟเวอร์ส่งทอดข้อมูล"
 
-#: ../src/empathy-streamed-media-window.c:1515
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:2034
 msgid "The IP address of the multicast group"
-msgstr ""
+msgstr "ที่อยู่ไอพีของ�ลุ่มมัลติ�คสต์"
+
+#: ../src/empathy-streamed-media-window.c:1843
+msgctxt "encoding video codec"
+msgid "Unknown"
+msgstr "ไม่ทราบ"
+
+#: ../src/empathy-streamed-media-window.c:1846
+msgctxt "encoding audio codec"
+msgid "Unknown"
+msgstr "ไม่ทราบ"
+
+#: ../src/empathy-streamed-media-window.c:1849
+msgctxt "decoding video codec"
+msgid "Unknown"
+msgstr "ไม่ทราบ"
+
+#: ../src/empathy-streamed-media-window.c:1852
+msgctxt "decoding audio codec"
+msgid "Unknown"
+msgstr "ไม่ทราบ"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2270
+#: ../src/empathy-streamed-media-window.c:2144
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "เชื่อมต่อ�ล้ว — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2331
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2798
 msgid "Technical Details"
 msgstr "รายละเอียดทางเทคนิค"
 
-#: ../src/empathy-streamed-media-window.c:2369
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2836
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "ซอฟต์�วร์ของ %s ไม่รู้จั�ฟอร์�มตเสียงใดๆ เลยที่คอมพิวเตอร์ของคุณรองรับ"
 
-#: ../src/empathy-streamed-media-window.c:2374
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2841
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "ซอฟต์�วร์ของ %s ไม่รู้จั�ฟอร์�มตวีดิทัศน์ใดๆ เลยที่คอมพิวเตอร์ของคุณรองรับ"
 
-#: ../src/empathy-streamed-media-window.c:2380
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2847
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3049,23 +3385,27 @@ msgid ""
 msgstr ""
 "ไม่สามารถเชื่อมต่อไปยัง %s ได้ �่ายใด�่ายหนึ่งอาจอยู่ในเครือข่ายที่ไม่อนุ�าตให้เชื่อมต่อโดยตรง"
 
-#: ../src/empathy-streamed-media-window.c:2386
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2853
 msgid "There was a failure on the network"
 msgstr "เ�ิดความล้มเหลวในเครือข่าย"
 
-#: ../src/empathy-streamed-media-window.c:2390
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2857
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "�ารรองรับฟอร์�มตเสียงที่จำเป็นต้องใช้ใน�ารเรีย�สายนี้ ยังไม่ได้ติดตั้งลงในคอมพิวเตอร์ของคุณ"
 
-#: ../src/empathy-streamed-media-window.c:2393
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2860
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "�ารรองรับฟอร์�มตวีดิทัศน์ที่จำเป็นต้องใช้ใน�ารเรีย�สายนี้ ยังไม่ได้ติดตั้งลงในคอมพิวเตอร์ของคุณ"
 
-#: ../src/empathy-streamed-media-window.c:2403
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2872
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3075,145 +3415,195 @@ msgstr ""
 "เ�ิดสิ่งไม่คาดคิดในองค์ประ�อบ Telepathy  �รุณา <a href=\"%s\">รายงานบั๊�นี้</a> "
 "พร้อม�นบปูมที่ได้จา�หน้าต่าง 'ดีบั๊�' ในเมนูวิธีใช้ไปด้วย"
 
-#: ../src/empathy-streamed-media-window.c:2411
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2881
 msgid "There was a failure in the call engine"
 msgstr "เ�ิดความล้มเหลวใน�ลไ��ารเรีย�สาย"
 
-#: ../src/empathy-streamed-media-window.c:2414
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2884
 msgid "The end of the stream was reached"
-msgstr ""
+msgstr "พบจุดจบของสตรีม"
 
-#: ../src/empathy-streamed-media-window.c:2454
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2924
 msgid "Can't establish audio stream"
 msgstr "ไม่สามารถเชื่อมต่อสตรีมเสียงได้"
 
-#: ../src/empathy-streamed-media-window.c:2464
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2934
 msgid "Can't establish video stream"
 msgstr "ไม่สามารถเชื่อมต่อสตรีมวีดิทัศน์ได้"
 
-#: ../src/empathy-call-window.ui.h:1
-#, fuzzy
-#| msgid "Auto"
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "Audio"
-msgstr "ออดิโอ"
-
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "เรีย�ผู้ติดต่ออี�ครั้ง"
+msgstr "เสียง"
 
 #: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "ปิด�ล้อง"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "ตัวอ่านรหัส:"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "เปิด�ล้อง"
+msgid "Disable camera"
+msgstr "ปิด�ล้อง"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr ""
+msgid "Display the dialpad"
+msgstr "�สดง�ป้นโทรศัพท์"
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "ปิด�ล้อง�ละหยุดส่งวีดิทัศน์"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "ตัวลงรหัส:"
 
 #: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "เปิด�ล้อง�ละส่งวีดิทัศน์"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Hang up"
+msgstr "วางสาย"
 
 #: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "เปิด�ล้อง�ต่ไม่ต้องส่งวีดิทัศน์"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Hang up current call"
+msgstr "วางสายปัจจุบัน"
 
 #: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Local Candidate:"
 msgstr ""
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "วางสาย"
+msgid "Maximise me"
+msgstr "ขยาย�ผ่"
 
 #: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr "วางสายปัจจุบัน"
+msgid "Minimise me"
+msgstr "ย่อเ�็บ"
 
 #: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Remote Candidate:"
 msgstr ""
 
 #: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "�สดงตัวอย่าง"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Send Audio"
+msgstr "ส่งสั��าณเสียง"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "เรีย�ซ้ำ"
+msgid "Send Video"
+msgstr "ส่งภาพวีดิทัศน์"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr ""
+msgid "Show dialpad"
+msgstr "�สดง�ป้นโทรศัพท์"
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "ส่งสั��าณเสียง"
+msgid "Start a video call"
+msgstr "เรีย�สายเพื่อสนทนาด้วยวีดิทัศน์"
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "เปิด-ปิด�ารส่งสั��าณเสียง"
+msgid "Start an audio call"
+msgstr "เรีย�สายเพื่อคุยสายด้วยเสียง"
+
+#: ../src/empathy-call-window.ui.h:18
+msgid "Swap camera"
+msgstr "สลับ�ล้อง"
 
 #: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "_วีดิทัศน์"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr "เปิด-ปิด�ารส่งสั��าณเสียง"
 
 #: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "วีดิทัศน์"
+msgid "Toggle video transmission"
+msgstr "เปิด-ปิด�ารส่งสั��าณวีดิทัศน์"
 
 #: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "ปิดวีดิทัศน์"
-
-#: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "เปิดวีดิทัศน์"
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:2431 ../src/empathy-call-window.c:2432
+#: ../src/empathy-call-window.c:2433 ../src/empathy-call-window.c:2434
+msgid "Unknown"
+msgstr "ไม่ทราบ"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "�สดงตัวอย่างวีดิทัศน์"
+msgid "Video call"
+msgstr "เรีย�สายเพื่อสนทนาด้วยวีดิทัศน์"
 
 #: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "เ_รีย�สาย"
 
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:25
+msgid "_Camera"
+msgstr "_�ล้อง"
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:18
+msgid "_Contents"
+msgstr "เนื้อ_หา"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
+msgid "_Debug"
+msgstr "_ดีบั๊�"
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:22
+msgid "_Help"
+msgstr "_วิธีใช้"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Microphone"
+msgstr "_ไมโครโฟน"
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "_Settings"
+msgstr "_ตั้งค่า"
+
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "มุ_มมอง"
 
-#: ../src/empathy-chat-window.c:474 ../src/empathy-chat-window.c:494
+#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (ยังไม่อ่าน %d ข้อความ)"
 
-#: ../src/empathy-chat-window.c:486
+#: ../src/empathy-chat-window.c:493
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (�ละอี� %u คน)"
 
-#: ../src/empathy-chat-window.c:502
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (ยังไม่อ่าน %d ข้อความจา�คนอื่น)"
 
-#: ../src/empathy-chat-window.c:511
+#: ../src/empathy-chat-window.c:518
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (ยังไม่อ่าน %d ข้อความจา�ทุ�คน)"
 
-#: ../src/empathy-chat-window.c:721
+#: ../src/empathy-chat-window.c:733
+msgid "SMS:"
+msgstr "SMS:"
+
+#: ../src/empathy-chat-window.c:743
+#, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "�ำลังส่งข้อความ %d ข้อความ"
+
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
 msgstr "�ำลังพิมพ์ข้อความ"
 
@@ -3225,10 +3615,6 @@ msgstr "_ล้าง"
 msgid "C_ontact"
 msgstr "ผู้_ติดต่อ"
 
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "�ารสนทนา"
-
 #: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
 msgstr "�ทร�รูป_สีหน้า"
@@ -3249,10 +3635,6 @@ msgstr "ย้าย�ท็บไปทาง_ขวา"
 msgid "Notify for All Messages"
 msgstr "�จ้งเหตุทุ�ข้อความ"
 
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
-msgid "_Contents"
-msgstr "เนื้อ_หา"
-
 #: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "�าร_สนทนา"
@@ -3261,18 +3643,10 @@ msgstr "�าร_สนทนา"
 msgid "_Detach Tab"
 msgstr "_ดึง�ท็บออ�"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
-msgid "_Edit"
-msgstr "�_�้ไข"
-
 #: ../src/empathy-chat-window.ui.h:13
 msgid "_Favorite Chat Room"
 msgstr "_ห้องสนทนาโปรด"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
-msgid "_Help"
-msgstr "_วิธีใช้"
-
 #: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "�ท็บ_ถัดไป"
@@ -3293,15 +3667,15 @@ msgstr "�_ท็บ"
 msgid "_Undo Close Tab"
 msgstr "เรี_ย�คืน�ารปิด�ท็บ"
 
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "ชื่อ"
 
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
 msgstr "ห้อง"
 
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "เชื่อมต่ออัตโนมัติ"
 
@@ -3309,92 +3683,96 @@ msgstr "เชื่อมต่ออัตโนมัติ"
 msgid "Manage Favorite Rooms"
 msgstr "จัด�ารห้องโปรด"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming video call"
 msgstr "�ารเรีย�เข้าเพื่อสนทนาด้วยวีดิทัศน์"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1408
 msgid "Incoming call"
 msgstr "�ารเรีย�เข้า"
 
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:525
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s �ำลังเรีย�สายคุณอยู่ เพื่อสนทนาด้วยวีดิทัศน์ คุณต้อง�ารจะตอบรับหรือไม่?"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s �ำลังเรีย�สายคุณอยู่ คุณต้อง�ารจะตอบรับหรือไม่?"
 
-#: ../src/empathy-event-manager.c:515 ../src/empathy-event-manager.c:667
+#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1414
 #, c-format
 msgid "Incoming call from %s"
 msgstr "�ารเรีย�เข้าจา� %s"
 
-#: ../src/empathy-event-manager.c:540
+#: ../src/empathy-event-manager.c:554
 msgid "_Reject"
 msgstr "_ป�ิเสธ"
 
-#: ../src/empathy-event-manager.c:546
+#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
 msgid "_Answer"
 msgstr "_ตอบรับ"
 
-#: ../src/empathy-event-manager.c:667
+#: ../src/empathy-event-manager.c:570
+msgid "_Answer with video"
+msgstr "_ตอบรับด้วยวีดิทัศน์"
+
+#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1414
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "�ารเรีย�เข้าด้วยวีดิทัศน์จา� %s"
 
-#: ../src/empathy-event-manager.c:744
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
 msgstr "คำเชิ�สู่ห้องสนทนา"
 
-#: ../src/empathy-event-manager.c:746
+#: ../src/empathy-event-manager.c:838
 #, c-format
 msgid "Invitation to join %s"
 msgstr "คำเชิ�เข้าร่วมสนทนาที่ห้อง %s"
 
-#: ../src/empathy-event-manager.c:753
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s เชิ�คุณเข้าร่วมสนทนาที่ห้อง %s"
 
-#: ../src/empathy-event-manager.c:761
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
 msgstr "_ป�ิเสธ"
 
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "เ_ข้าห้อง"
 
-#: ../src/empathy-event-manager.c:793
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s ได้เชิ�คุณเข้าร่วมสนทนาที่ห้อง %s"
 
-#: ../src/empathy-event-manager.c:799
+#: ../src/empathy-event-manager.c:891
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "คุณได้ถู�เชิ�เข้าร่วมสนทนาที่ห้อง %s"
 
-#: ../src/empathy-event-manager.c:850
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "�ารถ่านโอน�ฟ้มเข้าจา� %s"
 
-#: ../src/empathy-event-manager.c:1020 ../src/empathy-main-window.c:370
-#, fuzzy
-#| msgid "Password:"
+#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
 msgid "Password required"
-msgstr "รหัสผ่าน:"
+msgstr "ต้องใช้รหัสผ่าน"
 
-#: ../src/empathy-event-manager.c:1076
+#: ../src/empathy-event-manager.c:1190
 #, c-format
 msgid "%s would like permission to see when you are online"
-msgstr ""
+msgstr "%s ขออนุ�าตติดต่อ�ับคุณ�บบออนไลน์"
 
-#: ../src/empathy-event-manager.c:1080
+#: ../src/empathy-event-manager.c:1194
 #, c-format
 msgid ""
 "\n"
@@ -3404,105 +3782,105 @@ msgstr ""
 "ข้อความ: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:100
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:102
+#: ../src/empathy-ft-manager.c:103
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:179
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "ไม่ทราบ"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s จา� %s ที่ %s/s"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:275
 #, c-format
 msgid "%s of %s"
 msgstr "%s จา� %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:305
+#: ../src/empathy-ft-manager.c:306
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "�ำลังรับ \"%s\" จา� %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:309
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "�ำลังส่ง \"%s\" ให้�ับ %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:338
+#: ../src/empathy-ft-manager.c:339
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "เ�ิดข้อผิดพลาดขณะรับ \"%s\" จา� %s"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:342
 msgid "Error receiving a file"
 msgstr "เ�ิดข้อผิดพลาดขณะรับ�ฟ้ม"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:347
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "เ�ิดข้อผิดพลาดขณะส่ง \"%s\" ให้�ับ %s"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:350
 msgid "Error sending a file"
 msgstr "เ�ิดข้อผิดพลาดขณะส่ง�ฟ้ม"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:489
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "รับ \"%s\" จา� %s เรียบร้อย"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:493
+#: ../src/empathy-ft-manager.c:494
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "ส่ง \"%s\" ให้�ับ %s เรียบร้อย"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:497
 msgid "File transfer completed"
 msgstr "ถ่ายโอน�ฟ้มเสร็จสมบูรณ์"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
 msgid "Waiting for the other participant's response"
 msgstr "�ำลังรอให้อี��่ายหนึ่งตอบ�ลับ"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "�ำลังตรวจสอบความครบถ้วนของ \"%s\""
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "�ำลังคำนวณ�ฮชของ \"%s\""
 
-#: ../src/empathy-ft-manager.c:1016
+#: ../src/empathy-ft-manager.c:1026
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1028
+#: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "�ฟ้ม"
 
-#: ../src/empathy-ft-manager.c:1050
+#: ../src/empathy-ft-manager.c:1060
 msgid "Remaining"
 msgstr "เหลืออี�"
 
@@ -3537,141 +3915,142 @@ msgstr "โพรโทคอล"
 msgid "Source"
 msgstr "�หล่งข้อมูล"
 
-#: ../src/empathy-main-window.c:387
-#, fuzzy
-#| msgid "Password:"
+#: ../src/empathy-main-window.c:392
 msgid "Provide Password"
-msgstr "รหัสผ่าน:"
+msgstr "ป้อนรหัสผ่าน"
 
-#: ../src/empathy-main-window.c:393
-#, fuzzy
-#| msgid "Disconnected"
+#: ../src/empathy-main-window.c:398
 msgid "Disconnect"
-msgstr "ตัด�ารเชื่อมต่อ�ล้ว"
+msgstr "ตัด�ารเชื่อมต่อ"
 
-#: ../src/empathy-main-window.c:533
-#, fuzzy
-#| msgid "No topic defined"
+#: ../src/empathy-main-window.c:622
 msgid "No match found"
-msgstr "ไม่มี�าร�ำหนดหัวข้อ"
+msgstr "ไม่พบราย�ารที่ตรง�ัน"
 
-#: ../src/empathy-main-window.c:688
+#: ../src/empathy-main-window.c:777
 msgid "Reconnect"
 msgstr "เชื่อมต่อใหม่"
 
-#: ../src/empathy-main-window.c:694
+#: ../src/empathy-main-window.c:783
 msgid "Edit Account"
 msgstr "��้ไขบั�ชี"
 
-#: ../src/empathy-main-window.c:700
+#: ../src/empathy-main-window.c:789
 msgid "Close"
 msgstr "ปิด"
 
-#: ../src/empathy-main-window.c:1418
+#. Translators: this string will be something like:
+#. *   Top up My Account ($1.23)..."
+#: ../src/empathy-main-window.c:928
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr "เติมเงิน %s (%s)..."
+
+#: ../src/empathy-main-window.c:975
+msgid "Top up account credit"
+msgstr "เติมเงินในบั�ชี"
+
+#. top up button
+#: ../src/empathy-main-window.c:1046
+msgid "Top Up..."
+msgstr "เติมเงิน..."
+
+#: ../src/empathy-main-window.c:1789
 msgid "Contact"
 msgstr "ผู้ติดต่อ"
 
-#: ../src/empathy-main-window.c:1765
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "รายชื่อผู้ติดต่อ"
 
-#: ../src/empathy-main-window.c:1881
-msgid "Show and edit accounts"
-msgstr "�สดง�ละ��้ไขบั�ชีต่างๆ"
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "�สดงผู้ติดต่อใน�_ผนที่"
 
-#: ../src/empathy-main-window.ui.h:2
-#, fuzzy
-#| msgid "Contact List"
+#: ../src/empathy-main-window-menubar.ui.h:2
+msgid "Credit Balance"
+msgstr "ยอดเงินคงเหลือ"
+
+#: ../src/empathy-main-window-menubar.ui.h:3
 msgid "Find in Contact _List"
-msgstr "รายชื่อผู้ติดต่อ"
+msgstr "ค้นหาในราย_ชื่อผู้ติดต่อ"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "เข้าห้องโ_ปรด"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "จัด�ารห้องโปรด"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "ขนาด_ป�ติ"
 
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "_สายใหม่…"
 
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "ขนาดป�ติพร้อมรูป�_ทนตัว"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "_ปรับ�ต่ง"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "�สดงโ_พรโทคอล"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "เรียงตาม_ชื่อ"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "เรียงตาม_สถานะ"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_บั�ชี"
 
-#: ../src/empathy-main-window.ui.h:14
-#, fuzzy
-#| msgid "_Offline Contacts"
+#: ../src/empathy-main-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
-msgstr "ผู้ติดต่อที่_ออฟไลน์"
+msgstr "ผู้ติดต่อที่ถู�_ปิด�ั้น"
 
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "ขนาด_�ะทัดรัด"
 
-#: ../src/empathy-main-window.ui.h:18
-msgid "_Debug"
-msgstr "_ดีบั๊�"
-
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "�าร_ถ่ายโอน�ฟ้ม"
 
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "เ_ข้าห้อง…"
 
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "�ารสนทนาใ_หม่…"
 
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "ผู้ติดต่อที่_ออฟไลน์"
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "_ข้อมูลส่วนบุคคล"
 
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "_ห้อง"
 
-#: ../src/empathy-main-window.ui.h:28
-#, fuzzy
-#| msgid "_Show Contact List"
+#: ../src/empathy-main-window-menubar.ui.h:29
 msgid "_Search for Contacts…"
-msgstr "�_สดงรายชื่อผู้ติดต่อ"
+msgstr "_ค้นหาผู้ติดต่อ…"
 
 #: ../src/empathy-new-chatroom-dialog.c:337
 msgid "Chat Room"
@@ -3683,34 +4062,29 @@ msgstr "สมาชิ�"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:560
-#, fuzzy, c-format
-#| msgid ""
-#| "<b>%s</b>\n"
-#| "Invite required: %s\n"
-#| "Password required: %s\n"
-#| "Members: %s"
+#: ../src/empathy-new-chatroom-dialog.c:553
+#, c-format
 msgid ""
 "%s\n"
 "Invite required: %s\n"
 "Password required: %s\n"
 "Members: %s"
 msgstr ""
-"<b>%s</b>\n"
+"%s\n"
 "ผู้รับเชิ�เท่านั้น: %s\n"
 "ต้องใช้รหัสผ่าน: %s\n"
 "สมาชิ�: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
 msgid "No"
 msgstr "ไม่ใช่"
 
-#: ../src/empathy-new-chatroom-dialog.c:591
+#: ../src/empathy-new-chatroom-dialog.c:584
 msgid "Could not start room listing"
 msgstr "ไม่สามารถเริ่ม�สดงรายชื่อห้อง"
 
-#: ../src/empathy-new-chatroom-dialog.c:601
+#: ../src/empathy-new-chatroom-dialog.c:594
 msgid "Could not stop room listing"
 msgstr "ไม่สามารถหยุด�สดงรายชื่อห้อง"
 
@@ -3741,39 +4115,79 @@ msgstr "รายชื่อห้อง"
 msgid "_Room:"
 msgstr "_ห้อง:"
 
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr "ได้รับข้อความ"
 
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr "ส่งข้อความ"
 
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
 msgstr "�ารสนทนาใหม่"
 
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
 msgstr "ผู้ติดต่อเข้าสู่ระบบ"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
 msgstr "ผู้ติดต่อออ�จา�ระบบ"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
 msgstr "บั�ชีมี�ารเชื่อมต่อ"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
 msgstr "บั�ชีตัด�ารเชื่อมต่อ"
 
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr "ภาษา"
 
-#: ../src/empathy-preferences.c:875
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:734
+msgid "Juliet"
+msgstr "เรียม"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:741
+msgid "Romeo"
+msgstr "ขวั�"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:747
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr "เรียมเหลือทน�ล้วนั่น ขวั�ของเรียม"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:750
+msgid "Deny thy father and refuse thy name;"
+msgstr "หวนคิดผิด�ล้วขมขื่น �ืนใจเจียม"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:753
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr "เคยโลมเรียมเลียบ�ั่ง มา�ต่หลังยังจำ"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:756
+msgid "And I'll no longer be a Capulet."
+msgstr "คำที่ขวั�เคยพลอดเคยพร่ำ..."
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:759
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr "อ�พี่�ลัดหนอง พี่หมองดั่งคลอง�สน�สบ"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:762
+msgid "Juliet has disconnected"
+msgstr "เรียม ตัด�ารเชื่อมต่อ�ล้ว"
+
+#: ../src/empathy-preferences.c:1166
 msgid "Preferences"
 msgstr "ปรับ�ต่ง"
 
@@ -3781,69 +4195,86 @@ msgstr "ปรับ�ต่ง"
 msgid "Appearance"
 msgstr "หน้าตา"
 
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
 msgstr "พฤติ�รรม"
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
 msgid "Chat Th_eme:"
 msgstr "ชุด_ต��ต่งหน้าต่างสนทนา:"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
 msgid "Disable notifications when _away or busy"
 msgstr "ปิด�าร�จ้งเหตุเมื่อไ_ม่อยู่หรือไม่ว่าง"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
 msgid "Disable sounds when _away or busy"
 msgstr "ปิด�ารใช้เสียงเมื่อไ_ม่อยู่หรือไม่ว่าง"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
+msgstr "�สดงเหตุ�ารณ์ขาเข้าในพื้นที่�จ้งเหตุ"
+
+#: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
+"�ารตัดเสียงสะท้อนจะช่วยทำให้คู่สนทนาฟังเสียงของคุณได้ชัดเจนขึ้น "
+"�ต่�็อาจทำให้เ�ิดปั�หาในคอมพิวเตอร์บางเครื่อง ถ้าคุณหรือคู่สนทนาได้ยินเสียงรบ�วน�ปล�ๆ ขณะคุยสาย "
+"�็ลองปิด�ารตัดเสียงสะท้อน�ล้วเรีย�สายใหม่"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "เปิดใช้�าร�จ้งเหตุเมื่อผู้ติดต่อ_ออนไลน์"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "เปิดใช้�าร�จ้งเหตุเมื่อผู้ติดต่อออ_ฟไลน์"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "เปิดใช้�าร�จ้งเหตุเมื่อหน้าต่าง_สนทนาไม่ได้โฟ�ัส"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "เปิดใช้�ารตรวจตัวสะ�ดสำหรับภาษา:"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "ทั่วไป"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input level:"
+msgstr "ระดับเสียงเข้า:"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "ความดังเสียงเข้า:"
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "�หล่งข้อมูลตำ�หน่งที่ตั้ง:"
 
-#: ../src/empathy-preferences.ui.h:14
-#, fuzzy
-#| msgid "Conversations"
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
-msgstr "�ารสนทนา"
+msgstr "เ�็บบันทึ��ารสนทนา"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "�าร�จ้งเหตุ"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "เล่นเสียงสำหรับเหตุ�ารณ์ต่างๆ"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "ความเป็นส่วนตัว"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -3852,66 +4283,70 @@ msgstr ""
 "ความละเอียดของตำ�หน่งที่ตั้งที่ลดลง จะหมายถึง�ารไม่ประ�าศข้อมูลที่ละเอียดไป�ว่าเมือง รั� "
 "�ละประเทศที่คุณอยู่ พิ�ัดจา� GPS จะละเอียดถึงทศนิยมหนึ่งตำ�หน่ง"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "�สดงรูป_สีหน้า�บบรูปภาพ"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "�สดง_รายชื่อผู้ติดต่อในห้องต่างๆ"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "เสียง"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "�ารตรวจตัวสะ�ด"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "รายชื่อภาษานี้จะมีเพียงภาษาที่คุณได้ติดตั้งพจนานุ�รมไว้เท่านั้น"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "ชุดต��ต่ง"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:30
+msgid "Variant:"
+msgstr "�บบย่อย:"
+
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "เชื่อม_ต่อโดยอัตโนมัติเมื่อเริ่มทำงาน"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "โ_ทรศัพท์มือถือ"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "เ_ปิดใช้�รอบคำพูด�จ้งเหตุ"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "เ_ปิดใช้�าร�จ้งเหตุด้วยเสียง"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "เ_ครือข่าย (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "_เปิด�ารสนทนาใหม่ในหน้าต่าง�ย�"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "_ประ�าศตำ�หน่งที่ตั้งไปยังผู้ติดต่อของฉัน"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "_ลดความละเอียดของตำ�หน่งที่ตั้ง"
 
@@ -3923,82 +4358,130 @@ msgstr "สถานะ"
 msgid "_Quit"
 msgstr "_ออ�"
 
-#: ../src/empathy-map-view.c:442
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "เรีย�ผู้ติดต่ออี�ครั้ง"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "ปิด�ล้อง"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "เปิด�ล้อง"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "ปิด�ล้อง�ละหยุดส่งวีดิทัศน์"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "เปิด�ล้อง�ละส่งวีดิทัศน์"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "เปิด�ล้อง�ต่ไม่ต้องส่งวีดิทัศน์"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "�สดงตัวอย่าง"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "เรีย�ซ้ำ"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "_วีดิทัศน์"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "ปิดวีดิทัศน์"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "เปิดวีดิทัศน์"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "�สดงตัวอย่างวีดิทัศน์"
+
+#: ../src/empathy-map-view.c:448
 msgid "Contact Map View"
 msgstr "�ผนที่ผู้ติดต่อ"
 
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
 msgid "Save"
 msgstr "บันทึ�"
 
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
 msgstr "หน้าต่างดีบั๊�"
 
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
 msgstr "พั�"
 
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
 msgstr "ระดับ "
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
 msgid "Debug"
 msgstr "ดีบั๊�"
 
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
 msgid "Info"
 msgstr "ข้อมูล"
 
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
 msgid "Message"
 msgstr "ข้อความ"
 
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
 msgid "Warning"
 msgstr "คำเตือน"
 
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
 msgid "Critical"
 msgstr "วิ�ฤติ"
 
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
 msgid "Error"
 msgstr "ข้อผิดพลาด"
 
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
 msgid "Time"
 msgstr "เวลา"
 
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
 msgid "Domain"
 msgstr "โดเมน"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
 msgstr "หมวด"
 
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "ระดับ"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "เครื่องมือจัด�าร�ารเชื่อมต่อที่เลือ�ไม่รองรับส่วนขยายสำหรับดีบั๊�ระยะไ�ล"
 
-#: ../src/empathy-invite-participant-dialog.c:34
-#: ../src/empathy-invite-participant-dialog.c:48
+#: ../src/empathy-invite-participant-dialog.c:179
+#: ../src/empathy-invite-participant-dialog.c:205
 msgid "Invite Participant"
 msgstr "เชิ�ผู้ร่วมสนทนา"
 
-#: ../src/empathy-invite-participant-dialog.c:35
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "เลือ�ผู้ติดต่อที่จะเชิ�เข้าร่วมสนทนา:"
 
-#: ../src/empathy-invite-participant-dialog.c:45
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "เชิ�"
 
@@ -4007,11 +4490,9 @@ msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "ไม่ต้อง�สดง�ล่องโต้ตอบใดๆ ทำงานตามที่สั่ง (เช่น นำเข้า) �ล้วจบโปร��รม"
 
 #: ../src/empathy-accounts.c:187
-#, fuzzy
-#| msgid "Don't display any dialogs if there are any non-salut accounts"
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
-msgstr "ไม่ต้อง�สดง�ล่องโต้ตอบใดๆ ถ้ามีบั�ชีที่ไม่ใช่ salut อยู่"
+msgstr "ไม่ต้อง�สดง�ล่องโต้ตอบใดๆ ย�เว้นเมื่อมี�ค่บั�ชี \"ผู้คน�ถวนี้\" เท่านั้น"
 
 #: ../src/empathy-accounts.c:191
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
@@ -4030,7 +4511,15 @@ msgstr "- บั�ชี Empathy"
 msgid "Empathy Accounts"
 msgstr "บั�ชี Empathy"
 
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr "�สดงบริ�ารที่�ำหนด"
+
+#: ../src/empathy-debugger.c:75
+msgid "- Empathy Debugger"
+msgstr "- เครื่องมือดีบั๊� Empathy"
+
+#: ../src/empathy-debugger.c:114
 msgid "Empathy Debugger"
 msgstr "เครื่องมือดีบั๊� Empathy"
 
@@ -4038,37 +4527,109 @@ msgstr "เครื่องมือดีบั๊� Empathy"
 msgid "- Empathy Chat Client"
 msgstr "- ลู�ข่าย�ช็ต Empathy"
 
-#: ../src/empathy-notifications-approver.c:184
+#: ../src/empathy-notifications-approver.c:203
 msgid "Respond"
 msgstr "ตอบ"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1418
 msgid "Reject"
 msgstr "ป�ิเสธ"
 
-#: ../src/empathy-notifications-approver.c:194
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1419
 msgid "Answer"
 msgstr "รับสาย"
 
-#: ../src/empathy-notifications-approver.c:201
-#: ../src/empathy-notifications-approver.c:211
+#: ../src/empathy-notifications-approver.c:227
+msgid "Answer with video"
+msgstr "ตอบรับด้วยวีดิทัศน์"
+
+#: ../src/empathy-notifications-approver.c:235
+#: ../src/empathy-notifications-approver.c:245
 msgid "Decline"
 msgstr "ป�ิเสธ"
 
-#: ../src/empathy-notifications-approver.c:205
-#: ../src/empathy-notifications-approver.c:216
+#: ../src/empathy-notifications-approver.c:239
+#: ../src/empathy-notifications-approver.c:250
 msgid "Accept"
 msgstr "รับ"
 
-#: ../src/empathy-call-observer.c:130
-#, c-format
-msgid "Missed call from %s"
-msgstr "สายที่ไม่ได้รับจา� %s"
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:260
+msgid "Provide"
+msgstr "ป้อนรหัสผ่าน"
 
-#: ../src/empathy-call-observer.c:133
+#: ../src/empathy-call-observer.c:134
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
-msgstr ""
+msgstr "%s ได้พยายามเรีย�สายคุณ �ต่ขณะนั้นคุณ�ำลังคุยสายอี�สายหนึ่งอยู่"
+
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1047 ../src/empathy-call-window.c:1070
+msgid "i"
+msgstr "i"
+
+#: ../src/empathy-call-window.c:2727
+msgid "On hold"
+msgstr "ถือสายรอ"
+
+#: ../src/empathy-call-window.c:2730
+msgid "Mute"
+msgstr "ปิดเสียง"
+
+#: ../src/empathy-call-window.c:2732
+msgid "Duration"
+msgstr "ความยาว"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2735
+#, c-format
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02dm"
+
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "ตัว_พิมพ์ให�่-เล็�ตรง�ัน"
+
+#~ msgid "All"
+#~ msgstr "ทั้งหมด"
+
+#~ msgid "_Enabled"
+#~ msgstr "เ_ปิดใช้"
+
+#~ msgid "Date"
+#~ msgstr "วันที่"
+
+#~ msgid "Conversations"
+#~ msgstr "�ารสนทนา"
+
+#, fuzzy
+#~| msgid "Video Preview"
+#~ msgid "Find Previous"
+#~ msgstr "�สดงตัวอย่างวีดิทัศน์"
+
+#~ msgid "Previous Conversations"
+#~ msgstr "�ารสนทนา�่อนหน้านี้"
+
+#~ msgid "_For:"
+#~ msgstr "_คำว่า:"
+
+#~ msgid "Enter Custom Message"
+#~ msgstr "ป้อนข้อความ�ำหนดเอง"
+
+#~ msgid "Save _New Status Message"
+#~ msgstr "บึนทึ�ข้อความสถานะใ_หม่"
+
+#~ msgid "Saved Status Messages"
+#~ msgstr "ข้อความสถานะที่บันทึ�ไว้"
+
+#~ msgid "Show and edit accounts"
+#~ msgstr "�สดง�ละ��้ไขบั�ชีต่างๆ"
 
 #~ msgid "Send and receive messages"
 #~ msgstr "รับ�ละส่งข้อความ"
@@ -4134,9 +4695,6 @@ msgstr ""
 #~ msgid "%s account"
 #~ msgstr "บั�ชี %s"
 
-#~ msgid "Salut account is created"
-#~ msgstr "สร้างบั�ชี Salut �ล้ว"
-
 #~ msgid "Whether the Salut account has been created on the first Empathy run."
 #~ msgstr "�ำหนดว่าได้สร้างบั�ชี Salut ไป�ล้วหรือยัง เมื่อเรีย� Empathy ครั้ง�ร�"
 
@@ -4170,9 +4728,6 @@ msgstr ""
 #~ msgid "Show the accounts dialog"
 #~ msgstr "�สดง�ล่องโต้ตอบบั�ชี"
 
-#~ msgid "Accounts"
-#~ msgstr "บั�ชี"
-
 #~ msgid "_Add&#x2026;"
 #~ msgstr "เ_พิ่ม&#x2026;"
 
@@ -4204,6 +4759,3 @@ msgstr ""
 
 #~ msgid "The error message was: <span style=\"italic\">%s</span>"
 #~ msgstr "ข้อผิดพลาดคือ: <span style=\"italic\">%s</span>"
-
-#~ msgid "_Next"
-#~ msgstr "_ถัดไป"
diff --git a/po/tr.po b/po/tr.po
index a51ca2b82..a97f394fd 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,17 +1,17 @@
 # translation of empathy to Turkish
 # This file is distributed under the same license as the empathy package.
 # Copyright (C) 2008-2011 Free Software Foundation, Inc.
+#
 # Görkem Çetin <gorkem@kde.org>, 2004.
 # Baris Cicek <baris@teamforce.name.tr>, 2008, 2009.
 # Muhammet Kara <muhammet.k@gmail.com>, 2011.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=empathy&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-05-02 12:56+0000\n"
-"PO-Revision-Date: 2011-05-03 11:22+0300\n"
+"product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2011-10-09 15:14+0000\n"
+"PO-Revision-Date: 2011-10-10 09:12+0300\n"
 "Last-Translator: Muhammet Kara <muhammet.k@gmail.com>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Lokalize 1.2\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
@@ -43,6 +44,22 @@ msgid "Always open a separate chat window for new chats."
 msgstr "Yeni sohbetler için her zaman ayrı bir pencere aç."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr "Çağrı ses düzeyi"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr "Yüzde olarak çağrı ses düzeyi."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Camera device"
+msgstr "Kamera aygıtı"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "Kamera konumu"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -50,46 +67,59 @@ msgstr ""
 "Grup sohbetindeyken takma isim tamamlamada (tab) ismin sonuna eklenecek "
 "karakter."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "Sohbet penceresi teması"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+msgid "Chat window theme variant"
+msgstr "Sohbet penceresi tema varyantı"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "İmla denetçisinin kullanacağı dillerin virgülle ayrılmış listesi (örn: \"tr, "
 "en, fr\")."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "Sıkışık bağlantı listesi"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "Bağlantı yöneticileri kullanılmalıdır"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "Bağlantı listesi sıralama kıstası"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "Bir odaya katılmak için son seçilen hesabın D-Bus nesne yolu"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr ""
+"Görüntülü aramalarda kullanılacak öntanımlı kamera aygıtı, /dev/vide0 vb."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Default directory to select an avatar image from"
 msgstr "Bir avatar resmi seçmek için öntanımlı dizin"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable popup notifications when away"
 msgstr "Uzaktayken açılır uyarıları etkisizleştir"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Disable sounds when away"
 msgstr "Uzaktayken sesleri etkisizleÅŸtir"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Display incoming events in the status area"
 msgstr "Gelen olayları durum alanında göster"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -97,234 +127,248 @@ msgstr ""
 "Gelen olayları durum alanında göster. Eğer devre dışıysa, kullanıcıya hemen "
 "göster."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+msgid "Echo cancellation support"
+msgstr "Yankı giderme desteği"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can publish the user's location"
 msgstr "Empati kullanıcının yerini yayınlayabilirsiniz"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empati konumu tahmin etmek için GPS kullanabilir"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empati konumu tahmin etmek için hücresel ağ kullanabilir"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy can use the network to guess the location"
 msgstr "Empati konumu tahmin etmek için ağ kullanabilir"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy default download folder"
 msgstr "Empati öntanımlı indirme klasörü"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Empathy has migrated butterfly logs"
-msgstr "Empati kelebek (butterfly) kayıtlarını taşıdı"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy boş duruyorsa otomatik olarak uzakta durumuna geçmeli"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "Başlangıçta Empati otomatik bağlanmalı"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empati konumun hassasiyetini azaltmalı"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
 "Empati sohbet penceresi simgesi olarak bağlantının avatarını kullanmalı"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr "WebKit Geliştirici Araçlarını Etkinleştir"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "Yeni mesajlar için açılır uyarıları etkinleştir"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "İmla denetçisini etkinleştir"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "Ana pencereyi gizle"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "Ana pencereyi gizle."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+msgid "Last account selected in Join Room dialog"
+msgstr "Odaya Katıl iletişim penceresinde son seçilen hesap"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Nick completed character"
 msgstr "Takma ad tamamlama karakteri"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Open new chats in separate windows"
 msgstr "Yeni sohbetleri ayrı pencerelerde aç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use"
 msgstr "Kullanılacak Adium teması yolu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
 "Eğer sohbet için kullanılan tema Adium ise kullanılacak Adium temasının yolu."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for incoming messages"
 msgstr "Gelen mesajlar için bir ses çal"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for new conversations"
 msgstr "Yeni sohbetler için bir ses çal"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound for outgoing messages"
 msgstr "Giden mesajlar için bir ses çal"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs in"
 msgstr "Bir bağlantı giriş yaptığında bir ses çal"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when a contact logs out"
 msgstr "Bir kişi çıkış yaptığında bir ses çal"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log in"
 msgstr "Giriş yaptığımızda bir ses çal"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Play a sound when we log out"
 msgstr "Çıkış yaptığımızda bir ses çal"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Sohbet odaklanmamışsa uyarıları açılır pencerede göster"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs in"
 msgstr "Bir kişi oturum açtığında uyarıları açılır pencerede göster"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "Pop up notifications when a contact logs out"
 msgstr "Bir kişi çıkış yaptığında uyarıları açılır pencerede göster"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+msgid "Position the camera preview should be during a call."
+msgstr "Arama sırasında kamera önizlemesinin olması gereken konum."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+msgid "Show Balance in contact list"
+msgstr "Kişi listesinde bakiyeyi göster"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show avatars"
 msgstr "Avatarları göster"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show contact list in rooms"
 msgstr "Odalarda bağlantı listesini göster"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show hint about closing the main window"
 msgstr "Ana pencereyi kapatırken ipucu göster"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show offline contacts"
 msgstr "Çevrimdışı bağlantıları göster"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Show protocols"
 msgstr "İletişim kurallarını göster"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Spell checking languages"
 msgstr "Ä°mla denetimi dilleri"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The default folder to save file transfers in."
 msgstr "Dosya transferlerini içine kaydetmek için öntanımlı klasör."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Bir avatar resminin seçildiği son dizin."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The position for the chat window side pane"
 msgstr "Sohbet penceresi kenar paneli konumu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "Sohbet penceresi kenar panelinin kayıtlı konumu (piksel olarak)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Sohbet pencerelerinde konuşmayı göstermek için kullanılan tema."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr ""
+"Sohbet pencerelerinde konuşmayı göstermek için kullanılan tema değişkeni."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use graphical smileys"
 msgstr "Grafiksel gülümsemeleri kullan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use notification sounds"
 msgstr "Uyarı seslerini kullan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Use theme for chat rooms"
 msgstr "Sohbet odaları için tema kullan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr ""
 "Empati'nin bağlantılara kullanıcının yerini yayınlayıp yayınlayamayacağı."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Empati'nin konumu tahmin etmek için GPS kullanıp kullanamayacağı."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
 "Empati'nin konumu tahmin etmek için cep telefonu şebekesini kullanıp "
 "kullanamayacağı."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Empati'nin konumu tahmin etmek için ağı kullanıp kullanamayacağı."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Empathynin kelebek kayıtlarını taşıyıp taşımadığı."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr ""
 "Başlangıçta Empati'nin hesaplarınıza otomatik olarak giriş yapıp yapmayacağı."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
 "Kullanıcının bilgisayar başında olmadığı zaman Empati'nin uzakta kipine "
 "otomatik olarak geçip geçmeyeceği."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 "Empati'nin gizlilik nedenleriyle konumun doğruluğunu azaltıp azaltmayacağı."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 "Empati'nin bağlantının avatarını sohbet penceresi simgesi olarak kullanıp "
 "kullanmayacağı."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "Web Inspector gibi WebKit geliştirici araçlarının etkin olması."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
@@ -332,66 +376,72 @@ msgstr ""
 "Bağlantı yöneticilerinin otomatik olarak bağlantıyı kesmek/yeniden bağlanmak "
 "için kullanılıp kullanılmayacağı."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr ""
 "Yazılan kelimelerin seçtiğiniz dillere göre imla denetiminden geçip "
 "geçmeyeceği."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr ""
 "Konuşmalarda gülümsemelerin grafiksel görüntülere çevrilip çevrilmeyeceği."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr ""
+"Pulseaudio'nun yankı giderme filtresinin etkinleştirilip "
+"etkinleÅŸtirilmeyeceÄŸi."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr ""
 "Bağlantılar ağa giriş yaparken uyarı amaçlı bir ses çalınıp çalınmayacağı."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
 "Bağlantılar ağdan çıkış yaparken uyarı amaçlı bir ses çalınıp çalınmayacağı."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "Olaylar için uyarı amaçlı bir ses çalınıp çalınmayacağı."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Gelen mesajlar için uyarı amaçlı bir ses çalınıp çalınmayacağı."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Yeni sohbetler için uyarı amaçlı bir ses çalınıp çalınmayacağı."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Giden mesajlar için uyarı amaçlı bir ses çalınıp çalınmayacağı."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "Bir ağa giriş yapılırken uyarı amaçlı bir ses çalınıp çalınmayacağı."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Bir ağdan çıkış yapılırken uyarı amaçlı bir ses çalınıp çalınmayacağı."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr "Uzakta veya meşgul iken uyarı amaçlı seslerin çalınıp çalınmayacağı."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "Bir kişi çevrimdışı olduğunda bir uyarı belirtilip belirtilmeyeceği."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "Bir kişi çevrimiçi olduğunda bir uyarı belirtilip belirtilmeyeceği."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -399,42 +449,46 @@ msgstr ""
 "Sohbet halen açık fakat odaklanmamış olsa dahi yeni bir mesaj alınırken "
 "açılır bir uyarı gösterilip gösterilmeyeceği."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr ""
 "Yeni bir mesaj alınırken açılır uyarıların gösterilip gösterilmeyeceği."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+msgid "Whether to show account balances in the contact list."
+msgstr "Kişi listesinde hesap bakiyelerinin gösterilip gösterilmeyeceği."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 "Bağlantı listesindeki ve sohbet pencerelerindeki  bağlantılar için avatar "
 "gösterilip gösterilmeyeceği."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr ""
 "Bağlantı listesindeki çevrimdışı bağlantıların gösterilip gösterilmeyeceği."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
 msgstr "Uzakta veya meşgul iken açılır uyarıların gösterilip gösterilmeyeceği."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr ""
 "Bağlantı listesindeki kişilerin iletişim kurallarının gösterilip "
 "gösterilmeyeceği."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Sohbet odalarında bağlantı listesinin gösterilip gösterilmeyeceği."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "Bağlantı listesinin sıkışık kipte gösterilip gösterilmeyeceği."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -442,11 +496,11 @@ msgstr ""
 "Başlık çubuğundaki 'x' düğmesi ile ana pencerenin kapatılması hakkında mesaj "
 "penceresinin gösterilip gösterilmeyeceği."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "Temanın sohbet odaları için kullanılıp kullanılmayacağı."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -462,189 +516,206 @@ msgstr "Mesajlaşma ve VoIP hesaplarını Yönet"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2340
+#: ../src/empathy-accounts-dialog.c:2324
 msgid "Messaging and VoIP Accounts"
 msgstr "Mesajlaşma ve VoIP Hesapları"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:838
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Dosya transferi tamamlandı, ama dosya bozuk"
 
-#: ../libempathy/empathy-ft-handler.c:1113
+#: ../libempathy/empathy-ft-handler.c:1124
 msgid "File transfer not supported by remote contact"
 msgstr "Uzaktan bağlantıda dosya aktarma desteklenmiyor"
 
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1180
 msgid "The selected file is not a regular file"
 msgstr "Seçilen dosya normal bir dosya değil"
 
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1189
 msgid "The selected file is empty"
 msgstr "Seçilen dosya boş"
 
-#: ../libempathy/empathy-tp-file.c:268
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#, c-format
+msgid "Missed call from %s"
+msgstr "Cevapsız çağrı %s"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, c-format
+msgid "Called %s"
+msgstr "%s Arandı"
+
+#: ../libempathy/empathy-message.c:422
+#, c-format
+msgid "Call from %s"
+msgstr "%s'den Gelen Çağrı"
+
+#: ../libempathy/empathy-tp-file.c:258
 msgid "Socket type not supported"
 msgstr "Soket türü desteklenmiyor"
 
-#: ../libempathy/empathy-tp-file.c:387
+#: ../libempathy/empathy-tp-file.c:377
 msgid "No reason was specified"
 msgstr "Sebep belirtilmemiÅŸ"
 
-#: ../libempathy/empathy-tp-file.c:390
+#: ../libempathy/empathy-tp-file.c:380
 msgid "The change in state was requested"
 msgstr "Durumda deÄŸiÅŸiklik istendi"
 
-#: ../libempathy/empathy-tp-file.c:393
+#: ../libempathy/empathy-tp-file.c:383
 msgid "You canceled the file transfer"
 msgstr "Dosya transferini iptal ettiniz"
 
-#: ../libempathy/empathy-tp-file.c:396
+#: ../libempathy/empathy-tp-file.c:386
 msgid "The other participant canceled the file transfer"
 msgstr "Diğer katılımcı dosya transferini iptal etti"
 
-#: ../libempathy/empathy-tp-file.c:399
+#: ../libempathy/empathy-tp-file.c:389
 msgid "Error while trying to transfer the file"
 msgstr "Dosya transfer etmeye çalışılırken hata"
 
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-tp-file.c:392
 msgid "The other participant is unable to transfer the file"
 msgstr "Diğer katılımcı dosya transfer edemiyor"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:383
+#: ../libempathy/empathy-tp-file.c:395 ../libempathy/empathy-utils.c:312
 msgid "Unknown reason"
 msgstr "Bilinmeyen sebep"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:232
 msgid "Available"
 msgstr "Ulaşılabilir"
 
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:234
 msgid "Busy"
 msgstr "MeÅŸgul"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:237
 msgid "Away"
 msgstr "Uzakta"
 
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:239
 msgid "Invisible"
 msgstr "Görünmez"
 
-#: ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-utils.c:241
 msgid "Offline"
 msgstr "Çevrimdışı"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:244
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Bilinmiyor"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:284
 msgid "No reason specified"
 msgstr "Sebep belirtilmemiÅŸ"
 
-#: ../libempathy/empathy-utils.c:357 ../libempathy/empathy-utils.c:413
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
 msgid "Status is set to offline"
 msgstr "Durum çevrimdışına ayarlı"
 
-#: ../libempathy/empathy-utils.c:359 ../libempathy/empathy-utils.c:393
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "Ağ hatası"
 
-#: ../libempathy/empathy-utils.c:361 ../libempathy/empathy-utils.c:395
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
 msgid "Authentication failed"
 msgstr "Kimlik denetimi başarısız"
 
-#: ../libempathy/empathy-utils.c:363 ../libempathy/empathy-utils.c:397
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
 msgid "Encryption error"
 msgstr "Şifreleme hatası"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:294
 msgid "Name in use"
 msgstr "İsim kullanımda"
 
-#: ../libempathy/empathy-utils.c:367 ../libempathy/empathy-utils.c:399
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate not provided"
 msgstr "Sertifika sağlanmamış"
 
-#: ../libempathy/empathy-utils.c:369 ../libempathy/empathy-utils.c:401
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate untrusted"
 msgstr "Sertifika güvenilmez"
 
-#: ../libempathy/empathy-utils.c:371 ../libempathy/empathy-utils.c:403
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
 msgid "Certificate expired"
 msgstr "Sertifikanın süresi dolmuş"
 
-#: ../libempathy/empathy-utils.c:373 ../libempathy/empathy-utils.c:405
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
 msgid "Certificate not activated"
 msgstr "Sertifika etkinleÅŸtirilmemiÅŸ"
 
-#: ../libempathy/empathy-utils.c:375 ../libempathy/empathy-utils.c:407
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
 msgid "Certificate hostname mismatch"
 msgstr "Sertifikanın makine adı uyuşmuyor"
 
-#: ../libempathy/empathy-utils.c:377 ../libempathy/empathy-utils.c:409
+#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
 msgid "Certificate fingerprint mismatch"
 msgstr "Sertifikanın parmak izi uyuşmuyor"
 
-#: ../libempathy/empathy-utils.c:379 ../libempathy/empathy-utils.c:411
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
 msgid "Certificate self-signed"
 msgstr "Sertifika kendinden-imzalı"
 
-#: ../libempathy/empathy-utils.c:381
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate error"
 msgstr "Sertifika hatası"
 
-#: ../libempathy/empathy-utils.c:415
+#: ../libempathy/empathy-utils.c:344
 msgid "Encryption is not available"
 msgstr "Şifreleme kullanılabilir değil"
 
-#: ../libempathy/empathy-utils.c:417
+#: ../libempathy/empathy-utils.c:346
 msgid "Certificate is invalid"
 msgstr "Sertifika geçerli"
 
-#: ../libempathy/empathy-utils.c:419
+#: ../libempathy/empathy-utils.c:348
 msgid "Connection has been refused"
 msgstr "Bağlantı reddedildi"
 
-#: ../libempathy/empathy-utils.c:421
+#: ../libempathy/empathy-utils.c:350
 msgid "Connection can't be established"
 msgstr "Bağlantı kurulamadı"
 
-#: ../libempathy/empathy-utils.c:423
+#: ../libempathy/empathy-utils.c:352
 msgid "Connection has been lost"
 msgstr "Bağlantı koptu"
 
-#: ../libempathy/empathy-utils.c:425
+#: ../libempathy/empathy-utils.c:354
 msgid "This resource is already connected to the server"
 msgstr "Bu kaynak zaten sunucuya bağlı"
 
-#: ../libempathy/empathy-utils.c:427
+#: ../libempathy/empathy-utils.c:356
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Bağlantı, aynı kaynak kullanılarak yeni bir bağlantı ile değiştirildi"
 
-#: ../libempathy/empathy-utils.c:430
+#: ../libempathy/empathy-utils.c:359
 msgid "The account already exists on the server"
 msgstr "Sunucuda böyle bir hesap zaten var"
 
-#: ../libempathy/empathy-utils.c:432
+#: ../libempathy/empathy-utils.c:361
 msgid "Server is currently too busy to handle the connection"
 msgstr "Sunucu, şu anda bağlantı kuramayacak kadar meşgul"
 
-#: ../libempathy/empathy-utils.c:434
+#: ../libempathy/empathy-utils.c:363
 msgid "Certificate has been revoked"
 msgstr "Sertifika iptal edildi"
 
-#: ../libempathy/empathy-utils.c:436
+#: ../libempathy/empathy-utils.c:365
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Sertifika güvensiz bir şifreleme algoritması kullanıyor ya da kriptografik "
 "olarak zayıf"
 
-#: ../libempathy/empathy-utils.c:439
+#: ../libempathy/empathy-utils.c:368
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -652,128 +723,138 @@ msgstr ""
 "Sunucu sertifikasının uzunluğu veya sunucu sertifikası zincirinin derinliği, "
 "şifreleme kütüphanesi tarafından uygulanan sınırları aşıyor"
 
-#: ../libempathy/empathy-utils.c:602
+#: ../libempathy/empathy-utils.c:529
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "Yakındaki İnsanlar"
 
-#: ../libempathy/empathy-utils.c:607
+#: ../libempathy/empathy-utils.c:534
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japonya"
 
-#: ../libempathy/empathy-utils.c:636
+#: ../libempathy/empathy-utils.c:563
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:637
+#: ../libempathy/empathy-utils.c:564
 msgid "Facebook Chat"
 msgstr "Facebook Sohbet"
 
-#: ../libempathy/empathy-time.c:100
+#: ../libempathy/empathy-time.c:88
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d saniye önce"
 
-#: ../libempathy/empathy-time.c:105
+#: ../libempathy/empathy-time.c:93
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d dakika önce"
 
-#: ../libempathy/empathy-time.c:110
+#: ../libempathy/empathy-time.c:98
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d saat önce"
 
-#: ../libempathy/empathy-time.c:115
+#: ../libempathy/empathy-time.c:103
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d gün önce"
 
-#: ../libempathy/empathy-time.c:120
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d hafta önce"
 
-#: ../libempathy/empathy-time.c:125
+#: ../libempathy/empathy-time.c:113
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d ay önce"
 
-#: ../libempathy/empathy-time.c:130
+#: ../libempathy/empathy-time.c:136
 msgid "in the future"
 msgstr "gelecekte"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:491
-msgid "All"
-msgstr "Hepsi"
+#: ../libempathy-gtk/empathy-account-chooser.c:540
+msgid "All accounts"
+msgstr "Tüm hesaplar"
 
-#: ../libempathy-gtk/empathy-account-widget.c:678
-#: ../libempathy-gtk/empathy-log-window.c:643
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "Hesap"
 
-#: ../libempathy-gtk/empathy-account-widget.c:679
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "Parola"
 
-#: ../libempathy-gtk/empathy-account-widget.c:680
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Sunucu"
 
-#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:753
-#: ../libempathy-gtk/empathy-account-widget.c:810
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1151
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "Web Hesaplarım"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1209
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "%s hesabı, Web Hesaplarım yoluyla düzenlendi."
+msgid "The account %s is edited via %s."
+msgstr "%s hesabı, %s aracılığıyla düzenlendi."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1157
+#: ../libempathy-gtk/empathy-account-widget.c:1215
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "%s hesabı Empathy içinden düzenlenemiyor."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1177
+#: ../libempathy-gtk/empathy-account-widget.c:1234
 msgid "Launch My Web Accounts"
 msgstr "Web Hesaplarımı Başlat"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1515
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1242
+#, c-format
+msgid "Edit %s"
+msgstr "%s'i Düzenle"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1592
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Kullanıcı Adı:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1833
+#: ../libempathy-gtk/empathy-account-widget.c:1910
 msgid "A_pply"
 msgstr "U_ygula"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1863
+#: ../libempathy-gtk/empathy-account-widget.c:1940
 msgid "L_og in"
 msgstr "_Oturum aç"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1937
+#: ../libempathy-gtk/empathy-account-widget.c:2014
 msgid "This account already exists on the server"
 msgstr "Bu hesap sunucu üzerinde zaten bulunuyor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:2017
 msgid "Create a new account on the server"
 msgstr "Sunucuda yeni bir hesap oluÅŸtur"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2132
+#: ../libempathy-gtk/empathy-account-widget.c:2209
 msgid "Ca_ncel"
 msgstr "Va_zgeç"
 
@@ -782,19 +863,19 @@ msgstr "Va_zgeç"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2413
+#: ../libempathy-gtk/empathy-account-widget.c:2487
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%2$s üzerinde %1$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2439
+#: ../libempathy-gtk/empathy-account-widget.c:2513
 #, c-format
 msgid "%s Account"
 msgstr "%s Hesabı"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2443
+#: ../libempathy-gtk/empathy-account-widget.c:2517
 msgid "New account"
 msgstr "Yeni hesap"
 
@@ -806,6 +887,7 @@ msgstr "<b>Örnek:</b> Ekranİsmim"
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -819,7 +901,7 @@ msgstr "GeliÅŸmiÅŸ"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "Pass_word:"
 msgstr "Par_ola:"
@@ -829,7 +911,7 @@ msgstr "Par_ola:"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
 msgid "Remember Password"
 msgstr "Parolayı Anımsa"
 
@@ -839,7 +921,7 @@ msgstr "Parolayı Anımsa"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 #: ../libempathy-gtk/empathy-password-dialog.c:311
 msgid "Remember password"
@@ -915,76 +997,84 @@ msgstr "ICQ UIN'iniz nedir?"
 msgid "What is your ICQ password?"
 msgstr "ICQ parolanız nedir?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:183
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "Otomatik"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:221
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "Kayıt"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:226
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "Seçenekler"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "Yok"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Character set:"
 msgstr "Karakter kümesi:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"Çoğu IRC sunucusu bir parolaya ihtiyaç duymaz; eğer emin değilseniz parola "
+"girmeyin."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Network"
 msgstr "AÄŸ"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Network:"
 msgstr "AÄŸ:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Takma ad:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "Parola:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "Çıkış mesajı:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "Geçek isim:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Servers"
 msgstr "Sunucular"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "What is your IRC nickname?"
 msgstr "IRC takma adınız nedir?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Hangi IRC ağı?"
 
@@ -1118,58 +1208,67 @@ msgid "Discover the STUN server automatically"
 msgstr "STUN sunucusunu otomatik olarak keÅŸfedin"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "Ignore TLS Errors"
+msgstr "TLS Hatalarını Yoksay"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Interval (seconds)"
 msgstr "Aralık (saniye)"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
 msgid "Keep-Alive Options"
 msgstr "Canlı-Tut (Keep-Alive) Seçenekleri"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
 msgid "Loose Routing"
 msgstr "Gevşek Yönlendirme"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Mechanism:"
 msgstr "Düzenek:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
 msgid "Miscellaneous Options"
 msgstr "Çeşitli Ayarlar"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 msgid "NAT Traversal Options"
 msgstr "NAT Geçiş Seçenekleri"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 msgid "Port:"
 msgstr "Port:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 msgid "Proxy Options"
 msgstr "Vekil Sunucu Seçenekleri"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "STUN Server:"
 msgstr "STUN Sunucusu:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.c:347
 msgid "Server:"
 msgstr "Sunucu:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid "Transport:"
 msgstr "Aktarım:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Sabit hat_ları ve cep telefonlarını aramak için bu hesabı kullan"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "SIP hesabı parolanız nedir?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "SIP giriÅŸ kimliÄŸiniz nedir?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "K_ullanıcı adı:"
 
@@ -1193,28 +1292,36 @@ msgstr "Yahoo! Hes_abı:"
 msgid "_Room List locale:"
 msgstr "Oda Listesi ye_reli:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:448
-#: ../libempathy-gtk/empathy-avatar-chooser.c:524
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "Resim çevirilemedi"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "Sisteminizde, kabul edilen resim biçimlerinden hiçbiri desteklenmiyor"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:930
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+msgid "Couldn't save picture to file"
+msgstr "Resim, dosyaya kaydedilemedi"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "Avatar Resminizi Seçin"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
+msgid "Take a picture..."
+msgstr "Resim çek..."
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "Resim Yok"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:995
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "Resimler"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:999
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "Tüm Dosyalar"
 
@@ -1222,35 +1329,61 @@ msgstr "Tüm Dosyalar"
 msgid "Click to enlarge"
 msgstr "Büyütmek için tıklayın"
 
-#: ../libempathy-gtk/empathy-chat.c:652
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
+msgid "There was an error starting the call"
+msgstr "Arama başlatılırken bir hata oluştu"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact doesn't support calls"
+msgstr "Belirtilen kişi, aramaları desteklemiyor"
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is offline"
+msgstr "Belirtilen kişi çevrimdışı"
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "The specified contact is not valid"
+msgstr "Belirtilen kişi geçersiz"
+
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "Emergency calls are not supported on this protocol"
+msgstr "Bu iletişim kuralında acil aramalar desteklenmiyor"
+
+#: ../libempathy-gtk/empathy-chat.c:704
 msgid "Failed to open private chat"
 msgstr "Özel sohbet açma başarısız oldu"
 
-#: ../libempathy-gtk/empathy-chat.c:717
+#: ../libempathy-gtk/empathy-chat.c:765
 msgid "Topic not supported on this conversation"
 msgstr "Bu görüşmede başlık desteklenmiyor"
 
-#: ../libempathy-gtk/empathy-chat.c:723
+#: ../libempathy-gtk/empathy-chat.c:771
 msgid "You are not allowed to change the topic"
 msgstr "Başlığı değiştirmenize izin verilmiyor"
 
-#: ../libempathy-gtk/empathy-chat.c:932
+#: ../libempathy-gtk/empathy-chat.c:975
+#, c-format
+msgid "“%s� is not a valid contact ID"
+msgstr "“%s�, geçerli bir kişi kimliği değil"
+
+#: ../libempathy-gtk/empathy-chat.c:1070
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: geçerli görüşmedeki tüm iletileri sil"
 
-#: ../libempathy-gtk/empathy-chat.c:935
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <başlık>: geçerli konuşmanın başlığını ayarla"
 
-#: ../libempathy-gtk/empathy-chat.c:938
+#: ../libempathy-gtk/empathy-chat.c:1076
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <sohbet odası kimliği (ID)>: yeni bir sohbet odasına katıl"
 
-#: ../libempathy-gtk/empathy-chat.c:941
+#: ../libempathy-gtk/empathy-chat.c:1079
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <sohbet odası kimliği>: yeni bir sohbet odasına katıl"
 
-#: ../libempathy-gtk/empathy-chat.c:946
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1258,23 +1391,23 @@ msgstr ""
 "/part [<sohbet odası kimliği>] [<sebep>]: (öntanımlı olarak, şu anda "
 "bulunulan) sohbet odasından ayrıl"
 
-#: ../libempathy-gtk/empathy-chat.c:951
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <bağlantı kimliği> [<ileti>]: özel bir sohbet aç"
 
-#: ../libempathy-gtk/empathy-chat.c:954
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <bağlantı kimliği> [<ileti>]: özel bir sohbet aç"
 
-#: ../libempathy-gtk/empathy-chat.c:957
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <rumuz>: geçerli sunucudaki rumuzunuzu değiştirin"
 
-#: ../libempathy-gtk/empathy-chat.c:960
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <ileti>: geçerli görüşmeye bir EYLEM iletisi gönder"
 
-#: ../libempathy-gtk/empathy-chat.c:963
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1284,7 +1417,11 @@ msgstr ""
 "ileti göndermek için kullanılır. Örneğin: ''/say /join yeni bir sohbet "
 "odasına katılmak için kullanılır''"
 
-#: ../libempathy-gtk/empathy-chat.c:968
+#: ../libempathy-gtk/empathy-chat.c:1104
+msgid "/whois <contact ID>: display information about a contact"
+msgstr "/whois <kişi adı>: bir kişi hakkındaki bilgileri göster"
+
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1292,104 +1429,114 @@ msgstr ""
 "/help [<komut>]: bütün desteklenen komutları göster. Eğer <komut> "
 "tanımlanmışsa, kullanım biçimini göster."
 
-#: ../libempathy-gtk/empathy-chat.c:978
+#: ../libempathy-gtk/empathy-chat.c:1126
 #, c-format
 msgid "Usage: %s"
 msgstr "Kullanım: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1017
+#: ../libempathy-gtk/empathy-chat.c:1171
 msgid "Unknown command"
 msgstr "Bilinmeyen komut"
 
-#: ../libempathy-gtk/empathy-chat.c:1143
+#: ../libempathy-gtk/empathy-chat.c:1297
 msgid "Unknown command; see /help for the available commands"
 msgstr ""
 "Bilinmeyen komut; kullanılabilir komutlar için /help komutunu deneyiniz"
 
-#: ../libempathy-gtk/empathy-chat.c:1281
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1467
+msgid "insufficient balance to send message"
+msgstr "mesaj göndermek için yetersiz bakiye"
+
+#: ../libempathy-gtk/empathy-chat.c:1469
+msgid "not capable"
+msgstr "kapasitesiz"
+
+#: ../libempathy-gtk/empathy-chat.c:1476
 msgid "offline"
 msgstr "çevrimdışı"
 
-#: ../libempathy-gtk/empathy-chat.c:1284
+#: ../libempathy-gtk/empathy-chat.c:1479
 msgid "invalid contact"
 msgstr "geçersiz bağlantı"
 
-#: ../libempathy-gtk/empathy-chat.c:1287
+#: ../libempathy-gtk/empathy-chat.c:1482
 msgid "permission denied"
 msgstr "izin verilmedi"
 
-#: ../libempathy-gtk/empathy-chat.c:1290
+#: ../libempathy-gtk/empathy-chat.c:1485
 msgid "too long message"
 msgstr "çok uzun mesaj"
 
-#: ../libempathy-gtk/empathy-chat.c:1293
+#: ../libempathy-gtk/empathy-chat.c:1488
 msgid "not implemented"
 msgstr "uygulanmamış"
 
-#: ../libempathy-gtk/empathy-chat.c:1297
+#: ../libempathy-gtk/empathy-chat.c:1492
 msgid "unknown"
 msgstr "bilinmiyor"
 
-#: ../libempathy-gtk/empathy-chat.c:1302
+#: ../libempathy-gtk/empathy-chat.c:1498
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "'%s' mesajı gönderilirken hata : %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1306
+#: ../libempathy-gtk/empathy-chat.c:1502
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Mesaj gönderme hatası: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1367 ../src/empathy-chat-window.c:717
+#: ../libempathy-gtk/empathy-chat.c:1563 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "Başlık:"
 
-#: ../libempathy-gtk/empathy-chat.c:1379
+#: ../libempathy-gtk/empathy-chat.c:1575
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Başlık değiştirildi: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1381
+#: ../libempathy-gtk/empathy-chat.c:1577
 msgid "No topic defined"
 msgstr "Başlık belirtilmemiş"
 
-#: ../libempathy-gtk/empathy-chat.c:1888
+#: ../libempathy-gtk/empathy-chat.c:2086
 msgid "(No Suggestions)"
 msgstr "(Öneri Yok)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1956
+#: ../libempathy-gtk/empathy-chat.c:2154
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "'%s' kelimesini Sözlüğe ekle"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1993
+#: ../libempathy-gtk/empathy-chat.c:2191
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "'%s' kelimesini %s Sözlüğe ekle"
 
-#: ../libempathy-gtk/empathy-chat.c:2050
+#: ../libempathy-gtk/empathy-chat.c:2261
 msgid "Insert Smiley"
 msgstr "Gülümseme Ekle"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2068
-#: ../libempathy-gtk/empathy-ui-utils.c:1808
+#: ../libempathy-gtk/empathy-chat.c:2279
+#: ../libempathy-gtk/empathy-ui-utils.c:1840
 msgid "_Send"
 msgstr "_Gönder"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2103
+#: ../libempathy-gtk/empathy-chat.c:2333
 msgid "_Spelling Suggestions"
 msgstr "_Yazım Önerileri"
 
-#: ../libempathy-gtk/empathy-chat.c:2192
+#: ../libempathy-gtk/empathy-chat.c:2422
 msgid "Failed to retrieve recent logs"
 msgstr "Son kayıtlara erişme başarısız oldu"
 
-#: ../libempathy-gtk/empathy-chat.c:2303
+#: ../libempathy-gtk/empathy-chat.c:2559
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s bağlantısını kesti"
@@ -1397,12 +1544,12 @@ msgstr "%s bağlantısını kesti"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2310
+#: ../libempathy-gtk/empathy-chat.c:2566
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s tarafından %1$s kanaldan atıldı"
 
-#: ../libempathy-gtk/empathy-chat.c:2313
+#: ../libempathy-gtk/empathy-chat.c:2569
 #, c-format
 msgid "%s was kicked"
 msgstr "%s kanaldan atıldı"
@@ -1410,17 +1557,17 @@ msgstr "%s kanaldan atıldı"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2321
+#: ../libempathy-gtk/empathy-chat.c:2577
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s tarafından %1$s yasaklandı"
 
-#: ../libempathy-gtk/empathy-chat.c:2324
+#: ../libempathy-gtk/empathy-chat.c:2580
 #, c-format
 msgid "%s was banned"
 msgstr "%s yasaklandı"
 
-#: ../libempathy-gtk/empathy-chat.c:2328
+#: ../libempathy-gtk/empathy-chat.c:2584
 #, c-format
 msgid "%s has left the room"
 msgstr "%s odayı terk etti"
@@ -1430,110 +1577,131 @@ msgstr "%s odayı terk etti"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2337
+#: ../libempathy-gtk/empathy-chat.c:2593
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2362
+#: ../libempathy-gtk/empathy-chat.c:2618
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s odaya katıldı"
 
-#: ../libempathy-gtk/empathy-chat.c:2387
+#: ../libempathy-gtk/empathy-chat.c:2643
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ÅŸimdi %s olarak biliniyor"
 
-#: ../libempathy-gtk/empathy-chat.c:2526
-#: ../src/empathy-streamed-media-window.c:1957
-#: ../src/empathy-event-manager.c:1126
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2796
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1260 ../src/empathy-call-window.c:1546
+#: ../src/empathy-call-window.c:1596 ../src/empathy-call-window.c:2641
 msgid "Disconnected"
 msgstr "Bağlı Değil"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3158
+#: ../libempathy-gtk/empathy-chat.c:3440
 msgid "Would you like to store this password?"
 msgstr "Bu parolayı kaydetmek istiyor musunuz?"
 
-#: ../libempathy-gtk/empathy-chat.c:3164
+#: ../libempathy-gtk/empathy-chat.c:3446
 msgid "Remember"
 msgstr "Hatırla"
 
-#: ../libempathy-gtk/empathy-chat.c:3174
+#: ../libempathy-gtk/empathy-chat.c:3456
 msgid "Not now"
 msgstr "Åžimdi deÄŸil"
 
-#: ../libempathy-gtk/empathy-chat.c:3218
+#: ../libempathy-gtk/empathy-chat.c:3500
 msgid "Retry"
 msgstr "Yeniden Dene"
 
-#: ../libempathy-gtk/empathy-chat.c:3222
+#: ../libempathy-gtk/empathy-chat.c:3504
 msgid "Wrong password; please try again:"
 msgstr "Yanlış parola: lütfen tekrar deneyin:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3339
+#: ../libempathy-gtk/empathy-chat.c:3634
 msgid "This room is protected by a password:"
 msgstr "Bu oda bir parolayla korunuyor:"
 
-#: ../libempathy-gtk/empathy-chat.c:3366
+#: ../libempathy-gtk/empathy-chat.c:3661
 msgid "Join"
 msgstr "Katıl"
 
-#: ../libempathy-gtk/empathy-chat.c:3536 ../src/empathy-event-manager.c:1147
+#: ../libempathy-gtk/empathy-chat.c:3863 ../src/empathy-event-manager.c:1281
 msgid "Connected"
 msgstr "Bağlı"
 
-#: ../libempathy-gtk/empathy-chat.c:3589
-#: ../libempathy-gtk/empathy-log-window.c:650
+#: ../libempathy-gtk/empathy-chat.c:3918
 msgid "Conversation"
 msgstr "KonuÅŸma"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:422
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:3923
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (SMS)"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
 msgid "Unknown or invalid identifier"
 msgstr "Bilinmeyen ya da geçersiz tanımlayıcı"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
 msgid "Contact blocking temporarily unavailable"
 msgstr "Kişi engelleme geçici olarak kullanılamıyor"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
 msgid "Contact blocking unavailable"
 msgstr "Kişi engelleme kullanılamıyor"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
 msgid "Permission Denied"
 msgstr "Ä°zin verilmedi"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
 msgid "Could not block contact"
 msgstr "KiÅŸi engellenemedi"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:701
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
 msgid "Edit Blocked Contacts"
 msgstr "Engellenmiş Kişileri Düzenle"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:520
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1479
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid "Account:"
 msgstr "Hesap:"
 
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "EngellenmiÅŸ KiÅŸiler"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Sil"
+
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:1010
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "BaÄŸ Adresini _Kopyala"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:1017
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Bağı Aç"
 
@@ -1558,13 +1726,13 @@ msgid "New Contact"
 msgstr "Yeni Bağlantı"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:199
+#: ../libempathy-gtk/empathy-individual-dialogs.c:200
 #, c-format
 msgid "Block %s?"
 msgstr "%s engellensin mi?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:247
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr ""
@@ -1572,12 +1740,12 @@ msgstr ""
 "misiniz?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
 msgid "_Block"
 msgstr "_Engelle"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:278
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "Bu kişiyi kötü niyetli olarak bildi_r"
@@ -1602,301 +1770,327 @@ msgstr "Gruplanmamış"
 msgid "Favorite People"
 msgstr "Sık Görüşülen Kişiler"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1987
-#: ../libempathy-gtk/empathy-individual-view.c:2386
+#: ../libempathy-gtk/empathy-contact-list-view.c:1985
+#: ../libempathy-gtk/empathy-individual-view.c:2375
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Gerçekten '%s' grubunu kaldırmak istiyor musunuz?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1989
-#: ../libempathy-gtk/empathy-individual-view.c:2389
+#: ../libempathy-gtk/empathy-contact-list-view.c:1987
+#: ../libempathy-gtk/empathy-individual-view.c:2378
 msgid "Removing group"
 msgstr "Grup kaldırılıyor"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2038
-#: ../libempathy-gtk/empathy-contact-list-view.c:2115
-#: ../libempathy-gtk/empathy-individual-view.c:2444
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../libempathy-gtk/empathy-contact-list-view.c:2036
+#: ../libempathy-gtk/empathy-contact-list-view.c:2113
+#: ../libempathy-gtk/empathy-individual-view.c:2433
+#: ../libempathy-gtk/empathy-individual-view.c:2636
 msgid "_Remove"
 msgstr "Kaldı_r"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2068
-#: ../libempathy-gtk/empathy-individual-view.c:2508
+#: ../libempathy-gtk/empathy-contact-list-view.c:2066
+#: ../libempathy-gtk/empathy-individual-view.c:2500
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Gerçekten '%s' bağlantısını kaldırmak istiyor musunuz?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2070
-#: ../libempathy-gtk/empathy-individual-view.c:2529
+#: ../libempathy-gtk/empathy-contact-list-view.c:2068
+#: ../libempathy-gtk/empathy-individual-view.c:2521
 msgid "Removing contact"
 msgstr "Bağlantı kaldırılıyor"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:219
-#: ../src/empathy-main-window.ui.h:13
+#: ../libempathy-gtk/empathy-contact-menu.c:220
+#: ../src/empathy-main-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "KiÅŸi _Ekle..."
 
-#: ../libempathy-gtk/empathy-contact-menu.c:299
+#: ../libempathy-gtk/empathy-contact-menu.c:300
 msgid "_Block Contact"
 msgstr "KiÅŸiyi _Engelle"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:328
-#: ../libempathy-gtk/empathy-individual-menu.c:517
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:329
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "S_ohbet"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:359
-#: ../libempathy-gtk/empathy-individual-menu.c:560
+#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Sesli Arama"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:390
-#: ../libempathy-gtk/empathy-individual-menu.c:602
+#: ../libempathy-gtk/empathy-contact-menu.c:394
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Video Arama"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:436
-#: ../libempathy-gtk/empathy-individual-menu.c:645
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:440
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "Önceki _Konuşmalar"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:458
-#: ../libempathy-gtk/empathy-individual-menu.c:686
+#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "Dosya Gönder"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:481
-#: ../libempathy-gtk/empathy-individual-menu.c:728
+#: ../libempathy-gtk/empathy-contact-menu.c:485
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
 msgstr "Masaüstümü Paylaş"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:521
-#: ../libempathy-gtk/empathy-contact-widget.c:1761
-#: ../libempathy-gtk/empathy-individual-menu.c:763
-#: ../libempathy-gtk/empathy-individual-widget.c:1370
+#: ../libempathy-gtk/empathy-contact-menu.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:1887
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "BeÄŸenilen"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:550
-#: ../libempathy-gtk/empathy-individual-menu.c:791
+#: ../libempathy-gtk/empathy-contact-menu.c:554
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "Bil_gi"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:596
+#: ../libempathy-gtk/empathy-contact-menu.c:600
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "Düz_enle"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:650
-#: ../libempathy-gtk/empathy-individual-menu.c:972
-#: ../src/empathy-chat-window.c:935
+#: ../libempathy-gtk/empathy-contact-menu.c:654
+#: ../libempathy-gtk/empathy-individual-menu.c:1284
+#: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "Sizi bu odaya davet ediyor"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:681
-#: ../libempathy-gtk/empathy-individual-menu.c:1019
+#: ../libempathy-gtk/empathy-contact-menu.c:685
+#: ../libempathy-gtk/empathy-individual-menu.c:1330
 msgid "_Invite to Chat Room"
 msgstr "Sohbet Odasına _Davet Et"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:513
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
 msgid "Search contacts"
 msgstr "KiÅŸi ara"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:543
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
 msgid "Search: "
 msgstr "Ara: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:601
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
 msgid "_Add Contact"
 msgstr "KiÅŸi _Ekle"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:619
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
 msgid "No contacts found"
 msgstr "Kişi bulunamadı"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "Bir bağlantı seç"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr "Kendinizi tanıtan mesajınız:"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
+msgstr "Lütfen çevrimiçi olduğunuzda sizi görebilmeme izin verin. Teşekkürler!"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:295
+#: ../libempathy-gtk/empathy-contact-widget.c:336
 #: ../libempathy-gtk/empathy-individual-widget.c:153
 msgid "Full name:"
 msgstr "Tam Ad:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:296
+#: ../libempathy-gtk/empathy-contact-widget.c:337
 #: ../libempathy-gtk/empathy-individual-widget.c:154
 msgid "Phone number:"
 msgstr "Telefon numarası:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:297
+#: ../libempathy-gtk/empathy-contact-widget.c:338
 #: ../libempathy-gtk/empathy-individual-widget.c:155
 msgid "E-mail address:"
 msgstr "E-posta adresi:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:298
+#: ../libempathy-gtk/empathy-contact-widget.c:339
 #: ../libempathy-gtk/empathy-individual-widget.c:156
 msgid "Website:"
 msgstr "Web sitesi:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:299
+#: ../libempathy-gtk/empathy-contact-widget.c:340
 #: ../libempathy-gtk/empathy-individual-widget.c:157
 msgid "Birthday:"
 msgstr "Doğum günü:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:346
+msgid "Last seen:"
+msgstr "Son görüşme:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:348
+msgid "Connected from:"
+msgstr "Şuradan bağlandı:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:353
+msgid "Away message:"
+msgstr "Uzak mesajı:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+msgid "Channels:"
+msgstr "Kanallar:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
 msgstr "Ãœlke ISO Kodu:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Country:"
 msgstr "Ãœlke:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "State:"
 msgstr "Eyalet:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:768
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "City:"
 msgstr "Åžehir:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:770
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Area:"
 msgstr "Alan:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:772
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
 msgstr "Posta Kodu:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:774
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Street:"
 msgstr "Sokak:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:776
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
 msgstr "Bina:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:778
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Floor:"
 msgstr "Kat:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:780
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Room:"
 msgstr "Oda:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:782
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Text:"
 msgstr "Metin:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:784
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Description:"
 msgstr "Açıklama:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:786
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
 msgstr "DoÄŸruluk Seviyesi:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:790
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr "Hata:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:792
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
 msgstr "Dikey Hata (metre):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:794
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
 msgstr "Yatay Hata (metre):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr "Hız:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Bearing:"
 msgstr "Yatak:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:800
-#: ../libempathy-gtk/empathy-individual-widget.c:526
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
 msgstr "Tırmanma Hızı:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:802
-#: ../libempathy-gtk/empathy-individual-widget.c:528
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
 msgstr "Son Güncelleme Tarihi:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:804
-#: ../libempathy-gtk/empathy-individual-widget.c:530
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
 msgstr "Boylam:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:806
-#: ../libempathy-gtk/empathy-individual-widget.c:532
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
 msgstr "Enlem:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:808
-#: ../libempathy-gtk/empathy-individual-widget.c:534
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
 msgstr "Rakım:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:871
-#: ../libempathy-gtk/empathy-contact-widget.c:886
-#: ../libempathy-gtk/empathy-individual-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:631
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "Konum"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:888
-#: ../libempathy-gtk/empathy-individual-widget.c:633
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:940
-#: ../libempathy-gtk/empathy-individual-widget.c:682
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y tarih %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1022
-#: ../libempathy-gtk/empathy-individual-widget.c:917
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
 msgid "Save Avatar"
 msgstr "Avatarı Kaydet"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1078
-#: ../libempathy-gtk/empathy-individual-widget.c:975
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
 msgid "Unable to save avatar"
 msgstr "Avatar kaydedilemiyor"
 
@@ -1906,7 +2100,7 @@ msgstr "<b>Konum</b> (tarih) de \t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1305
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr "Takma ad:"
 
@@ -1926,7 +2120,7 @@ msgstr "Bağlantı Ayrıntıları"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1509
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "Tanımlayıcı:"
 
@@ -1943,11 +2137,11 @@ msgstr "Ä°ÅŸletim Sistemi:"
 msgid "Version:"
 msgstr "Sürüm:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:332
+#: ../libempathy-gtk/empathy-groups-widget.c:333
 msgid "Groups"
 msgstr "Gruplar"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:344
+#: ../libempathy-gtk/empathy-groups-widget.c:345
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -1955,72 +2149,103 @@ msgstr ""
 "Bu bağlantının içerisinde görünmesini istediğiniz grupları seçin.  Birden "
 "fazla grup seçebilir ya da hiç seçmeyebilirsiniz."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:363
+#: ../libempathy-gtk/empathy-groups-widget.c:364
 msgid "_Add Group"
 msgstr "Grup Ek_le"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:398
+#: ../libempathy-gtk/empathy-groups-widget.c:399
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Seç"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1439
+#: ../libempathy-gtk/empathy-groups-widget.c:409
+#: ../src/empathy-main-window.c:1833
 msgid "Group"
 msgstr "Grup"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Aşağıdaki kişi kartları engellenecek:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:259
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Aşağıdaki kişi kartları engellenemiyor:"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
 msgstr "Bağlı Kişiler"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:354
+#: ../libempathy-gtk/empathy-individual-linker.c:370
 msgid "Select contacts to link"
 msgstr "Bağlantılanacak kişileri seç"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:428
+#: ../libempathy-gtk/empathy-individual-linker.c:444
 msgid "New contact preview"
 msgstr "Yeni kişi önizlemesi"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:472
+#: ../libempathy-gtk/empathy-individual-linker.c:488
 msgid "Contacts selected in the list on the left will be linked together."
 msgstr "Sol taraftaki listeden seçilen kişiler birbirine bağlantılanacak."
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:131
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:839
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "Arama için kullanılacak hesabı seçin"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "Çağrı"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+msgid "Mobile"
+msgstr "Cep"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "Ä°ÅŸ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "EV"
+
+#. add an SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+msgid "_SMS"
+msgstr "_SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1142
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "Düz_enle"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:865
+#: ../libempathy-gtk/empathy-individual-menu.c:1168
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "_KiÅŸileri BaÄŸla..."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2351
+#: ../libempathy-gtk/empathy-individual-view.c:2340
 msgid "Delete and _Block"
 msgstr "Sil ve _Engelle"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2517
+#: ../libempathy-gtk/empathy-individual-view.c:2509
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2029,7 +2254,7 @@ msgstr ""
 "'%s' bağlı kişisini gerçekten silmek istiyor musunuz? Bu işlemin, bu bağlı "
 "kişiyi oluşturan tüm kişileri sileceğini unutmayın."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1650
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2111,65 +2336,200 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "_Bağı çöz"
 
-#: ../libempathy-gtk/empathy-log-window.c:660
-msgid "Date"
-msgstr "Tarih"
+#: ../libempathy-gtk/empathy-log-window.c:634
+msgid "History"
+msgstr "Geçmiş"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
-msgstr "KonuÅŸmalar"
+#: ../libempathy-gtk/empathy-log-window.c:689
+msgid "Show"
+msgstr "Göster"
+
+#: ../libempathy-gtk/empathy-log-window.c:711
+msgid "Search"
+msgstr "Ara"
+
+#: ../libempathy-gtk/empathy-log-window.c:1159
+#, c-format
+msgid "Chat in %s"
+msgstr "%s'de Sohbet Et"
+
+#: ../libempathy-gtk/empathy-log-window.c:1161
+#, c-format
+msgid "Chat with %s"
+msgstr "%s ile Sohbet Et"
+
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%A, %e %B %Y, %X"
+
+#. Translators: this is an emote: '* Danielle waves'
+#: ../libempathy-gtk/empathy-log-window.c:1300
+#, c-format
+msgid "<i>* %s %s</i>"
+msgstr "<i>* %s %s</i>"
+
+#. Translators: this is a message: 'Danielle: hello'
+#. * The string in bold is the sender's name
+#: ../libempathy-gtk/empathy-log-window.c:1306
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1382
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s saniye"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s dakika"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "Çağrı %s sürdü, %s'de sonlandı"
+
+#: ../libempathy-gtk/empathy-log-window.c:1729
+msgid "Today"
+msgstr "Bugün"
+
+#: ../libempathy-gtk/empathy-log-window.c:1733
+msgid "Yesterday"
+msgstr "Dün"
+
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
+msgid "%e %B %Y"
+msgstr "%e %B %Y"
+
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3444
+msgid "Anytime"
+msgstr "Herhangi bir zaman"
+
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2372
+msgid "Anyone"
+msgstr "Herhangi biri"
+
+#: ../libempathy-gtk/empathy-log-window.c:2685
+msgid "Who"
+msgstr "Kim"
+
+#: ../libempathy-gtk/empathy-log-window.c:2889
+msgid "When"
+msgstr "Ne Zaman"
+
+#: ../libempathy-gtk/empathy-log-window.c:3005
+msgid "Anything"
+msgstr "Herhangi bir ÅŸey"
+
+#: ../libempathy-gtk/empathy-log-window.c:3007
+msgid "Text chats"
+msgstr "Yazılı sohbetler"
+
+#: ../libempathy-gtk/empathy-log-window.c:3009
+#: ../src/empathy-preferences.ui.h:4
+msgid "Calls"
+msgstr "Çağrılar"
+
+#: ../libempathy-gtk/empathy-log-window.c:3014
+msgid "Incoming calls"
+msgstr "Gelen çağrılar"
+
+#: ../libempathy-gtk/empathy-log-window.c:3015
+msgid "Outgoing calls"
+msgstr "Giden çağrılar"
+
+#: ../libempathy-gtk/empathy-log-window.c:3016
+msgid "Missed calls"
+msgstr "Cevapsız çağrılar"
+
+#: ../libempathy-gtk/empathy-log-window.c:3038
+msgid "What"
+msgstr "Ne"
+
+#: ../libempathy-gtk/empathy-log-window.c:3747
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr ""
+"Önceki görüşmelerin tüm kayıtlarını silmek istediğinizden emin misiniz?"
+
+#: ../libempathy-gtk/empathy-log-window.c:3751
+msgid "Clear All"
+msgstr "Tümünü Temizle"
+
+#: ../libempathy-gtk/empathy-log-window.c:3758
+msgid "Delete from:"
+msgstr "Åžuradan itibaren sil:"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Yükleniyor...</span>"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "Sonrakini Bul"
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Chat"
+msgstr "Sohbet"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "Öncekini Bul"
+msgid "Delete All History..."
+msgstr "Tüm Geçmişi Sil..."
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr "Önceki Konuşmalar"
+msgid "Profile"
+msgstr "Profil"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Video"
+msgstr "Görüntü"
 
-#. Tab Label
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "Ara"
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:20
+msgid "_Edit"
+msgstr "Düzenl_e"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "_File"
+msgstr "_Dosya"
 
-#. Searching *for* something
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "_Aranan:"
+msgid "page 2"
+msgstr "sayfa 2"
 
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
 msgid "Contact ID:"
 msgstr "Bağlantı ID:"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:171
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
 msgid "C_hat"
 msgstr "So_hbet"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:181
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
 msgstr "Yeni KonuÅŸma"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:253
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
 msgid "Send _Video"
 msgstr "_Video Gönder"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:261
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
 msgid "C_all"
 msgstr "Ç_ağrı"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:271
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "New Call"
 msgstr "Yeni Çağrı"
 
@@ -2188,34 +2548,34 @@ msgstr ""
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Message…"
 msgstr "Özel İleti..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messages…"
 msgstr "Özel İletileri Düzenle..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
 msgstr "Bu durumu favorilerden çıkartmak için tıklayın"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
 msgstr "Bu durumu favorilere eklemek için tıklayın"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
 msgstr "Durum ayarı"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:946
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
 msgid "Set your presence and current status"
 msgstr "Gösterim ve mevcut durum ayarı"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1134
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
 msgid "Custom messages…"
 msgstr "Özel iletiler..."
 
@@ -2228,18 +2588,26 @@ msgstr "Özel iletiler..."
 msgid "New %s account"
 msgstr "Yeni %s hesabı"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "Bul:"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "BÜYÜK/küçük harf eşleştir"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Mat_ch case"
+msgstr "BÜYÜK/kü_çük harf eşleştir"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
 msgid "Phrase not found"
 msgstr "İfade bulunamadı"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "_Next"
+msgstr "_Ä°leri"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+msgid "_Previous"
+msgstr "_Geri"
+
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
 msgstr "Bir anında mesaj alındı"
@@ -2280,35 +2648,32 @@ msgstr "Giden sesli çağrı"
 msgid "Voice call ended"
 msgstr "Sesli çağrı sonlandı"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "Özel Mesaj Girin"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
 msgstr "Özel Mesajları Değiştir"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr "Ye_ni Durum Ä°letisini Kaydet"
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#, c-format
+msgid "Message edited at %s"
+msgstr "Mesaj, %s'de düzenlendi"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Status Messages"
-msgstr "Kayıtlı Durum İletileri"
+#: ../libempathy-gtk/empathy-theme-adium.c:1740
+msgid "Normal"
+msgstr "Normal"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "Klasik"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "Basit"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "Temiz"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "Mavi"
 
@@ -2384,19 +2749,19 @@ msgstr "Gelecekteki bağlantılarda bu seçimi hatırla"
 msgid "Certificate Details"
 msgstr "Sertifika Ayrıntıları"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1705
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
 msgstr "URI açılamıyor"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1800
+#: ../libempathy-gtk/empathy-ui-utils.c:1832
 msgid "Select a file"
 msgstr "Bir dosya seçin"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1904
 msgid "Insufficient free space to save file"
 msgstr "Dosyayı kaydetmek için yeterli boş alan yok"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#: ../libempathy-gtk/empathy-ui-utils.c:1912
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2405,7 +2770,7 @@ msgstr ""
 "Bu dosyayı kaydetmek için %s boş alan gerekiyor, ama sadece %s "
 "kullanılabilir alan var. Lütfen başka bir konum seçiniz."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1924
+#: ../libempathy-gtk/empathy-ui-utils.c:1956
 #, c-format
 msgid "Incoming file from %s"
 msgstr "%s'den gelen dosya"
@@ -2577,40 +2942,32 @@ msgstr "Batı"
 msgid "Vietnamese"
 msgstr "Vietnamca"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "Seçili kişi dosyaları alamıyor."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "Seçili kişi çevrimdışı."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:203
 msgid "No error message"
 msgstr "Hata iletisi yok"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:276
 msgid "Instant Message (Empathy)"
 msgstr "Anlık İleti (Empathy)"
 
-#: ../src/empathy.c:308
+#: ../src/empathy.c:434
 msgid "Don't connect on startup"
 msgstr "Başlangıçta bağlanma"
 
-#: ../src/empathy.c:312
+#: ../src/empathy.c:438
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr ""
 "Başlangıçta kişi listesi ya da herhangi bir iletişim penceresi gösterme"
 
-#: ../src/empathy.c:320
+#: ../src/empathy.c:453
 msgid "- Empathy IM Client"
 msgstr "- Empati MesajlaÅŸma Ä°stemcisi"
 
-#: ../src/empathy.c:499
+#: ../src/empathy.c:640
 msgid "Error contacting the Account Manager"
 msgstr "Hesap Yöneticisiyle temasa geçilirken hata oluştu"
 
-#: ../src/empathy.c:501
+#: ../src/empathy.c:642
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2664,8 +3021,7 @@ msgid "translator-credits"
 msgstr ""
 "Deniz Koçak <deniz.kocak@linux.org.tr>\n"
 "Barış Çiçek <baris@teamforce.name.tr>\n"
-"Muhammet Kara <muhammet.k@gmail.com>\n"
-"Launchpad Çevirmenleri"
+"Muhammet Kara <muhammet.k@gmail.com>"
 
 #: ../src/empathy-account-assistant.c:167
 msgid "There was an error while importing the accounts."
@@ -2762,8 +3118,8 @@ msgid "Select the accounts you want to import:"
 msgstr "İçe aktarmak istediğiniz hesapları seçin:"
 
 #: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:625
+#: ../src/empathy-new-chatroom-dialog.c:626
 msgid "Yes"
 msgstr "Evet"
 
@@ -2839,7 +3195,8 @@ msgid "Your new account has not been saved yet."
 msgstr "Yeni hesabınız henüz kaydedilmedi."
 
 #: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:809
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1330
 msgid "Connecting…"
 msgstr "Bağlanıyor..."
 
@@ -2882,7 +3239,7 @@ msgstr "%s'i bilgisayarınızdan silmek istiyor musunuz?"
 msgid "This will not remove your account on the server."
 msgstr "Bu, sunucudaki hesabınızı silmeyecektir."
 
-#: ../src/empathy-accounts-dialog.c:1434
+#: ../src/empathy-accounts-dialog.c:1432
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2891,15 +3248,15 @@ msgstr ""
 "kaybedecek. Devam etmek istediÄŸinize emin misiniz?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1652
+#: ../src/empathy-accounts-dialog.c:1643
 msgid "_Enable"
 msgstr "_EtkinleÅŸtir"
 
-#: ../src/empathy-accounts-dialog.c:1653
+#: ../src/empathy-accounts-dialog.c:1644
 msgid "_Disable"
 msgstr "_Devre dışı bırak"
 
-#: ../src/empathy-accounts-dialog.c:2174
+#: ../src/empathy-accounts-dialog.c:2154
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2908,18 +3265,22 @@ msgstr ""
 "kaybedecek. Devam etmek istediÄŸinize emin misiniz?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Ekle..."
+
+#: ../src/empathy-accounts-dialog.ui.h:2
 msgid "Loading account information"
 msgstr "Hesap bilgileri yükleniyor"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "No protocol installed"
 msgstr "Hiçbir protokol yüklü değil"
 
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Protocol:"
 msgstr "İletişim Kuralı:"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -2927,19 +3288,15 @@ msgstr ""
 "Yeni bir hesap eklemek için önce kullanmak istediğiniz protokollerin her "
 "biri için sisteminize bir arka uç kurmalısınız."
 
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add…"
-msgstr "_Ekle..."
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Import…"
 msgstr "_İçe aktar..."
 
-#: ../src/empathy-auth-client.c:250
+#: ../src/empathy-auth-client.c:249
 msgid " - Empathy authentication client"
 msgstr " -Empathy kimlik denetimi istemcisi"
 
-#: ../src/empathy-auth-client.c:266
+#: ../src/empathy-auth-client.c:265
 msgid "Empathy authentication client"
 msgstr "Empathy kimlik denetimi istemcisi"
 
@@ -2947,114 +3304,105 @@ msgstr "Empathy kimlik denetimi istemcisi"
 msgid "People nearby"
 msgstr "Yakındaki kişiler"
 
-#: ../src/empathy-av.c:118
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathy Ses/Görüntü İstemcisi"
 
-#: ../src/empathy-av.c:134
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy Ses/Görüntü İstemcisi"
 
-#: ../src/empathy-streamed-media-window.c:479
+#: ../src/empathy-streamed-media-window.c:431
 msgid "Contrast"
 msgstr "Karşıtlık"
 
-#: ../src/empathy-streamed-media-window.c:482
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Brightness"
 msgstr "Parlaklık"
 
-#: ../src/empathy-streamed-media-window.c:485
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Gamma"
 msgstr "Gama"
 
-#: ../src/empathy-streamed-media-window.c:590
+#: ../src/empathy-streamed-media-window.c:542
 msgid "Volume"
 msgstr "Ses Seviyesi"
 
-#: ../src/empathy-streamed-media-window.c:1166
+#: ../src/empathy-streamed-media-window.c:1110
 msgid "_Sidebar"
 msgstr "_Kenar çubuğu"
 
-#: ../src/empathy-streamed-media-window.c:1186
+#: ../src/empathy-streamed-media-window.c:1130
 msgid "Audio input"
 msgstr "Ses giriÅŸi"
 
-#: ../src/empathy-streamed-media-window.c:1190
+#: ../src/empathy-streamed-media-window.c:1134
 msgid "Video input"
 msgstr "Video giriÅŸi"
 
-#: ../src/empathy-streamed-media-window.c:1194
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Dialpad"
 msgstr "Tuş Takımı"
 
-#: ../src/empathy-streamed-media-window.c:1205
+#: ../src/empathy-streamed-media-window.c:1151
 msgid "Details"
 msgstr "Ayrıntılar"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1274
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1939
 #, c-format
 msgid "Call with %s"
 msgstr "%s ile çağrı"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-streamed-media-window.c:1353
-msgid "Call"
-msgstr "Çağrı"
-
-#: ../src/empathy-streamed-media-window.c:1507
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:2183
 msgid "The IP address as seen by the machine"
 msgstr "Makine tarafından görülen biçimde IP adresi"
 
-#: ../src/empathy-streamed-media-window.c:1509
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:2185
 msgid "The IP address as seen by a server on the Internet"
 msgstr "İnternetteki bir sunucu tarafından görülen biçimde IP adresi"
 
-#: ../src/empathy-streamed-media-window.c:1511
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:2187
 msgid "The IP address of the peer as seen by the other side"
 msgstr "Karşı taraftan görülen biçimde paylaşımcının IP adresi"
 
-#: ../src/empathy-streamed-media-window.c:1513
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:2189
 msgid "The IP address of a relay server"
 msgstr "Aktarım sunucusunun IP adresi"
 
-#: ../src/empathy-streamed-media-window.c:1515
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:2191
 msgid "The IP address of the multicast group"
 msgstr "Çoklu yayın grubunun IP adresi"
 
-#: ../src/empathy-streamed-media-window.c:1906
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "Bilinmiyor"
-
-#: ../src/empathy-streamed-media-window.c:1909
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "Bilinmiyor"
-
-#: ../src/empathy-streamed-media-window.c:1912
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "Bilinmiyor"
-
-#: ../src/empathy-streamed-media-window.c:1915
-msgctxt "decoding audio codec"
+#: ../src/empathy-streamed-media-window.c:1843
+#: ../src/empathy-streamed-media-window.c:1846
+#: ../src/empathy-streamed-media-window.c:1849
+#: ../src/empathy-streamed-media-window.c:1852
+#| msgid "Unknown"
+msgctxt "codec"
 msgid "Unknown"
 msgstr "Bilinmiyor"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2274
+#: ../src/empathy-streamed-media-window.c:2144
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Bağlı - %d:%02dd"
 
-#: ../src/empathy-streamed-media-window.c:2335
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2960
 msgid "Technical Details"
 msgstr "Teknik Detaylar"
 
-#: ../src/empathy-streamed-media-window.c:2373
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2998
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3063,7 +3411,8 @@ msgstr ""
 "%s'in yazılımı bilgisayarınız tarafından desteklenen ses formatlarının "
 "hiçbirini anlayamıyor"
 
-#: ../src/empathy-streamed-media-window.c:2378
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3003
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3072,7 +3421,8 @@ msgstr ""
 "%s'in yazılımı bilgisayarınız tarafından desteklenen video formatlarının "
 "hiçbirini anlamıyor"
 
-#: ../src/empathy-streamed-media-window.c:2384
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3009
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3081,22 +3431,26 @@ msgstr ""
 "%s ile bağlantı kurulamıyor. İçinizden biri doğrudan bağlantılara izin "
 "vermeyen bir ağ üzerinde olabilir."
 
-#: ../src/empathy-streamed-media-window.c:2390
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:3015
 msgid "There was a failure on the network"
 msgstr "AÄŸ' da bir hata oluÅŸtu"
 
-#: ../src/empathy-streamed-media-window.c:2394
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:3019
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "Bu çağrı için gerekli olan ses biçimleri bilgisayarınızda yüklü değil"
 
-#: ../src/empathy-streamed-media-window.c:2397
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:3022
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Bu çağrı için gerekli olan görüntü biçimleri bilgisayarınızda yüklü değil"
 
-#: ../src/empathy-streamed-media-window.c:2407
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:3034
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3107,147 +3461,195 @@ msgstr ""
 "\"%s\">bu hatayı bildirin</a> ve Yardım menüsündeki 'Hata Ayıklama' "
 "penceresinden alınan günlük kayıtlarını ekleyin."
 
-#: ../src/empathy-streamed-media-window.c:2415
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure in the call engine"
 msgstr "Çağrı motorunda bir hata oluştu"
 
-#: ../src/empathy-streamed-media-window.c:2418
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:3046
 msgid "The end of the stream was reached"
 msgstr "Akışın sonuna ulaşıldı"
 
-#: ../src/empathy-streamed-media-window.c:2458
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:3086
 msgid "Can't establish audio stream"
 msgstr "Ses akışı kurulamıyor"
 
-#: ../src/empathy-streamed-media-window.c:2468
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:3096
 msgid "Can't establish video stream"
 msgstr "Görüntü akışı kurulamıyor"
 
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "Audio"
 msgstr "Ses"
 
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "KiÅŸiyi tekrar ara"
-
 #: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "Kamera Kapalı"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "Kod Çözücü:"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "Kamera Açık"
+msgid "Disable camera"
+msgstr "Kamerayı devre dışı bırak"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Kod Çözücü:"
+msgid "Display the dialpad"
+msgstr "Tuş takımını göster"
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Kamerayı kapat ve görüntü göndermeyi bırak"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "Kodlayıcı:"
 
 #: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Kamerayı aç ve görüntü gönder"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Hang up"
+msgstr "Askıya al"
 
 #: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Kamerayı aç ama görüntü gönderme"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Hang up current call"
+msgstr "Geçerli aramayı kapat"
 
 #: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Kodlayıcı:"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "Yerel Aday:"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "Askıya al"
+msgid "Maximise me"
+msgstr "Beni büyüt"
 
 #: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Geçerli aramayı kapat"
+msgid "Minimise me"
+msgstr "Beni küçült"
 
 #: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Yerel Aday:"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "Uzaktaki Aday:"
 
 #: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "Önizleme"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Send Audio"
+msgstr "Ses Gönder"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "Tekrar arama"
+msgid "Send Video"
+msgstr "Video Gönder"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Uzaktaki Aday:"
+msgid "Show dialpad"
+msgstr "Tuş takımını göster"
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "Ses Gönder"
+msgid "Start a video call"
+msgstr "Görüntülü arama başlat"
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Ses aktarımını aç/kapat"
+msgid "Start an audio call"
+msgstr "Sesli arama baÅŸlat"
 
 #: ../src/empathy-call-window.ui.h:18
-msgid "Unknown"
-msgstr "Bilinmiyor"
+msgid "Swap camera"
+msgstr "Kamera deÄŸiÅŸtir"
 
 #: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "G_örüntü"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr "Ses aktarımını aç/kapat"
 
 #: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "Görüntü"
+msgid "Toggle video transmission"
+msgstr "Video aktarımını aç/kapat"
 
 #: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "Görüntü Kapalı"
-
-#: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "Görüntü Açık"
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:2590 ../src/empathy-call-window.c:2591
+#: ../src/empathy-call-window.c:2592 ../src/empathy-call-window.c:2593
+msgid "Unknown"
+msgstr "Bilinmiyor"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "Görüntü Önizleme"
+msgid "Video call"
+msgstr "Görüntülü arama"
 
 #: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "_Ara"
 
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:25
+msgid "_Camera"
+msgstr "_Kamera"
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:18
+msgid "_Contents"
+msgstr "_İçindekiler"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
+msgid "_Debug"
+msgstr "_Hata Ayıklama"
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:22
+msgid "_Help"
+msgstr "_Yardım"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Microphone"
+msgstr "_Mikrofon"
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "_Settings"
+msgstr "_Ayarlar"
+
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_Görünüm"
 
-#: ../src/empathy-chat-window.c:474 ../src/empathy-chat-window.c:494
+#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d okunmamış)"
 
-#: ../src/empathy-chat-window.c:486
+#: ../src/empathy-chat-window.c:493
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (ve %u diÄŸerleri)"
 
-#: ../src/empathy-chat-window.c:502
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d diğerlerinden okunmamış)"
 
-#: ../src/empathy-chat-window.c:511
+#: ../src/empathy-chat-window.c:518
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d hiçbirinden okunmamış)"
 
-#: ../src/empathy-chat-window.c:721
+#: ../src/empathy-chat-window.c:733
+msgid "SMS:"
+msgstr "SMS:"
+
+#: ../src/empathy-chat-window.c:743
+#, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "%d mesaj gönderiliyor"
+
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
 msgstr "Bir mesaj yazıyor."
 
@@ -3259,10 +3661,6 @@ msgstr "Temiz_le"
 msgid "C_ontact"
 msgstr "Bağla_ntı"
 
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Sohbet"
-
 #: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
 msgstr "Gülüm_seme Ekle"
@@ -3283,10 +3681,6 @@ msgstr "Sekmeyi _Sağa Taşı"
 msgid "Notify for All Messages"
 msgstr "Tüm İletileri Bildir"
 
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
-msgid "_Contents"
-msgstr "_İçindekiler"
-
 #: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "Ko_nuÅŸmalar"
@@ -3295,18 +3689,10 @@ msgstr "Ko_nuÅŸmalar"
 msgid "_Detach Tab"
 msgstr "_Sekmeyi Ayır"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
-msgid "_Edit"
-msgstr "Düzenl_e"
-
 #: ../src/empathy-chat-window.ui.h:13
 msgid "_Favorite Chat Room"
 msgstr "_Gözde Sohbet Odası"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
-msgid "_Help"
-msgstr "_Yardım"
-
 #: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "_Sonraki Sekme"
@@ -3327,15 +3713,15 @@ msgstr "Sek_meler"
 msgid "_Undo Close Tab"
 msgstr "Sekmeyi Kapat'ı _Geri Al"
 
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "Ad"
 
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
 msgstr "Oda"
 
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "Otomatik-BaÄŸlan"
 
@@ -3343,90 +3729,96 @@ msgstr "Otomatik-BaÄŸlan"
 msgid "Manage Favorite Rooms"
 msgstr "Sık Kullanılan Odaları Yönet"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming video call"
 msgstr "Gelen görüntülü arama"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1563
 msgid "Incoming call"
 msgstr "Gelen çağrı"
 
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:525
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s sizi görüntülü olarak arıyor. Yanıtlamak ister misiniz?"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s sizi arıyor. Yanıtlamak ister misiniz?"
 
-#: ../src/empathy-event-manager.c:515 ../src/empathy-event-manager.c:667
+#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1569
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s kişisinden gelen çağrı"
 
-#: ../src/empathy-event-manager.c:540
+#: ../src/empathy-event-manager.c:554
 msgid "_Reject"
 msgstr "_Reddet"
 
-#: ../src/empathy-event-manager.c:546
+#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
 msgid "_Answer"
 msgstr "Cev_apla"
 
-#: ../src/empathy-event-manager.c:667
+#: ../src/empathy-event-manager.c:570
+msgid "_Answer with video"
+msgstr "_Görüntülü olarak cevapla"
+
+#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1569
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "%s'den gelen görüntülü arama"
 
-#: ../src/empathy-event-manager.c:744
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
 msgstr "Oda daveti"
 
-#: ../src/empathy-event-manager.c:746
+#: ../src/empathy-event-manager.c:838
 #, c-format
 msgid "Invitation to join %s"
 msgstr "%s'e katılma daveti"
 
-#: ../src/empathy-event-manager.c:753
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s sizi %s 'e katılmanız için davet ediyor"
 
-#: ../src/empathy-event-manager.c:761
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
 msgstr "_Reddet"
 
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Katıl"
 
-#: ../src/empathy-event-manager.c:793
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s sizi %s 'e katılmanız için davet etti"
 
-#: ../src/empathy-event-manager.c:799
+#: ../src/empathy-event-manager.c:891
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "%s'e katılmaya davet edildiniz"
 
-#: ../src/empathy-event-manager.c:850
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "%s kiÅŸisinden gelen dosya transferi"
 
-#: ../src/empathy-event-manager.c:1020 ../src/empathy-main-window.c:373
+#: ../src/empathy-event-manager.c:1145 ../src/empathy-main-window.c:378
 msgid "Password required"
 msgstr "Parola gerekli"
 
-#: ../src/empathy-event-manager.c:1076
+#: ../src/empathy-event-manager.c:1210
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s çevrimiçi olduğunuz zaman sizi görebilmek için izin istiyor"
 
-#: ../src/empathy-event-manager.c:1080
+#: ../src/empathy-event-manager.c:1214
 #, c-format
 msgid ""
 "\n"
@@ -3512,7 +3904,7 @@ msgstr "\"%s\" dosyası %s kişisine gönderildi"
 msgid "File transfer completed"
 msgstr "Dosya transferi tamamlandı"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:783
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
 msgid "Waiting for the other participant's response"
 msgstr "Diğer katılımcının yanıtı bekleniyor"
 
@@ -3526,15 +3918,15 @@ msgstr "\"%s\" bütünlüğünü kontrol ediliyor"
 msgid "Hashing \"%s\""
 msgstr "Karma \"%s\""
 
-#: ../src/empathy-ft-manager.c:1029
+#: ../src/empathy-ft-manager.c:1026
 msgid "%"
 msgstr "%%"
 
-#: ../src/empathy-ft-manager.c:1041
+#: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "Dosya"
 
-#: ../src/empathy-ft-manager.c:1063
+#: ../src/empathy-ft-manager.c:1060
 msgid "Remaining"
 msgstr "Kalan"
 
@@ -3572,141 +3964,154 @@ msgstr "Protokol"
 msgid "Source"
 msgstr "Kaynak"
 
-#: ../src/empathy-main-window.c:390
+#: ../src/empathy-main-window.c:395
 msgid "Provide Password"
 msgstr "Parola Gir"
 
-#: ../src/empathy-main-window.c:396
+#: ../src/empathy-main-window.c:401
 msgid "Disconnect"
 msgstr "Bağlantıyı kes"
 
-#: ../src/empathy-main-window.c:536
+#: ../src/empathy-main-window.c:642
 msgid "No match found"
 msgstr "Eşleşme bulunamadı"
 
-#: ../src/empathy-main-window.c:691
+#: ../src/empathy-main-window.c:803
 msgid "Reconnect"
 msgstr "Yeniden BaÄŸlan"
 
-#: ../src/empathy-main-window.c:697
+#: ../src/empathy-main-window.c:809
 msgid "Edit Account"
 msgstr "Hesabı Düzenle"
 
-#: ../src/empathy-main-window.c:703
+#: ../src/empathy-main-window.c:815
 msgid "Close"
 msgstr "Kapat"
 
-#: ../src/empathy-main-window.c:1421
+#. Translators: this string will be something like:
+#. *   Top up My Account ($1.23)..."
+#: ../src/empathy-main-window.c:954
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr "%s doldur (%s)..."
+
+#: ../src/empathy-main-window.c:1001
+msgid "Top up account credit"
+msgstr "Hesap kontörü doldur"
+
+#. top up button
+#: ../src/empathy-main-window.c:1072
+msgid "Top Up..."
+msgstr "Doldur..."
+
+#: ../src/empathy-main-window.c:1815
 msgid "Contact"
 msgstr "Bağlantı"
 
-#: ../src/empathy-main-window.c:1768
+#: ../src/empathy-main-window.c:2190
 msgid "Contact List"
 msgstr "Bağlantı Listesi"
 
-#: ../src/empathy-main-window.c:1884
-msgid "Show and edit accounts"
-msgstr "Hesapları göster ve düzenle"
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "_Haritada Bağlantılar"
 
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-main-window-menubar.ui.h:2
+msgid "Credit Balance"
+msgstr "Kontör Bakiyesi"
+
+#: ../src/empathy-main-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "Bağlantı _Listesinde Bul"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "_Sık Kullanılanlara Katıl"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "Sık Kullanılanları Yönet"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "_Normal Boyut"
 
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "Yeni _Arama..."
 
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "_Avatarlar ile Normal Boyut"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "Te_rcihler"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "İletişim Ku_rallarını Göster"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "_Ada Göre Sırala"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "_Duruma Göre Sırala"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "Hes_aplar"
 
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "_Engellenen KiÅŸiler"
 
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "_Sıkışık Boyut"
 
-#: ../src/empathy-main-window.ui.h:18
-msgid "_Debug"
-msgstr "_Hata Ayıklama"
-
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "_Dosya Transferleri"
 
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "_Katıl..."
 
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "Ye_ni Görüşme..."
 
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "Ç_evrim Dışı Bağlantılar"
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "_KiÅŸisel Bilgi"
 
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "_Oda"
 
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window-menubar.ui.h:29
 msgid "_Search for Contacts…"
 msgstr "_KiÅŸi Ara..."
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Sohbet Odası"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "Ãœyeler"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:560
+#: ../src/empathy-new-chatroom-dialog.c:623
 #, c-format
 msgid ""
 "%s\n"
@@ -3719,16 +4124,16 @@ msgstr ""
 "Parola gerekli: %s\n"
 "Ãœyeler: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:625
+#: ../src/empathy-new-chatroom-dialog.c:626
 msgid "No"
 msgstr "Hayır"
 
-#: ../src/empathy-new-chatroom-dialog.c:591
+#: ../src/empathy-new-chatroom-dialog.c:654
 msgid "Could not start room listing"
 msgstr "Oda listesi başlatılamadı"
 
-#: ../src/empathy-new-chatroom-dialog.c:601
+#: ../src/empathy-new-chatroom-dialog.c:664
 msgid "Could not stop room listing"
 msgstr "Oda listesi durdurulamadı"
 
@@ -3763,39 +4168,79 @@ msgstr "Oda Listesi"
 msgid "_Room:"
 msgstr "_Oda:"
 
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr "Mesaj alındı"
 
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr "Mesaj gönderildi"
 
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
 msgstr "Yeni sohbet"
 
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
 msgstr "Bağlantı çevrimiçi oldu"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
 msgstr "Bağlantı çevrimdışı oldu"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
 msgstr "Hesap bağlı"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
 msgstr "Hesap bağlı değil"
 
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr "Dil"
 
-#: ../src/empathy-preferences.c:875
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:734
+msgid "Juliet"
+msgstr "Juliet"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:741
+msgid "Romeo"
+msgstr "Romeo"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:747
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr "Ah Romeo, Romeo, neden Romeo'sun sen?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:750
+msgid "Deny thy father and refuse thy name;"
+msgstr "İnkar et babanı ve adını yadsı;"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:753
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr "Yapamazsan, yemin et sevdiÄŸine"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:756
+msgid "And I'll no longer be a Capulet."
+msgstr "Vazgeçeyim Capulet olmaktan ben."
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:759
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr "Daha dinleyeyim mi, yoksa açılayım mı ona?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:762
+msgid "Juliet has disconnected"
+msgstr "Juliet bağlı değil"
+
+#: ../src/empathy-preferences.c:1166
 msgid "Preferences"
 msgstr "Tercihler"
 
@@ -3803,67 +4248,87 @@ msgstr "Tercihler"
 msgid "Appearance"
 msgstr "Görünüm"
 
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
 msgstr "Davranış"
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
 msgid "Chat Th_eme:"
 msgstr "Sohbet T_eması:"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
 msgid "Disable notifications when _away or busy"
 msgstr "Uz_akta veya meşgul iken uyarıları etkisizleştir"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
 msgid "Disable sounds when _away or busy"
 msgstr "Uz_akta veya meÅŸgul iken sesleri etkisizleÅŸtir"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Gelen olayları bildirim alanında göster"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"Yankı giderme, karşıdaki kişinin sesinizi daha net duymasına yardımcı olur, "
+"fakat bazı bilgisayarlarda sorunlara yol açabilir. Siz ya da karşıdaki kişi, "
+"aramalar sırasında garip sesler ya da hışırtılar duyarsanız, yankı gidermeyi "
+"devre dışı bırakıp aramayı yeniden başlatmayı deneyin."
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "Bir kişi çevrimiçi olduğunda uyarıları etkinleştir"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "Bir kişi çevrimdışı kalırsa uyarıları etkinleştir"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "_Sohbet odaklı değilken uyarıları etkinleştir"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "Diller için yazım denetimini etkinleştir:"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "Genel"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input level:"
+msgstr "Giriş düzeyi:"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "Giriş ses düzeyi:"
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "Konum kaynakları:"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "Görüşmelerin günlüğünü tut"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "Uyarılar"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Etkinlikler için ses çal"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "Gizlilik"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -3873,66 +4338,70 @@ msgstr ""
 "bilgisinden daha fazla kesin olmayacak demektir. GPS koordinatları 1 ondalık "
 "basamağa kadar doğru olacaktır."
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "Gülüm_semeleri görüntü olarak göster"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "Odalarda kişi _listesini göster"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "Sesler"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "Ä°mla Denetimi"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "Dillerin listesi sadece sözlük yüklü dilleri yansıtır."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "Temalar"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:30
+msgid "Variant:"
+msgstr "Varyant:"
+
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "_Açılışta otomatik bağlan"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Cep Telefonu"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "Balon uyarıları _etkinleştir"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "Ses uyarılarını _etkinleştir"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_AÄŸ (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "Yeni s_ohbetleri ayrı pencerelerde aç"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "Bağlantılarıma _konumumu yayınla"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "_Konum hassasiyetini indirge"
 
@@ -3944,117 +4413,178 @@ msgstr "Durum"
 msgid "_Quit"
 msgstr "Çı_k"
 
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "KiÅŸiyi tekrar ara"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "Kamera Kapalı"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "Kamera Açık"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "Kamerayı kapat ve görüntü göndermeyi bırak"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "Kamerayı aç ve görüntü gönder"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "Kamerayı aç ama görüntü gönderme"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "Önizleme"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "Tekrar arama"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "G_örüntü"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "Görüntü Kapalı"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "Görüntü Açık"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "Görüntü Önizleme"
+
 #: ../src/empathy-map-view.c:448
 msgid "Contact Map View"
 msgstr "Bağlantı Harita Görünümü"
 
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
 msgid "Save"
 msgstr "Kayıt"
 
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
 msgstr "Debug Penceresi"
 
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
 msgstr "Duraklat"
 
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
 msgstr "Seviye"
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
 msgid "Debug"
 msgstr "Debug"
 
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
 msgid "Info"
 msgstr "Bilgi"
 
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
 msgid "Message"
 msgstr "Mesaj"
 
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
 msgid "Warning"
 msgstr "Uyarı"
 
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
 msgid "Critical"
 msgstr "Kritik"
 
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
 msgid "Error"
 msgstr "Hata"
 
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
 msgid "Time"
 msgstr "Zaman"
 
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
 msgid "Domain"
 msgstr "Alan"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
 msgstr "Kategori"
 
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "Seviye"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr ""
 "Seçilen bağlantı yöneticisi uzaktan hata ayıklama eklentisini desteklemiyor."
 
-#: ../src/empathy-invite-participant-dialog.c:34
-#: ../src/empathy-invite-participant-dialog.c:48
+#: ../src/empathy-invite-participant-dialog.c:179
+#: ../src/empathy-invite-participant-dialog.c:205
 msgid "Invite Participant"
 msgstr "Katılımcı Davet Et"
 
-#: ../src/empathy-invite-participant-dialog.c:35
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Görüşmeye davet etmek için bir kişi seçin:"
 
-#: ../src/empathy-invite-participant-dialog.c:45
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "Davet et"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:184
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "Hiçbir iletişim penceresi gösterme; yapılacakları yap (içe aktarma vb.) ve "
 "çık"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:188
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "Sadece \"Yakındaki Kişiler\" hesapları olmadıkça hiçbir iletişim penceresi "
 "gösterme"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:192
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "İlk olarak verilen hesabı seçin (örn: gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:194
 msgid "<account-id>"
 msgstr "<hesap-kimliÄŸi>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:197
+#| msgid "Show the accounts dialog"
+msgid "Show account assistant"
+msgstr "Hesap yardımcısını göster"
+
+#: ../src/empathy-accounts.c:203
 msgid "- Empathy Accounts"
 msgstr "- Empathy Hesapları"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:242
 msgid "Empathy Accounts"
 msgstr "Empathy Hesapları"
 
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr "Belli bir hizmeti göster"
+
+#: ../src/empathy-debugger.c:75
+msgid "- Empathy Debugger"
+msgstr "- Empathy Hata Ayıklayıcısı"
+
+#: ../src/empathy-debugger.c:114
 msgid "Empathy Debugger"
 msgstr "Empathy Hata Ayıklayıcısı"
 
@@ -4062,47 +4592,139 @@ msgstr "Empathy Hata Ayıklayıcısı"
 msgid "- Empathy Chat Client"
 msgstr "- Empati Sohbet Ä°stemcisi"
 
-#: ../src/empathy-notifications-approver.c:184
+#: ../src/empathy-notifications-approver.c:203
 msgid "Respond"
 msgstr "Yanıtla"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1573
 msgid "Reject"
 msgstr "Reddet"
 
-#: ../src/empathy-notifications-approver.c:194
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1574
 msgid "Answer"
 msgstr "Yanıtla"
 
-#: ../src/empathy-notifications-approver.c:201
-#: ../src/empathy-notifications-approver.c:211
+#: ../src/empathy-notifications-approver.c:227
+msgid "Answer with video"
+msgstr "Görüntülü olarak cevapla"
+
+#: ../src/empathy-notifications-approver.c:235
+#: ../src/empathy-notifications-approver.c:245
 msgid "Decline"
 msgstr "Reddet"
 
-#: ../src/empathy-notifications-approver.c:205
-#: ../src/empathy-notifications-approver.c:216
+#: ../src/empathy-notifications-approver.c:239
+#: ../src/empathy-notifications-approver.c:250
 msgid "Accept"
 msgstr "Kabul Et"
 
-#: ../src/empathy-notifications-approver.c:223
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:260
 msgid "Provide"
 msgstr "SaÄŸla"
 
-#: ../src/empathy-call-observer.c:130
-#, c-format
-msgid "Missed call from %s"
-msgstr "Cevapsız çağrı %s"
-
-#: ../src/empathy-call-observer.c:133
+#: ../src/empathy-call-observer.c:134
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s sizi aramayı denedi, fakat siz başka bir arama ile meşguldünüz."
 
-#: ../libempathy-gtk/empathy-search-bar.c:282
-#| msgid "Match case"
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1183 ../src/empathy-call-window.c:1206
+msgid "i"
+msgstr "i"
+
+#: ../src/empathy-call-window.c:2889
+msgid "On hold"
+msgstr "Beklemede"
+
+#: ../src/empathy-call-window.c:2892
+msgid "Mute"
+msgstr "Sessiz"
+
+#: ../src/empathy-call-window.c:2894
+msgid "Duration"
+msgstr "Süre"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2897
+#, c-format
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02ds"
+
+#: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "_BÜYÜK/küçük harf eşleştir"
 
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Empati kelebek (butterfly) kayıtlarını taşıdı"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Empathynin kelebek kayıtlarını taşıyıp taşımadığı."
+
+#~ msgid "Select a contact"
+#~ msgstr "Bir bağlantı seç"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "Seçili kişi dosyaları alamıyor."
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "Seçili kişi çevrimdışı."
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Bilinmiyor"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Bilinmiyor"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Bilinmiyor"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Bilinmiyor"
+
+#~ msgid "All"
+#~ msgstr "Hepsi"
+
+#~ msgid "Date"
+#~ msgstr "Tarih"
+
+#~ msgid "Conversations"
+#~ msgstr "KonuÅŸmalar"
+
+#~ msgid "Find Next"
+#~ msgstr "Sonrakini Bul"
+
+#~ msgid "Find Previous"
+#~ msgstr "Öncekini Bul"
+
+#~ msgid "Previous Conversations"
+#~ msgstr "Önceki Konuşmalar"
+
+#~ msgid "_For:"
+#~ msgstr "_Aranan:"
+
+#~ msgid "Enter Custom Message"
+#~ msgstr "Özel Mesaj Girin"
+
+#~ msgid "Save _New Status Message"
+#~ msgstr "Ye_ni Durum Ä°letisini Kaydet"
+
+#~ msgid "Saved Status Messages"
+#~ msgstr "Kayıtlı Durum İletileri"
+
+#~ msgid "Show and edit accounts"
+#~ msgstr "Hesapları göster ve düzenle"
+
 #~ msgid "_Enabled"
 #~ msgstr "_Etkin"
 
@@ -4118,9 +4740,6 @@ msgstr "_BÜYÜK/küçük harf eşleştir"
 #~ msgid "MC 4 accounts have been imported."
 #~ msgstr "MC 4 hesapları içe aktarıldı."
 
-#~ msgid "Salut account is created"
-#~ msgstr "Salut hesabı yaratıldı"
-
 #~ msgid ""
 #~ "Whether or not Empathy has asked about importing accounts from other "
 #~ "programs."
@@ -4215,9 +4834,6 @@ msgstr "_BÜYÜK/küçük harf eşleştir"
 #~ msgid "Set your own presence"
 #~ msgstr "Kendi durumunuzu belirtin"
 
-#~ msgid "Show the accounts dialog"
-#~ msgstr "Hesaplar penceresini göster"
-
 #~ msgid "The error message was: <span style=\"italic\">%s</span>"
 #~ msgstr "Hata mesajı: <span style=\"italic\">%s</span>"
 
@@ -4241,9 +4857,6 @@ msgstr "_BÜYÜK/küçük harf eşleştir"
 #~ "Daha sonraki bir zamanda hesabı geri eklemeye karar verirseniz yine de "
 #~ "erişilebilir olacaklardır."
 
-#~ msgid "Accounts"
-#~ msgstr "Hesaplar"
-
 #~ msgid "Add new"
 #~ msgstr "Yeni ekle"
 
@@ -4295,9 +4908,6 @@ msgstr "_BÜYÜK/küçük harf eşleştir"
 #~ msgid "Allow _network usage"
 #~ msgstr "_Ağ kullanımına izin ver"
 
-#~ msgid "Geoclue Settings"
-#~ msgstr "Geoclue Ayarlar"
-
 #~ msgid "Unable to start application for service %s: %s"
 #~ msgstr "%s servisi için uygulama başlatılamıyor: %s"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0c93ff90c..7ce025242 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -23,8 +23,8 @@ msgstr ""
 "Project-Id-Version: empathy master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-08-15 13:23+0000\n"
-"PO-Revision-Date: 2011-08-21 23:56+0800\n"
+"POT-Creation-Date: 2011-09-26 10:41+0000\n"
+"PO-Revision-Date: 2011-09-27 16:14+0000\n"
 "Last-Translator: Julius Wong <villahwong@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -66,405 +66,413 @@ msgid "Camera device"
 msgstr "相机设备"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "相机�置"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr "在群�中使用昵称补全时在昵称��添加的字符。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "�天窗�主题"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Chat window theme variant"
 msgstr "�天窗�主题�生"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr "用于拼写检查器的语言的列表，以逗�分隔(例如：en, fr, nl)。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "紧凑显示�系人列表"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "应该使用连接管�器"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "�系人列表排��件"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr "视频呼�时默认使用的相机设备，例如 /dev/video0。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
 msgstr "默认的选�头�图片的目录"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr "离开时�用弹出�示"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr "离开时�用声音"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
 msgstr "在状��显示呼入事件。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
 msgstr "在状��显示呼入事件。如果为 false 则立�显示给用户。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Echo cancellation support"
 msgstr "回声抑制支�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr "Empathy 能够�布用户的�置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy 能够通过 GPS �估计�置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy 能够通过手机�估计�置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy 能够通过网络�估计�置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr "Empathy 默认下载文件夹"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
 msgstr "Empathy 已��移至 telepathy-butterfly 日志"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy 空闲时是�自动离开"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy �动时是�自动连接"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "�低 Emapthy �置信�的准确度"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy 是�使用�系人头�作为�天窗�图标"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr "�用 WebKit 开�工具"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "�用新消�弹出�示"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "�用拼写检查器"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "��主窗�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "��主窗�。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "昵称补全字符"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "在�独窗�中打开新�天"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "Adium 主题的路径"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "如果�天使用 Adium 主题，使用 Adium 主题的路径"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "收到消�时播放声音"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "新对�时播放声音"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "�出消�时播放声音"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "�系人登录时播放声音"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "�系人注销时播放声音"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "登录时播放声音"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "注销时播放声音"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "如果�天窗��是焦点则弹出消�通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "当�系人登录时弹出通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "当�系人注销时弹出通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr "在通�时摄�头预览的�置。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Show Balance in contact list"
 msgstr "在�系人列表中显示余�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "显示头�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "在�天室显示�系人列表"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr "关闭主窗�时显示�示"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr "显示离线�系人"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
 msgstr "显示�议"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "拼写检查器语言"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr "�存传�文件的默认文件夹。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
 msgstr "上次选�头�图片的目录。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
 msgstr "�天窗�边�的�置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "�天窗�边��存的�置(�素)。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "用于在�天窗�中显示会�的主题。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr "用于在�天窗�中显示会�的主题。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "使用表情图标"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "使用通知声音"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "为�天室使用主题"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "是��许 Empathy 将用户的�置共享给�系人"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "是��许 Empathy 通过 GPS 估计�置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "是��许 Empathy 通过手机网络估计�置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "是��许 Empathy 通过网络估计�置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "Empathy 是�已��移至 telepathy-butterfly 日志。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Empathy 是�在�动时自动登入您的��。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr "Empathy 是�应在用户空闲时自动进入离开模�。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "是�出于��原因�低 Empathy �置信�的准确度。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "是�使用�系人的头�作为�天窗�的图标。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "WebKit 开�工具，例如 Web Inspector 是�应该�用。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr "是�使用连接管�器自动断开连接或�新连接。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "是�对您想�作拼写检查的��作拼写检查。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "对�时是�将表情符�转�为表情图标。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr "是��用 Pulseaudio 的回声抑制过滤器。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "是�需��系人上线�示音。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "是�需��系人下线�示音。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "是�需�事件�示音。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "是�需�消�到达�示音。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "是�需�新会��示音。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "是�为外出消�使用声音�示。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "当�网登录时是�播放�示音。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "当网络断开时是�播放�示音。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr "当离开或忙碌时是�使用声音�示。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "当�系人离线时是�显示弹出通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "当�系人上线时是�显示弹出通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
 msgstr "如果�天窗�已开�，但�是当�窗�，接收新消�时是�弹出�示。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "当收到新消�时是�弹出显示�示框。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show account balances in the contact list."
 msgstr "是�在�系人列表和�天窗�中显示余�。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "是�在�系人列表和�天窗�中显示头�。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "是�显示�系人清�中离线的�系人。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
 msgstr "当离开或忙碌时是�弹出显示�示框。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "是�在�系人列表和�天窗�中显示�议。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr "是�在�天室显示�系人列表。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "是�以紧凑模�显示�系人列表。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
 msgstr "当使用标题�中的“X�按钮关闭主窗�时是�显示�示对�框。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "是�对�天室使用主题。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -487,30 +495,30 @@ msgstr "消�和 VoIP ��"
 msgid "File transfer completed, but the file was corrupted"
 msgstr "文件传输完�，但该文件已��"
 
-#: ../libempathy/empathy-ft-handler.c:1113
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
 msgstr "文件传输�支�远程连接"
 
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is not a regular file"
 msgstr "所选文件是�正常的文件"
 
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1176
 msgid "The selected file is empty"
 msgstr "所选文件是空的"
 
-#: ../libempathy/empathy-message.c:413 ../src/empathy-call-observer.c:132
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
 #, c-format
 msgid "Missed call from %s"
 msgstr "未接�电：%s"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:417
+#: ../libempathy/empathy-message.c:419
 #, c-format
 msgid "Called %s"
 msgstr "与 %s 通�"
 
-#: ../libempathy/empathy-message.c:420
+#: ../libempathy/empathy-message.c:422
 #, c-format
 msgid "Call from %s"
 msgstr "�电：%s"
@@ -543,161 +551,161 @@ msgstr "当传输这个文件的时候�生错误"
 msgid "The other participant is unable to transfer the file"
 msgstr "�外的�与者无法传输这个文件"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
 msgid "Unknown reason"
 msgstr "未知原因"
 
-#: ../libempathy/empathy-utils.c:212
+#: ../libempathy/empathy-utils.c:232
 msgid "Available"
 msgstr "在线"
 
-#: ../libempathy/empathy-utils.c:214
+#: ../libempathy/empathy-utils.c:234
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libempathy/empathy-utils.c:217
+#: ../libempathy/empathy-utils.c:237
 msgid "Away"
 msgstr "离开"
 
-#: ../libempathy/empathy-utils.c:219
+#: ../libempathy/empathy-utils.c:239
 msgid "Invisible"
 msgstr "�身"
 
-#: ../libempathy/empathy-utils.c:221
+#: ../libempathy/empathy-utils.c:241
 msgid "Offline"
 msgstr "离线"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:224
+#: ../libempathy/empathy-utils.c:244
 msgctxt "presence"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libempathy/empathy-utils.c:264
+#: ../libempathy/empathy-utils.c:284
 msgid "No reason specified"
 msgstr "未指定原因"
 
-#: ../libempathy/empathy-utils.c:266 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
 msgid "Status is set to offline"
 msgstr "状�已设置为离线"
 
-#: ../libempathy/empathy-utils.c:268 ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
 #: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "网络错误"
 
-#: ../libempathy/empathy-utils.c:270 ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
 msgid "Authentication failed"
 msgstr "验�失败"
 
-#: ../libempathy/empathy-utils.c:272 ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
 msgid "Encryption error"
 msgstr "加密错误"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:294
 msgid "Name in use"
 msgstr "用户�已�被�用"
 
-#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:308
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate not provided"
 msgstr "未�供�书"
 
-#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate untrusted"
 msgstr "�书�被信任"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
 msgid "Certificate expired"
 msgstr "�书已过期"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
 msgid "Certificate not activated"
 msgstr "�书尚未激活"
 
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
 msgid "Certificate hostname mismatch"
 msgstr "�书主机��匹�"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
 msgid "Certificate fingerprint mismatch"
 msgstr "�书指纹�匹�"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
 msgid "Certificate self-signed"
 msgstr "�书是自签属的"
 
-#: ../libempathy/empathy-utils.c:290
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate error"
 msgstr "�书错误"
 
-#: ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:344
 msgid "Encryption is not available"
 msgstr "加密��用"
 
-#: ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:346
 msgid "Certificate is invalid"
 msgstr "�书无效"
 
-#: ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:348
 msgid "Connection has been refused"
 msgstr "连接被拒�"
 
-#: ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:350
 msgid "Connection can't be established"
 msgstr "无法建立连接"
 
-#: ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:352
 msgid "Connection has been lost"
 msgstr "连接已丢失"
 
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:354
 msgid "This resource is already connected to the server"
 msgstr "该资�已被连接至�务器"
 
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:356
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "连接已被使用相�资�的新连接�代"
 
-#: ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:359
 msgid "The account already exists on the server"
 msgstr "�务器上已存在该��"
 
-#: ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:361
 msgid "Server is currently too busy to handle the connection"
 msgstr "�务器太忙，无法处�当�连接"
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:363
 msgid "Certificate has been revoked"
 msgstr "�书已被�销"
 
 # lainme：�书使用�安全的加密算法或是弱加密的
 # xslidian：�书使用的加密算法�安全或者易被破解
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:365
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "�书使用�安全的加密算法或者是弱加密的"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:368
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr "�务器�书的长度——或�务器�书链的深度——超出了加密库的硬性�制"
 
-#: ../libempathy/empathy-utils.c:509
+#: ../libempathy/empathy-utils.c:529
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "附近的人"
 
-#: ../libempathy/empathy-utils.c:514
+#: ../libempathy/empathy-utils.c:534
 msgid "Yahoo! Japan"
 msgstr "Yahoo! 日本"
 
-#: ../libempathy/empathy-utils.c:543
+#: ../libempathy/empathy-utils.c:563
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:544
+#: ../libempathy/empathy-utils.c:564
 msgid "Facebook Chat"
 msgstr "Facebook �天"
 
@@ -741,71 +749,81 @@ msgstr[0] "%d 月�"
 msgid "in the future"
 msgstr "将�"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:539
+#: ../libempathy-gtk/empathy-account-chooser.c:540
 msgid "All accounts"
 msgstr "全部��"
 
-#: ../libempathy-gtk/empathy-account-widget.c:693
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "密�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "�务器"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "端�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:768
-#: ../libempathy-gtk/empathy-account-widget.c:825
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s："
 
-#: ../libempathy-gtk/empathy-account-widget.c:1166
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "我的网络��"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "%s ��通过我的网络�户进行了编辑。"
+msgid "The account %s is edited via %s."
+msgstr "%s ��通过 %s 进行了编辑。"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1172
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "%s ��无法在 Empathy 中编辑。"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
 msgstr "�动我的网络��"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1532
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "编辑 %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "用户�："
 
-#: ../libempathy-gtk/empathy-account-widget.c:1850
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "应用(_P)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1880
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
 msgstr "登录(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1954
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "�务器上已存在该��"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1957
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "在�务器上创建新的��"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2149
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "�消(_N)"
 
@@ -814,19 +832,19 @@ msgstr "�消(_N)"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2427
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%2$s 中的 %1$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2453
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "%s ��"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2457
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "新建��"
 
@@ -948,36 +966,36 @@ msgstr "您的 ICQ UIN 是什么？"
 msgid "What is your ICQ password?"
 msgstr "您的 ICQ 密�是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:184
-#: ../libempathy-gtk/empathy-account-widget-sip.c:217
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "自动"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:187
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:193
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:222
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "注册"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:227
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "选项"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "æ— "
 
@@ -1206,14 +1224,18 @@ msgid "Transport:"
 msgstr "传输："
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "用此账户拨打固定电�和手机(_L)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "您的 SIP ��密�是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "您的 SIP 登录 ID 是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "用户�(_U)："
 
@@ -1237,36 +1259,36 @@ msgstr "Yahoo I_D："
 msgid "_Room List locale:"
 msgstr "�天室列表 locale(_R)："
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:474
-#: ../libempathy-gtk/empathy-avatar-chooser.c:559
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "无法转�图�"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:475
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "没有任何接�的图片格�能被您的系统支�"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:822
-msgid "Couldn't save pixbuf to png"
-msgstr "无法将 pixbuf �存为 PNG"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+msgid "Couldn't save picture to file"
+msgstr "无法将图片�存为文件"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "选择您的头�图片"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:942
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
 msgstr "照相..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:945
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "无图�"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "图�"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1009
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "所有文件"
 
@@ -1295,62 +1317,62 @@ msgstr "选择的�系人无效"
 msgid "Emergency calls are not supported on this protocol"
 msgstr "�支�在此会�上进行紧急呼�"
 
-#: ../libempathy-gtk/empathy-chat.c:702
+#: ../libempathy-gtk/empathy-chat.c:704
 msgid "Failed to open private chat"
 msgstr "建立�人对�失败"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:765
 msgid "Topic not supported on this conversation"
 msgstr "�支�在此会�上设置主题"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:771
 msgid "You are not allowed to change the topic"
 msgstr "您�能更改主题"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:975
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "%s 是无效的�系人 ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1030
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear：清空当�会�的所有消�"
 
-#: ../libempathy-gtk/empathy-chat.c:1033
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <主题>：设定当�对�的主题"
 
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <�天室�>：加入一个新的�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1039
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <�天室�>：加入一个新的�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1043
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr "/用户[<�天室ID>] [<原因>]：当�默认离开�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1047
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <昵称> [<消�>]：打开一个�人�天"
 
-#: ../libempathy-gtk/empathy-chat.c:1050
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <昵称> <消�>：打开一个�人�天"
 
-#: ../libempathy-gtk/empathy-chat.c:1053
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <昵称>：在当��务器上改�您的昵称"
 
-#: ../libempathy-gtk/empathy-chat.c:1056
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <动作消�>：�当�对�中��一个动作消�"
 
-#: ../libempathy-gtk/empathy-chat.c:1059
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1359,124 +1381,124 @@ msgstr ""
 "/say <消�>：�� <消�> 到当�对�。这是用���一个“/�开始的信�。例如：“/"
 "say /join 是用�加入一个新的�天室�"
 
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <�系人 ID>：显示一个�系人的信�"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr ""
 "/help [<命令>]：显示所有支�的命令。如果 <命令> 是有定义的，则显示它的用法。"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1114
 #, c-format
 msgid "Usage: %s"
 msgstr "用法：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1116
+#: ../libempathy-gtk/empathy-chat.c:1159
 msgid "Unknown command"
 msgstr "未知命令"
 
-#: ../libempathy-gtk/empathy-chat.c:1242
+#: ../libempathy-gtk/empathy-chat.c:1285
 msgid "Unknown command; see /help for the available commands"
 msgstr "未知命令，请使用 /help 查阅�用命令"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1412
+#: ../libempathy-gtk/empathy-chat.c:1455
 msgid "insufficient balance to send message"
 msgstr "余��足，无法��消�"
 
-#: ../libempathy-gtk/empathy-chat.c:1414
+#: ../libempathy-gtk/empathy-chat.c:1457
 msgid "not capable"
 msgstr "��到"
 
-#: ../libempathy-gtk/empathy-chat.c:1421
+#: ../libempathy-gtk/empathy-chat.c:1464
 msgid "offline"
 msgstr "离线"
 
-#: ../libempathy-gtk/empathy-chat.c:1424
+#: ../libempathy-gtk/empathy-chat.c:1467
 msgid "invalid contact"
 msgstr "无效�系人"
 
-#: ../libempathy-gtk/empathy-chat.c:1427
+#: ../libempathy-gtk/empathy-chat.c:1470
 msgid "permission denied"
 msgstr "���足"
 
-#: ../libempathy-gtk/empathy-chat.c:1430
+#: ../libempathy-gtk/empathy-chat.c:1473
 msgid "too long message"
 msgstr "消�太长"
 
-#: ../libempathy-gtk/empathy-chat.c:1433
+#: ../libempathy-gtk/empathy-chat.c:1476
 msgid "not implemented"
 msgstr "尚未实现"
 
-#: ../libempathy-gtk/empathy-chat.c:1437
+#: ../libempathy-gtk/empathy-chat.c:1480
 msgid "unknown"
 msgstr "未知"
 
-#: ../libempathy-gtk/empathy-chat.c:1443
+#: ../libempathy-gtk/empathy-chat.c:1486
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "��消�“%s�出错：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1447
+#: ../libempathy-gtk/empathy-chat.c:1490
 #, c-format
 msgid "Error sending message: %s"
 msgstr "��消�出错：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1508 ../src/empathy-chat-window.c:760
+#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "�题："
 
-#: ../libempathy-gtk/empathy-chat.c:1520
+#: ../libempathy-gtk/empathy-chat.c:1563
 #, c-format
 msgid "Topic set to: %s"
 msgstr "�题被设置为：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "No topic defined"
 msgstr "未设置�题"
 
-#: ../libempathy-gtk/empathy-chat.c:2031
+#: ../libempathy-gtk/empathy-chat.c:2074
 msgid "(No Suggestions)"
 msgstr "(没有建议)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2099
+#: ../libempathy-gtk/empathy-chat.c:2142
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "添加“%s�到字典"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2136
+#: ../libempathy-gtk/empathy-chat.c:2179
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "添加“%s�到 %s 字典"
 
-#: ../libempathy-gtk/empathy-chat.c:2206
+#: ../libempathy-gtk/empathy-chat.c:2249
 msgid "Insert Smiley"
 msgstr "�入表情"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2224
-#: ../libempathy-gtk/empathy-ui-utils.c:1757
+#: ../libempathy-gtk/empathy-chat.c:2267
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "��(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2278
+#: ../libempathy-gtk/empathy-chat.c:2321
 msgid "_Spelling Suggestions"
 msgstr "拼写建议(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2367
+#: ../libempathy-gtk/empathy-chat.c:2410
 msgid "Failed to retrieve recent logs"
 msgstr "获�最近日志失败"
 
-#: ../libempathy-gtk/empathy-chat.c:2504
+#: ../libempathy-gtk/empathy-chat.c:2547
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已断开连接"
@@ -1484,12 +1506,12 @@ msgstr "%s 已断开连接"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2511
+#: ../libempathy-gtk/empathy-chat.c:2554
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 被 %2$s 踢出"
 
-#: ../libempathy-gtk/empathy-chat.c:2514
+#: ../libempathy-gtk/empathy-chat.c:2557
 #, c-format
 msgid "%s was kicked"
 msgstr "%s 被踢出"
@@ -1497,17 +1519,17 @@ msgstr "%s 被踢出"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2522
+#: ../libempathy-gtk/empathy-chat.c:2565
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%s 已被 %s �止"
 
-#: ../libempathy-gtk/empathy-chat.c:2525
+#: ../libempathy-gtk/empathy-chat.c:2568
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被�止"
 
-#: ../libempathy-gtk/empathy-chat.c:2529
+#: ../libempathy-gtk/empathy-chat.c:2572
 #, c-format
 msgid "%s has left the room"
 msgstr "%s 离开了�天室"
@@ -1517,68 +1539,72 @@ msgstr "%s 离开了�天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2538
+#: ../libempathy-gtk/empathy-chat.c:2581
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2606
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s 加入了�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:2588
+#: ../libempathy-gtk/empathy-chat.c:2631
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 现在�� %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2727
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2784
 #: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1241 ../src/empathy-call-window.c:2264
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
+#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
 msgid "Disconnected"
 msgstr "已断开连接"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3374
+#: ../libempathy-gtk/empathy-chat.c:3428
 msgid "Would you like to store this password?"
 msgstr "是��存密�?"
 
-#: ../libempathy-gtk/empathy-chat.c:3380
+#: ../libempathy-gtk/empathy-chat.c:3434
 msgid "Remember"
 msgstr "记录"
 
-#: ../libempathy-gtk/empathy-chat.c:3390
+#: ../libempathy-gtk/empathy-chat.c:3444
 msgid "Not now"
 msgstr "�是现在"
 
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3488
 msgid "Retry"
 msgstr "�试"
 
-#: ../libempathy-gtk/empathy-chat.c:3438
+#: ../libempathy-gtk/empathy-chat.c:3492
 msgid "Wrong password; please try again:"
 msgstr "密�错误，请�试："
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3568
+#: ../libempathy-gtk/empathy-chat.c:3622
 msgid "This room is protected by a password:"
 msgstr "这个房间是由一个密��护的："
 
-#: ../libempathy-gtk/empathy-chat.c:3595
+#: ../libempathy-gtk/empathy-chat.c:3649
 msgid "Join"
 msgstr "加入"
 
-#: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1262
+#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "已连接"
 
-#: ../libempathy-gtk/empathy-chat.c:3852
+#: ../libempathy-gtk/empathy-chat.c:3906
 msgid "Conversation"
 msgstr "对�"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3857
+#: ../libempathy-gtk/empathy-chat.c:3911
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (短信)"
@@ -1603,15 +1629,15 @@ msgstr "���足"
 msgid "Could not block contact"
 msgstr "无法�蔽�系人"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:772
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
 msgid "Edit Blocked Contacts"
 msgstr "编辑�蔽的�系人"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:521
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1495
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
@@ -1622,15 +1648,22 @@ msgstr "��："
 msgid "Blocked Contacts"
 msgstr "已�蔽的�系人"
 
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "删除"
+
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:1417
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "�制链接地�(_C)"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:1424
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "打开链接(_O)"
 
@@ -1661,18 +1694,18 @@ msgid "Block %s?"
 msgstr "�蔽 %s？"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "确定��蔽 %s 以阻止他�次�系您�？"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:274
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
 msgid "_Block"
 msgstr "�蔽(_B)"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:283
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "举报�系人滥用"
@@ -1697,38 +1730,38 @@ msgstr "未分组"
 msgid "Favorite People"
 msgstr "收�夹"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1983
-#: ../libempathy-gtk/empathy-individual-view.c:2375
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "您真的�删除群组“%s��？"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1985
-#: ../libempathy-gtk/empathy-individual-view.c:2378
+#: ../libempathy-gtk/empathy-contact-list-view.c:1988
+#: ../libempathy-gtk/empathy-individual-view.c:2379
 msgid "Removing group"
 msgstr "删除群组"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2034
-#: ../libempathy-gtk/empathy-contact-list-view.c:2111
-#: ../libempathy-gtk/empathy-individual-view.c:2433
-#: ../libempathy-gtk/empathy-individual-view.c:2636
+#: ../libempathy-gtk/empathy-contact-list-view.c:2037
+#: ../libempathy-gtk/empathy-contact-list-view.c:2114
+#: ../libempathy-gtk/empathy-individual-view.c:2434
+#: ../libempathy-gtk/empathy-individual-view.c:2637
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2064
-#: ../libempathy-gtk/empathy-individual-view.c:2500
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
+#: ../libempathy-gtk/empathy-individual-view.c:2501
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "您真的想�删除�系人“%s��？"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2066
-#: ../libempathy-gtk/empathy-individual-view.c:2521
+#: ../libempathy-gtk/empathy-contact-list-view.c:2069
+#: ../libempathy-gtk/empathy-individual-view.c:2522
 msgid "Removing contact"
 msgstr "删除�系人"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "添加�系人(_A)..."
 
@@ -1737,48 +1770,48 @@ msgid "_Block Contact"
 msgstr "�蔽�系人"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:548
-#: ../src/empathy-main-window.ui.h:16
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "�天(_C)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:639
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "音频呼�(_A)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:684
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "视频呼�(_V)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:737
-#: ../src/empathy-main-window.ui.h:27
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "最近会�(_P)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:778
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "��文件"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:820
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
 msgstr "共享我的桌�"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1890
-#: ../libempathy-gtk/empathy-individual-menu.c:855
-#: ../libempathy-gtk/empathy-individual-widget.c:1386
+#: ../libempathy-gtk/empathy-contact-widget.c:1887
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "收�"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:883
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "信�(_M)"
 
@@ -1788,33 +1821,41 @@ msgid "_Edit"
 msgstr "编辑(_E)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1070
-#: ../src/empathy-chat-window.c:1010
+#: ../libempathy-gtk/empathy-individual-menu.c:1284
+#: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "邀请到此�天室"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1116
+#: ../libempathy-gtk/empathy-individual-menu.c:1330
 msgid "_Invite to Chat Room"
 msgstr "邀请到�天室(_I)"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:514
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
 msgid "Search contacts"
 msgstr "�索�系人"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:544
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
 msgid "Search: "
 msgstr "�索"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:602
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
 msgid "_Add Contact"
 msgstr "添加�系人(_A)"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:620
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
 msgid "No contacts found"
 msgstr "未找到�系人"
 
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr "您的自我介�信�："
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
+msgstr "你在线时请让我知�，谢谢�"
+
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "选择一个�系"
@@ -1867,153 +1908,153 @@ msgstr "离开消�："
 msgid "Channels:"
 msgstr "频�："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
 msgstr "包括 ISO 编�："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Country:"
 msgstr "国家："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "State:"
 msgstr "�："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "City:"
 msgstr "城市："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Area:"
 msgstr "地区："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
 msgstr "邮政编�："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Street:"
 msgstr "街�："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
 msgstr "建筑物："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Floor:"
 msgstr "楼层："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Room:"
 msgstr "房间："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Text:"
 msgstr "文本："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:517
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Description:"
 msgstr "�述："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:519
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
 msgstr "URI："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:521
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
 msgstr "准确程度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:523
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr "错误："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
 msgstr "垂直误差(米)："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:527
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
 msgstr "水平误差(米)："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:529
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr "速度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:531
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Bearing:"
 msgstr "方���："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:533
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
 msgstr "爬�速度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:535
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
 msgstr "最近更新于："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:537
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
 msgstr "�度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:945
-#: ../libempathy-gtk/empathy-individual-widget.c:539
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
 msgstr "纬度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:947
-#: ../libempathy-gtk/empathy-individual-widget.c:541
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
 msgstr "海拔："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1000
-#: ../libempathy-gtk/empathy-contact-widget.c:1015
-#: ../libempathy-gtk/empathy-individual-widget.c:629
-#: ../libempathy-gtk/empathy-individual-widget.c:644
-#: ../src/empathy-preferences.ui.h:16
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "�置"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1017
-#: ../libempathy-gtk/empathy-individual-widget.c:646
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1069
-#: ../libempathy-gtk/empathy-individual-widget.c:695
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e,%Y 于 %R UTC 时间"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1151
-#: ../libempathy-gtk/empathy-individual-widget.c:931
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
 msgid "Save Avatar"
 msgstr "�存头�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1207
-#: ../libempathy-gtk/empathy-individual-widget.c:989
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
 msgid "Unable to save avatar"
 msgstr "无法�存头�"
 
@@ -2023,7 +2064,7 @@ msgstr "<b>�置</b>于(日期）\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1321
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr "别�："
 
@@ -2043,7 +2084,7 @@ msgstr "�系人详情"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1525
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "标识符："
 
@@ -2080,16 +2121,16 @@ msgid "Select"
 msgstr "选择"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1835
+#: ../src/empathy-main-window.c:1807
 msgid "Group"
 msgstr "群组"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:257
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "以下用户将被�蔽："
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:264
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "以下用户无法被�蔽："
@@ -2114,34 +2155,59 @@ msgstr "在左侧列表中选中的�系人将被绑定在一起。"
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:138
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "选择�用于拨打电�的账户"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "通�"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+msgid "Mobile"
+msgstr "手机"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "办公"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "家庭"
+
 #. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:594
-#: ../libempathy-gtk/empathy-new-message-dialog.c:248
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
 msgid "_SMS"
 msgstr "短信(_S)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:931
+#: ../libempathy-gtk/empathy-individual-menu.c:1142
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "编辑(_E)"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:957
+#: ../libempathy-gtk/empathy-individual-menu.c:1168
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "绑定�系人(_L)…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2340
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 msgid "Delete and _Block"
 msgstr "删除并�蔽(_B)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2509
+#: ../libempathy-gtk/empathy-individual-view.c:2510
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2149,7 +2215,7 @@ msgid ""
 msgstr ""
 "您是�真正地想�删除已绑定的�系人'%s' ？ 注�这将删除所有�系已绑定的�系人"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1672
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2231,128 +2297,133 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "解除绑定(_U)"
 
-#: ../libempathy-gtk/empathy-log-window.c:458
+#: ../libempathy-gtk/empathy-log-window.c:634
 msgid "History"
 msgstr "历�"
 
-#: ../libempathy-gtk/empathy-log-window.c:510
+#: ../libempathy-gtk/empathy-log-window.c:689
 msgid "Show"
 msgstr "显示"
 
-#: ../libempathy-gtk/empathy-log-window.c:532
+#: ../libempathy-gtk/empathy-log-window.c:711
 msgid "Search"
 msgstr "�索"
 
-#: ../libempathy-gtk/empathy-log-window.c:946
+#: ../libempathy-gtk/empathy-log-window.c:1159
 #, c-format
 msgid "Chat in %s"
 msgstr "在 %s �天"
 
-#: ../libempathy-gtk/empathy-log-window.c:948
+#: ../libempathy-gtk/empathy-log-window.c:1161
 #, c-format
 msgid "Chat with %s"
 msgstr "与 %s �天"
 
-#: ../libempathy-gtk/empathy-log-window.c:998
-#: ../libempathy-gtk/empathy-log-window.c:1176
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%Y年%m月%d日 %A"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1118
+#: ../libempathy-gtk/empathy-log-window.c:1300
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1124
+#: ../libempathy-gtk/empathy-log-window.c:1306
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s：</b>%s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1195
-#: ../libempathy-gtk/empathy-log-window.c:1197
-#: ../src/empathy-ft-manager.c:1026
-msgid "%"
-msgstr "%"
+#: ../libempathy-gtk/empathy-log-window.c:1382
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s 秒"
 
-#: ../libempathy-gtk/empathy-log-window.c:1204
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s 分"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "通�时长：%s，结�于 %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1536
+#: ../libempathy-gtk/empathy-log-window.c:1729
 msgid "Today"
 msgstr "今天"
 
-#: ../libempathy-gtk/empathy-log-window.c:1540
+#: ../libempathy-gtk/empathy-log-window.c:1733
 msgid "Yesterday"
 msgstr "昨天"
 
-#: ../libempathy-gtk/empathy-log-window.c:1556
-msgctxt ""
-"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
 msgid "%e %B %Y"
 msgstr "%Y年%m月%d日"
 
-#: ../libempathy-gtk/empathy-log-window.c:1637
-#: ../libempathy-gtk/empathy-log-window.c:3203
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3444
 msgid "Anytime"
 msgstr "�时"
 
-#: ../libempathy-gtk/empathy-log-window.c:1717
-#: ../libempathy-gtk/empathy-log-window.c:2154
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2372
 msgid "Anyone"
 msgstr "任何人"
 
-#: ../libempathy-gtk/empathy-log-window.c:2451
+#: ../libempathy-gtk/empathy-log-window.c:2685
 msgid "Who"
 msgstr "è°�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2655
+#: ../libempathy-gtk/empathy-log-window.c:2889
 msgid "When"
 msgstr "何时"
 
-#: ../libempathy-gtk/empathy-log-window.c:2771
+#: ../libempathy-gtk/empathy-log-window.c:3005
 msgid "Anything"
 msgstr "任何事"
 
-#: ../libempathy-gtk/empathy-log-window.c:2773
+#: ../libempathy-gtk/empathy-log-window.c:3007
 msgid "Text chats"
 msgstr "文本�天"
 
-#: ../libempathy-gtk/empathy-log-window.c:2775
+#: ../libempathy-gtk/empathy-log-window.c:3009
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "通�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2780
+#: ../libempathy-gtk/empathy-log-window.c:3014
 msgid "Incoming calls"
 msgstr "�电"
 
-#: ../libempathy-gtk/empathy-log-window.c:2781
+#: ../libempathy-gtk/empathy-log-window.c:3015
 msgid "Outgoing calls"
 msgstr "呼出的语音通�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2782
+#: ../libempathy-gtk/empathy-log-window.c:3016
 msgid "Missed calls"
 msgstr "未接�电"
 
-#: ../libempathy-gtk/empathy-log-window.c:2804
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "What"
 msgstr "什么事"
 
-#: ../libempathy-gtk/empathy-log-window.c:3506
+#: ../libempathy-gtk/empathy-log-window.c:3747
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "确定�删除以�的全部对�日志？"
 
-#: ../libempathy-gtk/empathy-log-window.c:3510
+#: ../libempathy-gtk/empathy-log-window.c:3751
 msgid "Clear All"
 msgstr "全部清除"
 
-#: ../libempathy-gtk/empathy-log-window.c:3517
+#: ../libempathy-gtk/empathy-log-window.c:3758
 msgid "Delete from:"
 msgstr "从以下�置删除："
 
@@ -2360,14 +2431,6 @@ msgstr "从以下�置删除："
 msgid "<span size=\"x-large\">Loading...</span>"
 msgstr "<span size=\"x-large\">正在载入...</span>"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call"
-msgstr "通�"
-
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
 #: ../src/empathy-chat-window.ui.h:3
 msgid "Chat"
@@ -2389,7 +2452,7 @@ msgstr "视频"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
 #: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window-menubar.ui.h:20
 msgid "_Edit"
 msgstr "编辑(_E)"
 
@@ -2406,27 +2469,27 @@ msgid "Contact ID:"
 msgstr "�系人 ID："
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:258
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
 msgid "C_hat"
 msgstr "�天(_H)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:277
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
 msgstr "新建对�"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:231
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
 msgid "Send _Video"
 msgstr "��视频(_V)"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
 msgid "C_all"
 msgstr "通�(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:252
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "New Call"
 msgstr "新建通�"
 
@@ -2486,24 +2549,24 @@ msgid "New %s account"
 msgstr "新建 %s ��"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "�下查找"
+msgid "Find:"
+msgstr "查找："
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "�上查找"
+msgid "Mat_ch case"
+msgstr "区分大�写(_C)"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Find:"
-msgstr "查找："
+msgid "Phrase not found"
+msgstr "未找到短语"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "区分大�写"
+msgid "_Next"
+msgstr "下一页(_N)"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "Phrase not found"
-msgstr "未找到短语"
+msgid "_Previous"
+msgstr "上一页(_P)"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2549,34 +2612,28 @@ msgstr "语音通�结�"
 msgid "Edit Custom Messages"
 msgstr "编辑自定义状�"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
-#: ../src/empathy-chatrooms-window.ui.h:3
-msgid "Remove"
-msgstr "删除"
-
-#: ../libempathy-gtk/empathy-theme-adium.c:1121
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
 #, c-format
 msgid "Message edited at %s"
 msgstr "消�于 %s 被编辑"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1943
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
 msgid "Normal"
 msgstr "普通"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:75
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "�典"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:76
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "简�"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:77
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "清爽"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:78
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "�色"
 
@@ -2651,26 +2708,26 @@ msgstr "为将�的连接记�本次选择"
 msgid "Certificate Details"
 msgstr "�书详情"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1653
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
 msgstr "无法打开 URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1749
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
 msgstr "选择文件"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1821
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
 msgid "Insufficient free space to save file"
 msgstr "空间�足，无法�存文件"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1829
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr "�存此文件需� %s 空闲空间，但目�仅有 %s，请选择其他�置。"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1873
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid "Incoming file from %s"
 msgstr "从 %s 传�的文件"
@@ -2858,23 +2915,23 @@ msgstr "无错误信�"
 msgid "Instant Message (Empathy)"
 msgstr "�时消�(Empathy)"
 
-#: ../src/empathy.c:354
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "�动时�自动连接"
 
-#: ../src/empathy.c:358
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "�动时�显示�系人列表"
 
-#: ../src/empathy.c:373
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr " - Empathy �时通讯客户端"
 
-#: ../src/empathy.c:560
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
 msgstr "�系��管�器出错"
 
-#: ../src/empathy.c:562
+#: ../src/empathy.c:639
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3112,7 +3169,7 @@ msgstr "您的新��还没有�存。"
 
 #: ../src/empathy-accounts-dialog.c:345
 #: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1098
+#: ../src/empathy-call-window.c:1216
 msgid "Connecting…"
 msgstr "正在连接..."
 
@@ -3212,11 +3269,11 @@ msgstr "Empathy 认�客户端"
 msgid "People nearby"
 msgstr "附近的人"
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:127
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr " - Empathy 语音/视频客户端"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:152
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy 语音/视频客户端"
 
@@ -3259,33 +3316,33 @@ msgstr "详细信�"
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1599
+#: ../src/empathy-call-window.c:1825
 #, c-format
 msgid "Call with %s"
 msgstr "与 %s 通�"
 
 #: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:1843
+#: ../src/empathy-call-window.c:2069
 msgid "The IP address as seen by the machine"
 msgstr "机器所�的 IP 地�"
 
 #: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:1845
+#: ../src/empathy-call-window.c:2071
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Internet 上�务器所�的 IP 地�"
 
 #: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:1847
+#: ../src/empathy-call-window.c:2073
 msgid "The IP address of the peer as seen by the other side"
 msgstr "�一方所�的 IP 地�"
 
 #: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:1849
+#: ../src/empathy-call-window.c:2075
 msgid "The IP address of a relay server"
 msgstr "中转�务器 IP 地�"
 
 #: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:1851
+#: ../src/empathy-call-window.c:2077
 msgid "The IP address of the multicast group"
 msgstr "多播组的 IP 地�"
 
@@ -3316,12 +3373,12 @@ msgid "Connected — %d:%02dm"
 msgstr "已连接 — %d:%02dm"
 
 #: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2583
+#: ../src/empathy-call-window.c:2846
 msgid "Technical Details"
 msgstr "技术细节"
 
 #: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2621
+#: ../src/empathy-call-window.c:2884
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3329,7 +3386,7 @@ msgid ""
 msgstr "%s 软件无法�解您计算机所支�的任何音频格�。"
 
 #: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2626
+#: ../src/empathy-call-window.c:2889
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3337,7 +3394,7 @@ msgid ""
 msgstr "%s 软件无法�解您计算机所支�的任何视频格�。"
 
 #: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2632
+#: ../src/empathy-call-window.c:2895
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3345,24 +3402,24 @@ msgid ""
 msgstr "�能与 %s 建立连接。�能是两�计算机之一��许直接连接。"
 
 #: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2638
+#: ../src/empathy-call-window.c:2901
 msgid "There was a failure on the network"
 msgstr "网络出现一个错误"
 
 #: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2642
+#: ../src/empathy-call-window.c:2905
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "呼�所需�的音频格�还没有在您的电脑上安装"
 
 #: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2645
+#: ../src/empathy-call-window.c:2908
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "呼�所需�的视频格�还没有在您的电脑上安装"
 
 #: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2657
+#: ../src/empathy-call-window.c:2920
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3373,22 +3430,22 @@ msgstr ""
 "�里“调试�窗�收集到的日志。"
 
 #: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2666
+#: ../src/empathy-call-window.c:2929
 msgid "There was a failure in the call engine"
 msgstr "呼�引擎里出现了一个故障"
 
 #: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2669
+#: ../src/empathy-call-window.c:2932
 msgid "The end of the stream was reached"
 msgstr "已到达�的末尾"
 
 #: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2709
+#: ../src/empathy-call-window.c:2972
 msgid "Can't establish audio stream"
 msgstr "�能建立音频�"
 
 #: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2719
+#: ../src/empathy-call-window.c:2982
 msgid "Can't establish video stream"
 msgstr "�能建立视频�"
 
@@ -3479,8 +3536,8 @@ msgstr "切�视频传输"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2219 ../src/empathy-call-window.c:2220
-#: ../src/empathy-call-window.c:2221 ../src/empathy-call-window.c:2222
+#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
+#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
 msgid "Unknown"
 msgstr "未知"
 
@@ -3498,16 +3555,17 @@ msgid "_Camera"
 msgstr "相机(_C)"
 
 #: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window-menubar.ui.h:18
 msgid "_Contents"
 msgstr "内容(_C)"
 
-#: ../src/empathy-call-window.ui.h:27 ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
 msgid "_Debug"
 msgstr "调试(_D)"
 
 #: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window-menubar.ui.h:22
 msgid "_Help"
 msgstr "帮助(_H)"
 
@@ -3519,46 +3577,47 @@ msgstr "�筒(_M)"
 msgid "_Settings"
 msgstr "设置(_S)"
 
-#: ../src/empathy-call-window.ui.h:32 ../src/empathy-main-window.ui.h:30
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "查看(_V)"
 
-#: ../src/empathy-chat-window.c:480 ../src/empathy-chat-window.c:500
+#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d 未读)"
 
-#: ../src/empathy-chat-window.c:492
+#: ../src/empathy-chat-window.c:493
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (和�外 %u 人)"
 
-#: ../src/empathy-chat-window.c:508
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (�有他人的 %d �未读)"
 
-#: ../src/empathy-chat-window.c:517
+#: ../src/empathy-chat-window.c:518
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (所有人共 %d �未读)"
 
-#: ../src/empathy-chat-window.c:732
+#: ../src/empathy-chat-window.c:733
 msgid "SMS:"
 msgstr "短信："
 
-#: ../src/empathy-chat-window.c:742
+#: ../src/empathy-chat-window.c:743
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "正在�� %d �消�"
 
-#: ../src/empathy-chat-window.c:764
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
 msgstr "输入消�。"
 
@@ -3638,95 +3697,96 @@ msgstr "自动连接"
 msgid "Manage Favorite Rooms"
 msgstr "管��天室收�"
 
-#: ../src/empathy-event-manager.c:522
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming video call"
 msgstr "呼入的视频通�"
 
-#: ../src/empathy-event-manager.c:522
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
 msgid "Incoming call"
 msgstr "�电"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:525
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s 视频�电。您想�接��？"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s �电，您想�接��？"
 
-#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
-#: ../src/empathy-event-manager.c:764
+#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s 的�电"
 
-#: ../src/empathy-event-manager.c:555
+#: ../src/empathy-event-manager.c:554
 msgid "_Reject"
 msgstr "拒�(_R)"
 
-#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
 msgid "_Answer"
 msgstr "接�(_A)"
 
-#: ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:570
 msgid "_Answer with video"
 msgstr "使用视频接�(_A)"
 
-#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
+#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "%s 的视频呼�"
 
-#: ../src/empathy-event-manager.c:837
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
 msgstr "�天室邀请"
 
-#: ../src/empathy-event-manager.c:839
+#: ../src/empathy-event-manager.c:838
 #, c-format
 msgid "Invitation to join %s"
 msgstr "邀请您加入 %s"
 
-#: ../src/empathy-event-manager.c:846
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s 正邀请您加入 %s"
 
-#: ../src/empathy-event-manager.c:854
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
 msgstr "拒�(_D)"
 
-#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: ../src/empathy-event-manager.c:886
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s 已邀请您加入 %s"
 
-#: ../src/empathy-event-manager.c:892
+#: ../src/empathy-event-manager.c:891
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "您被邀请加入 %s"
 
-#: ../src/empathy-event-manager.c:943
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "接收 %s 文件传输"
 
-#: ../src/empathy-event-manager.c:1135 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
 msgid "Password required"
 msgstr "需�密�"
 
-#: ../src/empathy-event-manager.c:1191
+#: ../src/empathy-event-manager.c:1190
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s 当您在线的时候��"
 
-#: ../src/empathy-event-manager.c:1195
+#: ../src/empathy-event-manager.c:1194
 #, c-format
 msgid ""
 "\n"
@@ -3826,6 +3886,10 @@ msgstr "检查\"%s\"完整性"
 msgid "Hashing \"%s\""
 msgstr "校验中 \"%s\""
 
+#: ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "%"
+
 #: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "文件"
@@ -3901,107 +3965,104 @@ msgid "Top up account credit"
 msgstr "账户充值"
 
 #. top up button
-#: ../src/empathy-main-window.c:1050
+#: ../src/empathy-main-window.c:1046
 msgid "Top Up..."
 msgstr "充值..."
 
-#: ../src/empathy-main-window.c:1817
+#: ../src/empathy-main-window.c:1789
 msgid "Contact"
 msgstr "�系人"
 
-#: ../src/empathy-main-window.c:2145
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "�系人列表"
 
-#: ../src/empathy-main-window.c:2263
-msgid "Show and edit accounts"
-msgstr "显示和编辑��"
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "�系人地图(_M)"
 
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-main-window-menubar.ui.h:2
 msgid "Credit Balance"
 msgstr "账户余�"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "在�系人列表中查找(_L)"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "加入已收�的�天室(_F)"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "管�收�夹"
 
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "常规视图(_O)"
 
-#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "新建呼�(_C)..."
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "扩展视图(_A)"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "首选项(_R)"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "显示�议(_R)"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "按姓�排�(_N)"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "按状�排�(_S)"
 
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "��(_A)"
 
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "已�蔽的�系人(_B)"
 
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "紧凑视图(_C)"
 
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "文件传输(_F)"
 
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "加入(_J)..."
 
-#: ../src/empathy-main-window.ui.h:24 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "新建对�(_N)..."
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "离线�系人(_O)"
 
-#: ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "个人信�(_P)"
 
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "�天室(_R)"
 
-#: ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-main-window-menubar.ui.h:29
 msgid "_Search for Contacts…"
 msgstr "�索�系人(_S)..."
 
@@ -4068,79 +4129,79 @@ msgstr "�天室列表"
 msgid "_Room:"
 msgstr "�天室(_R)："
 
-#: ../src/empathy-preferences.c:172
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr "收到了消�"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr "�出了消�"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
 msgstr "新对�"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
 msgstr "离线人上线"
 
-#: ../src/empathy-preferences.c:176
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
 msgstr "�系人离线"
 
-#: ../src/empathy-preferences.c:177
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
 msgstr "��已连接"
 
-#: ../src/empathy-preferences.c:178
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
 msgstr "��已断开"
 
-#: ../src/empathy-preferences.c:487
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr "语言"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:737
+#: ../src/empathy-preferences.c:734
 msgid "Juliet"
 msgstr "朱立�"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:741
 msgid "Romeo"
 msgstr "罗密欧"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:747
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "O Romeo, Romeo, wherefore art thou Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:750
 msgid "Deny thy father and refuse thy name;"
 msgstr "Deny thy father and refuse thy name;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:753
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Or if thou wilt not, be but sworn my love"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:756
 msgid "And I'll no longer be a Capulet."
 msgstr "And I'll no longer be a Capulet."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:759
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Shall I hear more, or shall I speak at this?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:765
+#: ../src/empathy-preferences.c:762
 msgid "Juliet has disconnected"
 msgstr "朱立�已断开连接"
 
-#: ../src/empathy-preferences.c:1171
+#: ../src/empathy-preferences.c:1166
 msgid "Preferences"
 msgstr "首选项"
 
@@ -4169,54 +4230,64 @@ msgid "Display incoming events in the notification area"
 msgstr "��示区域显示呼入事件"
 
 #: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"回声消除�以使您的语音在对方��更清晰，但在�些计算机上�能导致问题。如果您"
+"或对方在通�时�到了奇怪的噪音或怪音，请�试关闭回声消除并�新通�。"
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "当�系人上线时�许�示"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "当�系人离线时�许�示"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "当会�闲置时�许�示"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "�许拼写检查的语言："
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "常规"
 
-#: ../src/empathy-preferences.ui.h:14
-msgid "Input level"
-msgstr "输入级别"
-
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input volume"
-msgstr "输入音�"
+msgid "Input level:"
+msgstr "输入级别："
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "输入音�："
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "�置��："
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "记录对�"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "�示"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "播放事件声音"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "��"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -4225,70 +4296,70 @@ msgstr ""
 "�低定�精度�味�比您所在的城市�州和国家更明确的信�将�会被公布。 GPS �标"
 "将精确到一��数。 "
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "显示表情符�为图形(_S)"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "在�天室显示�系人列表(_L)"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "声音"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "拼写检查"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "语言列表仅�映已安装的字典"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "主题"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "版本："
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "�动时自动连接(_A) "
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "手机(_C)"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "�许气泡通知(_E)"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "�用声音通知(_E)"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "网络(_N)(IP，Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "在�独窗�中打开新�天(_O)"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "�我的�系人公布�置信�(_P)"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "�低�置信�精度(_R)"
 
@@ -4414,16 +4485,16 @@ msgid ""
 "extension."
 msgstr "已选定的连接管��支�远程调试扩展"
 
+#: ../src/empathy-invite-participant-dialog.c:179
 #: ../src/empathy-invite-participant-dialog.c:205
-#: ../src/empathy-invite-participant-dialog.c:231
 msgid "Invite Participant"
 msgstr "邀请�与者"
 
-#: ../src/empathy-invite-participant-dialog.c:206
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "选择一个�系人以加入该会�："
 
-#: ../src/empathy-invite-participant-dialog.c:227
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "邀请"
 
@@ -4474,11 +4545,13 @@ msgid "Respond"
 msgstr "�应"
 
 #: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1459
 msgid "Reject"
 msgstr "拒�"
 
 #: ../src/empathy-notifications-approver.c:222
 #: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1460
 msgid "Answer"
 msgstr "接�"
 
@@ -4496,35 +4569,38 @@ msgstr "拒�"
 msgid "Accept"
 msgstr "接�"
 
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
 #: ../src/empathy-notifications-approver.c:260
 msgid "Provide"
 msgstr "�供"
 
-#: ../src/empathy-call-observer.c:135
+#: ../src/empathy-call-observer.c:134
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s 刚刚�试呼�您，但您当时正在与其他人通�。"
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:986 ../src/empathy-call-window.c:1000
+#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2512
+#: ../src/empathy-call-window.c:2775
 msgid "On hold"
 msgstr "挂起"
 
-#: ../src/empathy-call-window.c:2515
+#: ../src/empathy-call-window.c:2778
 msgid "Mute"
 msgstr "�音"
 
-#: ../src/empathy-call-window.c:2517
+#: ../src/empathy-call-window.c:2780
 msgid "Duration"
 msgstr "时长"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2520
+#: ../src/empathy-call-window.c:2783
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
@@ -4533,6 +4609,15 @@ msgstr "%s — %d:%02dm"
 msgid "_Match case"
 msgstr "区分大�写(_M)"
 
+#~ msgid "Find Next"
+#~ msgstr "�下查找"
+
+#~ msgid "Find Previous"
+#~ msgstr "�上查找"
+
+#~ msgid "Show and edit accounts"
+#~ msgstr "显示和编辑��"
+
 #, fuzzy
 #~ msgid "Call with %d participants"
 #~ msgstr "与 %s 通�"
@@ -4664,9 +4749,6 @@ msgstr "区分大�写(_M)"
 #~ msgid "The error message was: <span style=\"italic\">%s</span>"
 #~ msgstr "错误信�是：<span style=\"italic\">%s</span>"
 
-#~ msgid "_Next"
-#~ msgstr "下一页(_N)"
-
 #~ msgid "Add new"
 #~ msgstr "添加"
 
@@ -4857,9 +4939,6 @@ msgstr "区分大�写(_M)"
 #~ msgid "Status:"
 #~ msgstr "状�："
 
-#~ msgid "Word"
-#~ msgstr "��"
-
 #~ msgid "Suggestions for the word"
 #~ msgstr "��的拼写建议"
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index c582a3b43..88cd526e7 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy 3.1.5\n"
+"Project-Id-Version: empathy 3.1.92\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-29 19:11+0800\n"
-"PO-Revision-Date: 2011-08-29 19:11+0800\n"
+"POT-Creation-Date: 2011-09-25 14:31+0800\n"
+"PO-Revision-Date: 2011-09-25 14:32+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
 "Language: zh_TW\n"
@@ -52,405 +52,413 @@ msgid "Camera device"
 msgstr "�影機�置"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "�影機�置"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr "在羣組�天中使用網�補齊 (tab) 時�加到網�之後的字符。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "�天視窗佈景主題"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Chat window theme variant"
 msgstr "�天視窗佈景主題樣�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr "以逗號分隔�使用拼字檢查的語言清單 (如：「 en, fr, nl�)。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "精簡�絡人清單"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "使用連線管�程�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "�絡人清單排�準則"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr "�用於視�通話的�設�影機�置，例：/dev/video0。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
 msgstr "用來�擇大頭貼圖片的�設目錄"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr "當狀態為離開時�用彈出�通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr "當狀態為離開時�用音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
 msgstr "在狀態�域顯示收到事件"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
 msgstr "在狀態�域顯示收到事件。如果�啟用的話，收到事件會直接呈�給使用者。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Echo cancellation support"
 msgstr "回音消除支�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr "Empathy �以發布使用者的�置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy �以利用 GPS 來推測�置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy �以利用�動電話網絡基地臺來推測�置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy �以利用網絡來推測�置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr "Empathy �設下載資料夾"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
 msgstr "Empathy 已轉移 butterfly 日誌"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy 當閒置時應該自動設為離開"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy 啟動時自動連線"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy 應�低�置的準確度"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy �使用�絡人的大頭貼�為�天視窗圖示"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr "啟用 WebKit 開發者工具"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "啟用新訊�的彈出�通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "啟用拼字檢查程�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "隱�主視窗"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "隱�主視窗。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "網�補齊字符"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "在個別視窗開啟新的�天"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "�使用的 Adium 佈景主題路徑"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "如果�天室使用的主題是 Adium 時�使用的 Adium 佈景主題路徑。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "收到訊�時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "當開啟新的談話時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "�出訊�時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "當�絡人登入時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "當有�絡人登出時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "當我們登入時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "當我們登出時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "如果�天視窗失去焦點則彈出通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "當�絡人登入時彈出通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "當�絡人登出時彈出通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr "通話時�影機�覽應該擺放的�置。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Show Balance in contact list"
 msgstr "於�絡人清單內顯示餘�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "顯示大頭貼"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "在�天室顯示�絡人清單"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr "關閉主視窗時顯示�示"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr "顯示離線�絡人"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
 msgstr "顯示�定"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "拼字檢查的語言"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr "用來儲存檔案傳輸接收檔案的�設資料夾。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
 msgstr "上次�擇大頭貼圖片的目錄。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
 msgstr "�天視窗�窗格的�置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "�天視窗�窗格的儲存�置 (單�為�素)。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "用來顯示在�天視窗中談話的佈景主題。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr "用來在�天視窗顯示談話的佈景主題樣�。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "使用圖片�表情符號"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "使用通知音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "在�天室使用佈景主題"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Empathy 是��將使用者的�置發布給他的�絡人。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Empathy 是�使用 GPS 來推測�置。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Empathy 是�使用�動電話網絡來推測�置。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Empathy 是�使用網絡來推測�置。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "Empathy 是�應轉移 butterfly 日誌。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Empathy 是�應在啟動時自動登入你的帳號。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr "Empathy 是�應在使用者閒置時自動切�為離開模�。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "Empathy 是�基於�隱的�由減低�置的準確度。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "Empathy 是�使用�絡人大頭貼�為�天視窗圖示。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "是�啟用 WebKit 開發者工具，例如 Web Inspector。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr "是�使用連線管�程�自動斷線或�新連線。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "是�以你設定的語言檢查輸入有無錯字。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "是�將談話中的表情符號轉�為圖片形�。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr "是��啟用 Pulseaudio 的回音消除�濾器。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "是�播放音效來通知有�絡人登入網絡。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "是�播放音效來通知有�絡人登出網絡。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "是�播放音效來通知有事件發生。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "是�播放音效來通知有收到訊�。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "是�播放音效來通知新的談話。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "是�播放音效來通知有�出訊�。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "當登入�網絡時是�播放音效。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "當登出�網絡時是�播放音效。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr "當狀態為離開或忙碌時是�播放音效通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "當�絡人離線時是�顯示彈出�通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "當�絡人上線時是�顯示彈出�通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
 msgstr "收到新訊�時是�顯示彈出�通知 (�使已開啟�天視窗，但沒有�得焦點)。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "當收到新訊�時是�顯示彈出�通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show account balances in the contact list."
 msgstr "是��在�絡人清單內顯示帳戶餘�。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "是�在�絡人清單與�天視窗顯示�絡人大頭貼。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "是�在�絡人清單中顯示離線的�絡人。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
 msgstr "當狀態為離開或忙碌時是�顯示彈出�通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "是��在�絡人清單內顯示�絡人使用�定。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr "是�在�天室中顯示�絡人清單。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "是�以精簡模�顯示�絡人清單。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
 msgstr "是�在使用標題列的「x�按鈕關閉主視窗時，顯示訊��話窗。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "是�為�天室使用佈景主題。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -527,159 +535,159 @@ msgstr "嘗試傳輸檔案時發生錯誤"
 msgid "The other participant is unable to transfer the file"
 msgstr "其他的�與者無法傳輸該檔案"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
 msgid "Unknown reason"
 msgstr "�明原因"
 
-#: ../libempathy/empathy-utils.c:222
+#: ../libempathy/empathy-utils.c:232
 msgid "Available"
 msgstr "有空"
 
-#: ../libempathy/empathy-utils.c:224
+#: ../libempathy/empathy-utils.c:234
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libempathy/empathy-utils.c:227
+#: ../libempathy/empathy-utils.c:237
 msgid "Away"
 msgstr "離開"
 
-#: ../libempathy/empathy-utils.c:229
+#: ../libempathy/empathy-utils.c:239
 msgid "Invisible"
 msgstr "隱�"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:241
 msgid "Offline"
 msgstr "離線"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:244
 msgctxt "presence"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:284
 msgid "No reason specified"
 msgstr "沒有指定原因"
 
-#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
 msgid "Status is set to offline"
 msgstr "狀態設為離線"
 
-#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
 #: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "網絡錯誤"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
 msgid "Authentication failed"
 msgstr "驗證失敗"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
 msgid "Encryption error"
 msgstr "加密發生錯誤"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:294
 msgid "Name in use"
 msgstr "使用中的�稱"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate not provided"
 msgstr "沒有�供證書"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate untrusted"
 msgstr "證書�被信任"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
 msgid "Certificate expired"
 msgstr "證書已逾期"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
 msgid "Certificate not activated"
 msgstr "證書尚未使用"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
 msgid "Certificate hostname mismatch"
 msgstr "證書主機�稱�符"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
 msgid "Certificate fingerprint mismatch"
 msgstr "證書指紋檔�符"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
 msgid "Certificate self-signed"
 msgstr "證書為自我簽署"
 
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate error"
 msgstr "證書錯誤"
 
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:344
 msgid "Encryption is not available"
 msgstr "加密無法使用"
 
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:346
 msgid "Certificate is invalid"
 msgstr "證書無效"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:348
 msgid "Connection has been refused"
 msgstr "連線�拒"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:350
 msgid "Connection can't be established"
 msgstr "無法建立連線"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:352
 msgid "Connection has been lost"
 msgstr "已失去連線"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:354
 msgid "This resource is already connected to the server"
 msgstr "此資�已連接至該伺�器"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:356
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "連線已被使用相�資�的新連線�代"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:359
 msgid "The account already exists on the server"
 msgstr "該帳號已經存在於伺�器上"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:361
 msgid "Server is currently too busy to handle the connection"
 msgstr "伺�器目��於忙碌以致於無法處�該連線"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:363
 msgid "Certificate has been revoked"
 msgstr "已撤銷證書"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:365
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "證書使用�安全的密碼演算法，或是密碼處�上較弱"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:368
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr "伺�器證書的長度，或是伺�器證書�的深度超�密碼函�庫所能處�的範�"
 
-#: ../libempathy/empathy-utils.c:519
+#: ../libempathy/empathy-utils.c:529
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "附近的人"
 
-#: ../libempathy/empathy-utils.c:524
+#: ../libempathy/empathy-utils.c:534
 msgid "Yahoo! Japan"
 msgstr "Yahoo! 日本"
 
-#: ../libempathy/empathy-utils.c:553
+#: ../libempathy/empathy-utils.c:563
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:554
+#: ../libempathy/empathy-utils.c:564
 msgid "Facebook Chat"
 msgstr "Facebook �天"
 
@@ -723,71 +731,81 @@ msgstr[0] "%d 個月以�"
 msgid "in the future"
 msgstr "未來"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:539
+#: ../libempathy-gtk/empathy-account-chooser.c:540
 msgid "All accounts"
 msgstr "所有帳號"
 
-#: ../libempathy-gtk/empathy-account-widget.c:693
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "帳號"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "密碼"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "伺�器"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "連接埠"
 
-#: ../libempathy-gtk/empathy-account-widget.c:768
-#: ../libempathy-gtk/empathy-account-widget.c:825
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s："
 
-#: ../libempathy-gtk/empathy-account-widget.c:1166
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "我的網絡帳號"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "%s 帳號已��我的網絡帳號修改。"
+msgid "The account %s is edited via %s."
+msgstr "%s 帳號已�� %s 修改。"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1172
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "%s 帳號無法於 Empathy 內修改。"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
 msgstr "啟動我的網絡帳號"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1532
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "編輯 %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "使用者�稱："
 
-#: ../libempathy-gtk/empathy-account-widget.c:1850
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "套用(_A)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1880
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
 msgstr "登入(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1954
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "此帳號已經存在這個伺�器上"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1957
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "在這個伺�器上建立新的帳號"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2149
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "�消(_N)"
 
@@ -796,19 +814,19 @@ msgstr "�消(_N)"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2427
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%2$s 上的 %1$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2453
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "%s 帳號"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2457
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "新增帳號"
 
@@ -1222,36 +1240,36 @@ msgstr "Yahoo I_D："
 msgid "_Room List locale:"
 msgstr "�天室清單地�資訊(_R)："
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:470
-#: ../libempathy-gtk/empathy-avatar-chooser.c:555
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "無法轉�圖片"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "你的系統上沒有支�已接�的圖片格�"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:818
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
 msgid "Couldn't save picture to file"
 msgstr "無法將圖片儲存至檔案"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:934
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "�擇你的大頭貼圖片"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
 msgstr "挑�圖片..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:941
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "沒有圖片"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "圖片"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "所有檔案"
 
@@ -1280,185 +1298,185 @@ msgstr "指定的�絡人無效"
 msgid "Emergency calls are not supported on this protocol"
 msgstr "此�定�支�緊急通話功能"
 
-#: ../libempathy-gtk/empathy-chat.c:702
+#: ../libempathy-gtk/empathy-chat.c:704
 msgid "Failed to open private chat"
 msgstr "開啟�人�天失敗"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:765
 msgid "Topic not supported on this conversation"
 msgstr "此談話的主題�被支�"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:771
 msgid "You are not allowed to change the topic"
 msgstr "你�被�許更改這個主題"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:975
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "「%s��是有效的�絡人 ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1030
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear：清除目�談話的所有訊�"
 
-#: ../libempathy-gtk/empathy-chat.c:1033
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <主題>：設置目�談話的主題"
 
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <�天室 ID>：�加新的�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1039
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <�天室 ID>：�加新的�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1043
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr "/part [<�天室 ID>] [<原因>]：離開�天室，�設為目�的�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1047
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <�絡人 ID> [<訊�>]：開啟�人�天"
 
-#: ../libempathy-gtk/empathy-chat.c:1050
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <�絡人 ID> <訊�>：開啟�人�天"
 
-#: ../libempathy-gtk/empathy-chat.c:1053
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <網�>：更改在目�伺�器上的你的網�"
 
-#: ../libempathy-gtk/empathy-chat.c:1056
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <訊�>：�出一個 ACTION 訊�到目�的談話中"
 
-#: ../libempathy-gtk/empathy-chat.c:1059
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 msgstr "/say <訊�>：�出 <訊�> 到目�的談話中。這用於傳�以「/�開頭的訊�。舉例來說：「/say /join 是用來�加新的�天室�"
 
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <�絡人 ID>：顯示�絡人的相關資訊"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr "/help [<命令>]：顯示所有支�的指令。如果有定義這個 <命令> 的話，便顯示它的用法。"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1114
 #, c-format
 msgid "Usage: %s"
 msgstr "用法：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1116
+#: ../libempathy-gtk/empathy-chat.c:1159
 msgid "Unknown command"
 msgstr "未知的命令"
 
-#: ../libempathy-gtk/empathy-chat.c:1242
+#: ../libempathy-gtk/empathy-chat.c:1285
 msgid "Unknown command; see /help for the available commands"
 msgstr "未知的指令；請�見 /help 以�得�用的指令"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1412
+#: ../libempathy-gtk/empathy-chat.c:1455
 msgid "insufficient balance to send message"
 msgstr "餘��足以傳�訊�"
 
-#: ../libempathy-gtk/empathy-chat.c:1414
+#: ../libempathy-gtk/empathy-chat.c:1457
 msgid "not capable"
 msgstr "無法"
 
-#: ../libempathy-gtk/empathy-chat.c:1421
+#: ../libempathy-gtk/empathy-chat.c:1464
 msgid "offline"
 msgstr "離線"
 
-#: ../libempathy-gtk/empathy-chat.c:1424
+#: ../libempathy-gtk/empathy-chat.c:1467
 msgid "invalid contact"
 msgstr "無效的�絡人"
 
-#: ../libempathy-gtk/empathy-chat.c:1427
+#: ../libempathy-gtk/empathy-chat.c:1470
 msgid "permission denied"
 msgstr "權�被拒絕"
 
-#: ../libempathy-gtk/empathy-chat.c:1430
+#: ../libempathy-gtk/empathy-chat.c:1473
 msgid "too long message"
 msgstr "太長的訊�"
 
-#: ../libempathy-gtk/empathy-chat.c:1433
+#: ../libempathy-gtk/empathy-chat.c:1476
 msgid "not implemented"
 msgstr "未實作"
 
-#: ../libempathy-gtk/empathy-chat.c:1437
+#: ../libempathy-gtk/empathy-chat.c:1480
 msgid "unknown"
 msgstr "�明"
 
-#: ../libempathy-gtk/empathy-chat.c:1443
+#: ../libempathy-gtk/empathy-chat.c:1486
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "傳�訊�「%s�時發生錯誤：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1447
+#: ../libempathy-gtk/empathy-chat.c:1490
 #, c-format
 msgid "Error sending message: %s"
 msgstr "傳�訊�時發生錯誤：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1508 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "主題："
 
-#: ../libempathy-gtk/empathy-chat.c:1520
+#: ../libempathy-gtk/empathy-chat.c:1563
 #, c-format
 msgid "Topic set to: %s"
 msgstr "主題設定為: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "No topic defined"
 msgstr "尚未定義主題"
 
-#: ../libempathy-gtk/empathy-chat.c:2031
+#: ../libempathy-gtk/empathy-chat.c:2074
 msgid "(No Suggestions)"
 msgstr "(沒有建議)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2099
+#: ../libempathy-gtk/empathy-chat.c:2142
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "加入「%s�至字典"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2136
+#: ../libempathy-gtk/empathy-chat.c:2179
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "加入「%s�至 %s 字典"
 
-#: ../libempathy-gtk/empathy-chat.c:2206
+#: ../libempathy-gtk/empathy-chat.c:2249
 msgid "Insert Smiley"
 msgstr "�入表情符號"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2224
+#: ../libempathy-gtk/empathy-chat.c:2267
 #: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "傳�(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2278
+#: ../libempathy-gtk/empathy-chat.c:2321
 msgid "_Spelling Suggestions"
 msgstr "拼字建議(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2367
+#: ../libempathy-gtk/empathy-chat.c:2410
 msgid "Failed to retrieve recent logs"
 msgstr "無法�得最近的日誌"
 
-#: ../libempathy-gtk/empathy-chat.c:2504
+#: ../libempathy-gtk/empathy-chat.c:2547
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已斷線"
@@ -1466,12 +1484,12 @@ msgstr "%s 已斷線"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2511
+#: ../libempathy-gtk/empathy-chat.c:2554
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 被 %2$s 踢出去"
 
-#: ../libempathy-gtk/empathy-chat.c:2514
+#: ../libempathy-gtk/empathy-chat.c:2557
 #, c-format
 msgid "%s was kicked"
 msgstr "%s 被踢出"
@@ -1479,17 +1497,17 @@ msgstr "%s 被踢出"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2522
+#: ../libempathy-gtk/empathy-chat.c:2565
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s 被 %2$s 設為黑�單"
 
-#: ../libempathy-gtk/empathy-chat.c:2525
+#: ../libempathy-gtk/empathy-chat.c:2568
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被設為黑�單"
 
-#: ../libempathy-gtk/empathy-chat.c:2529
+#: ../libempathy-gtk/empathy-chat.c:2572
 #, c-format
 msgid "%s has left the room"
 msgstr "%s 已經離開此�天室"
@@ -1499,68 +1517,72 @@ msgstr "%s 已經離開此�天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2538
+#: ../libempathy-gtk/empathy-chat.c:2581
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2606
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s 已經�加此�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:2588
+#: ../libempathy-gtk/empathy-chat.c:2631
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s �在被稱為 %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2727
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2784
 #: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:2328
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
+#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
 msgid "Disconnected"
 msgstr "已斷線"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3374
+#: ../libempathy-gtk/empathy-chat.c:3428
 msgid "Would you like to store this password?"
 msgstr "你想�儲存此密碼？"
 
-#: ../libempathy-gtk/empathy-chat.c:3380
+#: ../libempathy-gtk/empathy-chat.c:3434
 msgid "Remember"
 msgstr "記�"
 
-#: ../libempathy-gtk/empathy-chat.c:3390
+#: ../libempathy-gtk/empathy-chat.c:3444
 msgid "Not now"
 msgstr "�在��"
 
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3488
 msgid "Retry"
 msgstr "�試"
 
-#: ../libempathy-gtk/empathy-chat.c:3438
+#: ../libempathy-gtk/empathy-chat.c:3492
 msgid "Wrong password; please try again:"
 msgstr "密碼錯誤；請�試一次："
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3568
+#: ../libempathy-gtk/empathy-chat.c:3622
 msgid "This room is protected by a password:"
 msgstr "此�天室已被密碼�護："
 
-#: ../libempathy-gtk/empathy-chat.c:3595
+#: ../libempathy-gtk/empathy-chat.c:3649
 msgid "Join"
 msgstr "�加"
 
-#: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "�功連線"
 
-#: ../libempathy-gtk/empathy-chat.c:3852
+#: ../libempathy-gtk/empathy-chat.c:3906
 msgid "Conversation"
 msgstr "談話"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3857
+#: ../libempathy-gtk/empathy-chat.c:3911
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1593,7 +1615,7 @@ msgstr "編輯�鎖的�絡人"
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:512
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1485
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
@@ -1762,7 +1784,7 @@ msgstr "分享我的桌�"
 #: ../libempathy-gtk/empathy-contact-menu.c:525
 #: ../libempathy-gtk/empathy-contact-widget.c:1886
 #: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1373
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "喜好"
 
@@ -1777,13 +1799,13 @@ msgid "_Edit"
 msgstr "編輯(_E)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1283
+#: ../libempathy-gtk/empathy-individual-menu.c:1284
 #: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "邀請你到這個�天室"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1329
+#: ../libempathy-gtk/empathy-individual-menu.c:1330
 msgid "_Invite to Chat Room"
 msgstr "邀請到�天室(_I)"
 
@@ -1988,7 +2010,7 @@ msgstr "緯度："
 #: ../libempathy-gtk/empathy-contact-widget.c:1011
 #: ../libempathy-gtk/empathy-individual-widget.c:607
 #: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "�置"
 
@@ -2040,7 +2062,7 @@ msgstr "�絡人詳細資料"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1515
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "識別身分："
 
@@ -2118,7 +2140,7 @@ msgstr "%s (%s)"
 
 #: ../libempathy-gtk/empathy-individual-menu.c:309
 msgid "Select account to use to place the call"
-msgstr ""
+msgstr "���用來放置通話的帳號"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
@@ -2130,18 +2152,16 @@ msgid "Call"
 msgstr "通話"
 
 #: ../libempathy-gtk/empathy-individual-menu.c:378
-#, fuzzy
-#| msgid "Profile"
 msgid "Mobile"
-msgstr "個人檔案"
+msgstr "�動電話"
 
 #: ../libempathy-gtk/empathy-individual-menu.c:380
 msgid "Work"
-msgstr ""
+msgstr "工作"
 
 #: ../libempathy-gtk/empathy-individual-menu.c:382
 msgid "HOME"
-msgstr ""
+msgstr "�家"
 
 #. add an SMS button
 #: ../libempathy-gtk/empathy-individual-menu.c:804
@@ -2149,14 +2169,14 @@ msgstr ""
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1141
+#: ../libempathy-gtk/empathy-individual-menu.c:1142
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "編輯(_E)"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1167
+#: ../libempathy-gtk/empathy-individual-menu.c:1168
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "連��絡人(_L)…"
@@ -2172,7 +2192,7 @@ msgid ""
 "remove all the contacts which make up this linked contact."
 msgstr "你真的想�移除連��絡人「%s�嗎？請注�這會移除所有構�此連��絡羣的�絡人。"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1662
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2252,128 +2272,133 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "�消連�(_U)"
 
-#: ../libempathy-gtk/empathy-log-window.c:633
+#: ../libempathy-gtk/empathy-log-window.c:634
 msgid "History"
 msgstr "歷�"
 
-#: ../libempathy-gtk/empathy-log-window.c:685
+#: ../libempathy-gtk/empathy-log-window.c:689
 msgid "Show"
 msgstr "顯示"
 
-#: ../libempathy-gtk/empathy-log-window.c:707
+#: ../libempathy-gtk/empathy-log-window.c:711
 msgid "Search"
 msgstr "�尋"
 
-#: ../libempathy-gtk/empathy-log-window.c:1155
+#: ../libempathy-gtk/empathy-log-window.c:1159
 #, c-format
 msgid "Chat in %s"
 msgstr "於 %s 內�天"
 
-#: ../libempathy-gtk/empathy-log-window.c:1157
+#: ../libempathy-gtk/empathy-log-window.c:1161
 #, c-format
 msgid "Chat with %s"
 msgstr "與 %s �天中"
 
-#: ../libempathy-gtk/empathy-log-window.c:1207
-#: ../libempathy-gtk/empathy-log-window.c:1354
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%Y %B %d %A"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1296
+#: ../libempathy-gtk/empathy-log-window.c:1300
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1302
+#: ../libempathy-gtk/empathy-log-window.c:1306
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s：</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
-#: ../libempathy-gtk/empathy-log-window.c:1375
-#: ../src/empathy-ft-manager.c:1026
-msgid "%"
-msgstr "%"
-
 #: ../libempathy-gtk/empathy-log-window.c:1382
 #, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s 秒"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s 分�"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
+#, c-format
 msgid "Call took %s, ended at %s"
 msgstr "通話時間 %s，��於 %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1714
+#: ../libempathy-gtk/empathy-log-window.c:1729
 msgid "Today"
 msgstr "今日"
 
-#: ../libempathy-gtk/empathy-log-window.c:1718
+#: ../libempathy-gtk/empathy-log-window.c:1733
 msgid "Yesterday"
 msgstr "昨日"
 
-#: ../libempathy-gtk/empathy-log-window.c:1734
-msgctxt ""
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
 msgid "%e %B %Y"
-"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
-msgstr "%Y %B %e"
+msgstr "%Yå¹´%B%eæ—¥"
 
-#: ../libempathy-gtk/empathy-log-window.c:1815
-#: ../libempathy-gtk/empathy-log-window.c:3396
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3444
 msgid "Anytime"
 msgstr "任何時間"
 
-#: ../libempathy-gtk/empathy-log-window.c:1895
-#: ../libempathy-gtk/empathy-log-window.c:2325
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2372
 msgid "Anyone"
 msgstr "任一個"
 
-#: ../libempathy-gtk/empathy-log-window.c:2637
+#: ../libempathy-gtk/empathy-log-window.c:2685
 msgid "Who"
 msgstr "誰"
 
-#: ../libempathy-gtk/empathy-log-window.c:2841
+#: ../libempathy-gtk/empathy-log-window.c:2889
 msgid "When"
 msgstr "何時"
 
-#: ../libempathy-gtk/empathy-log-window.c:2957
+#: ../libempathy-gtk/empathy-log-window.c:3005
 msgid "Anything"
 msgstr "任何事"
 
-#: ../libempathy-gtk/empathy-log-window.c:2959
+#: ../libempathy-gtk/empathy-log-window.c:3007
 msgid "Text chats"
 msgstr "文字�天"
 
-#: ../libempathy-gtk/empathy-log-window.c:2961
+#: ../libempathy-gtk/empathy-log-window.c:3009
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "通話"
 
-#: ../libempathy-gtk/empathy-log-window.c:2966
+#: ../libempathy-gtk/empathy-log-window.c:3014
 msgid "Incoming calls"
 msgstr "來電"
 
-#: ../libempathy-gtk/empathy-log-window.c:2967
+#: ../libempathy-gtk/empathy-log-window.c:3015
 msgid "Outgoing calls"
 msgstr "播出"
 
-#: ../libempathy-gtk/empathy-log-window.c:2968
+#: ../libempathy-gtk/empathy-log-window.c:3016
 msgid "Missed calls"
 msgstr "�接來電"
 
-#: ../libempathy-gtk/empathy-log-window.c:2990
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "What"
 msgstr "什麼"
 
-#: ../libempathy-gtk/empathy-log-window.c:3699
+#: ../libempathy-gtk/empathy-log-window.c:3747
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "你確定�刪除�往談話的所有紀錄嗎？"
 
-#: ../libempathy-gtk/empathy-log-window.c:3703
+#: ../libempathy-gtk/empathy-log-window.c:3751
 msgid "Clear All"
 msgstr "清除全部"
 
-#: ../libempathy-gtk/empathy-log-window.c:3710
+#: ../libempathy-gtk/empathy-log-window.c:3758
 msgid "Delete from:"
 msgstr "刪除從："
 
@@ -2562,12 +2587,12 @@ msgstr "語音通話��"
 msgid "Edit Custom Messages"
 msgstr "編輯自�訊�"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1030
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
 #, c-format
 msgid "Message edited at %s"
 msgstr "訊�編輯於 %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1720
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
 msgid "Normal"
 msgstr "一般"
 
@@ -2865,23 +2890,23 @@ msgstr "沒有錯誤訊�"
 msgid "Instant Message (Empathy)"
 msgstr "�時通訊 (Empathy)"
 
-#: ../src/empathy.c:354
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "啟動時��自動連線"
 
-#: ../src/empathy.c:358
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "啟動時�顯示�絡人清單或任何其他�話窗"
 
-#: ../src/empathy.c:373
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr "- Empathy �時通用戶端"
 
-#: ../src/empathy.c:560
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
 msgstr "�絡帳號管�程�時發生錯誤"
 
-#: ../src/empathy.c:562
+#: ../src/empathy.c:639
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2927,7 +2952,7 @@ msgstr ""
 "以下地�，GNOME 翻譯隊�會盡快回覆你：\n"
 "chinese-l10n@googlegroups.com\n"
 "\n"
-"Cheng-Chia Tseng <pswo10680@gmail.com>, 2009, 10\n"
+"Cheng-Chia Tseng <pswo10680@gmail.com>, 2009, 10, 11\n"
 "Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>, 2003, 05\n"
 "Craig Jeffares <cjeffares@novell.com>, 2004\n"
 "Joe Man <trmetal@yahoo.com.hk>, 2001"
@@ -3090,7 +3115,7 @@ msgstr "尚未儲存你的新帳號。"
 
 #: ../src/empathy-accounts-dialog.c:345
 #: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1152
+#: ../src/empathy-call-window.c:1216
 msgid "Connecting…"
 msgstr "連線中…"
 
@@ -3196,11 +3221,11 @@ msgstr "Empathy �證用戶端"
 msgid "People nearby"
 msgstr "附近的人"
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:127
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathy 音訊視�用戶端"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:152
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy 音訊視�用戶端"
 
@@ -3243,33 +3268,33 @@ msgstr "詳細資料"
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1660
+#: ../src/empathy-call-window.c:1825
 #, c-format
 msgid "Call with %s"
 msgstr "與 %s 通話中"
 
 #: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:1904
+#: ../src/empathy-call-window.c:2069
 msgid "The IP address as seen by the machine"
 msgstr "機器看見的 IP ��"
 
 #: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:1906
+#: ../src/empathy-call-window.c:2071
 msgid "The IP address as seen by a server on the Internet"
 msgstr "互�網上的伺�器看見的 IP ��"
 
 #: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:1908
+#: ../src/empathy-call-window.c:2073
 msgid "The IP address of the peer as seen by the other side"
 msgstr "其他端看見的點的 IP ��"
 
 #: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:1910
+#: ../src/empathy-call-window.c:2075
 msgid "The IP address of a relay server"
 msgstr "中繼伺�器的 IP ��"
 
 #: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:1912
+#: ../src/empathy-call-window.c:2077
 msgid "The IP address of the multicast group"
 msgstr "多點廣播羣組的 IP ��"
 
@@ -3300,12 +3325,12 @@ msgid "Connected — %d:%02dm"
 msgstr "已連線 — %d:%02dm"
 
 #: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2647
+#: ../src/empathy-call-window.c:2846
 msgid "Technical Details"
 msgstr "技術細節"
 
 #: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2685
+#: ../src/empathy-call-window.c:2884
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3313,7 +3338,7 @@ msgid ""
 msgstr "%s 的軟件�瞭解任何你電腦上所支�的音訊格�"
 
 #: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2690
+#: ../src/empathy-call-window.c:2889
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3321,7 +3346,7 @@ msgid ""
 msgstr "%s 的軟件�瞭解任何你電腦上所支�的視�格�"
 
 #: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2696
+#: ../src/empathy-call-window.c:2895
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3329,24 +3354,24 @@ msgid ""
 msgstr "無法和 %s 建立連線。你們其中之一�能在一個��許直接連線的網絡之上。"
 
 #: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2702
+#: ../src/empathy-call-window.c:2901
 msgid "There was a failure on the network"
 msgstr "這個網絡上有錯誤發生"
 
 #: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2706
+#: ../src/empathy-call-window.c:2905
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "此通話所必�的音訊格�尚未在你的電腦上安�"
 
 #: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2709
+#: ../src/empathy-call-window.c:2908
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "此通話所必�的視�格�尚未在你的電腦上安�"
 
 #: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2721
+#: ../src/empathy-call-window.c:2920
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3355,22 +3380,22 @@ msgid ""
 msgstr "在 Telepathy 元件中發生未�期的狀�。請<a href=\"%s\">匯報這個錯誤</a>並附上從求助�單內的「除錯�視窗中所收集的紀錄。"
 
 #: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2730
+#: ../src/empathy-call-window.c:2929
 msgid "There was a failure in the call engine"
 msgstr "通話引擎內有錯誤發生"
 
 #: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2733
+#: ../src/empathy-call-window.c:2932
 msgid "The end of the stream was reached"
 msgstr "已�串�末端"
 
 #: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2773
+#: ../src/empathy-call-window.c:2972
 msgid "Can't establish audio stream"
 msgstr "無法建立音訊串�"
 
 #: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2783
+#: ../src/empathy-call-window.c:2982
 msgid "Can't establish video stream"
 msgstr "無法建立視�串�"
 
@@ -3461,8 +3486,8 @@ msgstr "切�視�傳播"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2280 ../src/empathy-call-window.c:2281
-#: ../src/empathy-call-window.c:2282 ../src/empathy-call-window.c:2283
+#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
+#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
 msgid "Unknown"
 msgstr "�明"
 
@@ -3626,7 +3651,7 @@ msgstr "管�喜好的�天室"
 msgid "Incoming video call"
 msgstr "傳入的視�通話"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
 msgid "Incoming call"
 msgstr "來電"
 
@@ -3641,7 +3666,7 @@ msgid "%s is calling you. Do you want to answer?"
 msgstr "%s �與你進行通話。你是��接�？"
 
 #: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s 的來電"
@@ -3659,6 +3684,7 @@ msgid "_Answer with video"
 msgstr "以視�接�(_A)"
 
 #: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "來自 %s 的視�通話"
@@ -3810,6 +3836,10 @@ msgstr "正在檢查檔案「%s�的完整性"
 msgid "Hashing \"%s\""
 msgstr "正在計算「%s�雜湊值"
 
+#: ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "%"
+
 #: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "檔案"
@@ -3893,7 +3923,7 @@ msgstr "加值..."
 msgid "Contact"
 msgstr "�絡人"
 
-#: ../src/empathy-main-window.c:2119
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "�絡人清單"
 
@@ -3911,7 +3941,7 @@ msgstr "於�絡人清單內尋找(_L)"
 
 #: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
-msgstr "�加喜好(_F)"
+msgstr "�加喜好�天室(_F)"
 
 #: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
@@ -4150,124 +4180,132 @@ msgid "Display incoming events in the notification area"
 msgstr "在通知�域顯示收到事件"
 
 #: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr "回音消除�以讓你的�音�他人來說更清晰，但在�些電腦上�能導致�題。如果通話時你或其他人�見怪異的噪音或電波干擾，請嘗試關掉回音消除功能，並�新開始通話。"
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "當�絡人上線時啟用通知"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "當�絡人離線時啟用通知"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "當�天視窗失去焦點時啟用通知(_C)"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "為語言啟用拼字檢查："
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "一般"
 
-#: ../src/empathy-preferences.ui.h:14
-msgid "Input level"
-msgstr "輸入等級"
-
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input volume"
-msgstr "輸入音�"
+msgid "Input level:"
+msgstr "輸入等級："
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "輸入音�："
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "�置來�："
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "紀錄談話"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "通知"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "播放事件音效"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "�隱"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
 "decimal place."
 msgstr "�低�置準確度�指除了你所在的城市�洲和國家會被公開之外，�會�供其他訊�。GPS 的座標準確度將會�為個�數。"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "將表情符號以圖片顯示(_S)"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "在�天室顯示�絡人清單(_L)"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "音效"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "拼字檢查"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "這�的語言清單��映出你已經安�字典的語言。"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "佈景主題"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "樣�："
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "啟動時自動連線(_A)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "手機(_C)"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "啟用氣泡�通知(_E)"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "啟用音效通知(_E)"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "網絡 (IP, Wi-Fi)(_N)"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "在個別視窗開啟新的�天(_O)"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "�我的�絡人公開�置(_P)"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "�低�置準確度(_R)"
 
@@ -4393,16 +4431,16 @@ msgid ""
 "extension."
 msgstr "��的連線管�程��支��端�錯擴充功能。"
 
+#: ../src/empathy-invite-participant-dialog.c:179
 #: ../src/empathy-invite-participant-dialog.c:205
-#: ../src/empathy-invite-participant-dialog.c:231
 msgid "Invite Participant"
 msgstr "邀請�與"
 
-#: ../src/empathy-invite-participant-dialog.c:206
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "�擇想�邀請進入談話的�絡人："
 
-#: ../src/empathy-invite-participant-dialog.c:227
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "邀請"
 
@@ -4452,11 +4490,13 @@ msgid "Respond"
 msgstr "回應"
 
 #: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1459
 msgid "Reject"
 msgstr "拒絕"
 
 #: ../src/empathy-notifications-approver.c:222
 #: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1460
 msgid "Answer"
 msgstr "接�"
 
@@ -4474,6 +4514,9 @@ msgstr "拒絕"
 msgid "Accept"
 msgstr "接�"
 
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
 #: ../src/empathy-notifications-approver.c:260
 msgid "Provide"
 msgstr "�供"
@@ -4485,24 +4528,24 @@ msgstr "%s 剛剛播打給你，但你正與他人通話。"
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1026 ../src/empathy-call-window.c:1049
+#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
 msgid "i"
 msgstr "訊"
 
-#: ../src/empathy-call-window.c:2576
+#: ../src/empathy-call-window.c:2775
 msgid "On hold"
 msgstr "�留"
 
-#: ../src/empathy-call-window.c:2579
+#: ../src/empathy-call-window.c:2778
 msgid "Mute"
 msgstr "�音"
 
-#: ../src/empathy-call-window.c:2581
+#: ../src/empathy-call-window.c:2780
 msgid "Duration"
 msgstr "時間"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2584
+#: ../src/empathy-call-window.c:2783
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 06bb26437..fad653e9c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy 3.1.5\n"
+"Project-Id-Version: empathy 3.1.92\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-29 19:11+0800\n"
-"PO-Revision-Date: 2011-08-28 22:44+0800\n"
+"POT-Creation-Date: 2011-09-25 14:31+0800\n"
+"PO-Revision-Date: 2011-09-23 19:23+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Chinese (traditional) <chinese-l10n@googlegroups.com>\n"
 "Language: zh_TW\n"
@@ -52,405 +52,413 @@ msgid "Camera device"
 msgstr "�影機�置"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "�影機�置"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr "在群組�天中使用暱稱補齊 (tab) 時�加到暱稱之後的字元。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "�天視窗佈景主題"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Chat window theme variant"
 msgstr "�天視窗佈景主題樣�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr "以逗號分隔�使用拼字檢查的語言清單 (如：「 en, fr, nl�)。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "精簡連絡人清單"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "使用連線管�程�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "連絡人清單排�準則"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr "�用於視訊通話的�設�影機�置，例：/dev/video0。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
 msgstr "用來�擇大頭貼圖片的�設目錄"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr "當狀態為離開時�用彈出�通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr "當狀態為離開時�用音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
 msgstr "在狀態�域顯示收到事件"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
 msgstr "在狀態�域顯示收到事件。如果�啟用的話，收到事件會直接呈�給使用者。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Echo cancellation support"
 msgstr "回音消除支�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr "Empathy �以發布使用者的�置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy �以利用 GPS 來推測�置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy �以利用行動電話網路基地臺來推測�置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy �以利用網路來推測�置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr "Empathy �設下載資料夾"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
 msgstr "Empathy 已轉移 butterfly 日誌"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy 當閒置時應該自動設為離開"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy 啟動時自動連線"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy 應�低�置的準確度"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy �使用連絡人的大頭貼�為�天視窗圖示"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr "啟用 WebKit 開發者工具"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "啟用新訊�的彈出�通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "啟用拼字檢查程�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "隱�主視窗"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "隱�主視窗。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "暱稱補齊字元"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "在個別視窗開啟新的�天"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "�使用的 Adium 佈景主題路徑"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "如果�天室使用的主題是 Adium 時�使用的 Adium 佈景主題路徑。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "收到訊�時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "當開啟新的談話時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "�出訊�時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "當連絡人登入時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "當有連絡人登出時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "當我們登入時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "當我們登出時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "如果�天視窗失去焦點則彈出通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "當連絡人登入時彈出通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "當連絡人登出時彈出通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr "通話時�影機�覽應該擺放的�置。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Show Balance in contact list"
 msgstr "於�絡人清單內顯示餘�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "顯示大頭貼"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "在�天室顯示連絡人清單"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr "關閉主視窗時顯示�示"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr "顯示離線連絡人"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
 msgstr "顯示�定"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "拼字檢查的語言"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr "用來儲存檔案傳輸接收檔案的�設資料夾。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
 msgstr "上次�擇大頭貼圖片的目錄。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
 msgstr "�天視窗�窗格的�置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "�天視窗�窗格的儲存�置 (單�為�素)。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "用來顯示在�天視窗中談話的佈景主題。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr "用來在�天視窗顯示談話的佈景主題樣�。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "使用圖片�表情符號"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "使用通知音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "在�天室使用佈景主題"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Empathy 是��將使用者的�置發布給他的連絡人。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Empathy 是�使用 GPS 來推測�置。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Empathy 是�使用行動電話網路來推測�置。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Empathy 是�使用網路來推測�置。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "Empathy 是�應轉移 butterfly 日誌。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Empathy 是�應在啟動時自動登入您的帳號。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr "Empathy 是�應在使用者閒置時自動切�為離開模�。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "Empathy 是�基於隱�的�由減低�置的準確度。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "Empathy 是�使用連絡人大頭貼�為�天視窗圖示。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "是�啟用 WebKit 開發者工具，例如 Web Inspector。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr "是�使用連線管�程�自動斷線或�新連線。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "是�以您設定的語言檢查輸入有無錯字。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "是�將談話中的表情符號轉�為圖片形�。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr "是��啟用 Pulseaudio 的回音消除�濾器。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "是�播放音效來通知有連絡人登入網路。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "是�播放音效來通知有連絡人登出網路。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "是�播放音效來通知有事件發生。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "是�播放音效來通知有收到訊�。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "是�播放音效來通知新的談話。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "是�播放音效來通知有�出訊�。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "當登入�網路時是�播放音效。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "當登出�網路時是�播放音效。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr "當狀態為離開或忙碌時是�播放音效通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "當連絡人離線時是�顯示彈出�通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "當連絡人上線時是�顯示彈出�通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
 msgstr "收到新訊�時是�顯示彈出�通知 (�使已開啟�天視窗，但沒有�得焦點)。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "當收到新訊�時是�顯示彈出�通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show account balances in the contact list."
 msgstr "是��在�絡人清單內顯示帳戶餘�。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "是�在連絡人清單與�天視窗顯示連絡人大頭貼。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "是�在連絡人清單中顯示離線的連絡人。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
 msgstr "當狀態為離開或忙碌時是�顯示彈出�通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "是��在�絡人清單內顯示�絡人使用�定。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr "是�在�天室中顯示連絡人清單。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "是�以精簡模�顯示連絡人清單。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
 msgstr "是�在使用標題列的「x�按鈕關閉主視窗時，顯示訊��話窗。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "是�為�天室使用佈景主題。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -529,159 +537,159 @@ msgstr "嘗試傳輸檔案時發生錯誤"
 msgid "The other participant is unable to transfer the file"
 msgstr "其他的�與者無法傳輸該檔案"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
 msgid "Unknown reason"
 msgstr "�明原因"
 
-#: ../libempathy/empathy-utils.c:222
+#: ../libempathy/empathy-utils.c:232
 msgid "Available"
 msgstr "有空"
 
-#: ../libempathy/empathy-utils.c:224
+#: ../libempathy/empathy-utils.c:234
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libempathy/empathy-utils.c:227
+#: ../libempathy/empathy-utils.c:237
 msgid "Away"
 msgstr "離開"
 
-#: ../libempathy/empathy-utils.c:229
+#: ../libempathy/empathy-utils.c:239
 msgid "Invisible"
 msgstr "隱�"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:241
 msgid "Offline"
 msgstr "離線"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:244
 msgctxt "presence"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:284
 msgid "No reason specified"
 msgstr "沒有指定原因"
 
-#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
 msgid "Status is set to offline"
 msgstr "狀態設為離線"
 
-#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
 #: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "網路錯誤"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
 msgid "Authentication failed"
 msgstr "驗證失敗"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
 msgid "Encryption error"
 msgstr "加密發生錯誤"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:294
 msgid "Name in use"
 msgstr "使用中的�稱"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate not provided"
 msgstr "沒有�供憑證"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate untrusted"
 msgstr "憑證�被信任"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
 msgid "Certificate expired"
 msgstr "憑證已逾期"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
 msgid "Certificate not activated"
 msgstr "憑證尚未使用"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
 msgid "Certificate hostname mismatch"
 msgstr "憑證主機�稱�符"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
 msgid "Certificate fingerprint mismatch"
 msgstr "憑證指紋檔�符"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
 msgid "Certificate self-signed"
 msgstr "憑證為自我簽署"
 
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate error"
 msgstr "憑證錯誤"
 
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:344
 msgid "Encryption is not available"
 msgstr "加密無法使用"
 
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:346
 msgid "Certificate is invalid"
 msgstr "憑證無效"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:348
 msgid "Connection has been refused"
 msgstr "連線�拒"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:350
 msgid "Connection can't be established"
 msgstr "無法建立連線"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:352
 msgid "Connection has been lost"
 msgstr "已失去連線"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:354
 msgid "This resource is already connected to the server"
 msgstr "此資�已連接至該伺�器"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:356
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "連線已被使用相�資�的新連線�代"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:359
 msgid "The account already exists on the server"
 msgstr "該帳號已經存在於伺�器上"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:361
 msgid "Server is currently too busy to handle the connection"
 msgstr "伺�器目��於忙碌以致於無法處�該連線"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:363
 msgid "Certificate has been revoked"
 msgstr "已撤銷憑證"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:365
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "憑證使用�安全的密碼演算法，或是密碼處�上較弱"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:368
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr "伺�器憑證的長度，或是伺�器憑證�的深度超�密碼函�庫所能處�的範�"
 
-#: ../libempathy/empathy-utils.c:519
+#: ../libempathy/empathy-utils.c:529
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "附近的人"
 
-#: ../libempathy/empathy-utils.c:524
+#: ../libempathy/empathy-utils.c:534
 msgid "Yahoo! Japan"
 msgstr "Yahoo! 日本"
 
-#: ../libempathy/empathy-utils.c:553
+#: ../libempathy/empathy-utils.c:563
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:554
+#: ../libempathy/empathy-utils.c:564
 msgid "Facebook Chat"
 msgstr "Facebook �天"
 
@@ -725,71 +733,81 @@ msgstr[0] "%d 個月以�"
 msgid "in the future"
 msgstr "未來"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:539
+#: ../libempathy-gtk/empathy-account-chooser.c:540
 msgid "All accounts"
 msgstr "所有帳號"
 
-#: ../libempathy-gtk/empathy-account-widget.c:693
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "帳號"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "密碼"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "伺�器"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "連接埠"
 
-#: ../libempathy-gtk/empathy-account-widget.c:768
-#: ../libempathy-gtk/empathy-account-widget.c:825
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s："
 
-#: ../libempathy-gtk/empathy-account-widget.c:1166
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "我的網路帳號"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "%s 帳號已��我的網路帳號修改。"
+msgid "The account %s is edited via %s."
+msgstr "%s 帳號已�� %s 修改。"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1172
+#: ../libempathy-gtk/empathy-account-widget.c:1214
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "%s 帳號無法於 Empathy 內修改。"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1233
 msgid "Launch My Web Accounts"
 msgstr "啟動我的網路帳號"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1532
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "編輯 %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "使用者�稱："
 
-#: ../libempathy-gtk/empathy-account-widget.c:1850
+#: ../libempathy-gtk/empathy-account-widget.c:1909
 msgid "A_pply"
 msgstr "套用(_A)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1880
+#: ../libempathy-gtk/empathy-account-widget.c:1939
 msgid "L_og in"
 msgstr "登入(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1954
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 msgid "This account already exists on the server"
 msgstr "此帳號已經存在這個伺�器上"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1957
+#: ../libempathy-gtk/empathy-account-widget.c:2016
 msgid "Create a new account on the server"
 msgstr "在這個伺�器上建立新的帳號"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2149
+#: ../libempathy-gtk/empathy-account-widget.c:2208
 msgid "Ca_ncel"
 msgstr "�消(_N)"
 
@@ -798,19 +816,19 @@ msgstr "�消(_N)"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2427
+#: ../libempathy-gtk/empathy-account-widget.c:2486
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%2$s 上的 %1$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2453
+#: ../libempathy-gtk/empathy-account-widget.c:2512
 #, c-format
 msgid "%s Account"
 msgstr "%s 帳號"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2457
+#: ../libempathy-gtk/empathy-account-widget.c:2516
 msgid "New account"
 msgstr "新增帳號"
 
@@ -1225,36 +1243,36 @@ msgstr "Yahoo I_D："
 msgid "_Room List locale:"
 msgstr "�天室清單地�資訊(_R)："
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:470
-#: ../libempathy-gtk/empathy-avatar-chooser.c:555
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "無法轉�圖片"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "您的系統上沒有支�已接�的圖片格�"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:818
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
 msgid "Couldn't save picture to file"
 msgstr "無法將圖片儲存至檔案"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:934
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "�擇您的大頭貼圖片"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
 msgstr "挑�圖片..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:941
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "沒有圖片"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "圖片"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "所有檔案"
 
@@ -1283,62 +1301,62 @@ msgstr "指定的�絡人無效"
 msgid "Emergency calls are not supported on this protocol"
 msgstr "此�定�支�緊急通話功能"
 
-#: ../libempathy-gtk/empathy-chat.c:702
+#: ../libempathy-gtk/empathy-chat.c:704
 msgid "Failed to open private chat"
 msgstr "開啟�人�天失敗"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:765
 msgid "Topic not supported on this conversation"
 msgstr "此談話的主題�被支�"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:771
 msgid "You are not allowed to change the topic"
 msgstr "您�被�許變更這個主題"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:975
 #, c-format
 msgid "“%s� is not a valid contact ID"
 msgstr "「%s��是有效的連絡人 ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1030
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear：清除目�談話的所有訊�"
 
-#: ../libempathy-gtk/empathy-chat.c:1033
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <主題>：設置目�談話的主題"
 
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <�天室 ID>：�加新的�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1039
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <�天室 ID>：�加新的�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1043
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr "/part [<�天室 ID>] [<原因>]：離開�天室，�設為目�的�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1047
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <�絡人 ID> [<訊�>]：開啟�人�天"
 
-#: ../libempathy-gtk/empathy-chat.c:1050
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <�絡人 ID> <訊�>：開啟�人�天"
 
-#: ../libempathy-gtk/empathy-chat.c:1053
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <暱稱>：變更在目�伺�器上的您的暱稱"
 
-#: ../libempathy-gtk/empathy-chat.c:1056
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <訊�>：�出一個 ACTION 訊�到目�的談話中"
 
-#: ../libempathy-gtk/empathy-chat.c:1059
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1347,11 +1365,11 @@ msgstr ""
 "/say <訊�>：�出 <訊�> 到目�的談話中。這用於傳�以「/�開頭的訊�。舉例來"
 "說：「/say /join 是用來�加新的�天室�"
 
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <�絡人 ID>：顯示�絡人的相關資訊"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1359,113 +1377,113 @@ msgstr ""
 "/help [<命令>]：顯示所有支�的指令。如果有定義這個 <命令> 的話，便顯示它的用"
 "法。"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1114
 #, c-format
 msgid "Usage: %s"
 msgstr "用法：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1116
+#: ../libempathy-gtk/empathy-chat.c:1159
 msgid "Unknown command"
 msgstr "未知的命令"
 
-#: ../libempathy-gtk/empathy-chat.c:1242
+#: ../libempathy-gtk/empathy-chat.c:1285
 msgid "Unknown command; see /help for the available commands"
 msgstr "未知的指令；請�見 /help 以�得�用的指令"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1412
+#: ../libempathy-gtk/empathy-chat.c:1455
 msgid "insufficient balance to send message"
 msgstr "餘��足以傳�訊�"
 
-#: ../libempathy-gtk/empathy-chat.c:1414
+#: ../libempathy-gtk/empathy-chat.c:1457
 msgid "not capable"
 msgstr "無法"
 
-#: ../libempathy-gtk/empathy-chat.c:1421
+#: ../libempathy-gtk/empathy-chat.c:1464
 msgid "offline"
 msgstr "離線"
 
-#: ../libempathy-gtk/empathy-chat.c:1424
+#: ../libempathy-gtk/empathy-chat.c:1467
 msgid "invalid contact"
 msgstr "無效的連絡人"
 
-#: ../libempathy-gtk/empathy-chat.c:1427
+#: ../libempathy-gtk/empathy-chat.c:1470
 msgid "permission denied"
 msgstr "權�被拒絕"
 
-#: ../libempathy-gtk/empathy-chat.c:1430
+#: ../libempathy-gtk/empathy-chat.c:1473
 msgid "too long message"
 msgstr "太長的訊�"
 
-#: ../libempathy-gtk/empathy-chat.c:1433
+#: ../libempathy-gtk/empathy-chat.c:1476
 msgid "not implemented"
 msgstr "未實作"
 
-#: ../libempathy-gtk/empathy-chat.c:1437
+#: ../libempathy-gtk/empathy-chat.c:1480
 msgid "unknown"
 msgstr "�明"
 
-#: ../libempathy-gtk/empathy-chat.c:1443
+#: ../libempathy-gtk/empathy-chat.c:1486
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "傳�訊�「%s�時發生錯誤：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1447
+#: ../libempathy-gtk/empathy-chat.c:1490
 #, c-format
 msgid "Error sending message: %s"
 msgstr "傳�訊�時發生錯誤：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1508 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "主題："
 
-#: ../libempathy-gtk/empathy-chat.c:1520
+#: ../libempathy-gtk/empathy-chat.c:1563
 #, c-format
 msgid "Topic set to: %s"
 msgstr "主題設定為: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "No topic defined"
 msgstr "尚未定義主題"
 
-#: ../libempathy-gtk/empathy-chat.c:2031
+#: ../libempathy-gtk/empathy-chat.c:2074
 msgid "(No Suggestions)"
 msgstr "(沒有建議)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2099
+#: ../libempathy-gtk/empathy-chat.c:2142
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "加入「%s�至字典"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2136
+#: ../libempathy-gtk/empathy-chat.c:2179
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "加入「%s�至 %s 字典"
 
-#: ../libempathy-gtk/empathy-chat.c:2206
+#: ../libempathy-gtk/empathy-chat.c:2249
 msgid "Insert Smiley"
 msgstr "�入表情符號"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2224
+#: ../libempathy-gtk/empathy-chat.c:2267
 #: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "傳�(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2278
+#: ../libempathy-gtk/empathy-chat.c:2321
 msgid "_Spelling Suggestions"
 msgstr "拼字建議(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2367
+#: ../libempathy-gtk/empathy-chat.c:2410
 msgid "Failed to retrieve recent logs"
 msgstr "無法�得最近的日誌"
 
-#: ../libempathy-gtk/empathy-chat.c:2504
+#: ../libempathy-gtk/empathy-chat.c:2547
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已斷線"
@@ -1473,12 +1491,12 @@ msgstr "%s 已斷線"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2511
+#: ../libempathy-gtk/empathy-chat.c:2554
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 被 %2$s 踢出去"
 
-#: ../libempathy-gtk/empathy-chat.c:2514
+#: ../libempathy-gtk/empathy-chat.c:2557
 #, c-format
 msgid "%s was kicked"
 msgstr "%s 被踢出"
@@ -1486,17 +1504,17 @@ msgstr "%s 被踢出"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2522
+#: ../libempathy-gtk/empathy-chat.c:2565
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s 被 %2$s 設為黑�單"
 
-#: ../libempathy-gtk/empathy-chat.c:2525
+#: ../libempathy-gtk/empathy-chat.c:2568
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被設為黑�單"
 
-#: ../libempathy-gtk/empathy-chat.c:2529
+#: ../libempathy-gtk/empathy-chat.c:2572
 #, c-format
 msgid "%s has left the room"
 msgstr "%s 已經離開此�天室"
@@ -1506,68 +1524,72 @@ msgstr "%s 已經離開此�天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2538
+#: ../libempathy-gtk/empathy-chat.c:2581
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2606
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s 已經�加此�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:2588
+#: ../libempathy-gtk/empathy-chat.c:2631
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s �在被稱為 %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2727
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2784
 #: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:2328
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
+#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
 msgid "Disconnected"
 msgstr "已斷線"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3374
+#: ../libempathy-gtk/empathy-chat.c:3428
 msgid "Would you like to store this password?"
 msgstr "您想�儲存此密碼？"
 
-#: ../libempathy-gtk/empathy-chat.c:3380
+#: ../libempathy-gtk/empathy-chat.c:3434
 msgid "Remember"
 msgstr "記�"
 
-#: ../libempathy-gtk/empathy-chat.c:3390
+#: ../libempathy-gtk/empathy-chat.c:3444
 msgid "Not now"
 msgstr "�在��"
 
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3488
 msgid "Retry"
 msgstr "�試"
 
-#: ../libempathy-gtk/empathy-chat.c:3438
+#: ../libempathy-gtk/empathy-chat.c:3492
 msgid "Wrong password; please try again:"
 msgstr "密碼錯誤；請�試一次："
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3568
+#: ../libempathy-gtk/empathy-chat.c:3622
 msgid "This room is protected by a password:"
 msgstr "此�天室已被密碼�護："
 
-#: ../libempathy-gtk/empathy-chat.c:3595
+#: ../libempathy-gtk/empathy-chat.c:3649
 msgid "Join"
 msgstr "�加"
 
-#: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "�功連線"
 
-#: ../libempathy-gtk/empathy-chat.c:3852
+#: ../libempathy-gtk/empathy-chat.c:3906
 msgid "Conversation"
 msgstr "談話"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3857
+#: ../libempathy-gtk/empathy-chat.c:3911
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1600,7 +1622,7 @@ msgstr "編輯�鎖的�絡人"
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:512
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1485
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
@@ -1769,7 +1791,7 @@ msgstr "分享我的桌�"
 #: ../libempathy-gtk/empathy-contact-menu.c:525
 #: ../libempathy-gtk/empathy-contact-widget.c:1886
 #: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1373
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "喜好"
 
@@ -1784,13 +1806,13 @@ msgid "_Edit"
 msgstr "編輯(_E)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1283
+#: ../libempathy-gtk/empathy-individual-menu.c:1284
 #: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "邀請您到這個�天室"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1329
+#: ../libempathy-gtk/empathy-individual-menu.c:1330
 msgid "_Invite to Chat Room"
 msgstr "邀請到�天室(_I)"
 
@@ -1995,7 +2017,7 @@ msgstr "緯度："
 #: ../libempathy-gtk/empathy-contact-widget.c:1011
 #: ../libempathy-gtk/empathy-individual-widget.c:607
 #: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "�置"
 
@@ -2047,7 +2069,7 @@ msgstr "連絡人詳細資料"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1515
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "識別身分："
 
@@ -2126,7 +2148,7 @@ msgstr "%s (%s)"
 
 #: ../libempathy-gtk/empathy-individual-menu.c:309
 msgid "Select account to use to place the call"
-msgstr ""
+msgstr "���用來放置通話的帳號"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
@@ -2138,18 +2160,16 @@ msgid "Call"
 msgstr "通話"
 
 #: ../libempathy-gtk/empathy-individual-menu.c:378
-#, fuzzy
-#| msgid "Profile"
 msgid "Mobile"
-msgstr "個人檔案"
+msgstr "行動電話"
 
 #: ../libempathy-gtk/empathy-individual-menu.c:380
 msgid "Work"
-msgstr ""
+msgstr "工作"
 
 #: ../libempathy-gtk/empathy-individual-menu.c:382
 msgid "HOME"
-msgstr ""
+msgstr "�家"
 
 #. add an SMS button
 #: ../libempathy-gtk/empathy-individual-menu.c:804
@@ -2157,14 +2177,14 @@ msgstr ""
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1141
+#: ../libempathy-gtk/empathy-individual-menu.c:1142
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "編輯(_E)"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1167
+#: ../libempathy-gtk/empathy-individual-menu.c:1168
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "連��絡人(_L)…"
@@ -2182,7 +2202,7 @@ msgstr ""
 "您真的想�移除連��絡人「%s�嗎？請注�這會移除所有構�此連��絡群的�絡"
 "人。"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1662
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2263,128 +2283,133 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "�消連�(_U)"
 
-#: ../libempathy-gtk/empathy-log-window.c:633
+#: ../libempathy-gtk/empathy-log-window.c:634
 msgid "History"
 msgstr "歷�"
 
-#: ../libempathy-gtk/empathy-log-window.c:685
+#: ../libempathy-gtk/empathy-log-window.c:689
 msgid "Show"
 msgstr "顯示"
 
-#: ../libempathy-gtk/empathy-log-window.c:707
+#: ../libempathy-gtk/empathy-log-window.c:711
 msgid "Search"
 msgstr "�尋"
 
-#: ../libempathy-gtk/empathy-log-window.c:1155
+#: ../libempathy-gtk/empathy-log-window.c:1159
 #, c-format
 msgid "Chat in %s"
 msgstr "於 %s 內�天"
 
-#: ../libempathy-gtk/empathy-log-window.c:1157
+#: ../libempathy-gtk/empathy-log-window.c:1161
 #, c-format
 msgid "Chat with %s"
 msgstr "與 %s �天中"
 
-#: ../libempathy-gtk/empathy-log-window.c:1207
-#: ../libempathy-gtk/empathy-log-window.c:1354
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%Y %B %d %A"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1296
+#: ../libempathy-gtk/empathy-log-window.c:1300
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1302
+#: ../libempathy-gtk/empathy-log-window.c:1306
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s：</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
-#: ../libempathy-gtk/empathy-log-window.c:1375
-#: ../src/empathy-ft-manager.c:1026
-msgid "%"
-msgstr "%"
-
 #: ../libempathy-gtk/empathy-log-window.c:1382
 #, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s 秒"
+
+#: ../libempathy-gtk/empathy-log-window.c:1389
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s 分�"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
+#, c-format
 msgid "Call took %s, ended at %s"
 msgstr "通話時間 %s，��於 %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1714
+#: ../libempathy-gtk/empathy-log-window.c:1729
 msgid "Today"
 msgstr "今日"
 
-#: ../libempathy-gtk/empathy-log-window.c:1718
+#: ../libempathy-gtk/empathy-log-window.c:1733
 msgid "Yesterday"
 msgstr "昨日"
 
-#: ../libempathy-gtk/empathy-log-window.c:1734
-msgctxt ""
-"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
 msgid "%e %B %Y"
-msgstr "%Y %B %e"
+msgstr "%Yå¹´%B%eæ—¥"
 
-#: ../libempathy-gtk/empathy-log-window.c:1815
-#: ../libempathy-gtk/empathy-log-window.c:3396
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3444
 msgid "Anytime"
 msgstr "任何時間"
 
-#: ../libempathy-gtk/empathy-log-window.c:1895
-#: ../libempathy-gtk/empathy-log-window.c:2325
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2372
 msgid "Anyone"
 msgstr "任一個"
 
-#: ../libempathy-gtk/empathy-log-window.c:2637
+#: ../libempathy-gtk/empathy-log-window.c:2685
 msgid "Who"
 msgstr "誰"
 
-#: ../libempathy-gtk/empathy-log-window.c:2841
+#: ../libempathy-gtk/empathy-log-window.c:2889
 msgid "When"
 msgstr "何時"
 
-#: ../libempathy-gtk/empathy-log-window.c:2957
+#: ../libempathy-gtk/empathy-log-window.c:3005
 msgid "Anything"
 msgstr "任何事"
 
-#: ../libempathy-gtk/empathy-log-window.c:2959
+#: ../libempathy-gtk/empathy-log-window.c:3007
 msgid "Text chats"
 msgstr "文字�天"
 
-#: ../libempathy-gtk/empathy-log-window.c:2961
+#: ../libempathy-gtk/empathy-log-window.c:3009
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "通話"
 
-#: ../libempathy-gtk/empathy-log-window.c:2966
+#: ../libempathy-gtk/empathy-log-window.c:3014
 msgid "Incoming calls"
 msgstr "來電"
 
-#: ../libempathy-gtk/empathy-log-window.c:2967
+#: ../libempathy-gtk/empathy-log-window.c:3015
 msgid "Outgoing calls"
 msgstr "播出"
 
-#: ../libempathy-gtk/empathy-log-window.c:2968
+#: ../libempathy-gtk/empathy-log-window.c:3016
 msgid "Missed calls"
 msgstr "�接來電"
 
-#: ../libempathy-gtk/empathy-log-window.c:2990
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "What"
 msgstr "什麼"
 
-#: ../libempathy-gtk/empathy-log-window.c:3699
+#: ../libempathy-gtk/empathy-log-window.c:3747
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "您確定�刪除�往談話的所有紀錄嗎？"
 
-#: ../libempathy-gtk/empathy-log-window.c:3703
+#: ../libempathy-gtk/empathy-log-window.c:3751
 msgid "Clear All"
 msgstr "清除全部"
 
-#: ../libempathy-gtk/empathy-log-window.c:3710
+#: ../libempathy-gtk/empathy-log-window.c:3758
 msgid "Delete from:"
 msgstr "刪除從："
 
@@ -2573,12 +2598,12 @@ msgstr "語音通話��"
 msgid "Edit Custom Messages"
 msgstr "編輯自訂訊�"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1030
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
 #, c-format
 msgid "Message edited at %s"
 msgstr "訊�編輯於 %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1720
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
 msgid "Normal"
 msgstr "一般"
 
@@ -2876,23 +2901,23 @@ msgstr "沒有錯誤訊�"
 msgid "Instant Message (Empathy)"
 msgstr "�時通訊 (Empathy)"
 
-#: ../src/empathy.c:354
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "啟動時��自動連線"
 
-#: ../src/empathy.c:358
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "啟動時�顯示連絡人清單或任何其他�話窗"
 
-#: ../src/empathy.c:373
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr "- Empathy �時通用戶端"
 
-#: ../src/empathy.c:560
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
 msgstr "�絡帳號管�程�時發生錯誤"
 
-#: ../src/empathy.c:562
+#: ../src/empathy.c:639
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2946,7 +2971,7 @@ msgstr ""
 "以下地�，GNOME 翻譯團隊會盡快回覆您：\n"
 "chinese-l10n@googlegroups.com\n"
 "\n"
-"Cheng-Chia Tseng <pswo10680@gmail.com>, 2009, 10\n"
+"Cheng-Chia Tseng <pswo10680@gmail.com>, 2009, 10, 11\n"
 "Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>, 2003, 05\n"
 "Craig Jeffares <cjeffares@novell.com>, 2004\n"
 "Joe Man <trmetal@yahoo.com.hk>, 2001"
@@ -3120,7 +3145,7 @@ msgstr "尚未儲存您的新帳號。"
 
 #: ../src/empathy-accounts-dialog.c:345
 #: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1152
+#: ../src/empathy-call-window.c:1216
 msgid "Connecting…"
 msgstr "連線中…"
 
@@ -3226,11 +3251,11 @@ msgstr "Empathy �證用戶端"
 msgid "People nearby"
 msgstr "附近的人"
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:127
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathy 音訊視訊用戶端"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:152
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy 音訊視訊用戶端"
 
@@ -3273,33 +3298,33 @@ msgstr "詳細資料"
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1660
+#: ../src/empathy-call-window.c:1825
 #, c-format
 msgid "Call with %s"
 msgstr "與 %s 通話中"
 
 #: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:1904
+#: ../src/empathy-call-window.c:2069
 msgid "The IP address as seen by the machine"
 msgstr "機器看見的 IP ��"
 
 #: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:1906
+#: ../src/empathy-call-window.c:2071
 msgid "The IP address as seen by a server on the Internet"
 msgstr "網際網路上的伺�器看見的 IP ��"
 
 #: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:1908
+#: ../src/empathy-call-window.c:2073
 msgid "The IP address of the peer as seen by the other side"
 msgstr "其他端看見的點的 IP ��"
 
 #: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:1910
+#: ../src/empathy-call-window.c:2075
 msgid "The IP address of a relay server"
 msgstr "中繼伺�器的 IP ��"
 
 #: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:1912
+#: ../src/empathy-call-window.c:2077
 msgid "The IP address of the multicast group"
 msgstr "多點廣播群組的 IP ��"
 
@@ -3330,12 +3355,12 @@ msgid "Connected — %d:%02dm"
 msgstr "已連線 — %d:%02dm"
 
 #: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2647
+#: ../src/empathy-call-window.c:2846
 msgid "Technical Details"
 msgstr "技術細節"
 
 #: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2685
+#: ../src/empathy-call-window.c:2884
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3343,7 +3368,7 @@ msgid ""
 msgstr "%s 的軟體�瞭解任何您電腦上所支�的音訊格�"
 
 #: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2690
+#: ../src/empathy-call-window.c:2889
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3351,7 +3376,7 @@ msgid ""
 msgstr "%s 的軟體�瞭解任何您電腦上所支�的視訊格�"
 
 #: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2696
+#: ../src/empathy-call-window.c:2895
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3359,24 +3384,24 @@ msgid ""
 msgstr "無法和 %s 建立連線。您們其中之一�能在一個��許直接連線的網路之上。"
 
 #: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2702
+#: ../src/empathy-call-window.c:2901
 msgid "There was a failure on the network"
 msgstr "這個網路上有錯誤發生"
 
 #: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2706
+#: ../src/empathy-call-window.c:2905
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "此通話所必�的音訊格�尚未在您的電腦上安�"
 
 #: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2709
+#: ../src/empathy-call-window.c:2908
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "此通話所必�的視訊格�尚未在您的電腦上安�"
 
 #: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2721
+#: ../src/empathy-call-window.c:2920
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3387,22 +3412,22 @@ msgstr ""
 "從求助�單內的「除錯�視窗中所收集的紀錄。"
 
 #: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2730
+#: ../src/empathy-call-window.c:2929
 msgid "There was a failure in the call engine"
 msgstr "通話引擎內有錯誤發生"
 
 #: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2733
+#: ../src/empathy-call-window.c:2932
 msgid "The end of the stream was reached"
 msgstr "已�串�末端"
 
 #: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2773
+#: ../src/empathy-call-window.c:2972
 msgid "Can't establish audio stream"
 msgstr "無法建立音訊串�"
 
 #: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2783
+#: ../src/empathy-call-window.c:2982
 msgid "Can't establish video stream"
 msgstr "無法建立視訊串�"
 
@@ -3493,8 +3518,8 @@ msgstr "切�視訊傳播"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2280 ../src/empathy-call-window.c:2281
-#: ../src/empathy-call-window.c:2282 ../src/empathy-call-window.c:2283
+#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
+#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
 msgid "Unknown"
 msgstr "�明"
 
@@ -3658,7 +3683,7 @@ msgstr "管�喜好的�天室"
 msgid "Incoming video call"
 msgstr "傳入的視訊通話"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
 msgid "Incoming call"
 msgstr "來電"
 
@@ -3673,7 +3698,7 @@ msgid "%s is calling you. Do you want to answer?"
 msgstr "%s �與您進行通話。您是��接�？"
 
 #: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s 的來電"
@@ -3691,6 +3716,7 @@ msgid "_Answer with video"
 msgstr "以視訊接�(_A)"
 
 #: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "來自 %s 的視訊通話"
@@ -3842,6 +3868,10 @@ msgstr "正在檢查檔案「%s�的完整性"
 msgid "Hashing \"%s\""
 msgstr "正在計算「%s�雜湊值"
 
+#: ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "%"
+
 #: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "檔案"
@@ -3925,7 +3955,7 @@ msgstr "加值..."
 msgid "Contact"
 msgstr "連絡人"
 
-#: ../src/empathy-main-window.c:2119
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "連絡人清單"
 
@@ -3943,7 +3973,7 @@ msgstr "於連絡人清單內尋找(_L)"
 
 #: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
-msgstr "�加喜好(_F)"
+msgstr "�加喜好�天室(_F)"
 
 #: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
@@ -4183,126 +4213,137 @@ msgid "Display incoming events in the notification area"
 msgstr "在通知�域顯示收到事件"
 
 #: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"回音消除�以讓您的�音�他人來說更清晰，但在�些電腦上�能導致�題。如果通話"
+"時您或其他人�見怪異的噪音或電波干擾，請試著關掉回音消除功能，並�新開始通"
+"話。"
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "當連絡人上線時啟用通知"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "當連絡人離線時啟用通知"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "當�天視窗失去焦點時啟用通知(_C)"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "為語言啟用拼字檢查："
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "一般"
 
-#: ../src/empathy-preferences.ui.h:14
-msgid "Input level"
-msgstr "輸入等級"
-
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input volume"
-msgstr "輸入音�"
+msgid "Input level:"
+msgstr "輸入等級："
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "輸入音�："
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "�置來�："
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "紀錄談話"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "通知"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "播放事件音效"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "隱�"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
 "decimal place."
 msgstr ""
-"�低�置準確度�指除了你所在的城市�洲和國家會被公開之外，�會�供其他訊�。"
+"�低�置準確度�指除了您所在的城市�洲和國家會被公開之外，�會�供其他訊�。"
 "GPS 的座標準確度將會�為個�數。"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "將表情符號以圖片顯示(_S)"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "在�天室顯示連絡人清單(_L)"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "音效"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "拼字檢查"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "這裡的語言清單��映出您已經安�字典的語言。"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "佈景主題"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "樣�："
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "啟動時自動連線(_A)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "手機(_C)"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "啟用氣泡�通知(_E)"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "啟用音效通知(_E)"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "網路 (IP, Wi-Fi)(_N)"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "在個別視窗開啟新的�天(_O)"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "�我的連絡人公開�置(_P)"
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "�低�置準確度(_R)"
 
@@ -4428,16 +4469,16 @@ msgid ""
 "extension."
 msgstr "��的連線管�程��支��端�錯擴充功能。"
 
+#: ../src/empathy-invite-participant-dialog.c:179
 #: ../src/empathy-invite-participant-dialog.c:205
-#: ../src/empathy-invite-participant-dialog.c:231
 msgid "Invite Participant"
 msgstr "邀請�與"
 
-#: ../src/empathy-invite-participant-dialog.c:206
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "�擇想�邀請進入談話的�絡人："
 
-#: ../src/empathy-invite-participant-dialog.c:227
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "邀請"
 
@@ -4487,11 +4528,13 @@ msgid "Respond"
 msgstr "回應"
 
 #: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1459
 msgid "Reject"
 msgstr "拒絕"
 
 #: ../src/empathy-notifications-approver.c:222
 #: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1460
 msgid "Answer"
 msgstr "接�"
 
@@ -4509,6 +4552,9 @@ msgstr "拒絕"
 msgid "Accept"
 msgstr "接�"
 
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
 #: ../src/empathy-notifications-approver.c:260
 msgid "Provide"
 msgstr "�供"
@@ -4520,24 +4566,24 @@ msgstr "%s 剛剛播打給您，但您正與他人通話。"
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1026 ../src/empathy-call-window.c:1049
+#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
 msgid "i"
 msgstr "訊"
 
-#: ../src/empathy-call-window.c:2576
+#: ../src/empathy-call-window.c:2775
 msgid "On hold"
 msgstr "�留"
 
-#: ../src/empathy-call-window.c:2579
+#: ../src/empathy-call-window.c:2778
 msgid "Mute"
 msgstr "�音"
 
-#: ../src/empathy-call-window.c:2581
+#: ../src/empathy-call-window.c:2780
 msgid "Duration"
 msgstr "時間"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2584
+#: ../src/empathy-call-window.c:2783
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
diff --git a/release.py b/release.py
index 1821aa32f..0a4d2675c 100755
--- a/release.py
+++ b/release.py
@@ -9,7 +9,7 @@ import time
 from string import Template
 from optparse import OptionParser
 
-last_tag_pattern = 'EMPATHY_3_1*'
+last_tag_pattern = 'EMPATHY_3_2*'
 upload_server = 'master.gnome.org'
 template = '''\
 $name $version is now available for download from:
diff --git a/src/Makefile.am b/src/Makefile.am
index cc4eebe30..c6855d338 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -48,31 +48,6 @@ libempathy_accounts_common_la_LIBADD =					\
         $(LIBCHAMPLAIN_LIBS)						\
 	$(NULL)
 
-if HAVE_CONTROL_CENTER_EMBEDDING
-ccmodulesdir = $(CONTROL_CENTER_EXTENSIONDIR)
-ccmodules_LTLIBRARIES = libempathy-accounts-panel.la
-
-libempathy_accounts_panel_la_SOURCES =				\
-	empathy-accounts-module.c				\
-	cc-empathy-accounts-panel.c				\
-	cc-empathy-accounts-panel.h				\
-	$(NULL)
-
-libempathy_accounts_panel_la_CPPFLAGS =				\
-	$(CPPFLAGS_COMMON)					\
-	$(CONTROL_CENTER_EMBEDDING_CFLAGS)			\
-	-DLOCALEDIR=\""$(datadir)/locale"\"			\
-	$(NULL)
-
-libempathy_accounts_panel_la_LDFLAGS = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload)'
-
-libempathy_accounts_panel_la_LIBADD =				\
-	$(EMPATHY_LIBS)						\
-	$(CONTROL_CENTER_EMBEDDING_LIBS)			\
-	libempathy-accounts-common.la				\
-	$(NULL)
-endif
-
 bin_PROGRAMS =			\
 	empathy			\
 	empathy-accounts	\
@@ -84,11 +59,6 @@ libexec_PROGRAMS = \
 	empathy-av \
 	empathy-chat
 
-BUILT_SOURCES = \
-	src-marshal.h \
-	src-marshal.c \
-	src-marshal.list
-
 empathy_accounts_SOURCES =						\
 	empathy-accounts.c empathy-accounts.h				\
 	$(NULL)
@@ -127,8 +97,6 @@ empathy_av_SOURCES = \
 	empathy-mic-monitor.h
 	$(NULL)
 
-nodist_empathy_av_SOURCES = $(BUILT_SOURCES)
-
 empathy_av_CFLAGS = $(EMPATHY_AV_CFLAGS)
 empathy_av_LDFLAGS = $(EMPATHY_AV_LIBS) $(LIBM)
 
@@ -186,8 +154,6 @@ empathy_call_SOURCES = \
        empathy-mic-monitor.c \
        empathy-mic-monitor.h
 
-nodist_empathy_call_SOURCES = $(BUILT_SOURCES)
-
 empathy_call_CFLAGS = $(EMPATHY_CALL_CFLAGS)
 empathy_call_LDFLAGS = $(EMPATHY_CALL_LIBS)
 
@@ -201,7 +167,6 @@ empathy_handwritten_source = \
 	empathy-ft-manager.c empathy-ft-manager.h			\
 	empathy-invite-participant-dialog.c empathy-invite-participant-dialog.h \
 	empathy-main-window.c empathy-main-window.h			\
-	empathy-migrate-butterfly-logs.c empathy-migrate-butterfly-logs.h \
 	empathy-new-chatroom-dialog.c empathy-new-chatroom-dialog.h	\
 	empathy-notifications-approver.c empathy-notifications-approver.h \
 	empathy-call-observer.c empathy-call-observer.h			\
@@ -224,8 +189,6 @@ empathy_LDADD =								\
         $(LIBCHAMPLAIN_LIBS)						\
 	$(NULL)
 
-nodist_empathy_SOURCES = $(BUILT_SOURCES)
-
 check_c_sources = \
     $(empathy_handwritten_source) \
     $(empathy_logs_SOURCES) \
@@ -268,33 +231,7 @@ EXTRA_DIST +=					\
 	empathy-map-view.ui
 endif
 
-if !HAVE_CONTROL_CENTER_EMBEDDING
-EXTRA_DIST += $(libempathy_accounts_panel_la_SOURCES)
-else
-check_c_sources += $(libempathy_accounts_panel_la_SOURCES)
-endif
-
 dist_man_MANS =			\
 	empathy.1 \
 	empathy-accounts.1
 
-src-marshal.list: $(empathy_SOURCES) $(empathy_call_SOURCES) Makefile.am
-	$(AM_V_GEN)( cd $(srcdir) && \
-	sed -n -e 's/.*src_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
-	$(empathy_SOURCES) $(empathy_av_SOURCES) $(empathy_call_SOURCES) ) \
-	| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
-	@if cmp -s $@.tmp $@; then \
-		rm $@.tmp; \
-	else \
-		mv $@.tmp $@; \
-	fi
-
-%-marshal.h: %-marshal.list Makefile
-	$(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=_$(subst -,_,$*)_marshal $< > $*-marshal.h
-
-%-marshal.c: %-marshal.list Makefile
-	$(AM_V_GEN)echo "#include \"src-marshal.h\"" > $@ && \
-	$(GLIB_GENMARSHAL) --body --prefix=_$(subst -,_,$*)_marshal $< >> $*-marshal.c
-
-CLEANFILES = $(BUILT_SOURCES)
-
diff --git a/src/cc-empathy-accounts-panel.c b/src/cc-empathy-accounts-panel.c
deleted file mode 100644
index 6416c29f9..000000000
--- a/src/cc-empathy-accounts-panel.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2010 Collabora, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Authors: Travis Reitter <travis.reitter@collabora.co.uk>
- */
-
-#include "config.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-
-#include <gtk/gtk.h>
-#include <gio/gio.h>
-#include <glib/gi18n-lib.h>
-
-#include <telepathy-glib/telepathy-glib.h>
-
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-connection-managers.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include <libempathy/empathy-debug.h>
-
-#include "empathy-accounts-common.h"
-#include "empathy-account-assistant.h"
-#include "empathy-accounts-dialog.h"
-
-#include "cc-empathy-accounts-panel.h"
-
-#define CC_EMPATHY_ACCOUNTS_PANEL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_EMPATHY_ACCOUNTS_PANEL, CcEmpathyAccountsPanelPrivate))
-
-struct CcEmpathyAccountsPanelPrivate
-{
-  /* the original window holding the dialog content; it needs to be retained and
-   * destroyed in our finalize(), since it invalidates its children (even if
-   * they've already been reparented by the time it is destroyed) */
-  GtkWidget *accounts_window;
-
-  GtkWidget *assistant;
-  GtkWidget *container;
-};
-
-G_DEFINE_DYNAMIC_TYPE (CcEmpathyAccountsPanel, cc_empathy_accounts_panel, CC_TYPE_PANEL)
-
-static void
-panel_pack_with_accounts_dialog (CcEmpathyAccountsPanel *panel)
-{
-  GtkWidget *content;
-  GtkWidget *action_area;
-
-  if (panel->priv->accounts_window != NULL)
-    {
-      gtk_widget_destroy (panel->priv->accounts_window);
-      gtk_container_remove (GTK_CONTAINER (panel),
-          gtk_bin_get_child (GTK_BIN (panel)));
-    }
-
-    panel->priv->accounts_window = empathy_accounts_dialog_show (NULL, NULL);
-    gtk_widget_hide (panel->priv->accounts_window);
-
-    content = gtk_dialog_get_content_area (
-        GTK_DIALOG (panel->priv->accounts_window));
-    action_area = gtk_dialog_get_action_area (
-        GTK_DIALOG (panel->priv->accounts_window));
-    gtk_widget_set_no_show_all (action_area, TRUE);
-    gtk_widget_hide (action_area);
-
-    gtk_widget_reparent (content, GTK_WIDGET (panel->priv->container));
-}
-
-static void
-account_assistant_closed_cb (GtkWidget *widget,
-    gpointer user_data)
-{
-  CcEmpathyAccountsPanel *panel = CC_EMPATHY_ACCOUNTS_PANEL (user_data);
-
-  if (empathy_accounts_dialog_is_creating (
-      EMPATHY_ACCOUNTS_DIALOG (panel->priv->accounts_window)))
-    {
-      empathy_account_dialog_cancel (
-        EMPATHY_ACCOUNTS_DIALOG (panel->priv->accounts_window));
-    }
-
-  gtk_widget_set_sensitive (GTK_WIDGET (panel), TRUE);
-  panel->priv->assistant = NULL;
-}
-
-static void
-connection_managers_prepare (GObject *source,
-    GAsyncResult *result,
-    gpointer user_data)
-{
-  EmpathyConnectionManagers *cm_mgr = EMPATHY_CONNECTION_MANAGERS (source);
-  TpAccountManager *account_mgr;
-  CcEmpathyAccountsPanel *panel = CC_EMPATHY_ACCOUNTS_PANEL (user_data);
-
-  account_mgr = TP_ACCOUNT_MANAGER (g_object_get_data (G_OBJECT (cm_mgr),
-      "account-manager"));
-
-  if (!empathy_connection_managers_prepare_finish (cm_mgr, result, NULL))
-    goto out;
-
-  panel_pack_with_accounts_dialog (panel);
-
-  if (!empathy_accounts_has_non_salut_accounts (account_mgr))
-    {
-      GtkWindow *parent;
-
-      parent = empathy_get_toplevel_window (GTK_WIDGET (panel));
-      panel->priv->assistant = empathy_account_assistant_show (parent, cm_mgr);
-
-      gtk_widget_set_sensitive (GTK_WIDGET (panel), FALSE);
-
-      tp_g_signal_connect_object (panel->priv->assistant, "hide",
-        G_CALLBACK (account_assistant_closed_cb),
-        panel, 0);
-    }
-
-out:
-  /* remove ref from active_changed() */
-  g_object_unref (account_mgr);
-  g_object_unref (cm_mgr);
-}
-
-static void
-account_manager_ready_for_accounts_cb (GObject *source_object,
-    GAsyncResult *result,
-    gpointer user_data)
-{
-  TpAccountManager *account_mgr = TP_ACCOUNT_MANAGER (source_object);
-  CcEmpathyAccountsPanel *panel = CC_EMPATHY_ACCOUNTS_PANEL (user_data);
-  GError *error = NULL;
-
-  if (!tp_account_manager_prepare_finish (account_mgr, result, &error))
-    {
-      g_warning ("Failed to prepare account manager: %s", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  if (empathy_accounts_has_non_salut_accounts (account_mgr))
-    {
-      panel_pack_with_accounts_dialog (panel);
-
-      /* remove ref from active_changed() */
-      g_object_unref (account_mgr);
-    }
-  else
-    {
-      EmpathyConnectionManagers *cm_mgr;
-
-      cm_mgr = empathy_connection_managers_dup_singleton ();
-
-      g_object_set_data_full (G_OBJECT (cm_mgr), "account-manager",
-          g_object_ref (account_mgr), (GDestroyNotify) g_object_unref);
-
-      empathy_connection_managers_prepare_async (cm_mgr,
-          connection_managers_prepare, panel);
-    }
-}
-
-static void
-cc_empathy_accounts_panel_finalize (GObject *object)
-{
-  CcEmpathyAccountsPanel *panel;
-
-  g_return_if_fail (object != NULL);
-  g_return_if_fail (CC_IS_EMPATHY_ACCOUNTS_PANEL (object));
-
-  panel = CC_EMPATHY_ACCOUNTS_PANEL (object);
-
-  g_return_if_fail (panel->priv != NULL);
-
-  gtk_widget_destroy (panel->priv->accounts_window);
-
-  if (panel->priv->assistant != NULL)
-    gtk_widget_destroy (panel->priv->assistant);
-
-  G_OBJECT_CLASS (cc_empathy_accounts_panel_parent_class)->finalize (object);
-}
-
-static void
-cc_empathy_accounts_panel_class_init (CcEmpathyAccountsPanelClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->finalize = cc_empathy_accounts_panel_finalize;
-
-  g_type_class_add_private (klass, sizeof (CcEmpathyAccountsPanelPrivate));
-}
-
-static void
-cc_empathy_accounts_panel_class_finalize (CcEmpathyAccountsPanelClass *klass)
-{
-}
-
-static void
-cc_empathy_accounts_panel_init (CcEmpathyAccountsPanel *panel)
-{
-  TpAccountManager *account_manager;
-
-  panel->priv = CC_EMPATHY_ACCOUNTS_PANEL_GET_PRIVATE (panel);
-
-  /* create a container widget immediately, and pack it into the panel,
-   * because the CC library expects a children to exist after
-   * the object is constructed.
-   */
-  panel->priv->container = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-  gtk_widget_show (panel->priv->container);
-  gtk_container_add (GTK_CONTAINER (panel), panel->priv->container);
-
-  empathy_gtk_init ();
-
-  /* unref'd in final endpoint callbacks */
-  account_manager = tp_account_manager_dup ();
-
-  tp_account_manager_prepare_async (account_manager, NULL,
-      account_manager_ready_for_accounts_cb, panel);
-}
-
-void
-cc_empathy_accounts_panel_register (GIOModule *module)
-{
-  /* Setup gettext */
-  bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
-  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-
-  cc_empathy_accounts_panel_register_type (G_TYPE_MODULE (module));
-  g_io_extension_point_implement (CC_SHELL_PANEL_EXTENSION_POINT,
-      CC_TYPE_EMPATHY_ACCOUNTS_PANEL, "empathy-accounts", 10);
-}
diff --git a/src/cc-empathy-accounts-panel.h b/src/cc-empathy-accounts-panel.h
deleted file mode 100644
index cd51b69c1..000000000
--- a/src/cc-empathy-accounts-panel.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2010 Collabora Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Authors: Travis Reitter <travis.reitter@collabora.co.uk>
- */
-
-#ifndef __CC_EMPATHY_ACCOUNTS_PANEL_H
-#define __CC_EMPATHY_ACCOUNTS_PANEL_H
-
-#include <gtk/gtk.h>
-#include <libgnome-control-center/cc-panel.h>
-
-G_BEGIN_DECLS
-
-#define CC_TYPE_EMPATHY_ACCOUNTS_PANEL         (cc_empathy_accounts_panel_get_type ())
-#define CC_EMPATHY_ACCOUNTS_PANEL(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), CC_TYPE_EMPATHY_ACCOUNTS_PANEL, CcEmpathyAccountsPanel))
-#define CC_EMPATHY_ACCOUNTS_PANEL_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), CC_TYPE_EMPATHY_ACCOUNTS_PANEL, CcEmpathyAccountsPanelClass))
-#define CC_IS_EMPATHY_ACCOUNTS_PANEL(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), CC_TYPE_EMPATHY_ACCOUNTS_PANEL))
-#define CC_IS_EMPATHY_ACCOUNTS_PANEL_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), CC_TYPE_EMPATHY_ACCOUNTS_PANEL))
-#define CC_EMPATHY_ACCOUNTS_PANEL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CC_TYPE_EMPATHY_ACCOUNTS_PANEL, CcEmpathyAccountsPanelClass))
-
-typedef struct CcEmpathyAccountsPanelPrivate CcEmpathyAccountsPanelPrivate;
-
-typedef struct
-{
-  CcPanel parent;
-  CcEmpathyAccountsPanelPrivate *priv;
-} CcEmpathyAccountsPanel;
-
-typedef struct
-{
-  CcPanelClass parent_class;
-} CcEmpathyAccountsPanelClass;
-
-GType cc_empathy_accounts_panel_get_type (void);
-void  cc_empathy_accounts_panel_register (GIOModule *module);
-
-G_END_DECLS
-
-#endif /* __CC_EMPATHY_ACCOUNTS_PANEL_H */
diff --git a/src/empathy-about-dialog.c b/src/empathy-about-dialog.c
index 1a66fb2b9..04b2753b6 100644
--- a/src/empathy-about-dialog.c
+++ b/src/empathy-about-dialog.c
@@ -107,7 +107,7 @@ empathy_about_dialog_new (GtkWindow *parent)
 			       "comments", _("An Instant Messaging client for GNOME"),
 			       "license", license_trans,
 			       "wrap-license", TRUE,
-			       "copyright", "Imendio AB 2002-2007\nCollabora Ltd 2007-2010",
+			       "copyright", "Imendio AB 2002-2007\nCollabora Ltd 2007-2011",
 			       "documenters", documenters,
 			       "logo-icon-name", "empathy",
 			       "translator-credits", _("translator-credits"),
diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c
index 1b39000cd..efd6dc184 100644
--- a/src/empathy-account-assistant.c
+++ b/src/empathy-account-assistant.c
@@ -1161,7 +1161,7 @@ account_mgr_prepare_cb (GObject *source_object,
   TpAccountManager *manager = TP_ACCOUNT_MANAGER (source_object);
   GError *error = NULL;
 
-  if (!tp_account_manager_prepare_finish (manager, result, &error))
+  if (!tp_proxy_prepare_finish (manager, result, &error))
     {
       DEBUG ("Failed to prepare account manager: %s", error->message);
       g_error_free (error);
@@ -1277,7 +1277,7 @@ do_constructed (GObject *object)
   priv->salut_page = page;
   priv->display_salut_page = TRUE;
 
-  tp_account_manager_prepare_async (priv->account_mgr, NULL,
+  tp_proxy_prepare_async (priv->account_mgr, NULL,
       account_mgr_prepare_cb, self);
 
   gtk_window_set_resizable (GTK_WINDOW (self), FALSE);
diff --git a/src/empathy-accounts-common.c b/src/empathy-accounts-common.c
index 8932fdbbc..a08a1ef77 100644
--- a/src/empathy-accounts-common.c
+++ b/src/empathy-accounts-common.c
@@ -132,12 +132,14 @@ out:
 void
 empathy_accounts_show_accounts_ui (TpAccountManager *manager,
     TpAccount *account,
+    gboolean assistant,
     GCallback window_destroyed_cb)
 {
   g_return_if_fail (TP_IS_ACCOUNT_MANAGER (manager));
   g_return_if_fail (!account || TP_IS_ACCOUNT (account));
 
-  if (empathy_accounts_has_non_salut_accounts (manager))
+  if ((empathy_accounts_has_non_salut_accounts (manager) && !assistant) ||
+          account != NULL)
     {
       do_show_accounts_ui (manager, account, window_destroyed_cb);
     }
diff --git a/src/empathy-accounts-common.h b/src/empathy-accounts-common.h
index c7f36661b..002d78323 100644
--- a/src/empathy-accounts-common.h
+++ b/src/empathy-accounts-common.h
@@ -28,6 +28,7 @@ gboolean empathy_accounts_has_accounts (TpAccountManager *manager);
 
 void empathy_accounts_show_accounts_ui (TpAccountManager *manager,
     TpAccount *account,
+    gboolean assistant,
     GCallback window_destroyed_cb);
 
 #endif /* __EMPATHY_ACCOUNTS_COMMON_H__ */
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 0eeec826c..ccda20079 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -1887,7 +1887,7 @@ account_prepare_cb (GObject *source_object,
   TpAccount *account = TP_ACCOUNT (source_object);
   GError *error = NULL;
 
-  if (!tp_account_prepare_finish (account, result, &error))
+  if (!tp_proxy_prepare_finish (account, result, &error))
     {
       DEBUG ("Failed to prepare account: %s", error->message);
       g_error_free (error);
@@ -1903,7 +1903,7 @@ accounts_dialog_account_validity_changed_cb (TpAccountManager *manager,
     gboolean valid,
     EmpathyAccountsDialog *dialog)
 {
-  tp_account_prepare_async (account, NULL, account_prepare_cb, dialog);
+  tp_proxy_prepare_async (account, NULL, account_prepare_cb, dialog);
 }
 
 static void
@@ -2118,7 +2118,7 @@ accounts_dialog_manager_ready_cb (GObject *source_object,
   TpAccountManager *manager = TP_ACCOUNT_MANAGER (source_object);
   GError *error = NULL;
 
-  if (!tp_account_manager_prepare_finish (manager, result, &error))
+  if (!tp_proxy_prepare_finish (manager, result, &error))
     {
       DEBUG ("Failed to prepare account manager: %s", error->message);
       g_error_free (error);
@@ -2444,7 +2444,7 @@ do_constructed (GObject *object)
   /* Set up signalling */
   priv->account_manager = tp_account_manager_dup ();
 
-  tp_account_manager_prepare_async (priv->account_manager, NULL,
+  tp_proxy_prepare_async (priv->account_manager, NULL,
       accounts_dialog_manager_ready_cb, dialog);
 
   priv->connectivity = empathy_connectivity_dup_singleton ();
diff --git a/src/empathy-accounts-dialog.ui b/src/empathy-accounts-dialog.ui
index fd8c75c15..4a1b8bbb3 100644
--- a/src/empathy-accounts-dialog.ui
+++ b/src/empathy-accounts-dialog.ui
@@ -254,29 +254,6 @@
             <property name="position">1</property>
           </packing>
         </child>
-        <child type="tab">
-          <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="label">page 2</property>
-          </object>
-          <packing>
-            <property name="position">1</property>
-            <property name="tab_fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="label">page 3</property>
-          </object>
-          <packing>
-            <property name="position">2</property>
-            <property name="tab_fill">False</property>
-          </packing>
-        </child>
       </object>
       <packing>
         <property name="position">1</property>
diff --git a/src/empathy-accounts-module.c b/src/empathy-accounts-module.c
deleted file mode 100644
index aedded62c..000000000
--- a/src/empathy-accounts-module.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2010 Collabora Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Authors: Travis Reitter <travis.reitter@collabora.co.uk>
- */
-
-#include <config.h>
-
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-#include <gmodule.h>
-#include <gio/gio.h>
-
-#include "cc-empathy-accounts-panel.h"
-
-void
-g_io_module_load (GIOModule *module)
-{
-  cc_empathy_accounts_panel_register (module);
-}
-
-void
-g_io_module_unload (GIOModule *module)
-{
-}
diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c
index 78398c3ee..3cad96744 100644
--- a/src/empathy-accounts.c
+++ b/src/empathy-accounts.c
@@ -55,6 +55,7 @@ static gboolean only_if_needed = FALSE;
 static gboolean hidden = FALSE;
 static gchar *selected_account_name = NULL;
 static gboolean account_manager_prepared = FALSE;
+static gboolean assistant = FALSE;
 
 static void
 account_prepare_cb (GObject *source_object,
@@ -65,7 +66,7 @@ account_prepare_cb (GObject *source_object,
   TpAccount *account = TP_ACCOUNT (source_object);
   GError *error = NULL;
 
-  if (!tp_account_prepare_finish (account, result, &error))
+  if (!tp_proxy_prepare_finish (account, result, &error))
     {
       DEBUG ("Failed to prepare account: %s", error->message);
       g_error_free (error);
@@ -73,7 +74,7 @@ account_prepare_cb (GObject *source_object,
       account = NULL;
     }
 
-  empathy_accounts_show_accounts_ui (manager, account,
+  empathy_accounts_show_accounts_ui (manager, account, assistant,
       G_CALLBACK (gtk_main_quit));
 }
 
@@ -84,7 +85,7 @@ maybe_show_accounts_ui (TpAccountManager *manager)
       (only_if_needed && empathy_accounts_has_non_salut_accounts (manager)))
     gtk_main_quit ();
   else
-    empathy_accounts_show_accounts_ui (manager, NULL, gtk_main_quit);
+    empathy_accounts_show_accounts_ui (manager, NULL, assistant, gtk_main_quit);
 }
 
 static void
@@ -95,7 +96,7 @@ account_manager_ready_for_accounts_cb (GObject *source_object,
   TpAccountManager *manager = TP_ACCOUNT_MANAGER (source_object);
   GError *error = NULL;
 
-  if (!tp_account_manager_prepare_finish (manager, result, &error))
+  if (!tp_proxy_prepare_finish (manager, result, &error))
     {
       DEBUG ("Failed to prepare account manager: %s", error->message);
       g_clear_error (&error);
@@ -121,7 +122,7 @@ account_manager_ready_for_accounts_cb (GObject *source_object,
       bus = tp_dbus_daemon_dup (NULL);
       if ((account = tp_account_new (bus, account_path, &error)))
         {
-          tp_account_prepare_async (account, NULL, account_prepare_cb, manager);
+          tp_proxy_prepare_async (account, NULL, account_prepare_cb, manager);
           g_object_unref (bus);
           return;
         }
@@ -156,7 +157,7 @@ app_command_line_cb (GApplication *app,
       TpAccountManager *account_manager;
 
       account_manager = tp_account_manager_dup ();
-      empathy_accounts_show_accounts_ui (account_manager, NULL,
+      empathy_accounts_show_accounts_ui (account_manager, NULL, assistant,
               G_CALLBACK (gtk_main_quit));
 
       g_object_unref (account_manager);
@@ -191,6 +192,10 @@ local_cmdline (GApplication *app,
         N_("Initially select given account (eg, "
             "gabble/jabber/foo_40example_2eorg0)"),
         N_("<account-id>") },
+      { "assistant", 'a',
+        0, G_OPTION_ARG_NONE, &assistant,
+        N_("Show account assistant"),
+        NULL },
 
       { NULL }
   };
@@ -248,7 +253,7 @@ main (int argc, char *argv[])
 
   account_manager = tp_account_manager_dup ();
 
-  tp_account_manager_prepare_async (account_manager, NULL,
+  tp_proxy_prepare_async (account_manager, NULL,
     account_manager_ready_for_accounts_cb, NULL);
 
   g_signal_connect (app, "command-line", G_CALLBACK (app_command_line_cb),
diff --git a/src/empathy-audio-src.c b/src/empathy-audio-src.c
index 203082dce..916f3cd98 100644
--- a/src/empathy-audio-src.c
+++ b/src/empathy-audio-src.c
@@ -27,7 +27,6 @@
 
 #include "empathy-audio-src.h"
 
-#include "src-marshal.h"
 #include "empathy-mic-monitor.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
@@ -92,6 +91,21 @@ empathy_audio_src_supports_changing_mic (EmpathyGstAudioSrc *self)
           "source-output-index") != NULL);
 }
 
+static guint
+empathy_audio_src_get_mic_index (EmpathyGstAudioSrc *self)
+{
+  EmpathyGstAudioSrcPrivate *priv = EMPATHY_GST_AUDIO_SRC_GET_PRIVATE (self);
+  guint audio_src_idx = PA_INVALID_INDEX;
+
+  if (empathy_audio_src_supports_changing_mic (self))
+    g_object_get (priv->src,
+      "source-output-index", &audio_src_idx,
+      NULL);
+
+  return audio_src_idx;
+}
+
+
 static void
 empathy_audio_src_microphone_changed_cb (EmpathyMicMonitor *monitor,
     guint source_output_idx,
@@ -100,9 +114,9 @@ empathy_audio_src_microphone_changed_cb (EmpathyMicMonitor *monitor,
 {
   EmpathyGstAudioSrc *self = user_data;
   EmpathyGstAudioSrcPrivate *priv = EMPATHY_GST_AUDIO_SRC_GET_PRIVATE (self);
-  guint audio_src_idx = PA_INVALID_INDEX;
+  guint audio_src_idx;
 
-  g_object_get (priv->src, "source-output-index", &audio_src_idx, NULL);
+  audio_src_idx = empathy_audio_src_get_mic_index (self);
 
   if (source_output_idx == PA_INVALID_INDEX
       || source_output_idx != audio_src_idx)
@@ -148,9 +162,9 @@ empathy_audio_src_source_output_index_notify (GObject *object,
     EmpathyGstAudioSrc *self)
 {
   EmpathyGstAudioSrcPrivate *priv = EMPATHY_GST_AUDIO_SRC_GET_PRIVATE (self);
-  guint source_output_idx = PA_INVALID_INDEX;
+  guint source_output_idx;
 
-  g_object_get (priv->src, "source-output-index", &source_output_idx, NULL);
+  source_output_idx = empathy_audio_src_get_mic_index (self);
 
   if (source_output_idx == PA_INVALID_INDEX)
     return;
@@ -336,7 +350,7 @@ empathy_audio_src_class_init (EmpathyGstAudioSrcClass
     G_SIGNAL_RUN_LAST,
     0,
     NULL, NULL,
-    g_cclosure_marshal_VOID__DOUBLE,
+    g_cclosure_marshal_generic,
     G_TYPE_NONE, 1, G_TYPE_DOUBLE);
 
   param_spec = g_param_spec_double ("rms-level", "RMS level", "RMS level",
@@ -349,7 +363,7 @@ empathy_audio_src_class_init (EmpathyGstAudioSrcClass
     G_SIGNAL_RUN_LAST,
     0,
     NULL, NULL,
-    g_cclosure_marshal_VOID__DOUBLE,
+    g_cclosure_marshal_generic,
     G_TYPE_NONE, 1, G_TYPE_DOUBLE);
 }
 
@@ -562,7 +576,7 @@ empathy_audio_src_change_microphone_async (EmpathyGstAudioSrc *src,
       return;
     }
 
-  g_object_get (priv->src, "source-output-index", &source_output_idx, NULL);
+  source_output_idx = empathy_audio_src_get_mic_index (src);
 
   if (source_output_idx == PA_INVALID_INDEX)
     {
diff --git a/src/empathy-call-factory.c b/src/empathy-call-factory.c
index 9f3fe16ec..b3c85f4b0 100644
--- a/src/empathy-call-factory.c
+++ b/src/empathy-call-factory.c
@@ -29,69 +29,66 @@
 
 #include <telepathy-yell/telepathy-yell.h>
 
+#include <libempathy/empathy-client-factory.h>
 #include <libempathy/empathy-request-util.h>
 #include <libempathy/empathy-tp-contact-factory.h>
 #include <libempathy/empathy-utils.h>
 
 #include "empathy-call-factory.h"
 #include "empathy-call-handler.h"
-#include "src-marshal.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include <libempathy/empathy-debug.h>
 
-G_DEFINE_TYPE(EmpathyCallFactory, empathy_call_factory, G_TYPE_OBJECT)
+G_DEFINE_TYPE(EmpathyCallFactory, empathy_call_factory, TP_TYPE_BASE_CLIENT)
 
-static void handle_channels_cb (TpSimpleHandler *handler,
+static void handle_channels (TpBaseClient *client,
     TpAccount *account,
     TpConnection *connection,
     GList *channels,
     GList *requests_satisfied,
     gint64 user_action_time,
-    TpHandleChannelsContext *context,
-    gpointer user_data);
+    TpHandleChannelsContext *context);
+
+static void approve_channels (TpBaseClient *client,
+    TpAccount *account,
+    TpConnection *connection,
+    GList *channels,
+    TpChannelDispatchOperation *dispatch_operation,
+    TpAddDispatchOperationContext *context);
 
 /* signal enum */
 enum
 {
     NEW_CALL_HANDLER,
+    INCOMING_CALL,
     LAST_SIGNAL
 };
 
 static guint signals[LAST_SIGNAL] = {0};
 
-/* private structure */
-typedef struct {
-  TpBaseClient *handler;
-  gboolean dispose_has_run;
-} EmpathyCallFactoryPriv;
-
-#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCallFactory)
-
 static GObject *call_factory = NULL;
 
 static void
 empathy_call_factory_init (EmpathyCallFactory *obj)
 {
-  EmpathyCallFactoryPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (obj,
-    EMPATHY_TYPE_CALL_FACTORY, EmpathyCallFactoryPriv);
-  TpAccountManager *am;
-
-  obj->priv = priv;
-
-  am = tp_account_manager_dup ();
+  TpBaseClient *client = (TpBaseClient *) obj;
 
-  priv->handler = tp_simple_handler_new_with_am (am, FALSE, FALSE,
-      EMPATHY_CALL_BUS_NAME_SUFFIX, FALSE, handle_channels_cb, obj, NULL);
+  tp_base_client_take_approver_filter (client, tp_asv_new (
+        TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
+          TPY_IFACE_CHANNEL_TYPE_CALL,
+        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
+          G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
+        NULL));
 
-  tp_base_client_take_handler_filter (priv->handler, tp_asv_new (
+  tp_base_client_take_handler_filter (client, tp_asv_new (
         TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
           TPY_IFACE_CHANNEL_TYPE_CALL,
         TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
           G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
         NULL));
 
-  tp_base_client_take_handler_filter (priv->handler, tp_asv_new (
+  tp_base_client_take_handler_filter (client, tp_asv_new (
         TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
           TPY_IFACE_CHANNEL_TYPE_CALL,
         TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
@@ -99,7 +96,7 @@ empathy_call_factory_init (EmpathyCallFactory *obj)
         TPY_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, G_TYPE_BOOLEAN, TRUE,
         NULL));
 
-  tp_base_client_take_handler_filter (priv->handler, tp_asv_new (
+  tp_base_client_take_handler_filter (client, tp_asv_new (
         TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
           TPY_IFACE_CHANNEL_TYPE_CALL,
         TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
@@ -107,13 +104,11 @@ empathy_call_factory_init (EmpathyCallFactory *obj)
         TPY_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, G_TYPE_BOOLEAN, TRUE,
         NULL));
 
-  tp_base_client_add_handler_capabilities_varargs (priv->handler,
+  tp_base_client_add_handler_capabilities_varargs (client,
     "org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/ice-udp",
     "org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/gtalk-p2p",
     "org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/video/h264",
     NULL);
-
-  g_object_unref (am);
 }
 
 static GObject *
@@ -130,59 +125,59 @@ empathy_call_factory_constructor (GType type, guint n_construct_params,
 }
 
 static void
-empathy_call_factory_finalize (GObject *object)
-{
-  /* free any data held directly by the object here */
-
-  if (G_OBJECT_CLASS (empathy_call_factory_parent_class)->finalize)
-    G_OBJECT_CLASS (empathy_call_factory_parent_class)->finalize (object);
-}
-
-static void
-empathy_call_factory_dispose (GObject *object)
-{
-  EmpathyCallFactoryPriv *priv = GET_PRIV (object);
-
-  if (priv->dispose_has_run)
-    return;
-
-  priv->dispose_has_run = TRUE;
-
-  tp_clear_object (&priv->handler);
-
-  if (G_OBJECT_CLASS (empathy_call_factory_parent_class)->dispose)
-    G_OBJECT_CLASS (empathy_call_factory_parent_class)->dispose (object);
-}
-
-static void
-empathy_call_factory_class_init (
-  EmpathyCallFactoryClass *empathy_call_factory_class)
+empathy_call_factory_class_init (EmpathyCallFactoryClass *klass)
 {
-  GObjectClass *object_class = G_OBJECT_CLASS (empathy_call_factory_class);
-
-  g_type_class_add_private (empathy_call_factory_class,
-    sizeof (EmpathyCallFactoryPriv));
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  TpBaseClientClass *base_clt_cls = TP_BASE_CLIENT_CLASS (klass);
 
   object_class->constructor = empathy_call_factory_constructor;
-  object_class->dispose = empathy_call_factory_dispose;
-  object_class->finalize = empathy_call_factory_finalize;
+
+  base_clt_cls->handle_channels = handle_channels;
+  base_clt_cls->add_dispatch_operation = approve_channels;
 
   signals[NEW_CALL_HANDLER] =
     g_signal_new ("new-call-handler",
-      G_TYPE_FROM_CLASS (empathy_call_factory_class),
+      G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0,
       NULL, NULL,
-      _src_marshal_VOID__OBJECT_BOOLEAN,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       2, EMPATHY_TYPE_CALL_HANDLER, G_TYPE_BOOLEAN);
+
+  signals[INCOMING_CALL] =
+    g_signal_new ("incoming-call",
+      G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST, 0,
+      NULL, NULL,
+      g_cclosure_marshal_generic,
+      G_TYPE_BOOLEAN,
+      4, G_TYPE_UINT, TPY_TYPE_CALL_CHANNEL,
+      TP_TYPE_CHANNEL_DISPATCH_OPERATION,
+      TP_TYPE_ADD_DISPATCH_OPERATION_CONTEXT);
 }
 
 EmpathyCallFactory *
 empathy_call_factory_initialise (void)
 {
+  EmpathyCallFactory *self;
+  EmpathyClientFactory *factory;
+  TpAccountManager *am;
+
   g_return_val_if_fail (call_factory == NULL, NULL);
 
-  return EMPATHY_CALL_FACTORY (g_object_new (EMPATHY_TYPE_CALL_FACTORY, NULL));
+  am = tp_account_manager_dup ();
+  factory = empathy_client_factory_dup ();
+
+  self = EMPATHY_CALL_FACTORY (g_object_new (EMPATHY_TYPE_CALL_FACTORY,
+      "account-manager", am,
+      "factory", factory,
+      "name", EMPATHY_CALL_BUS_NAME_SUFFIX,
+      NULL));
+
+  g_object_unref (am);
+  g_object_unref (factory);
+
+  return self;
 }
 
 EmpathyCallFactory *
@@ -254,16 +249,15 @@ call_channel_ready_cb (TpyCallChannel *call,
 
 
 static void
-handle_channels_cb (TpSimpleHandler *handler,
+handle_channels (TpBaseClient *client,
     TpAccount *account,
     TpConnection *connection,
     GList *channels,
     GList *requests_satisfied,
     gint64 user_action_time,
-    TpHandleChannelsContext *context,
-    gpointer user_data)
+    TpHandleChannelsContext *context)
 {
-  EmpathyCallFactory *self = user_data;
+  EmpathyCallFactory *self = EMPATHY_CALL_FACTORY (client);
   GList *l;
 
   for (l = channels; l != NULL; l = g_list_next (l))
@@ -298,11 +292,80 @@ handle_channels_cb (TpSimpleHandler *handler,
   tp_handle_channels_context_accept (context);
 }
 
+static TpyCallChannel *
+find_call_channel (GList *channels)
+{
+  GList *l;
+
+  for (l = channels; l != NULL; l = g_list_next (l))
+    {
+      TpChannel *channel = l->data;
+      GQuark channel_type;
+
+      if (tp_proxy_get_invalidated (channel) != NULL)
+        continue;
+
+      channel_type = tp_channel_get_channel_type_id (channel);
+
+      if (channel_type == TPY_IFACE_QUARK_CHANNEL_TYPE_CALL)
+        return TPY_CALL_CHANNEL (channel);
+    }
+
+  return NULL;
+}
+
+static void
+approve_channels (TpBaseClient *client,
+    TpAccount *account,
+    TpConnection *connection,
+    GList *channels,
+    TpChannelDispatchOperation *dispatch_operation,
+    TpAddDispatchOperationContext *context)
+{
+  EmpathyCallFactory *self = EMPATHY_CALL_FACTORY (client);
+  TpyCallChannel *channel;
+  guint handle;
+  GError error = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, "" };
+  gboolean handled = FALSE;
+
+  channel = find_call_channel (channels);
+
+  if (channel == NULL)
+    {
+      DEBUG ("Failed to find the main channel; ignoring");
+      error.message = "Unknown channel";
+      goto out;
+    }
+
+  handle = tp_channel_get_handle (TP_CHANNEL (channel), NULL);
+
+  if (handle == 0)
+    {
+      DEBUG ("Unknown handle, ignoring");
+      error.code = TP_ERROR_INVALID_HANDLE;
+      error.message = "Unknown handle";
+      goto out;
+    }
+
+  g_signal_emit (self, signals[INCOMING_CALL], 0,
+      handle, channel, dispatch_operation, context,
+      &handled);
+
+  if (handled)
+    return;
+
+  /* There was no call window so the context wasn't handled. */
+  DEBUG ("Call with a contact for which there's no existing "
+    "call window, ignoring");
+  error.message = "No call window with this contact";
+
+ out:
+  tp_add_dispatch_operation_context_fail (context, &error);
+}
+
 gboolean
 empathy_call_factory_register (EmpathyCallFactory *self,
     GError **error)
 {
-  EmpathyCallFactoryPriv *priv = GET_PRIV (self);
-
-  return tp_base_client_register (priv->handler, error);
+  return tp_base_client_register (TP_BASE_CLIENT (self), error);
 }
diff --git a/src/empathy-call-factory.h b/src/empathy-call-factory.h
index 0e5276278..174fbf4bd 100644
--- a/src/empathy-call-factory.h
+++ b/src/empathy-call-factory.h
@@ -29,12 +29,11 @@ typedef struct _EmpathyCallFactory EmpathyCallFactory;
 typedef struct _EmpathyCallFactoryClass EmpathyCallFactoryClass;
 
 struct _EmpathyCallFactoryClass {
-    GObjectClass parent_class;
+    TpBaseClientClass parent_class;
 };
 
 struct _EmpathyCallFactory {
-    GObject parent;
-    gpointer priv;
+    TpBaseClient parent;
 };
 
 GType empathy_call_factory_get_type (void);
diff --git a/src/empathy-call-handler.c b/src/empathy-call-handler.c
index cf93a1de3..9fe89337d 100644
--- a/src/empathy-call-handler.c
+++ b/src/empathy-call-handler.c
@@ -36,7 +36,6 @@
 #include <libempathy-gtk/empathy-call-utils.h>
 
 #include "empathy-call-handler.h"
-#include "src-marshal.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include <libempathy/empathy-debug.h>
@@ -457,55 +456,55 @@ empathy_call_handler_class_init (EmpathyCallHandlerClass *klass)
   signals[CONFERENCE_ADDED] =
     g_signal_new ("conference-added", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__OBJECT,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       1, FS_TYPE_CONFERENCE);
 
   signals[CONFERENCE_REMOVED] =
     g_signal_new ("conference-removed", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__OBJECT,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       1, FS_TYPE_CONFERENCE);
 
   signals[SRC_PAD_ADDED] =
     g_signal_new ("src-pad-added", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      _src_marshal_BOOLEAN__OBJECT_UINT,
+      g_cclosure_marshal_generic,
       G_TYPE_BOOLEAN,
       2, GST_TYPE_PAD, G_TYPE_UINT);
 
   signals[SINK_PAD_ADDED] =
     g_signal_new ("sink-pad-added", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      _src_marshal_BOOLEAN__OBJECT_UINT,
+      g_cclosure_marshal_generic,
       G_TYPE_BOOLEAN,
       2, GST_TYPE_PAD, G_TYPE_UINT);
 
   signals[SINK_PAD_REMOVED] =
     g_signal_new ("sink-pad-removed", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      _src_marshal_BOOLEAN__OBJECT_UINT,
+      g_cclosure_marshal_generic,
       G_TYPE_BOOLEAN,
       2, GST_TYPE_PAD, G_TYPE_UINT);
 
   signals[CLOSED] =
     g_signal_new ("closed", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__VOID,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       0);
 
   signals[CANDIDATES_CHANGED] =
     g_signal_new ("candidates-changed", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__UINT,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE, 1, G_TYPE_UINT);
 
   signals[STATE_CHANGED] =
     g_signal_new ("state-changed", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__UINT,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE, 1, G_TYPE_UINT);
 }
 
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index ccec9f628..2a92e9471 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -43,6 +43,7 @@
 #include <libempathy/empathy-camera-monitor.h>
 #include <libempathy/empathy-gsettings.h>
 #include <libempathy/empathy-tp-contact-factory.h>
+#include <libempathy/empathy-request-util.h>
 #include <libempathy/empathy-utils.h>
 
 #include <libempathy-gtk/empathy-avatar-image.h>
@@ -103,11 +104,12 @@ enum {
 };
 
 typedef enum {
-  CONNECTING,
-  CONNECTED,
-  HELD,
-  DISCONNECTED,
-  REDIALING
+  RINGING,       /* Incoming call */
+  CONNECTING,    /* Outgoing call */
+  CONNECTED,     /* Connected */
+  HELD,          /* Connected, but on hold */
+  DISCONNECTED,  /* Disconnected */
+  REDIALING      /* Redialing (special case of CONNECTING) */
 } CallState;
 
 typedef enum {
@@ -152,6 +154,8 @@ struct _EmpathyCallWindowPriv
   ClutterActor *preview_rectangle_box2;
   ClutterActor *preview_rectangle_box3;
   ClutterActor *preview_rectangle_box4;
+  ClutterActor *preview_spinner_actor;
+  GtkWidget *preview_spinner_widget;
   GtkWidget *video_container;
   GtkWidget *remote_user_avatar_widget;
   GtkWidget *remote_user_avatar_toolbar;
@@ -184,11 +188,22 @@ struct _EmpathyCallWindowPriv
      easilly repack everything when toggling fullscreen */
   GtkWidget *content_hbox;
 
+  /* These are used to accept or reject an incoming call when the status
+     is RINGING. */
+  GtkWidget *incoming_call_dialog;
+  TpyCallChannel *pending_channel;
+  TpChannelDispatchOperation *pending_cdo;
+  TpAddDispatchOperationContext *pending_context;
+
   gulong video_output_motion_handler_id;
   guint bus_message_source_id;
 
   gdouble volume;
 
+  /* String that contains the queued tones to send after the current ones
+     are sent */
+  GString *tones;
+  gboolean sending_tones;
   GtkWidget *dtmf_panel;
 
   /* Details vbox */
@@ -293,6 +308,8 @@ static gboolean empathy_call_window_video_output_motion_notify (
 static void empathy_call_window_video_menu_popup (EmpathyCallWindow *window,
   guint button);
 
+static void empathy_call_window_connect_handler (EmpathyCallWindow *self);
+
 static void empathy_call_window_dialpad_cb (GtkToggleToolButton *button,
   EmpathyCallWindow *window);
 
@@ -335,35 +352,72 @@ empathy_call_window_video_call_cb (GtkToggleToolButton *button,
 }
 
 static void
-dtmf_button_pressed_cb (GtkButton *button, EmpathyCallWindow *window)
+empathy_call_window_emit_tones (EmpathyCallWindow *self)
 {
-  EmpathyCallWindowPriv *priv = GET_PRIV (window);
-  TpyCallChannel *call;
+  TpChannel *channel;
+
+  if (tp_str_empty (self->priv->tones->str))
+    return;
+
+  g_object_get (self->priv->handler, "call-channel", &channel, NULL);
+
+  DEBUG ("Emitting multiple tones: %s", self->priv->tones->str);
+
+  tp_cli_channel_interface_dtmf_call_multiple_tones (channel, -1,
+      self->priv->tones->str,
+      NULL, NULL, NULL, NULL);
+
+  self->priv->sending_tones = TRUE;
+
+  g_string_set_size (self->priv->tones, 0);
+
+  g_object_unref (channel);
+}
+
+static void
+empathy_call_window_maybe_emit_tones (EmpathyCallWindow *self)
+{
+  if (self->priv->sending_tones)
+    return;
+
+  empathy_call_window_emit_tones (self);
+}
+
+static void
+empathy_call_window_tones_stopped_cb (TpChannel *proxy,
+    gboolean arg_cancelled,
+    gpointer user_data,
+    GObject *weak_object)
+{
+  EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (user_data);
+
+  self->priv->sending_tones = FALSE;
+
+  empathy_call_window_emit_tones (self);
+}
+
+static void
+dtmf_button_pressed_cb (GtkButton *button,
+    EmpathyCallWindow *self)
+{
+  EmpathyCallWindowPriv *priv = GET_PRIV (self);
   GQuark button_quark;
   TpDTMFEvent event;
 
-  g_object_get (priv->handler, "call-channel", &call, NULL);
-
   button_quark = g_quark_from_static_string (EMPATHY_DTMF_BUTTON_ID);
   event = GPOINTER_TO_UINT (g_object_get_qdata (G_OBJECT (button),
     button_quark));
 
-  tpy_call_channel_dtmf_start_tone (call, event);
+  g_string_append_c (priv->tones, tp_dtmf_event_to_char (event));
 
-  g_object_unref (call);
+  empathy_call_window_maybe_emit_tones (self);
 }
 
+/* empathy_create_dtmf_dialpad() requires a callback, even if empty */
 static void
-dtmf_button_released_cb (GtkButton *button, EmpathyCallWindow *window)
+dtmf_button_released_cb (GtkButton *button,
+    EmpathyCallWindow *self)
 {
-  EmpathyCallWindowPriv *priv = GET_PRIV (window);
-  TpyCallChannel *call;
-
-  g_object_get (priv->handler, "call-channel", &call, NULL);
-
-  tpy_call_channel_dtmf_stop_tone (call);
-
-  g_object_unref (call);
 }
 
 static void
@@ -700,6 +754,55 @@ empathy_call_window_show_preview_rectangles (EmpathyCallWindow *self,
   g_object_set (self->priv->preview_rectangle4, "visible", show, NULL);
 }
 
+static void
+empathy_call_window_get_preview_coordinates (EmpathyCallWindow *self,
+    PreviewPosition pos,
+    guint *x,
+    guint *y)
+{
+  guint ret_x = 0, ret_y = 0;
+  ClutterGeometry box;
+
+  if (!clutter_actor_has_allocation (self->priv->video_box))
+    goto out;
+
+  clutter_actor_get_geometry (self->priv->video_box, &box);
+
+  switch (pos)
+    {
+      case PREVIEW_POS_TOP_LEFT:
+        ret_x = ret_y = SELF_VIDEO_SECTION_MARGIN;
+        break;
+      case PREVIEW_POS_TOP_RIGHT:
+        ret_x = box.width - SELF_VIDEO_SECTION_MARGIN
+            - SELF_VIDEO_SECTION_WIDTH;
+        ret_y = SELF_VIDEO_SECTION_MARGIN;
+        break;
+      case PREVIEW_POS_BOTTOM_LEFT:
+        ret_x = SELF_VIDEO_SECTION_MARGIN;
+        ret_y = box.height - SELF_VIDEO_SECTION_MARGIN
+            - SELF_VIDEO_SECTION_HEIGHT
+            - FLOATING_TOOLBAR_HEIGHT - FLOATING_TOOLBAR_SPACING;
+        break;
+      case PREVIEW_POS_BOTTOM_RIGHT:
+        ret_x = box.width - SELF_VIDEO_SECTION_MARGIN
+            - SELF_VIDEO_SECTION_WIDTH;
+        ret_y = box.height - SELF_VIDEO_SECTION_MARGIN
+            - SELF_VIDEO_SECTION_HEIGHT - FLOATING_TOOLBAR_HEIGHT
+            - FLOATING_TOOLBAR_SPACING;
+        break;
+      default:
+        g_warn_if_reached ();
+    }
+
+out:
+  if (x != NULL)
+    *x = ret_x;
+
+  if (y != NULL)
+    *y = ret_y;
+}
+
 static PreviewPosition
 empathy_call_window_get_preview_position (EmpathyCallWindow *self,
     gfloat event_x,
@@ -900,6 +1003,13 @@ empathy_call_window_preview_on_drag_begin_cb (ClutterDragAction *action,
 }
 
 static void
+empathy_call_window_on_animation_completed_cb (ClutterAnimation *animation,
+    ClutterActor *actor)
+{
+  clutter_actor_set_opacity (actor, 255);
+}
+
+static void
 empathy_call_window_preview_on_drag_end_cb (ClutterDragAction *action,
     ClutterActor *actor,
     gfloat event_x,
@@ -908,18 +1018,30 @@ empathy_call_window_preview_on_drag_end_cb (ClutterDragAction *action,
     EmpathyCallWindow *self)
 {
   PreviewPosition pos;
+  guint x, y;
 
   /* Get the position before destroying the drag actor, otherwise the
    * preview_box allocation won't be valid and we won't be able to
    * calculate the position. */
   pos = empathy_call_window_get_preview_position (self, event_x, event_y);
 
-  /* Destroy the video preview copy that we were dragging */
-  clutter_actor_destroy (self->priv->drag_preview);
-  self->priv->drag_preview = NULL;
+  empathy_call_window_get_preview_coordinates (self,
+      pos != PREVIEW_POS_NONE ? pos : self->priv->preview_pos,
+      &x, &y);
+
+  /* Move the preview to the destination and destroy it afterwards */
+  clutter_actor_animate (self->priv->drag_preview, CLUTTER_LINEAR, 500,
+      "x", (gfloat) x,
+      "y", (gfloat) y,
+      "signal-swapped-after::completed",
+        clutter_actor_destroy, self->priv->drag_preview,
+      "signal-swapped-after::completed",
+        clutter_actor_show, self->priv->preview_shown_button,
+      "signal::completed",
+        empathy_call_window_on_animation_completed_cb, actor,
+      NULL);
 
-  clutter_actor_set_opacity (actor, 255);
-  clutter_actor_show (self->priv->preview_shown_button);
+  self->priv->drag_preview = NULL;
 
   if (pos != PREVIEW_POS_NONE)
     empathy_call_window_move_video_preview (self, pos);
@@ -993,6 +1115,7 @@ create_video_preview (EmpathyCallWindow *self)
   ClutterAction *action;
   GtkWidget *button;
   PreviewPosition pos;
+  GdkRGBA transparent = { 0., 0., 0., 0. };
 
   g_assert (priv->video_preview == NULL);
 
@@ -1013,6 +1136,28 @@ create_video_preview (EmpathyCallWindow *self)
       SELF_VIDEO_SECTION_HEIGHT + 2 * SELF_VIDEO_SECTION_MARGIN +
       FLOATING_TOOLBAR_HEIGHT + FLOATING_TOOLBAR_SPACING);
 
+  /* Spinner for when changing the camera device */
+  priv->preview_spinner_widget = gtk_spinner_new ();
+  priv->preview_spinner_actor = empathy_rounded_actor_new ();
+  empathy_rounded_actor_set_round_factor (
+      EMPATHY_ROUNDED_ACTOR (priv->preview_spinner_actor), 16);
+
+  g_object_set (priv->preview_spinner_widget, "expand", TRUE, NULL);
+  gtk_widget_override_background_color (
+      gtk_clutter_actor_get_widget (
+          GTK_CLUTTER_ACTOR (priv->preview_spinner_actor)),
+      GTK_STATE_FLAG_NORMAL, &transparent);
+  gtk_widget_show (priv->preview_spinner_widget);
+
+  gtk_container_add (
+      GTK_CONTAINER (gtk_clutter_actor_get_widget (
+          GTK_CLUTTER_ACTOR (priv->preview_spinner_actor))),
+      priv->preview_spinner_widget);
+  clutter_actor_set_size (priv->preview_spinner_actor,
+      SELF_VIDEO_SECTION_WIDTH, SELF_VIDEO_SECTION_HEIGHT);
+  clutter_actor_set_opacity (priv->preview_spinner_actor, 128);
+  clutter_actor_hide (priv->preview_spinner_actor);
+
   /* We have a box with the margins and the video in the middle inside
    * a bigger box with an extra bottom margin so we're not on top of
    * the floating toolbar. */
@@ -1024,6 +1169,8 @@ create_video_preview (EmpathyCallWindow *self)
       SELF_VIDEO_SECTION_HEIGHT + 2 * SELF_VIDEO_SECTION_MARGIN);
 
   clutter_container_add_actor (CLUTTER_CONTAINER (box), preview);
+  clutter_container_add_actor (CLUTTER_CONTAINER (box),
+      priv->preview_spinner_actor);
   clutter_container_add_actor (CLUTTER_CONTAINER (priv->video_preview), box);
 
   g_object_set (priv->video_preview_sink,
@@ -1102,24 +1249,43 @@ create_video_preview (EmpathyCallWindow *self)
   clutter_actor_set_reactive (priv->preview_shown_button, TRUE);
 }
 
+static void
+empathy_call_window_start_camera_spinning (EmpathyCallWindow *self)
+{
+  clutter_actor_show (self->priv->preview_spinner_actor);
+  gtk_spinner_start (GTK_SPINNER (self->priv->preview_spinner_widget));
+}
+
+static void
+empathy_call_window_stop_camera_spinning (EmpathyCallWindow *self)
+{
+  clutter_actor_hide (self->priv->preview_spinner_actor);
+  gtk_spinner_stop (GTK_SPINNER (self->priv->preview_spinner_widget));
+}
+
 void
-empathy_call_window_play_camera (EmpathyCallWindow *window,
+empathy_call_window_play_camera (EmpathyCallWindow *self,
     gboolean play)
 {
-  EmpathyCallWindowPriv *priv = GET_PRIV (window);
+  EmpathyCallWindowPriv *priv = GET_PRIV (self);
   GstElement *preview;
   GstState state;
 
   if (priv->video_preview == NULL)
     {
-      create_video_preview (window);
-      add_video_preview_to_pipeline (window);
+      create_video_preview (self);
+      add_video_preview_to_pipeline (self);
     }
 
   if (play)
-    state = GST_STATE_PLAYING;
+    {
+      state = GST_STATE_PLAYING;
+    }
   else
-    state = GST_STATE_NULL;
+    {
+      empathy_call_window_start_camera_spinning (self);
+      state = GST_STATE_NULL;
+    }
 
   preview = priv->video_preview_sink;
 
@@ -1358,6 +1524,105 @@ empathy_call_window_stage_allocation_changed_cb (ClutterActor *stage,
 }
 
 static void
+empathy_call_window_incoming_call_response_cb (GtkDialog *dialog,
+    gint response_id,
+    EmpathyCallWindow *self)
+{
+  switch (response_id)
+    {
+      case GTK_RESPONSE_ACCEPT:
+        tp_channel_dispatch_operation_handle_with_async (
+            self->priv->pending_cdo, EMPATHY_CALL_BUS_NAME, NULL, NULL);
+
+        tp_clear_object (&self->priv->pending_cdo);
+        tp_clear_object (&self->priv->pending_channel);
+        tp_clear_object (&self->priv->pending_context);
+
+        break;
+      case GTK_RESPONSE_CANCEL:
+        tp_channel_dispatch_operation_close_channels_async (
+            self->priv->pending_cdo, NULL, NULL);
+
+        empathy_call_window_status_message (self, _("Disconnected"));
+        self->priv->call_state = DISCONNECTED;
+        break;
+      default:
+        g_warn_if_reached ();
+    }
+}
+
+static void
+empathy_call_window_set_state_ringing (EmpathyCallWindow *self)
+{
+  gboolean video;
+
+  g_assert (self->priv->call_state != CONNECTED);
+
+  video = tpy_call_channel_has_initial_video (self->priv->pending_channel);
+
+  empathy_call_window_status_message (self, _("Incoming call"));
+  self->priv->call_state = RINGING;
+
+  self->priv->incoming_call_dialog = gtk_message_dialog_new (
+      GTK_WINDOW (self), GTK_DIALOG_MODAL,
+      GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
+      video ? _("Incoming video call from %s") : _("Incoming call from %s"),
+      empathy_contact_get_alias (self->priv->contact));
+
+  gtk_dialog_add_buttons (GTK_DIALOG (self->priv->incoming_call_dialog),
+      _("Reject"), GTK_RESPONSE_CANCEL,
+      _("Answer"), GTK_RESPONSE_ACCEPT,
+      NULL);
+
+  g_signal_connect (self->priv->incoming_call_dialog, "response",
+      G_CALLBACK (empathy_call_window_incoming_call_response_cb), self);
+  gtk_widget_show (self->priv->incoming_call_dialog);
+}
+
+static void
+empathy_call_window_cdo_invalidated_cb (TpProxy *channel,
+    guint domain,
+    gint code,
+    gchar *message,
+    EmpathyCallWindow *self)
+{
+  tp_clear_object (&self->priv->pending_cdo);
+  tp_clear_object (&self->priv->pending_channel);
+  tp_clear_object (&self->priv->pending_context);
+
+  /* We don't know if the incoming call has been accepted or not, so we
+   * assume it hasn't and if it has, we'll set the proper status when
+   * we get the new handler. */
+  empathy_call_window_status_message (self, _("Disconnected"));
+  self->priv->call_state = DISCONNECTED;
+
+  gtk_widget_destroy (self->priv->incoming_call_dialog);
+  self->priv->incoming_call_dialog = NULL;
+}
+
+void
+empathy_call_window_start_ringing (EmpathyCallWindow *self,
+    TpyCallChannel *channel,
+    TpChannelDispatchOperation *dispatch_operation,
+    TpAddDispatchOperationContext *context)
+{
+  g_assert (self->priv->pending_channel == NULL);
+  g_assert (self->priv->pending_context == NULL);
+  g_assert (self->priv->pending_cdo == NULL);
+
+  /* Start ringing and delay until the user answers or hangs. */
+  self->priv->pending_channel = g_object_ref (channel);
+  self->priv->pending_context = g_object_ref (context);
+  self->priv->pending_cdo = g_object_ref (dispatch_operation);
+
+  g_signal_connect (self->priv->pending_cdo, "invalidated",
+      G_CALLBACK (empathy_call_window_cdo_invalidated_cb), self);
+
+  empathy_call_window_set_state_ringing (self);
+  tp_add_dispatch_operation_context_accept (context);
+}
+
+static void
 empathy_call_window_init (EmpathyCallWindow *self)
 {
   EmpathyCallWindowPriv *priv;
@@ -1373,6 +1638,8 @@ empathy_call_window_init (EmpathyCallWindow *self)
   priv = self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
     EMPATHY_TYPE_CALL_WINDOW, EmpathyCallWindowPriv);
 
+  priv->settings = g_settings_new (EMPATHY_PREFS_CALL_SCHEMA);
+
   filename = empathy_file_lookup ("empathy-call-window.ui", "src");
   gui = empathy_builder_get_file (filename,
     "call_window_vbox", &top_vbox,
@@ -1556,6 +1823,8 @@ empathy_call_window_init (EmpathyCallWindow *self)
       G_CALLBACK (dtmf_button_pressed_cb),
       G_CALLBACK (dtmf_button_released_cb));
 
+  priv->tones = g_string_new ("");
+
   gtk_box_pack_start (GTK_BOX (priv->pane), priv->dtmf_panel,
       FALSE, FALSE, 6);
 
@@ -1608,8 +1877,6 @@ empathy_call_window_init (EmpathyCallWindow *self)
 
   empathy_call_window_show_hangup_button (self, TRUE);
 
-  priv->settings = g_settings_new (EMPATHY_PREFS_CALL_SCHEMA);
-
   /* Retrieve initial volume */
   priv->volume = g_settings_get_double (priv->settings,
       EMPATHY_PREFS_CALL_SOUND_VOLUME) / 100.0;
@@ -1993,13 +2260,14 @@ empathy_call_window_constructed (GObject *object)
   EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (object);
   EmpathyCallWindowPriv *priv = GET_PRIV (self);
   TpyCallChannel *call;
+  TpyCallState state;
 
   g_assert (priv->handler != NULL);
 
   g_object_get (priv->handler, "call-channel", &call, NULL);
-  priv->outgoing = (call == NULL);
-  if (call != NULL)
-    g_object_unref (call);
+  state = tpy_call_channel_get_state (call, NULL, NULL);
+  priv->outgoing = (state == TPY_CALL_STATE_PENDING_INITIATOR);
+  tp_clear_object (&call);
 
   g_object_get (priv->handler, "target-contact", &priv->contact, NULL);
   g_assert (priv->contact != NULL);
@@ -2188,6 +2456,8 @@ empathy_call_window_finalize (GObject *object)
 
   g_timer_destroy (priv->timer);
 
+  g_string_free (priv->tones, TRUE);
+
   G_OBJECT_CLASS (empathy_call_window_parent_class)->finalize (object);
 }
 
@@ -2199,6 +2469,20 @@ empathy_call_window_new (EmpathyCallHandler *handler)
     g_object_new (EMPATHY_TYPE_CALL_WINDOW, "handler", handler, NULL));
 }
 
+void
+empathy_call_window_present (EmpathyCallWindow *self,
+    EmpathyCallHandler *handler)
+{
+  g_return_if_fail (EMPATHY_IS_CALL_HANDLER (handler));
+
+  tp_clear_object (&self->priv->handler);
+  self->priv->handler = g_object_ref (handler);
+  empathy_call_window_connect_handler (self);
+
+  empathy_window_present (GTK_WINDOW (self));
+  empathy_call_window_restart_call (self);
+}
+
 static void
 empathy_call_window_conference_added_cb (EmpathyCallHandler *handler,
   GstElement *conference, gpointer user_data)
@@ -2324,6 +2608,9 @@ empathy_call_window_disconnected (EmpathyCallWindow *self,
   gtk_action_set_sensitive (priv->menu_fullscreen, FALSE);
   gtk_widget_set_sensitive (priv->dtmf_panel, FALSE);
 
+  priv->sending_tones = FALSE;
+  g_string_set_size (priv->tones, 0);
+
   could_reset_pipeline = empathy_call_window_reset_pipeline (self);
 
   if (priv->call_state == CONNECTING)
@@ -3140,7 +3427,7 @@ empathy_call_window_bus_message (GstBus *bus, GstMessage *message,
 {
   EmpathyCallWindow *self = EMPATHY_CALL_WINDOW (user_data);
   EmpathyCallWindowPriv *priv = GET_PRIV (self);
-  GstState newstate;
+  GstState newstate, pending;
 
   empathy_call_handler_bus_message (priv->handler, bus, message);
 
@@ -3164,6 +3451,15 @@ empathy_call_window_bus_message (GstBus *bus, GstMessage *message,
                   start_call (self);
               }
           }
+        if (GST_MESSAGE_SRC (message) == GST_OBJECT (priv->video_preview_sink))
+          {
+            gst_message_parse_state_changed (message, NULL, &newstate,
+                &pending);
+
+            if (newstate == GST_STATE_PLAYING &&
+                pending == GST_STATE_VOID_PENDING)
+              empathy_call_window_stop_camera_spinning (self);
+          }
         break;
       case GST_MESSAGE_ERROR:
         {
@@ -3268,50 +3564,63 @@ call_handler_notify_call_cb (EmpathyCallHandler *handler,
   tp_g_signal_connect_object (call, "members-changed",
       G_CALLBACK (empathy_call_window_members_changed_cb), self, 0);
 
+  tp_cli_channel_interface_dtmf_connect_to_stopped_tones (TP_CHANNEL (call),
+      empathy_call_window_tones_stopped_cb, self, NULL,
+      G_OBJECT (call), NULL);
+
   g_object_unref (call);
 }
 
 static void
-empathy_call_window_realized_cb (GtkWidget *widget, EmpathyCallWindow *window)
+empathy_call_window_connect_handler (EmpathyCallWindow *self)
 {
-  EmpathyCallWindowPriv *priv = GET_PRIV (window);
+  EmpathyCallWindowPriv *priv = GET_PRIV (self);
   TpyCallChannel *call;
-  gint width;
-
-  /* Make the hangup button twice as wide */
-  width = gtk_widget_get_allocated_width (priv->hangup_button);
-  gtk_widget_set_size_request (priv->hangup_button, width * 2, -1);
 
   g_signal_connect (priv->handler, "state-changed",
-    G_CALLBACK (empathy_call_window_state_changed_cb), window);
+    G_CALLBACK (empathy_call_window_state_changed_cb), self);
   g_signal_connect (priv->handler, "conference-added",
-    G_CALLBACK (empathy_call_window_conference_added_cb), window);
+    G_CALLBACK (empathy_call_window_conference_added_cb), self);
   g_signal_connect (priv->handler, "conference-removed",
-    G_CALLBACK (empathy_call_window_conference_removed_cb), window);
+    G_CALLBACK (empathy_call_window_conference_removed_cb), self);
   g_signal_connect (priv->handler, "closed",
-    G_CALLBACK (empathy_call_window_channel_closed_cb), window);
+    G_CALLBACK (empathy_call_window_channel_closed_cb), self);
   g_signal_connect (priv->handler, "src-pad-added",
-    G_CALLBACK (empathy_call_window_src_added_cb), window);
+    G_CALLBACK (empathy_call_window_src_added_cb), self);
   g_signal_connect (priv->handler, "sink-pad-added",
-    G_CALLBACK (empathy_call_window_sink_added_cb), window);
+    G_CALLBACK (empathy_call_window_sink_added_cb), self);
   g_signal_connect (priv->handler, "sink-pad-removed",
-    G_CALLBACK (empathy_call_window_sink_removed_cb), window);
+    G_CALLBACK (empathy_call_window_sink_removed_cb), self);
+
+  /* We connect to ::call-channel unconditionally since we'll
+   * get new channels if we hangup and redial or if we reuse the
+   * call window. */
+  g_signal_connect (priv->handler, "notify::call-channel",
+    G_CALLBACK (call_handler_notify_call_cb), self);
 
   g_object_get (priv->handler, "call-channel", &call, NULL);
   if (call != NULL)
     {
-      call_handler_notify_call_cb (priv->handler, NULL, window);
+      /* We won't get notify::call-channel for this channel, so
+       * directly call the callback. */
+      call_handler_notify_call_cb (priv->handler, NULL, self);
       g_object_unref (call);
     }
-  else
-    {
-      /* call-channel doesn't exist yet, we'll connect signals once it has been
-       * set */
-      g_signal_connect (priv->handler, "notify::call-channel",
-        G_CALLBACK (call_handler_notify_call_cb), window);
-    }
+}
+
+static void
+empathy_call_window_realized_cb (GtkWidget *widget,
+    EmpathyCallWindow *self)
+{
+  gint width;
+
+  /* Make the hangup button twice as wide */
+  width = gtk_widget_get_allocated_width (self->priv->hangup_button);
+  gtk_widget_set_size_request (self->priv->hangup_button, width * 2, -1);
+
+  empathy_call_window_connect_handler (self);
 
-  gst_element_set_state (priv->pipeline, GST_STATE_PAUSED);
+  gst_element_set_state (self->priv->pipeline, GST_STATE_PAUSED);
 }
 
 static gboolean
diff --git a/src/empathy-call-window.h b/src/empathy-call-window.h
index eebb55f69..81cf170ae 100644
--- a/src/empathy-call-window.h
+++ b/src/empathy-call-window.h
@@ -63,6 +63,12 @@ GType empathy_call_window_get_type (void);
     EmpathyCallWindowClass))
 
 EmpathyCallWindow *empathy_call_window_new (EmpathyCallHandler *handler);
+void empathy_call_window_present (EmpathyCallWindow *window,
+  EmpathyCallHandler *handler);
+void empathy_call_window_start_ringing (EmpathyCallWindow *self,
+  TpyCallChannel *channel,
+  TpChannelDispatchOperation *dispatch_operation,
+  TpAddDispatchOperationContext *context);
 
 GtkUIManager *empathy_call_window_get_ui_manager (EmpathyCallWindow *window);
 
diff --git a/src/empathy-call-window.ui b/src/empathy-call-window.ui
index 0dea20869..924bab6f4 100644
--- a/src/empathy-call-window.ui
+++ b/src/empathy-call-window.ui
@@ -388,11 +388,8 @@
       <property name="right_padding">0</property>
 
       <child>
-        <object class="GtkTable" id="video">
+        <object class="GtkGrid" id="video">
           <property name="visible">True</property>
-          <property name="n_rows">4</property>
-          <property name="n_columns">2</property>
-          <property name="homogeneous">False</property>
           <property name="row_spacing">6</property>
           <property name="column_spacing">12</property>
 
@@ -419,11 +416,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="right_attach">1</property>
         <property name="top_attach">1</property>
-        <property name="bottom_attach">2</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -449,11 +442,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">1</property>
-        <property name="bottom_attach">2</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -480,11 +469,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="right_attach">1</property>
         <property name="top_attach">2</property>
-        <property name="bottom_attach">3</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -510,11 +495,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">2</property>
-        <property name="bottom_attach">3</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -541,11 +522,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="right_attach">1</property>
         <property name="top_attach">3</property>
-        <property name="bottom_attach">4</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -570,11 +547,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">3</property>
-        <property name="bottom_attach">4</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -586,11 +559,7 @@
             </object>
             <packing>
               <property name="left_attach">2</property>
-              <property name="right_attach">3</property>
               <property name="top_attach">3</property>
-              <property name="bottom_attach">4</property>
-              <property name="x_options">fill</property>
-              <property name="y_options"/>
             </packing>
           </child>
 
@@ -618,11 +587,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="right_attach">1</property>
         <property name="top_attach">4</property>
-        <property name="bottom_attach">5</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -647,11 +612,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">4</property>
-        <property name="bottom_attach">5</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -663,11 +624,7 @@
             </object>
             <packing>
               <property name="left_attach">2</property>
-              <property name="right_attach">3</property>
               <property name="top_attach">4</property>
-              <property name="bottom_attach">5</property>
-              <property name="x_options">fill</property>
-              <property name="y_options"/>
             </packing>
           </child>
 
@@ -736,11 +693,8 @@
       <property name="right_padding">0</property>
 
       <child>
-        <object class="GtkTable" id="audio">
+        <object class="GtkGrid" id="audio">
           <property name="visible">True</property>
-          <property name="n_rows">4</property>
-          <property name="n_columns">2</property>
-          <property name="homogeneous">False</property>
           <property name="row_spacing">6</property>
           <property name="column_spacing">12</property>
 
@@ -767,11 +721,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="right_attach">1</property>
         <property name="top_attach">0</property>
-        <property name="bottom_attach">1</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -796,11 +746,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">0</property>
-        <property name="bottom_attach">1</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -827,11 +773,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="right_attach">1</property>
         <property name="top_attach">1</property>
-        <property name="bottom_attach">2</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -856,11 +798,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">1</property>
-        <property name="bottom_attach">2</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -887,11 +825,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="right_attach">1</property>
         <property name="top_attach">2</property>
-        <property name="bottom_attach">3</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -916,11 +850,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">2</property>
-        <property name="bottom_attach">3</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -932,11 +862,7 @@
             </object>
             <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>
-              <property name="x_options">fill</property>
-              <property name="y_options"/>
             </packing>
           </child>
 
@@ -963,11 +889,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="right_attach">1</property>
         <property name="top_attach">3</property>
-        <property name="bottom_attach">4</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -992,11 +914,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">3</property>
-        <property name="bottom_attach">4</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -1008,11 +926,7 @@
             </object>
             <packing>
               <property name="left_attach">2</property>
-              <property name="right_attach">3</property>
               <property name="top_attach">3</property>
-              <property name="bottom_attach">4</property>
-              <property name="x_options">fill</property>
-              <property name="y_options"/>
             </packing>
           </child>
 
diff --git a/src/empathy-call.c b/src/empathy-call.c
index 1f60217db..2ff49a81b 100644
--- a/src/empathy-call.c
+++ b/src/empathy-call.c
@@ -34,6 +34,8 @@
 
 #include <telepathy-yell/telepathy-yell.h>
 
+#include <libempathy/empathy-client-factory.h>
+
 #include <libempathy-gtk/empathy-ui-utils.h>
 
 #include "empathy-call-window.h"
@@ -55,6 +57,55 @@ static gboolean use_timer = TRUE;
 
 static EmpathyCallFactory *call_factory = NULL;
 
+/* An EmpathyContact -> EmpathyCallWindow hash table for all existing
+ * Call windows. We own a ref on the EmpathyContacts. */
+static GHashTable *call_windows;
+
+static void
+call_window_destroyed_cb (GtkWidget *window,
+    EmpathyContact *contact)
+{
+  g_hash_table_remove (call_windows, contact);
+
+  g_application_release (G_APPLICATION (app));
+}
+
+static gboolean
+find_window_for_handle (gpointer key,
+    gpointer value,
+    gpointer user_data)
+{
+  EmpathyContact *contact = key;
+  guint handle = GPOINTER_TO_UINT (user_data);
+
+  if (handle == empathy_contact_get_handle (contact))
+    return TRUE;
+
+  return FALSE;
+}
+
+static gboolean
+incoming_call_cb (EmpathyCallFactory *factory,
+    guint handle,
+    TpyCallChannel *channel,
+    TpChannelDispatchOperation *dispatch_operation,
+    TpAddDispatchOperationContext *context,
+    gpointer user_data)
+{
+  EmpathyCallWindow *window = g_hash_table_find (call_windows,
+      find_window_for_handle, GUINT_TO_POINTER (handle));
+
+  if (window != NULL)
+    {
+      /* The window takes care of accepting or rejecting the context. */
+      empathy_call_window_start_ringing (window,
+          channel, dispatch_operation, context);
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
 static void
 new_call_handler_cb (EmpathyCallFactory *factory,
     EmpathyCallHandler *handler,
@@ -62,17 +113,29 @@ new_call_handler_cb (EmpathyCallFactory *factory,
     gpointer user_data)
 {
   EmpathyCallWindow *window;
+  EmpathyContact *contact;
 
-  DEBUG ("Create a new call window");
+  DEBUG ("Show the call window");
 
-  window = empathy_call_window_new (handler);
+  g_object_get (handler, "target-contact", &contact, NULL);
 
-  g_application_hold (G_APPLICATION (app));
+  window = g_hash_table_lookup (call_windows, contact);
 
-  g_signal_connect_swapped (window, "destroy",
-      G_CALLBACK (g_application_release), app);
+  if (window != NULL)
+    {
+      empathy_call_window_present (window, handler);
+    }
+  else
+    {
+      window = empathy_call_window_new (handler);
+
+      g_hash_table_insert (call_windows, g_object_ref (contact), window);
+      g_application_hold (G_APPLICATION (app));
+      g_signal_connect (window, "destroy",
+          G_CALLBACK (call_window_destroyed_cb), contact);
 
-  gtk_widget_show (GTK_WIDGET (window));
+      gtk_widget_show (GTK_WIDGET (window));
+    }
 }
 
 static void
@@ -96,6 +159,8 @@ activate_cb (GApplication *application)
 
   g_signal_connect (G_OBJECT (call_factory), "new-call-handler",
       G_CALLBACK (new_call_handler_cb), NULL);
+  g_signal_connect (G_OBJECT (call_factory), "incoming-call",
+      G_CALLBACK (incoming_call_cb), NULL);
 
   if (!empathy_call_factory_register (call_factory, &error))
     {
@@ -117,6 +182,7 @@ main (int argc,
 #endif
   GError *error = NULL;
   gint retval;
+  GtkSettings *gtk_settings;
 
   /* Init */
   g_thread_init (NULL);
@@ -156,6 +222,10 @@ main (int argc,
   gtk_window_set_default_icon_name ("empathy");
   textdomain (GETTEXT_PACKAGE);
 
+  gtk_settings = gtk_settings_get_default ();
+  g_object_set (G_OBJECT (gtk_settings), "gtk-application-prefer-dark-theme",
+      TRUE, NULL);
+
   app = gtk_application_new (EMPATHY_CALL_DBUS_NAME, G_APPLICATION_FLAGS_NONE);
   g_signal_connect (app, "activate", G_CALLBACK (activate_cb), NULL);
 
@@ -172,6 +242,9 @@ main (int argc,
       use_timer = FALSE;
     }
 
+  call_windows = g_hash_table_new_full (g_direct_hash, g_direct_equal,
+      g_object_unref, NULL);
+
   /* the inactivity timeout can only be set while the application is held */
   g_application_hold (G_APPLICATION (app));
   g_application_set_inactivity_timeout (G_APPLICATION (app), TIMEOUT * 1000);
@@ -179,6 +252,7 @@ main (int argc,
 
   retval = g_application_run (G_APPLICATION (app), argc, argv);
 
+  g_hash_table_unref (call_windows);
   g_object_unref (app);
   tp_clear_object (&call_factory);
 
diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c
index 0e1745edb..a52585736 100644
--- a/src/empathy-chat-manager.c
+++ b/src/empathy-chat-manager.c
@@ -349,7 +349,7 @@ empathy_chat_manager_class_init (
         G_SIGNAL_RUN_LAST,
         0,
         NULL, NULL,
-        g_cclosure_marshal_VOID__UINT,
+        g_cclosure_marshal_generic,
         G_TYPE_NONE,
         1, G_TYPE_UINT, NULL);
 
@@ -359,7 +359,7 @@ empathy_chat_manager_class_init (
         G_SIGNAL_RUN_LAST,
         0,
         NULL, NULL,
-        g_cclosure_marshal_VOID__UINT,
+        g_cclosure_marshal_generic,
         G_TYPE_NONE,
         1, G_TYPE_UINT, NULL);
 
@@ -448,9 +448,11 @@ empathy_chat_manager_undo_closed_chat (EmpathyChatManager *self,
   if (data->room)
     empathy_join_muc (data->account, data->id, timestamp);
   else if (data->sms)
-    empathy_sms_contact_id (data->account, data->id, timestamp);
+    empathy_sms_contact_id (data->account, data->id, timestamp,
+        NULL, NULL);
   else
-    empathy_chat_with_contact_id (data->account, data->id, timestamp);
+    empathy_chat_with_contact_id (data->account, data->id, timestamp,
+        NULL, NULL);
 
   g_signal_emit (self, signals[CLOSED_CHATS_CHANGED], 0,
       g_queue_get_length (priv->closed_queue));
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 97ed1b9de..46f76466b 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -1482,8 +1482,7 @@ chat_window_new_message_cb (EmpathyChat       *chat,
 	 *   a) the chatroom's always_urgent property is TRUE
 	 *   b) the message contains our alias
 	 */
-	if (empathy_chat_is_room (chat) ||
-	    empathy_chat_get_remote_contact (chat) == NULL) {
+	if (empathy_chat_is_room (chat)) {
 		TpAccount             *account;
 		const gchar           *room;
 		EmpathyChatroom       *chatroom;
@@ -1866,7 +1865,9 @@ chat_window_drag_data_received (GtkWidget        *widget,
 
 		if (!chat) {
 			empathy_chat_with_contact_id (
-				account, contact_id, empathy_get_current_action_time ());
+				account, contact_id,
+				empathy_get_current_action_time (),
+				NULL, NULL);
 
 			g_strfreev (strv);
 			return;
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index a6ce22b18..da677d42d 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -1115,12 +1115,11 @@ approve_channels (TpSimpleApprover *approver,
         event_manager_call_channel_got_contact_cb,
         approval, NULL, G_OBJECT (self));
     }
-  else if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER)
+  else if (EMPATHY_IS_TP_FILE (channel))
     {
       TpHandle handle;
-      EmpathyTpFile *tp_file = empathy_tp_file_new (channel);
 
-      approval->handler_instance = G_OBJECT (tp_file);
+      approval->handler_instance = g_object_ref (channel);
 
       handle = tp_channel_get_handle (channel, NULL);
 
@@ -1129,10 +1128,31 @@ approve_channels (TpSimpleApprover *approver,
     }
   else if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION)
     {
-      event_manager_add (approval->manager, account, NULL, EMPATHY_EVENT_TYPE_AUTH,
-          GTK_STOCK_DIALOG_AUTHENTICATION, tp_account_get_display_name (account),
-          _("Password required"), approval,
-          event_manager_auth_process_func, NULL);
+      GHashTable *props;
+      const gchar * const *available_mechanisms;
+
+      props = tp_channel_borrow_immutable_properties (channel);
+      available_mechanisms = tp_asv_get_boxed (props,
+          TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_AVAILABLE_MECHANISMS,
+          G_TYPE_STRV);
+
+      if (tp_strv_contains (available_mechanisms, "X-TELEPATHY-PASSWORD"))
+        {
+          event_manager_add (approval->manager, account, NULL,
+              EMPATHY_EVENT_TYPE_AUTH,
+              GTK_STOCK_DIALOG_AUTHENTICATION,
+              tp_account_get_display_name (account),
+              _("Password required"), approval,
+              event_manager_auth_process_func, NULL);
+        }
+      else
+        {
+          GError error = { TP_ERRORS, TP_ERROR_NOT_IMPLEMENTED,
+              "Support only X-TELEPATHY-PASSWORD auth method" };
+
+          tp_add_dispatch_operation_context_fail (context, &error);
+          return;
+        }
     }
   else
     {
@@ -1340,7 +1360,7 @@ empathy_event_manager_class_init (EmpathyEventManagerClass *klass)
       G_SIGNAL_RUN_LAST,
       0,
       NULL, NULL,
-      g_cclosure_marshal_VOID__POINTER,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       1, G_TYPE_POINTER);
 
@@ -1350,7 +1370,7 @@ empathy_event_manager_class_init (EmpathyEventManagerClass *klass)
       G_SIGNAL_RUN_LAST,
       0,
       NULL, NULL,
-      g_cclosure_marshal_VOID__POINTER,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE, 1, G_TYPE_POINTER);
 
   signals[EVENT_UPDATED] =
@@ -1359,7 +1379,7 @@ empathy_event_manager_class_init (EmpathyEventManagerClass *klass)
       G_SIGNAL_RUN_LAST,
       0,
       NULL, NULL,
-      g_cclosure_marshal_VOID__POINTER,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE, 1, G_TYPE_POINTER);
 
   g_type_class_add_private (object_class, sizeof (EmpathyEventManagerPriv));
diff --git a/src/empathy-import-utils.c b/src/empathy-import-utils.c
index 7e69d6235..bf7f29e3b 100644
--- a/src/empathy-import-utils.c
+++ b/src/empathy-import-utils.c
@@ -96,6 +96,10 @@ empathy_import_protocol_is_supported (const gchar *protocol,
       if (tp_connection_manager_has_protocol (tp_cm,
           (const gchar*) protocol))
         {
+          if (!tp_strdiff (protocol, "irc")
+              && !tp_strdiff (tp_cm->name, "haze"))
+              continue;
+
           if (!proto_is_supported)
             {
               *cm = tp_cm;
diff --git a/src/empathy-import-widget.c b/src/empathy-import-widget.c
index fc1e2f532..9a8917ffc 100644
--- a/src/empathy-import-widget.c
+++ b/src/empathy-import-widget.c
@@ -103,7 +103,7 @@ account_manager_prepared_cb (GObject *source_object,
   EmpathyImportWidgetPriv *priv = GET_PRIV (self);
   GError *error = NULL;
 
-  if (!tp_account_manager_prepare_finish (manager, result, &error))
+  if (!tp_proxy_prepare_finish (manager, result, &error))
     {
       DEBUG ("Failed to prepare account manager: %s", error->message);
       g_error_free (error);
@@ -156,7 +156,7 @@ import_widget_add_accounts_to_model (EmpathyImportWidget *self)
 
   manager = tp_account_manager_dup ();
 
-  tp_account_manager_prepare_async (manager, NULL,
+  tp_proxy_prepare_async (manager, NULL,
       account_manager_prepared_cb, self);
 
   g_object_unref (manager);
diff --git a/src/empathy-invite-participant-dialog.c b/src/empathy-invite-participant-dialog.c
index ec5a275d4..9280dda32 100644
--- a/src/empathy-invite-participant-dialog.c
+++ b/src/empathy-invite-participant-dialog.c
@@ -14,6 +14,8 @@
 
 #include "empathy-invite-participant-dialog.h"
 
+#include <libempathy/empathy-utils.h>
+
 #include <libempathy-gtk/empathy-contact-chooser.h>
 #include <libempathy-gtk/empathy-individual-view.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
@@ -101,39 +103,11 @@ static TpContact *
 get_tp_contact_for_chat (EmpathyInviteParticipantDialog *self,
     FolksIndividual *individual)
 {
-  TpContact *contact = NULL;
   TpConnection *chat_conn;
-  GeeSet *personas;
-  GeeIterator *iter;
 
   chat_conn = tp_channel_borrow_connection (TP_CHANNEL (self->priv->tp_chat));
 
-  personas = folks_individual_get_personas (individual);
-  iter = gee_iterable_iterator (GEE_ITERABLE (personas));
-  while (contact == FALSE && gee_iterator_next (iter))
-    {
-      TpfPersona *persona = gee_iterator_get (iter);
-      TpConnection *contact_conn;
-      TpContact *contact_cur = NULL;
-
-      if (TPF_IS_PERSONA (persona))
-        {
-          contact_cur = tpf_persona_get_contact (persona);
-          if (contact_cur != NULL)
-            {
-              contact_conn = tp_contact_get_connection (contact_cur);
-
-              if (!tp_strdiff (tp_proxy_get_object_path (contact_conn),
-                    tp_proxy_get_object_path (chat_conn)))
-                contact = contact_cur;
-            }
-        }
-
-      g_clear_object (&persona);
-    }
-  g_clear_object (&iter);
-
-  return contact;
+  return empathy_get_tp_contact_for_individual (individual, chat_conn);
 }
 
 static gboolean
diff --git a/src/empathy-main-window-menubar.ui b/src/empathy-main-window-menubar.ui
index 979afe215..0bb5d14f0 100644
--- a/src/empathy-main-window-menubar.ui
+++ b/src/empathy-main-window-menubar.ui
@@ -204,6 +204,7 @@
             <property name="name">room_join_new</property>
             <property name="label" translatable="yes">_Join…</property>
           </object>
+          <accelerator key="j" modifiers="GDK_CONTROL_MASK"/>
         </child>
         <child>
           <object class="GtkAction" id="room_join_favorites">
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 28198b037..c5f13dfaf 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -76,7 +76,6 @@
 #include "empathy-chatrooms-window.h"
 #include "empathy-event-manager.h"
 #include "empathy-ft-manager.h"
-#include "empathy-migrate-butterfly-logs.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include <libempathy/empathy-debug.h>
@@ -98,6 +97,11 @@ enum {
 	PAGE_NO_MATCH
 };
 
+enum {
+	PROP_0,
+	PROP_SHELL_RUNNING
+};
+
 G_DEFINE_TYPE (EmpathyMainWindow, empathy_main_window, GTK_TYPE_WINDOW);
 
 #define GET_PRIV(self) ((EmpathyMainWindowPriv *)((EmpathyMainWindow *) self)->priv)
@@ -164,8 +168,7 @@ struct _EmpathyMainWindowPriv {
 	/* Actions that are enabled when there are connected accounts */
 	GList                  *actions_connected;
 
-	/* The idle event source to migrate butterfly's logs */
-	guint butterfly_log_migration_members_changed_id;
+	gboolean               shell_running;
 };
 
 static void
@@ -552,6 +555,23 @@ main_window_event_removed_cb (EmpathyEventManager *manager,
 				&data);
 }
 
+static gboolean
+main_window_load_events_idle_cb (gpointer user_data)
+{
+	EmpathyMainWindow *window = user_data;
+	EmpathyMainWindowPriv *priv = GET_PRIV (window);
+	GSList *l;
+
+	l = empathy_event_manager_get_events (priv->event_manager);
+	while (l) {
+		main_window_event_added_cb (priv->event_manager, l->data,
+				window);
+		l = l->next;
+	}
+
+	return FALSE;
+}
+
 static void
 main_window_row_activated_cb (EmpathyContactListView *view,
 			      GtkTreePath            *path,
@@ -646,6 +666,12 @@ main_window_row_inserted_cb (GtkTreeModel      *model,
 		gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook),
 				PAGE_CONTACT_LIST);
 		gtk_widget_grab_focus (GTK_WIDGET (priv->individual_view));
+
+		/* The store is being filled, it will be done after an idle cb.
+		 * So we can then get events. If we do that too soon, event's
+		 * contact is not yet in the store and it won't get marked as
+		 * having events. */
+		g_idle_add (main_window_load_events_idle_cb, window);
 	}
 }
 
@@ -1988,7 +2014,8 @@ empathy_main_window_show_preferences (EmpathyMainWindow *window,
 	EmpathyMainWindowPriv *priv = GET_PRIV (window);
 
 	if (priv->preferences == NULL) {
-		priv->preferences = empathy_preferences_new (GTK_WINDOW (window));
+		priv->preferences = empathy_preferences_new (GTK_WINDOW (window),
+		                                             priv->shell_running);
 		g_object_add_weak_pointer (G_OBJECT (priv->preferences),
 					   (gpointer) &priv->preferences);
 
@@ -2118,9 +2145,11 @@ main_window_connection_items_setup (EmpathyMainWindow *window,
 		"room_join_favorites",
 		"chat_new_message",
 		"chat_new_call",
+		"chat_search_contacts",
 		"chat_add_contact",
 		"edit_personal_information",
-		"edit_blocked_contacts"
+		"edit_blocked_contacts",
+		"edit_search_contacts"
 	};
 
 	for (i = 0, list = NULL; i < G_N_ELEMENTS (actions_connected); i++) {
@@ -2142,7 +2171,7 @@ account_manager_prepared_cb (GObject      *source_object,
 	EmpathyMainWindowPriv *priv = GET_PRIV (window);
 	GError *error = NULL;
 
-	if (!tp_account_manager_prepare_finish (manager, result, &error)) {
+	if (!tp_proxy_prepare_finish (manager, result, &error)) {
 		DEBUG ("Failed to prepare account manager: %s", error->message);
 		g_error_free (error);
 		return;
@@ -2175,25 +2204,17 @@ account_manager_prepared_cb (GObject      *source_object,
 	g_list_free (accounts);
 }
 
-static void
-main_window_members_changed_cb (EmpathyContactList *list,
-				EmpathyContact     *contact,
-				EmpathyContact     *actor,
-				guint               reason,
-				gchar              *message,
-				gboolean            is_member,
-				EmpathyMainWindow  *window)
+void
+empathy_main_window_set_shell_running (EmpathyMainWindow *window,
+                                       gboolean          shell_running)
 {
 	EmpathyMainWindowPriv *priv = GET_PRIV (window);
 
-	if (!is_member)
+	if (priv->shell_running == shell_running)
 		return;
 
-	if (!empathy_migrate_butterfly_logs (contact)) {
-		g_signal_handler_disconnect (list,
-			priv->butterfly_log_migration_members_changed_id);
-		priv->butterfly_log_migration_members_changed_id = 0;
-	}
+	priv->shell_running = shell_running;
+	g_object_notify (G_OBJECT (window), "shell-running");
 }
 
 static GObject *
@@ -2215,13 +2236,64 @@ empathy_main_window_constructor (GType type,
 }
 
 static void
+empathy_main_window_set_property (GObject       *object,
+                                  guint         property_id,
+                                  const GValue *value,
+                                  GParamSpec    *pspec)
+{
+	EmpathyMainWindow *self = EMPATHY_MAIN_WINDOW (object);
+	EmpathyMainWindowPriv *priv = GET_PRIV (self);
+
+	switch (property_id)
+	{
+		case PROP_SHELL_RUNNING:
+			priv->shell_running = g_value_get_boolean (value);
+			break;
+		default:
+			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+			break;
+	}
+}
+
+static void
+empathy_main_window_get_property (GObject    *object,
+                                  guint      property_id,
+                                  GValue     *value,
+                                  GParamSpec *pspec)
+{
+	EmpathyMainWindow *self = EMPATHY_MAIN_WINDOW (object);
+	EmpathyMainWindowPriv *priv = GET_PRIV (self);
+
+	switch (property_id)
+	{
+		case PROP_SHELL_RUNNING:
+			g_value_set_boolean (value, priv->shell_running);
+			break;
+		default:
+			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+			break;
+	}
+}
+
+static void
 empathy_main_window_class_init (EmpathyMainWindowClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	GParamSpec *pspec;
 
 	object_class->finalize = empathy_main_window_finalize;
 	object_class->constructor = empathy_main_window_constructor;
 
+	object_class->set_property = empathy_main_window_set_property;
+	object_class->get_property = empathy_main_window_get_property;
+
+	pspec = g_param_spec_boolean ("shell-running",
+	                              "Shell running",
+	                              "Whether the Shell is running or not",
+	                              FALSE,
+	                              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+	g_object_class_install_property (object_class, PROP_SHELL_RUNNING, pspec);
+
 	g_type_class_add_private (object_class, sizeof (EmpathyMainWindowPriv));
 }
 
@@ -2237,7 +2309,6 @@ empathy_main_window_init (EmpathyMainWindow *window)
 	GtkToolItem              *item;
 	gboolean                  show_offline;
 	gchar                    *filename;
-	GSList                   *l;
 	GtkTreeModel             *model;
 	GtkWidget                *search_vbox;
 	GtkWidget                *menubar;
@@ -2254,6 +2325,10 @@ empathy_main_window_init (EmpathyMainWindow *window)
 	gtk_window_set_role (GTK_WINDOW (window), "contact_list");
 	gtk_window_set_default_size (GTK_WINDOW (window), 225, 325);
 
+	/* don't finalize the widget on delete-event, just hide it */
+	g_signal_connect (window, "delete-event",
+		G_CALLBACK (gtk_widget_hide_on_delete), NULL);
+
 	/* Set up interface */
 	filename = empathy_file_lookup ("empathy-main-window.ui", "src");
 	gui = empathy_builder_get_file (filename,
@@ -2340,7 +2415,7 @@ empathy_main_window_init (EmpathyMainWindow *window)
 
 	priv->account_manager = tp_account_manager_dup ();
 
-	tp_account_manager_prepare_async (priv->account_manager, NULL,
+	tp_proxy_prepare_async (priv->account_manager, NULL,
 					  account_manager_prepared_cb, window);
 
 	priv->errors = g_hash_table_new_full (g_direct_hash,
@@ -2414,10 +2489,6 @@ empathy_main_window_init (EmpathyMainWindow *window)
 			EMPATHY_INDIVIDUAL_VIEW_FEATURE_ALL ^ EMPATHY_INDIVIDUAL_VIEW_FEATURE_PERSONA_DROP,
 			EMPATHY_INDIVIDUAL_FEATURE_ALL);
 
-	priv->butterfly_log_migration_members_changed_id = g_signal_connect (
-			priv->contact_manager, "members-changed",
-			G_CALLBACK (main_window_members_changed_cb), window);
-
 	gtk_widget_show (GTK_WIDGET (priv->individual_view));
 	gtk_container_add (GTK_CONTAINER (sw),
 			   GTK_WIDGET (priv->individual_view));
@@ -2478,13 +2549,6 @@ empathy_main_window_init (EmpathyMainWindow *window)
 			  G_CALLBACK (main_window_account_disabled_cb),
 			  window);
 
-	l = empathy_event_manager_get_events (priv->event_manager);
-	while (l) {
-		main_window_event_added_cb (priv->event_manager, l->data,
-				window);
-		l = l->next;
-	}
-
 	/* Show offline ? */
 	show_offline = g_settings_get_boolean (priv->gsettings_ui,
 					       EMPATHY_PREFS_UI_SHOW_OFFLINE);
diff --git a/src/empathy-main-window.h b/src/empathy-main-window.h
index cb0ae3cf0..af4c1924e 100644
--- a/src/empathy-main-window.h
+++ b/src/empathy-main-window.h
@@ -55,6 +55,8 @@ GtkWidget *empathy_main_window_dup (void);
 
 void empathy_main_window_show_preferences (EmpathyMainWindow *window,
     const gchar *tab);
+void empathy_main_window_set_shell_running (EmpathyMainWindow *window,
+                                            gboolean           shell_running);
 
 G_END_DECLS
 
diff --git a/src/empathy-main-window.ui b/src/empathy-main-window.ui
index 711cab0da..a09d123f8 100644
--- a/src/empathy-main-window.ui
+++ b/src/empathy-main-window.ui
@@ -9,6 +9,9 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="toolbar_style">both</property>
+        <style>
+          <class name="primary-toolbar"/>
+        </style>
       </object>
       <packing>
         <property name="expand">False</property>
diff --git a/src/empathy-mic-monitor.c b/src/empathy-mic-monitor.c
index 1628828e0..29d2d3a3d 100644
--- a/src/empathy-mic-monitor.c
+++ b/src/empathy-mic-monitor.c
@@ -26,7 +26,6 @@
 
 #include "empathy-mic-monitor.h"
 
-#include "src-marshal.h"
 
 #include <libempathy/empathy-utils.h>
 
@@ -268,7 +267,7 @@ empathy_mic_monitor_class_init (EmpathyMicMonitorClass *klass)
     G_SIGNAL_RUN_LAST,
     0,
     NULL, NULL,
-    _src_marshal_VOID__UINT_STRING_STRING_BOOLEAN,
+    g_cclosure_marshal_generic,
     G_TYPE_NONE, 4, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
 
   signals[MICROPHONE_REMOVED] = g_signal_new ("microphone-removed",
@@ -276,7 +275,7 @@ empathy_mic_monitor_class_init (EmpathyMicMonitorClass *klass)
     G_SIGNAL_RUN_LAST,
     0,
     NULL, NULL,
-    g_cclosure_marshal_VOID__UINT,
+    g_cclosure_marshal_generic,
     G_TYPE_NONE, 1, G_TYPE_UINT);
 
   signals[MICROPHONE_CHANGED] = g_signal_new ("microphone-changed",
@@ -284,7 +283,7 @@ empathy_mic_monitor_class_init (EmpathyMicMonitorClass *klass)
     G_SIGNAL_RUN_LAST,
     0,
     NULL, NULL,
-    _src_marshal_VOID__UINT_UINT,
+    g_cclosure_marshal_generic,
     G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
 
   g_type_class_add_private (object_class, sizeof (EmpathyMicMonitorPrivate));
diff --git a/src/empathy-migrate-butterfly-logs.c b/src/empathy-migrate-butterfly-logs.c
deleted file mode 100644
index 4a8bf973c..000000000
--- a/src/empathy-migrate-butterfly-logs.c
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
-*  Copyright (C) 2010 Collabora Ltd.
-*
-*  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.1 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-#include <string.h>
-
-#include <gio/gio.h>
-
-#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-gsettings.h>
-
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/defs.h>
-
-#include "empathy-migrate-butterfly-logs.h"
-
-static guint butterfly_log_migration_id = 0;
-
-static void
-migrate_log_files_in_dir (const gchar *dirname)
-{
-  GDir *dir;
-  const gchar *subdir;
-  gchar *new_name;
-  gchar *full_path;
-  GError *error = NULL;
-
-  dir = g_dir_open (dirname, 0, &error);
-
-  if (dir == NULL)
-    {
-      DEBUG ("Failed to open dir: %s", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  while ((subdir = g_dir_read_name (dir)) != NULL)
-    {
-      GFile *old_gfile, *new_gfile;
-
-      if (!tp_strdiff (subdir, "chatrooms"))
-        continue;
-
-      if (g_str_has_suffix (subdir, "#1"))
-        {
-          new_name = g_strndup (subdir, (strlen (subdir) - 2));
-        }
-      else if (g_str_has_suffix (subdir, "#32"))
-        {
-          gchar *tmp;
-          tmp = g_strndup (subdir, (strlen (subdir) - 3));
-          new_name = g_strdup_printf ("%s#yahoo", tmp);
-          g_free (tmp);
-        }
-      else
-        {
-          continue;
-        }
-
-      full_path = g_build_filename (dirname, subdir, NULL);
-      old_gfile = g_file_new_for_path (full_path);
-      g_free (full_path);
-
-      full_path = g_build_filename (dirname, new_name, NULL);
-      new_gfile = g_file_new_for_path (full_path);
-      g_free (full_path);
-
-      if (!g_file_move (old_gfile, new_gfile, G_FILE_COPY_NONE,
-              NULL, NULL, NULL, &error))
-        {
-          DEBUG ("Failed to move file: %s", error->message);
-          g_clear_error (&error);
-        }
-      else
-        {
-          DEBUG ("Successfully migrated logs for %s", new_name);
-        }
-
-      g_free (new_name);
-      g_object_unref (old_gfile);
-      g_object_unref (new_gfile);
-    }
-
-  g_dir_close (dir);
-}
-
-/* This is copied from empathy-log-store-empathy.c (see #613437) */
-static gchar *
-log_store_account_to_dirname (TpAccount *account)
-{
-  const gchar *name;
-
-  name = tp_proxy_get_object_path (account);
-  if (g_str_has_prefix (name, TP_ACCOUNT_OBJECT_PATH_BASE))
-    name += strlen (TP_ACCOUNT_OBJECT_PATH_BASE);
-
-  return g_strdelimit (g_strdup (name), "/", '_');
-}
-
-static gchar *
-get_log_dir_for_account (TpAccount *account)
-{
-  gchar *basedir;
-  gchar *escaped;
-
-  escaped = log_store_account_to_dirname (account);
-
-  basedir = g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (),
-    PACKAGE_NAME, "logs", escaped, NULL);
-
-  g_free (escaped);
-
-  return basedir;
-}
-
-
-static void
-migration_account_manager_prepared_cb (GObject *source_object,
-    GAsyncResult *result,
-    gpointer user_data)
-{
-  TpAccountManager *am = TP_ACCOUNT_MANAGER (source_object);
-  GError *error = NULL;
-  GList *accounts, *l;
-  GSettings *gsettings;
-
-  if (!tp_account_manager_prepare_finish (am, result, &error))
-    {
-      DEBUG ("Failed to prepare the account manager: %s", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  accounts = tp_account_manager_get_valid_accounts (am);
-
-  for (l = accounts; l != NULL; l = l->next)
-    {
-      TpAccount *account = TP_ACCOUNT (l->data);
-      gchar *dir, *cm;
-
-      tp_account_parse_object_path (tp_proxy_get_object_path (account),
-          &cm, NULL, NULL, NULL);
-
-      if (tp_strdiff (cm, "butterfly"))
-        {
-          g_free (cm);
-          continue;
-        }
-
-      dir = get_log_dir_for_account (account);
-      DEBUG ("Migrating all logs from dir: %s", dir);
-
-      migrate_log_files_in_dir (dir);
-
-      g_free (cm);
-      g_free (dir);
-    }
-
-  DEBUG ("Finished all migrating");
-
-  gsettings = g_settings_new (EMPATHY_PREFS_SCHEMA);
-  g_settings_set_boolean (gsettings, EMPATHY_PREFS_BUTTERFLY_LOGS_MIGRATED,
-      TRUE);
-  g_object_unref (gsettings);
-
-  g_list_free (accounts);
-}
-
-static gboolean
-migrate_logs (gpointer data)
-{
-  TpAccountManager *account_manager;
-
-  account_manager = tp_account_manager_dup ();
-
-  tp_account_manager_prepare_async (account_manager, NULL,
-      migration_account_manager_prepared_cb, NULL);
-
-  g_object_unref (account_manager);
-
-  return FALSE;
-}
-
-gboolean
-empathy_migrate_butterfly_logs (EmpathyContact *contact)
-{
-  GSettings *gsettings = g_settings_new (EMPATHY_PREFS_SCHEMA);
-  gchar *cm;
-
-  /* Already in progress. */
-  if (butterfly_log_migration_id != 0)
-    return FALSE;
-
-  /* Already done. */
-  if (g_settings_get_boolean (gsettings, EMPATHY_PREFS_BUTTERFLY_LOGS_MIGRATED))
-    return FALSE;
-
-  tp_account_parse_object_path (
-      tp_proxy_get_object_path (empathy_contact_get_account (contact)),
-      &cm, NULL, NULL, NULL);
-
-  if (tp_strdiff (cm, "butterfly"))
-    {
-      g_free (cm);
-      return TRUE;
-    }
-  g_free (cm);
-
-  if (g_str_has_suffix (empathy_contact_get_id (contact), "#32")
-      || g_str_has_suffix (empathy_contact_get_id (contact), "#1"))
-    return TRUE;
-
-  /* Okay, we know a new butterfly is being used, so we should migrate its logs */
-  butterfly_log_migration_id = g_idle_add_full (G_PRIORITY_LOW,
-      migrate_logs, NULL, NULL);
-
-  return FALSE;
-}
diff --git a/src/empathy-migrate-butterfly-logs.h b/src/empathy-migrate-butterfly-logs.h
deleted file mode 100644
index a06c1b488..000000000
--- a/src/empathy-migrate-butterfly-logs.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-*  Copyright (C) 2010 Collabora Ltd.
-*
-*  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.1 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-#include <glib.h>
-
-#include <libempathy/empathy-contact.h>
-
-#ifndef __EMPATHY_MIGRATE_BUTTERFLY_LOGS_H__
-#define __EMPATHY_MIGRATE_BUTTERFLY_LOGS_H__
-
-G_BEGIN_DECLS
-
-gboolean empathy_migrate_butterfly_logs (EmpathyContact *contact);
-
-G_END_DECLS
-
-#endif /* __EMPATHY_MIGRATE_BUTTERFLY_LOGS_H__ */
diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c
index a09a5f710..8176c4803 100644
--- a/src/empathy-new-chatroom-dialog.c
+++ b/src/empathy-new-chatroom-dialog.c
@@ -37,6 +37,7 @@
 #include <libempathy/empathy-chatroom.h>
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-request-util.h>
+#include <libempathy/empathy-gsettings.h>
 
 #include <libempathy-gtk/empathy-account-chooser.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
@@ -56,7 +57,7 @@ typedef struct {
 
 	GtkWidget         *window;
 	GtkWidget         *vbox_widgets;
-	GtkWidget         *table_info;
+	GtkWidget         *table_grid;
 	GtkWidget         *label_account;
 	GtkWidget         *account_chooser;
 	GtkWidget         *label_server;
@@ -71,6 +72,8 @@ typedef struct {
 	GtkWidget         *button_join;
 	GtkWidget         *label_error_message;
 	GtkWidget         *viewport_error;
+
+	GSettings         *gsettings;
 } EmpathyNewChatroomDialog;
 
 enum {
@@ -94,6 +97,8 @@ static void     new_chatroom_dialog_model_add_columns               (EmpathyNewC
 static void     new_chatroom_dialog_update_widgets                  (EmpathyNewChatroomDialog *dialog);
 static void     new_chatroom_dialog_account_changed_cb              (GtkComboBox              *combobox,
 								     EmpathyNewChatroomDialog *dialog);
+static void     new_chatroom_dialog_account_ready_cb                (EmpathyAccountChooser   *combobox,
+                                                                     EmpathyNewChatroomDialog  *dialog);
 static void     new_chatroom_dialog_roomlist_destroy_cb             (EmpathyTpRoomlist        *room_list,
 								     EmpathyNewChatroomDialog *dialog);
 static void     new_chatroom_dialog_new_room_cb                     (EmpathyTpRoomlist        *room_list,
@@ -151,7 +156,7 @@ empathy_new_chatroom_dialog_show (GtkWindow *parent)
 	filename = empathy_file_lookup ("empathy-new-chatroom-dialog.ui", "src");
 	gui = empathy_builder_get_file (filename,
 				       "new_chatroom_dialog", &dialog->window,
-				       "table_info", &dialog->table_info,
+				       "table_grid", &dialog->table_grid,
 				       "label_account", &dialog->label_account,
 				       "label_server", &dialog->label_server,
 				       "label_room", &dialog->label_room,
@@ -198,16 +203,21 @@ empathy_new_chatroom_dialog_show (GtkWindow *parent)
 	gtk_box_pack_start (GTK_BOX (dialog->hbox_expander), dialog->throbber,
 		TRUE, TRUE, 0);
 
+	dialog->gsettings = g_settings_new (EMPATHY_PREFS_CHAT_SCHEMA);
+
 	/* Account chooser for custom */
 	dialog->account_chooser = empathy_account_chooser_new ();
 	empathy_account_chooser_set_filter (EMPATHY_ACCOUNT_CHOOSER (dialog->account_chooser),
 					    empathy_account_chooser_filter_supports_chatrooms,
 					    NULL);
-	gtk_table_attach_defaults (GTK_TABLE (dialog->table_info),
+	gtk_grid_attach (GTK_GRID (dialog->table_grid),
 				   dialog->account_chooser,
-				   1, 2, 0, 1);
+				   1, 0, 1, 1);
 	gtk_widget_show (dialog->account_chooser);
 
+	g_signal_connect (EMPATHY_ACCOUNT_CHOOSER (dialog->account_chooser), "ready",
+			  G_CALLBACK (new_chatroom_dialog_account_ready_cb),
+			  dialog);
 	g_signal_connect (GTK_COMBO_BOX (dialog->account_chooser), "changed",
 			  G_CALLBACK (new_chatroom_dialog_account_changed_cb),
 			  dialog);
@@ -223,12 +233,32 @@ empathy_new_chatroom_dialog_show (GtkWindow *parent)
 }
 
 static void
+new_chatroom_dialog_store_last_account (GSettings             *gsettings,
+                                        EmpathyAccountChooser *account_chooser)
+{
+	TpAccount   *account;
+	const char *account_path;
+
+	account = empathy_account_chooser_get_account (account_chooser);
+	if (account == NULL)
+		return;
+
+	account_path = tp_proxy_get_object_path (account);
+	DEBUG ("Storing account path '%s'", account_path);
+
+	g_settings_set (gsettings, EMPATHY_PREFS_CHAT_ROOM_LAST_ACCOUNT,
+	                "o", account_path);
+}
+
+static void
 new_chatroom_dialog_response_cb (GtkWidget               *widget,
 				 gint                     response,
 				 EmpathyNewChatroomDialog *dialog)
 {
 	if (response == GTK_RESPONSE_OK) {
 		new_chatroom_dialog_join (dialog);
+		new_chatroom_dialog_store_last_account (dialog->gsettings,
+		                                        EMPATHY_ACCOUNT_CHOOSER (dialog->account_chooser));
 	}
 
 	gtk_widget_destroy (widget);
@@ -248,6 +278,8 @@ new_chatroom_dialog_destroy_cb (GtkWidget               *widget,
 		g_object_unref (dialog->account);
 	}
 
+	g_clear_object (&dialog->gsettings);
+
 	g_free (dialog);
 }
 
@@ -428,6 +460,44 @@ account_status_changed_cb (TpAccount *account,
 }
 
 static void
+new_chatroom_dialog_select_last_account (GSettings             *gsettings,
+                                         EmpathyAccountChooser *account_chooser)
+{
+	const gchar          *account_path;
+	TpAccountManager      *manager;
+	TpSimpleClientFactory *factory;
+	TpAccount             *account;
+	TpConnectionStatus    status;
+
+	account_path = g_settings_get_string (gsettings, EMPATHY_PREFS_CHAT_ROOM_LAST_ACCOUNT);
+	DEBUG ("Selecting account path '%s'", account_path);
+
+	manager =  tp_account_manager_dup ();
+	factory = tp_proxy_get_factory (manager);
+	account = tp_simple_client_factory_ensure_account (factory,
+	                                                   account_path,
+	                                                   NULL,
+	                                                   NULL);
+
+	if (account != NULL) {
+		status = tp_account_get_connection_status (account, NULL);
+		if (status == TP_CONNECTION_STATUS_CONNECTED) {
+			empathy_account_chooser_set_account (account_chooser,
+			                                     account);
+		}
+		g_object_unref (account);
+	}
+	g_object_unref (manager);
+}
+
+static void
+new_chatroom_dialog_account_ready_cb (EmpathyAccountChooser    *combobox,
+                                      EmpathyNewChatroomDialog *dialog)
+{
+	new_chatroom_dialog_select_last_account (dialog->gsettings, combobox);
+}
+
+static void
 new_chatroom_dialog_account_changed_cb (GtkComboBox             *combobox,
 					EmpathyNewChatroomDialog *dialog)
 {
diff --git a/src/empathy-new-chatroom-dialog.ui b/src/empathy-new-chatroom-dialog.ui
index e2b6a814a..e77ec60cd 100644
--- a/src/empathy-new-chatroom-dialog.ui
+++ b/src/empathy-new-chatroom-dialog.ui
@@ -1,32 +1,82 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy toplevel-contextual -->
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkImage" id="join_image">
+    <property name="can_focus">False</property>
     <property name="stock">gtk-jump-to</property>
   </object>
   <object class="GtkDialog" id="new_chatroom_dialog">
     <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Join Room</property>
     <property name="role">join_new_chatroom</property>
     <property name="default_width">350</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox4">
+      <object class="GtkBox" id="dialog-vbox4">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area4">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="button_cancel">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button_join">
+                <property name="label" translatable="yes">_Join</property>
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_action_appearance">False</property>
+                <property name="image">join_image</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkVBox" id="vbox_widgets">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="border_width">5</property>
             <property name="spacing">5</property>
             <child>
-              <object class="GtkTable" id="table_info">
+              <object class="GtkGrid" id="table_grid">
                 <property name="visible">True</property>
-                <property name="n_rows">3</property>
-                <property name="n_columns">2</property>
-                <property name="column_spacing">5</property>
+                <property name="can_focus">False</property>
                 <property name="row_spacing">5</property>
+                <property name="column_spacing">5</property>
                 <child>
                   <object class="GtkEntry" id="entry_room">
                     <property name="visible">True</property>
@@ -37,24 +87,25 @@
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
                     <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                    <property name="x_options">GTK_FILL</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="label_room">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">_Room:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">entry_room</property>
                   </object>
                   <packing>
+                    <property name="left_attach">0</property>
                     <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                    <property name="x_options">GTK_FILL</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -66,42 +117,41 @@
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="label_server">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">_Server:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">entry_server</property>
                   </object>
                   <packing>
+                    <property name="left_attach">0</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="label_account">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Account:</property>
                   </object>
                   <packing>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
-                <child>
-                  <placeholder/>
-                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -116,16 +166,20 @@
                 <child>
                   <object class="GtkVBox" id="vbox1">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="spacing">2</property>
                     <child>
                       <object class="GtkViewport" id="viewport_error">
+                        <property name="can_focus">False</property>
                         <property name="resize_mode">queue</property>
                         <child>
                           <object class="GtkHBox" id="hbox1">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkImage" id="image1">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="stock">gtk-dialog-error</property>
                                 <property name="icon-size">1</property>
                               </object>
@@ -139,11 +193,14 @@
                             <child>
                               <object class="GtkLabel" id="label_error_message">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="xalign">0</property>
                                 <property name="xpad">10</property>
                                 <property name="label" translatable="yes">Couldn't load room list</property>
                               </object>
                               <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -152,10 +209,12 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="relief">none</property>
                                 <child>
                                   <object class="GtkImage" id="image2">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="stock">gtk-close</property>
                                     <property name="icon-size">1</property>
                                   </object>
@@ -183,7 +242,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="hscrollbar_policy">never</property>
-                        <property name="vscrollbar_policy">automatic</property>
                         <property name="shadow_type">in</property>
                         <child>
                           <object class="GtkTreeView" id="treeview">
@@ -191,10 +249,15 @@
                             <property name="can_focus">True</property>
                             <property name="search_column">0</property>
                             <property name="show_expanders">False</property>
+                            <child internal-child="selection">
+                              <object class="GtkTreeSelection" id="treeview-selection1"/>
+                            </child>
                           </object>
                         </child>
                       </object>
                       <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -203,13 +266,17 @@
                 <child type="label">
                   <object class="GtkHBox" id="hbox_expander">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkLabel" id="label1">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Room List</property>
                       </object>
                       <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
@@ -220,56 +287,16 @@
                 </child>
               </object>
               <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area4">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="button_cancel">
-                <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button_join">
-                <property name="label" translatable="yes">_Join</property>
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="image">join_image</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>
diff --git a/src/empathy-notifications-approver.c b/src/empathy-notifications-approver.c
index aa4630849..c312a3be6 100644
--- a/src/empathy-notifications-approver.c
+++ b/src/empathy-notifications-approver.c
@@ -253,10 +253,10 @@ add_notification_actions (EmpathyNotificationsApprover *self,
       break;
 
     case EMPATHY_EVENT_TYPE_AUTH:
-      /* translators: the 'Provide' button is displayed in a notification
-       * bubble when Empathy is asking for an account password; clicking on it
-       * brings the password popup. */
       notify_notification_add_action (notification,
+        /* translators: the 'Provide' button is displayed in a notification
+         * bubble when Empathy is asking for an account password; clicking on it
+         * brings the password popup. */
         "provide", _("Provide"), (NotifyActionCallback) notification_approve_cb,
           self, NULL);
       break;
diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index 9dc7f58bf..3eb9e608d 100644
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -846,7 +846,8 @@ preferences_theme_variant_notify_cb (GSettings   *gsettings,
 	g_free (conf_name);
 }
 
-static void
+/* return TRUE if we added at least one variant */
+static gboolean
 preferences_theme_variants_fill (EmpathyPreferences *preferences,
 				 GHashTable         *info)
 {
@@ -856,6 +857,7 @@ preferences_theme_variants_fill (EmpathyPreferences *preferences,
 	GPtrArray    *variants;
 	const gchar  *default_variant;
 	guint         i;
+	gboolean      result = FALSE;
 
 	model = gtk_combo_box_get_model (GTK_COMBO_BOX (priv->combobox_chat_theme_variant));
 	store = GTK_LIST_STORE (model);
@@ -870,12 +872,16 @@ preferences_theme_variants_fill (EmpathyPreferences *preferences,
 			COL_VARIANT_NAME, name,
 			COL_VARIANT_DEFAULT, !tp_strdiff (name, default_variant),
 			-1);
+
+		result = TRUE;
 	}
 
 	/* Select the variant from the GSetting key */
 	preferences_theme_variant_notify_cb (priv->gsettings_chat,
 					     EMPATHY_PREFS_CHAT_THEME_VARIANT,
 					     preferences);
+
+	return result;
 }
 
 static void
@@ -943,11 +949,14 @@ preferences_theme_changed_cb (GtkComboBox        *combo,
 				       EMPATHY_PREFS_CHAT_THEME,
 				       name);
 		if (is_adium) {
+			gboolean variant;
+
 			g_settings_set_string (priv->gsettings_chat,
 					       EMPATHY_PREFS_CHAT_ADIUM_PATH,
 					       path);
-			preferences_theme_variants_fill (preferences, info);
-			gtk_widget_show (priv->hbox_chat_theme_variant);
+
+			variant = preferences_theme_variants_fill (preferences, info);
+			gtk_widget_set_visible (priv->hbox_chat_theme_variant, variant);
 		} else {
 			gtk_widget_hide (priv->hbox_chat_theme_variant);
 		}
@@ -1283,9 +1292,12 @@ empathy_preferences_tab_to_string (EmpathyPreferencesTab tab)
 }
 
 GtkWidget *
-empathy_preferences_new (GtkWindow *parent)
+empathy_preferences_new (GtkWindow *parent,
+                         gboolean  shell_running)
 {
-	GtkWidget *self;
+	GtkWidget              *self;
+	EmpathyPreferencesPriv *priv;
+	GtkWidget              *notif_page;
 
 	g_return_val_if_fail (parent == NULL || GTK_IS_WINDOW (parent), NULL);
 
@@ -1296,6 +1308,19 @@ empathy_preferences_new (GtkWindow *parent)
 					      parent);
 	}
 
+	/* when running in Gnome Shell we must hide these options since they
+	 * are meaningless in that context:
+	 * - 'Display incoming events in the notification area' (General->Behavior)
+	 * - 'Notifications' tab
+	 */
+	priv = GET_PRIV (self);
+	if (shell_running) {
+		gtk_widget_hide (priv->checkbutton_events_notif_area);
+		notif_page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook),
+		                                        EMPATHY_PREFERENCES_TAB_NOTIFICATIONS);
+		gtk_widget_hide (notif_page);
+	}
+
 	return self;
 }
 
diff --git a/src/empathy-preferences.h b/src/empathy-preferences.h
index fef0646d7..b8b126bd8 100644
--- a/src/empathy-preferences.h
+++ b/src/empathy-preferences.h
@@ -64,7 +64,8 @@ typedef enum
 
 GType empathy_preferences_get_type (void);
 
-GtkWidget *empathy_preferences_new (GtkWindow *parent);
+GtkWidget *empathy_preferences_new (GtkWindow *parent,
+                                    gboolean  shell_running);
 
 void empathy_preferences_show_tab (EmpathyPreferences *self,
     const gchar *tab);
diff --git a/src/empathy-preferences.ui b/src/empathy-preferences.ui
index 791f3fbd9..67575abaa 100644
--- a/src/empathy-preferences.ui
+++ b/src/empathy-preferences.ui
@@ -495,7 +495,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Input volume</property>
+                            <property name="label" translatable="yes">Input volume:</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -535,7 +535,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Input level</property>
+                            <property name="label" translatable="yes">Input level:</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -563,7 +563,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="call_echo_cancellation">
-                        <property name="label">_Echo Cancellation</property>
+                        <property name="label">Use _echo cancellation to improve call quality</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="use_underline">True</property>
@@ -574,6 +574,47 @@
                         <property name="position">2</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkBox" id="box1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <object class="GtkImage" id="image2">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="stock">gtk-dialog-info</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label7">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">Echo cancellation helps to make your voice sound clearer to the other person, but may cause problems on some computers. If you or the other person hear strange noises or glitches during calls, try turning echo cancellation off and restarting the call.</property>
+                            <property name="wrap">True</property>
+                            <attributes>
+                              <attribute name="scale" value="0.80000000000000004"/>
+                            </attributes>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">3</property>
+                      </packing>
+                    </child>
                   </object>
                 </child>
               </object>
@@ -973,137 +1014,98 @@
       </packing>
     </child>
     <child>
-      <object class="GtkBox" id="vbox206">
+      <object class="GtkBox" id="vbox_chat_theme">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="border_width">12</property>
         <property name="orientation">vertical</property>
-        <property name="spacing">18</property>
+        <property name="spacing">6</property>
         <child>
-          <object class="GtkFrame" id="frame11">
+          <object class="GtkBox" id="hbox139">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
+            <property name="spacing">12</property>
             <child>
-              <object class="GtkAlignment" id="alignment19">
+              <object class="GtkLabel" id="label586">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="top_padding">6</property>
-                <property name="left_padding">12</property>
+                <property name="label" translatable="yes">Chat Th_eme:</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">combobox_chat_theme</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkComboBox" id="combobox_chat_theme">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="hbox_chat_theme_variant">
+                <property name="can_focus">False</property>
+                <property name="spacing">12</property>
                 <child>
-                  <object class="GtkBox" id="vbox_chat_theme">
+                  <object class="GtkLabel" id="label4">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkBox" id="hbox139">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="spacing">12</property>
-                        <child>
-                          <object class="GtkLabel" id="label586">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Chat Th_eme:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">combobox_chat_theme</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkComboBox" id="combobox_chat_theme">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox" id="hbox_chat_theme_variant">
-                            <property name="can_focus">False</property>
-                            <property name="spacing">12</property>
-                            <child>
-                              <object class="GtkLabel" id="label4">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">Variant:</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">combobox_chat_theme_variant</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkComboBox" id="combobox_chat_theme_variant">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkScrolledWindow" id="sw_chat_theme_preview">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="shadow_type">in</property>
-                        <child>
-                          <placeholder/>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
+                    <property name="label" translatable="yes">Variant:</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">combobox_chat_theme_variant</property>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBox" id="combobox_chat_theme_variant">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
                 </child>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
             </child>
-            <child type="label">
-              <object class="GtkLabel" id="label626">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Appearance</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
-              </object>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="sw_chat_theme_preview">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="shadow_type">in</property>
+            <child>
+              <placeholder/>
             </child>
           </object>
           <packing>
             <property name="expand">True</property>
             <property name="fill">True</property>
-            <property name="position">0</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>
diff --git a/src/empathy-rounded-actor.c b/src/empathy-rounded-actor.c
index 463a73c61..0537dea96 100644
--- a/src/empathy-rounded-actor.c
+++ b/src/empathy-rounded-actor.c
@@ -26,9 +26,15 @@
 
 G_DEFINE_TYPE(EmpathyRoundedActor, empathy_rounded_actor, GTK_CLUTTER_TYPE_ACTOR)
 
+struct _EmpathyRoundedActorPriv
+{
+  guint round_factor;
+};
+
 static void
 empathy_rounded_actor_paint (ClutterActor *actor)
 {
+  EmpathyRoundedActor *self = EMPATHY_ROUNDED_ACTOR (actor);
   ClutterActorBox allocation = { 0, };
   gfloat width, height;
 
@@ -38,7 +44,8 @@ empathy_rounded_actor_paint (ClutterActor *actor)
   cogl_path_new ();
 
   /* create and store a path describing a rounded rectangle */
-  cogl_path_round_rectangle (0, 0, width, height, height / 2, 0.1);
+  cogl_path_round_rectangle (0, 0, width, height,
+      height / self->priv->round_factor, 0.1);
 
   cogl_clip_push_from_path ();
 
@@ -50,6 +57,10 @@ empathy_rounded_actor_paint (ClutterActor *actor)
 static void
 empathy_rounded_actor_init (EmpathyRoundedActor *self)
 {
+  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
+      EMPATHY_TYPE_ROUNDED_ACTOR, EmpathyRoundedActorPriv);
+
+  self->priv->round_factor = 2;
 }
 
 static void
@@ -58,6 +69,8 @@ empathy_rounded_actor_class_init (EmpathyRoundedActorClass *klass)
   ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
 
   actor_class->paint = empathy_rounded_actor_paint;
+
+  g_type_class_add_private (klass, sizeof (EmpathyRoundedActorPriv));
 }
 
 ClutterActor *
@@ -66,3 +79,10 @@ empathy_rounded_actor_new (void)
   return CLUTTER_ACTOR (
     g_object_new (EMPATHY_TYPE_ROUNDED_ACTOR, NULL));
 }
+
+void
+empathy_rounded_actor_set_round_factor (EmpathyRoundedActor *self,
+    guint round_factor)
+{
+  self->priv->round_factor = round_factor;
+}
diff --git a/src/empathy-rounded-actor.h b/src/empathy-rounded-actor.h
index e4c83b078..4287cf389 100644
--- a/src/empathy-rounded-actor.h
+++ b/src/empathy-rounded-actor.h
@@ -27,6 +27,7 @@
 G_BEGIN_DECLS
 
 typedef struct _EmpathyRoundedActor EmpathyRoundedActor;
+typedef struct _EmpathyRoundedActorPriv EmpathyRoundedActorPriv;
 typedef struct _EmpathyRoundedActorClass EmpathyRoundedActorClass;
 
 struct _EmpathyRoundedActorClass {
@@ -35,6 +36,8 @@ struct _EmpathyRoundedActorClass {
 
 struct _EmpathyRoundedActor {
     GtkClutterActor parent;
+
+    EmpathyRoundedActorPriv *priv;
 };
 
 GType empathy_rounded_actor_get_type (void);
@@ -58,6 +61,9 @@ GType empathy_rounded_actor_get_type (void);
 
 ClutterActor *empathy_rounded_actor_new (void);
 
+void empathy_rounded_actor_set_round_factor (EmpathyRoundedActor *self,
+    guint round_factor);
+
 G_END_DECLS
 
 #endif /* #ifndef __EMPATHY_ROUNDED_ACTOR_H__*/
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index 008ea4701..d6f5b2e46 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -437,7 +437,7 @@ account_manager_prepared_cb (GObject *source_object,
 	EmpathyStatusIcon *icon = user_data;
 	GError *error = NULL;
 
-	if (!tp_account_manager_prepare_finish (account_manager, result, &error)) {
+	if (!tp_proxy_prepare_finish (account_manager, result, &error)) {
 		DEBUG ("Failed to prepare account manager: %s", error->message);
 		g_error_free (error);
 		return;
@@ -465,7 +465,7 @@ empathy_status_icon_init (EmpathyStatusIcon *icon)
 	priv->account_manager = tp_account_manager_dup ();
 	priv->event_manager = empathy_event_manager_dup_singleton ();
 
-	tp_account_manager_prepare_async (priv->account_manager, NULL,
+	tp_proxy_prepare_async (priv->account_manager, NULL,
 	    account_manager_prepared_cb, icon);
 
 	/* make icon listen and respond to MAIN_WINDOW_HIDDEN changes */
diff --git a/src/empathy-streamed-media-factory.c b/src/empathy-streamed-media-factory.c
index 9ef5da5e1..1c25ae253 100644
--- a/src/empathy-streamed-media-factory.c
+++ b/src/empathy-streamed-media-factory.c
@@ -32,7 +32,6 @@
 
 #include "empathy-streamed-media-factory.h"
 #include "empathy-streamed-media-handler.h"
-#include "src-marshal.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include <libempathy/empathy-debug.h>
@@ -166,7 +165,7 @@ empathy_streamed_media_factory_class_init (
       G_TYPE_FROM_CLASS (empathy_streamed_media_factory_class),
       G_SIGNAL_RUN_LAST, 0,
       NULL, NULL,
-      _src_marshal_VOID__OBJECT_BOOLEAN,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       2, EMPATHY_TYPE_STREAMED_MEDIA_HANDLER, G_TYPE_BOOLEAN);
 }
diff --git a/src/empathy-streamed-media-handler.c b/src/empathy-streamed-media-handler.c
index 39e3e560d..67527d8e4 100644
--- a/src/empathy-streamed-media-handler.c
+++ b/src/empathy-streamed-media-handler.c
@@ -34,7 +34,6 @@
 #include <libempathy-gtk/empathy-call-utils.h>
 
 #include "empathy-streamed-media-handler.h"
-#include "src-marshal.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include <libempathy/empathy-debug.h>
@@ -342,21 +341,21 @@ empathy_streamed_media_handler_class_init (EmpathyStreamedMediaHandlerClass *kla
   signals[CONFERENCE_ADDED] =
     g_signal_new ("conference-added", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__OBJECT,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       1, FS_TYPE_CONFERENCE);
 
   signals[SRC_PAD_ADDED] =
     g_signal_new ("src-pad-added", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      _src_marshal_BOOLEAN__OBJECT_UINT,
+      g_cclosure_marshal_generic,
       G_TYPE_BOOLEAN,
       2, GST_TYPE_PAD, G_TYPE_UINT);
 
   signals[SINK_PAD_ADDED] =
     g_signal_new ("sink-pad-added", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      _src_marshal_BOOLEAN__OBJECT_UINT,
+      g_cclosure_marshal_generic,
       G_TYPE_BOOLEAN,
       2, GST_TYPE_PAD, G_TYPE_UINT);
 
@@ -364,26 +363,26 @@ empathy_streamed_media_handler_class_init (EmpathyStreamedMediaHandlerClass *kla
     g_signal_new ("request-resource", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0,
       g_signal_accumulator_true_handled, NULL,
-      _src_marshal_BOOLEAN__UINT_UINT,
+      g_cclosure_marshal_generic,
       G_TYPE_BOOLEAN, 2, G_TYPE_UINT, G_TYPE_UINT);
 
   signals[CLOSED] =
     g_signal_new ("closed", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__VOID,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE,
       0);
 
   signals[STREAM_CLOSED] =
     g_signal_new ("stream-closed", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__OBJECT,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE, 1, TF_TYPE_STREAM);
 
   signals[CANDIDATES_CHANGED] =
     g_signal_new ("candidates-changed", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__UINT,
+      g_cclosure_marshal_generic,
       G_TYPE_NONE, 1, G_TYPE_UINT);
 }
 
diff --git a/src/empathy-streamed-media-window.c b/src/empathy-streamed-media-window.c
index d60c0753b..26bd689ac 100644
--- a/src/empathy-streamed-media-window.c
+++ b/src/empathy-streamed-media-window.c
@@ -1840,16 +1840,16 @@ reset_details_pane (EmpathyStreamedMediaWindow *self)
 
   /* translators: encoding video codec is unknown */
   gtk_label_set_text (GTK_LABEL (priv->vcodec_encoding_label),
-      C_("encoding video codec", "Unknown"));
+      C_("codec", "Unknown"));
   /* translators: encoding audio codec is unknown */
   gtk_label_set_text (GTK_LABEL (priv->acodec_encoding_label),
-      C_("encoding audio codec", "Unknown"));
+      C_("codec", "Unknown"));
   /* translators: decoding video codec is unknown */
   gtk_label_set_text (GTK_LABEL (priv->vcodec_decoding_label),
-      C_("decoding video codec", "Unknown"));
+      C_("codec", "Unknown"));
   /* translators: decoding audio codec is unknown */
   gtk_label_set_text (GTK_LABEL (priv->acodec_decoding_label),
-      C_("decoding audio codec", "Unknown"));
+      C_("codec", "Unknown"));
 }
 
 static gboolean
diff --git a/src/empathy-streamed-media-window.ui b/src/empathy-streamed-media-window.ui
index ecd00dfc1..5f1a16e8c 100644
--- a/src/empathy-streamed-media-window.ui
+++ b/src/empathy-streamed-media-window.ui
@@ -298,11 +298,8 @@
       <property name="right_padding">0</property>
 
       <child>
-        <object class="GtkTable" id="video">
+        <object class="GtkGrid" id="video">
           <property name="visible">True</property>
-          <property name="n_rows">4</property>
-          <property name="n_columns">2</property>
-          <property name="homogeneous">False</property>
           <property name="row_spacing">6</property>
           <property name="column_spacing">12</property>
 
@@ -329,11 +326,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="right_attach">1</property>
         <property name="top_attach">1</property>
-        <property name="bottom_attach">2</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -359,11 +352,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">1</property>
-        <property name="bottom_attach">2</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -390,11 +379,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="right_attach">1</property>
         <property name="top_attach">2</property>
-        <property name="bottom_attach">3</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -420,11 +405,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">2</property>
-        <property name="bottom_attach">3</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -451,11 +432,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="right_attach">1</property>
         <property name="top_attach">3</property>
-        <property name="bottom_attach">4</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -480,11 +457,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">3</property>
-        <property name="bottom_attach">4</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -496,11 +469,7 @@
             </object>
             <packing>
               <property name="left_attach">2</property>
-              <property name="right_attach">3</property>
               <property name="top_attach">3</property>
-              <property name="bottom_attach">4</property>
-              <property name="x_options">fill</property>
-              <property name="y_options"/>
             </packing>
           </child>
 
@@ -528,11 +497,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="right_attach">1</property>
         <property name="top_attach">4</property>
-        <property name="bottom_attach">5</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -557,11 +522,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">4</property>
-        <property name="bottom_attach">5</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -573,11 +534,7 @@
             </object>
             <packing>
               <property name="left_attach">2</property>
-              <property name="right_attach">3</property>
               <property name="top_attach">4</property>
-              <property name="bottom_attach">5</property>
-              <property name="x_options">fill</property>
-              <property name="y_options"/>
             </packing>
           </child>
 
@@ -646,11 +603,8 @@
       <property name="right_padding">0</property>
 
       <child>
-        <object class="GtkTable" id="audio">
+        <object class="GtkGrid" id="audio">
           <property name="visible">True</property>
-          <property name="n_rows">4</property>
-          <property name="n_columns">2</property>
-          <property name="homogeneous">False</property>
           <property name="row_spacing">6</property>
           <property name="column_spacing">12</property>
 
@@ -677,11 +631,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="right_attach">1</property>
         <property name="top_attach">0</property>
-        <property name="bottom_attach">1</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -706,11 +656,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">0</property>
-        <property name="bottom_attach">1</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -737,11 +683,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="right_attach">1</property>
         <property name="top_attach">1</property>
-        <property name="bottom_attach">2</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -766,11 +708,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">1</property>
-        <property name="bottom_attach">2</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -797,11 +735,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="right_attach">1</property>
         <property name="top_attach">2</property>
-        <property name="bottom_attach">3</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -826,11 +760,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">2</property>
-        <property name="bottom_attach">3</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -842,11 +772,7 @@
             </object>
             <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>
-              <property name="x_options">fill</property>
-              <property name="y_options"/>
             </packing>
           </child>
 
@@ -873,11 +799,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="right_attach">1</property>
         <property name="top_attach">3</property>
-        <property name="bottom_attach">4</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -902,11 +824,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">3</property>
-        <property name="bottom_attach">4</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -918,11 +836,7 @@
             </object>
             <packing>
               <property name="left_attach">2</property>
-              <property name="right_attach">3</property>
               <property name="top_attach">3</property>
-              <property name="bottom_attach">4</property>
-              <property name="x_options">fill</property>
-              <property name="y_options"/>
             </packing>
           </child>
 
diff --git a/src/empathy-video-src.c b/src/empathy-video-src.c
index 25d257f3d..ca8370d82 100644
--- a/src/empathy-video-src.c
+++ b/src/empathy-video-src.c
@@ -245,23 +245,41 @@ empathy_video_src_new (void)
   return gst_element_factory_make ("empathyvideosrc", NULL);
 }
 
+static GstColorBalance *
+dup_color_balance (GstElement *src)
+{
+  GstElement *color;
+
+  /* Find something supporting GstColorBalance */
+  color = gst_bin_get_by_interface (GST_BIN (src), GST_TYPE_COLOR_BALANCE);
+
+  if (color == NULL)
+    return NULL;
+
+  /* colorbalance is wrapped by GstImplementsInterface, we
+   * need to check if it is actually supported for this instance
+   * in its current state before trying to use it */
+  if (!GST_IS_COLOR_BALANCE (color))
+    {
+      g_object_unref (color);
+      return NULL;
+    }
+
+  return GST_COLOR_BALANCE (color);
+}
+
 void
 empathy_video_src_set_channel (GstElement *src,
   EmpathyGstVideoSrcChannel channel, guint percent)
 {
-  GstElement *color;
   GstColorBalance *balance;
   const GList *channels;
   GList *l;
 
-  /* Find something supporting GstColorBalance */
-  color = gst_bin_get_by_interface (GST_BIN (src), GST_TYPE_COLOR_BALANCE);
-
-  if (color == NULL)
+  balance = dup_color_balance (src);
+  if (balance == NULL)
     return;
 
-  balance = GST_COLOR_BALANCE (color);
-
   channels = gst_color_balance_list_channels (balance);
 
   for (l = (GList *) channels; l != NULL; l = g_list_next (l))
@@ -277,27 +295,22 @@ empathy_video_src_set_channel (GstElement *src,
         }
     }
 
-  g_object_unref (color);
+  g_object_unref (balance);
 }
 
 guint
 empathy_video_src_get_channel (GstElement *src,
   EmpathyGstVideoSrcChannel channel)
 {
-  GstElement *color;
   GstColorBalance *balance;
   const GList *channels;
   GList *l;
   guint percent = 0;
 
-  /* Find something supporting GstColorBalance */
-  color = gst_bin_get_by_interface (GST_BIN (src), GST_TYPE_COLOR_BALANCE);
-
-  if (color == NULL)
+  balance = dup_color_balance (src);
+  if (balance == NULL)
     return percent;
 
-  balance = GST_COLOR_BALANCE (color);
-
   channels = gst_color_balance_list_channels (balance);
 
   for (l = (GList *) channels; l != NULL; l = g_list_next (l))
@@ -315,7 +328,7 @@ empathy_video_src_get_channel (GstElement *src,
         }
     }
 
-  g_object_unref (color);
+  g_object_unref (balance);
 
   return percent;
 }
@@ -324,20 +337,15 @@ empathy_video_src_get_channel (GstElement *src,
 guint
 empathy_video_src_get_supported_channels (GstElement *src)
 {
-  GstElement *color;
   GstColorBalance *balance;
   const GList *channels;
   GList *l;
   guint result = 0;
 
-  /* Find something supporting GstColorBalance */
-  color = gst_bin_get_by_interface (GST_BIN (src), GST_TYPE_COLOR_BALANCE);
-
-  if (color == NULL)
+  balance = dup_color_balance (src);
+  if (balance == NULL)
     goto out;
 
-  balance = GST_COLOR_BALANCE (color);
-
   channels = gst_color_balance_list_channels (balance);
 
   for (l = (GList *) channels; l != NULL; l = g_list_next (l))
@@ -355,7 +363,7 @@ empathy_video_src_get_supported_channels (GstElement *src)
         }
     }
 
-  g_object_unref (color);
+  g_object_unref (balance);
 
 out:
   return result;
diff --git a/src/empathy.c b/src/empathy.c
index 9294557ec..e1dab1f18 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -287,6 +287,9 @@ out:
 
       /* Rely on GNOME Shell to watch session state */
       empathy_presence_manager_set_auto_away (self->presence_mgr, FALSE);
+
+      empathy_main_window_set_shell_running (EMPATHY_MAIN_WINDOW (self->window),
+                                             TRUE);
     }
   else
     {
@@ -382,7 +385,7 @@ empathy_app_command_line (GApplication *app,
     empathy_window_present (GTK_WINDOW (self->window));
 
   /* Display the accounts dialog if needed */
-  tp_account_manager_prepare_async (self->account_manager, NULL,
+  tp_proxy_prepare_async (self->account_manager, NULL,
       account_manager_ready_cb, self);
 
   return 0;
@@ -626,7 +629,7 @@ account_manager_ready_cb (GObject *source_object,
   GError *error = NULL;
   TpConnectionPresenceType presence;
 
-  if (!tp_account_manager_prepare_finish (manager, result, &error))
+  if (!tp_proxy_prepare_finish (manager, result, &error))
     {
       GtkWidget *dialog;
 
@@ -672,13 +675,10 @@ account_join_chatrooms (TpAccount *account,
   TpConnection *conn;
   GList *chatrooms, *p;
 
-  if (tp_account_get_connection_status (account, NULL) !=
-      TP_CONNECTION_STATUS_CONNECTED)
-    return;
-
-  /* If we're connected we should have a connection */
+  /* Wait if we are not connected or the TpConnection is not prepared yet */
   conn = tp_account_get_connection (account);
-  g_return_if_fail (conn != NULL);
+  if (conn == NULL)
+    return;
 
   chatrooms = empathy_chatroom_manager_get_chatrooms (
           chatroom_manager, account);
@@ -697,12 +697,8 @@ account_join_chatrooms (TpAccount *account,
 }
 
 static void
-account_status_changed_cb (TpAccount *account,
-    guint old_status,
-    guint new_status,
-    guint reason,
-    gchar *dbus_error_name,
-    GHashTable *details,
+account_connection_changed_cb (TpAccount *account,
+    GParamSpec *spec,
     EmpathyChatroomManager *manager)
 {
   account_join_chatrooms (account, manager);
@@ -718,7 +714,7 @@ account_manager_chatroom_ready_cb (GObject *source_object,
   GList *accounts, *l;
   GError *error = NULL;
 
-  if (!tp_account_manager_prepare_finish (account_manager, result, &error))
+  if (!tp_proxy_prepare_finish (account_manager, result, &error))
     {
       DEBUG ("Failed to prepare account manager: %s", error->message);
       g_error_free (error);
@@ -735,8 +731,8 @@ account_manager_chatroom_ready_cb (GObject *source_object,
       account_join_chatrooms (account, chatroom_manager);
 
       /* And/or join them on (re)connection */
-      tp_g_signal_connect_object (account, "status-changed",
-        G_CALLBACK (account_status_changed_cb), chatroom_manager, 0);
+      tp_g_signal_connect_object (account, "notify::connection",
+        G_CALLBACK (account_connection_changed_cb), chatroom_manager, 0);
     }
   g_list_free (accounts);
 }
@@ -748,7 +744,7 @@ chatroom_manager_ready_cb (EmpathyChatroomManager *chatroom_manager,
 {
   TpAccountManager *account_manager = user_data;
 
-  tp_account_manager_prepare_async (account_manager, NULL,
+  tp_proxy_prepare_async (account_manager, NULL,
       account_manager_chatroom_ready_cb, chatroom_manager);
 }
 
@@ -786,7 +782,7 @@ empathy_app_constructed (GObject *object)
 
   /* account management */
   self->account_manager = tp_account_manager_dup ();
-  tp_account_manager_prepare_async (self->account_manager, NULL,
+  tp_proxy_prepare_async (self->account_manager, NULL,
       account_manager_ready_cb, self);
 
   migrate_config_to_xdg_dir ();
diff --git a/src/ev-sidebar.c b/src/ev-sidebar.c
index 56e5cf982..1d0b2df2f 100644
--- a/src/ev-sidebar.c
+++ b/src/ev-sidebar.c
@@ -76,7 +76,7 @@ ev_sidebar_class_init (EvSidebarClass *ev_sidebar_class)
 				G_SIGNAL_RUN_LAST,
 				G_STRUCT_OFFSET (EvSidebarClass, closed),
 				NULL, NULL,
-				g_cclosure_marshal_VOID__VOID,
+				g_cclosure_marshal_generic,
 				G_TYPE_NONE, 0);
 
 	ev_sidebar_table_signals[CHANGED] =
@@ -85,7 +85,7 @@ ev_sidebar_class_init (EvSidebarClass *ev_sidebar_class)
 				G_SIGNAL_RUN_LAST,
 				G_STRUCT_OFFSET (EvSidebarClass, closed),
 				NULL, NULL,
-				g_cclosure_marshal_VOID__STRING,
+				g_cclosure_marshal_generic,
 				G_TYPE_NONE, 1, G_TYPE_STRING);
 
 }
diff --git a/telepathy-yell b/telepathy-yell
-Subproject e4c3e2946055e8a995b452684a0441ee327a940
+Subproject ec9faee52bf288d811f51071e405153b1a5b5a6
diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am
index bf2e83929..e850d25a4 100644
--- a/tests/interactive/Makefile.am
+++ b/tests/interactive/Makefile.am
@@ -16,7 +16,6 @@ LDADD =								\
 noinst_PROGRAMS =			\
 	contact-manager			\
 	empathy-logs			\
-	empetit				\
 	test-empathy-account-assistant \
 	test-empathy-contact-blocking-dialog \
 	test-empathy-presence-chooser	\
@@ -26,7 +25,6 @@ noinst_PROGRAMS =			\
 
 contact_manager_SOURCES = contact-manager.c
 empathy_logs_SOURCES = empathy-logs.c
-empetit_SOURCES = empetit.c
 test_empathy_contact_blocking_dialog_SOURCES = test-empathy-contact-blocking-dialog.c
 test_empathy_presence_chooser_SOURCES = test-empathy-presence-chooser.c
 test_empathy_status_preset_dialog_SOURCES = test-empathy-status-preset-dialog.c
diff --git a/tests/interactive/empetit.c b/tests/interactive/empetit.c
deleted file mode 100644
index f3957dbf9..000000000
--- a/tests/interactive/empetit.c
+++ /dev/null
@@ -1,69 +0,0 @@
-#include "config.h"
-
-#include <gtk/gtk.h>
-
-#include <libempathy/empathy-contact-manager.h>
-#include <libempathy/empathy-request-util.h>
-
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-contact-list-store.h>
-#include <libempathy-gtk/empathy-contact-selector.h>
-
-static GtkWidget *window = NULL;
-
-static void
-clicked_cb (GtkButton *button,
-            gpointer data)
-{
-  EmpathyContactSelector *selector = EMPATHY_CONTACT_SELECTOR (data);
-  EmpathyContact *contact;
-
-  contact = empathy_contact_selector_dup_selected (selector);
-
-  if (!contact)
-    return;
-
-  empathy_chat_with_contact (contact, gtk_get_current_event_time ());
-
-  g_object_unref (contact);
-}
-
-int main (int argc,
-          char *argv[])
-{
-  EmpathyContactManager *manager;
-  GtkWidget *vbox, *button, *selector;
-
-  gtk_init (&argc, &argv);
-
-  empathy_gtk_init ();
-
-  manager = empathy_contact_manager_dup_singleton ();
-  selector = empathy_contact_selector_new (EMPATHY_CONTACT_LIST (manager));
-
-  empathy_contact_selector_set_visible (EMPATHY_CONTACT_SELECTOR (selector),
-      (EmpathyContactSelectorFilterFunc) empathy_contact_can_send_files, NULL);
-
-  vbox = gtk_vbox_new (FALSE, 2);
-
-  gtk_box_pack_start (GTK_BOX (vbox), selector, FALSE, FALSE, 5);
-
-  button = gtk_button_new_with_label ("Chat");
-  g_signal_connect (G_OBJECT (button), "clicked",
-      G_CALLBACK (clicked_cb), (gpointer) selector);
-  gtk_box_pack_start(GTK_BOX (vbox), button, FALSE, FALSE, 5);
-
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  g_signal_connect (G_OBJECT (window), "destroy",
-      gtk_main_quit, NULL);
-  gtk_window_set_title (GTK_WINDOW (window),"Empetit");
-  gtk_container_set_border_width (GTK_CONTAINER (window), 5);
-  gtk_container_add (GTK_CONTAINER (window), vbox);
-  gtk_widget_show_all (window);
-
-  gtk_main ();
-
-  g_object_unref (manager);
-
-  return 0;
-}